summaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorKarel Zak2015-01-14 11:08:35 +0100
committerKarel Zak2015-01-14 11:08:35 +0100
commit6bbace6dc7ab33aceea4e5ff7d4a2806f2ab3f23 (patch)
tree3649c4bd052e59da530f80bdb9e246bb338cdc90 /po/zh_CN.po
parentdocs: add TODO entry for libblkid (diff)
downloadkernel-qcow2-util-linux-6bbace6dc7ab33aceea4e5ff7d4a2806f2ab3f23.tar.gz
kernel-qcow2-util-linux-6bbace6dc7ab33aceea4e5ff7d4a2806f2ab3f23.tar.xz
kernel-qcow2-util-linux-6bbace6dc7ab33aceea4e5ff7d4a2806f2ab3f23.zip
po: merge changes
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po9527
1 files changed, 5414 insertions, 4113 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 872c6913e..2cba81fc2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: util-linux-2.25.1-rc1\n"
"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2014-08-27 14:59+0200\n"
+"POT-Creation-Date: 2015-01-14 11:00+0100\n"
"PO-Revision-Date: 2014-11-29 21:39+0800\n"
"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -27,54 +27,60 @@ msgstr ""
msgid " %s <disk device> <partition number> <start> <length>\n"
msgstr " %s <磁盘设备> <分区号> <起点> <长度>\n"
-#: disk-utils/addpart.c:52 disk-utils/blockdev.c:276 disk-utils/blockdev.c:420
-#: disk-utils/blockdev.c:447 disk-utils/cfdisk.c:2056 disk-utils/delpart.c:53
-#: disk-utils/fdformat.c:62 disk-utils/fdformat.c:154 disk-utils/fdisk.c:687
-#: disk-utils/fdisk.c:704 disk-utils/fdisk.c:744 disk-utils/fdisk.c:963
-#: disk-utils/fsck.c:1423 disk-utils/fsck.cramfs.c:145
-#: disk-utils/fsck.cramfs.c:502 disk-utils/isosize.c:134
-#: disk-utils/mkfs.bfs.c:187 disk-utils/mkfs.cramfs.c:164
+#: disk-utils/addpart.c:18
+msgid "Tell the kernel about the existence of a specified partition.\n"
+msgstr ""
+
+#: disk-utils/addpart.c:56 disk-utils/blockdev.c:276 disk-utils/blockdev.c:420
+#: disk-utils/blockdev.c:447 disk-utils/cfdisk.c:2245 disk-utils/delpart.c:57
+#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:622 disk-utils/fdisk.c:856
+#: disk-utils/fdisk-list.c:205 disk-utils/fdisk-list.c:245
+#: disk-utils/fsck.c:1426 disk-utils/fsck.cramfs.c:150
+#: disk-utils/fsck.cramfs.c:507 disk-utils/isosize.c:134
+#: disk-utils/mkfs.bfs.c:192 disk-utils/mkfs.cramfs.c:164
#: disk-utils/mkfs.cramfs.c:664 disk-utils/mkfs.cramfs.c:791
-#: disk-utils/mkfs.minix.c:753 disk-utils/partx.c:949
-#: disk-utils/resizepart.c:97 disk-utils/swaplabel.c:105
-#: libfdisk/src/bsd.c:503 lib/path.c:73 lib/path.c:85 login-utils/islocal.c:87
-#: login-utils/last.c:643 login-utils/last-deprecated.c:245
-#: login-utils/sulogin.c:468 login-utils/sulogin.c:506
-#: login-utils/utmpdump.c:126 login-utils/utmpdump.c:345
-#: login-utils/utmpdump.c:367 login-utils/vipw.c:265 login-utils/vipw.c:283
-#: misc-utils/findmnt.c:1085 misc-utils/logger.c:412 misc-utils/mcookie.c:112
-#: misc-utils/uuidd.c:222 sys-utils/blkdiscard.c:135 sys-utils/dmesg.c:513
-#: sys-utils/eject.c:510 sys-utils/eject.c:711 sys-utils/fallocate.c:370
-#: sys-utils/fsfreeze.c:124 sys-utils/fstrim.c:72 sys-utils/hwclock.c:270
-#: sys-utils/hwclock-cmos.c:632 sys-utils/hwclock-rtc.c:162
-#: sys-utils/hwclock-rtc.c:256 sys-utils/hwclock-rtc.c:414
-#: sys-utils/hwclock-rtc.c:435 sys-utils/hwclock-rtc.c:482
-#: sys-utils/ldattach.c:290 sys-utils/nsenter.c:113 sys-utils/rtcwake.c:106
-#: sys-utils/rtcwake.c:265 sys-utils/rtcwake.c:525 sys-utils/setpriv.c:224
-#: sys-utils/setpriv.c:523 sys-utils/setpriv.c:546 sys-utils/swapon.c:320
-#: sys-utils/swapon.c:483 sys-utils/switch_root.c:163 sys-utils/unshare.c:49
-#: sys-utils/wdctl.c:319 sys-utils/wdctl.c:375 term-utils/script.c:216
-#: term-utils/script.c:242 term-utils/script.c:683
-#: term-utils/scriptreplay.c:203 term-utils/scriptreplay.c:206
-#: term-utils/wall.c:272 text-utils/rev.c:141 text-utils/tailf.c:61
-#: text-utils/tailf.c:98 text-utils/ul.c:232
+#: disk-utils/mkfs.minix.c:757 disk-utils/mkswap.c:216 disk-utils/mkswap.c:255
+#: disk-utils/partx.c:952 disk-utils/resizepart.c:101 disk-utils/sfdisk.c:552
+#: disk-utils/sfdisk.c:619 disk-utils/sfdisk.c:651 disk-utils/sfdisk.c:1098
+#: disk-utils/swaplabel.c:60 libfdisk/src/bsd.c:582 lib/path.c:73
+#: lib/path.c:85 login-utils/islocal.c:87 login-utils/last.c:659
+#: login-utils/last-deprecated.c:245 login-utils/sulogin.c:468
+#: login-utils/sulogin.c:506 login-utils/utmpdump.c:126
+#: login-utils/utmpdump.c:348 login-utils/utmpdump.c:370
+#: login-utils/vipw.c:256 login-utils/vipw.c:274 misc-utils/findmnt.c:1085
+#: misc-utils/logger.c:660 misc-utils/mcookie.c:115 misc-utils/uuidd.c:225
+#: sys-utils/blkdiscard.c:154 sys-utils/dmesg.c:519 sys-utils/eject.c:508
+#: sys-utils/eject.c:708 sys-utils/fallocate.c:374 sys-utils/fsfreeze.c:128
+#: sys-utils/fstrim.c:72 sys-utils/hwclock.c:283 sys-utils/hwclock-cmos.c:633
+#: sys-utils/hwclock-rtc.c:162 sys-utils/hwclock-rtc.c:256
+#: sys-utils/hwclock-rtc.c:414 sys-utils/hwclock-rtc.c:435
+#: sys-utils/hwclock-rtc.c:482 sys-utils/ldattach.c:371
+#: sys-utils/nsenter.c:117 sys-utils/rtcwake.c:109 sys-utils/rtcwake.c:268
+#: sys-utils/rtcwake.c:527 sys-utils/setpriv.c:230 sys-utils/setpriv.c:529
+#: sys-utils/setpriv.c:552 sys-utils/swapon.c:345 sys-utils/swapon.c:508
+#: sys-utils/switch_root.c:163 sys-utils/unshare.c:79 sys-utils/unshare.c:94
+#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/script.c:221
+#: term-utils/script.c:246 term-utils/script.c:693
+#: term-utils/scriptreplay.c:206 term-utils/scriptreplay.c:209
+#: term-utils/wall.c:276 text-utils/more.c:607 text-utils/rev.c:142
+#: text-utils/tailf.c:61 text-utils/tailf.c:98 text-utils/ul.c:225
#, c-format
msgid "cannot open %s"
msgstr "打不开 %s"
-#: disk-utils/addpart.c:55 disk-utils/delpart.c:56 disk-utils/resizepart.c:94
+#: disk-utils/addpart.c:59 disk-utils/delpart.c:60 disk-utils/resizepart.c:98
msgid "invalid partition number argument"
msgstr "无效的分区号参数"
-#: disk-utils/addpart.c:56
+#: disk-utils/addpart.c:60
msgid "invalid start argument"
msgstr "无效的 起点 参数"
-#: disk-utils/addpart.c:57 disk-utils/resizepart.c:104
+#: disk-utils/addpart.c:61 disk-utils/resizepart.c:108
msgid "invalid length argument"
msgstr "无效的长度参数"
-#: disk-utils/addpart.c:58
+#: disk-utils/addpart.c:62
msgid "failed to add partition"
msgstr "添加分区失败"
@@ -196,6 +202,11 @@ msgstr "未知命令: %s"
msgid "%s requires an argument"
msgstr "%s 需要一个参数"
+#: disk-utils/blockdev.c:368 disk-utils/blockdev.c:470
+#, c-format
+msgid "ioctl error on %s"
+msgstr "%s ioctl 出错"
+
#: disk-utils/blockdev.c:370
#, c-format
msgid "%s failed.\n"
@@ -206,364 +217,418 @@ msgstr "%s 失败.\n"
msgid "%s succeeded.\n"
msgstr "%s 成功.\n"
-#: disk-utils/blockdev.c:456 misc-utils/lsblk.c:1089 misc-utils/lsblk.c:1096
+#: disk-utils/blockdev.c:456 misc-utils/lsblk.c:1131 misc-utils/lsblk.c:1138
#, c-format
msgid "%s: failed to initialize sysfs handler"
msgstr "%s:初始化 sysfs 处理函数失败"
-#: disk-utils/blockdev.c:470
-#, c-format
-msgid "ioctl error on %s"
-msgstr "%s ioctl 出错"
-
#: disk-utils/blockdev.c:478
#, c-format
msgid "RO RA SSZ BSZ StartSec Size Device\n"
msgstr "RO RA SSZ BSZ 开始段 大小 设备\n"
-#: disk-utils/cfdisk.c:148
+#: disk-utils/cfdisk.c:168
msgid "Bootable"
msgstr "可启动"
-#: disk-utils/cfdisk.c:148
+#: disk-utils/cfdisk.c:168
msgid "Toggle bootable flag of the current partition"
msgstr "开关当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:149
+#: disk-utils/cfdisk.c:169
msgid "Delete"
msgstr "删除"
-#: disk-utils/cfdisk.c:149
+#: disk-utils/cfdisk.c:169
msgid "Delete the current partition"
msgstr "删除当前分区"
-#: disk-utils/cfdisk.c:150
+#: disk-utils/cfdisk.c:170
msgid "New"
msgstr "新建"
-#: disk-utils/cfdisk.c:150
+#: disk-utils/cfdisk.c:170
msgid "Create new partition from free space"
msgstr "在剩余空间上创建新分区"
-#: disk-utils/cfdisk.c:151
+#: disk-utils/cfdisk.c:171
msgid "Quit"
msgstr "退出"
-#: disk-utils/cfdisk.c:151
+#: disk-utils/cfdisk.c:171
msgid "Quit program without writing partition table"
msgstr "退出程序而不写入分区表"
-#: disk-utils/cfdisk.c:152 libfdisk/src/bsd.c:890 libfdisk/src/dos.c:2033
-#: libfdisk/src/gpt.c:2417 libfdisk/src/sgi.c:1093 libfdisk/src/sun.c:1007
+#: disk-utils/cfdisk.c:172 libfdisk/src/bsd.c:957 libfdisk/src/dos.c:2238
+#: libfdisk/src/gpt.c:2550 libfdisk/src/sgi.c:1139 libfdisk/src/sun.c:1083
msgid "Type"
msgstr "类型"
-#: disk-utils/cfdisk.c:152
+#: disk-utils/cfdisk.c:172
msgid "Change the partition type"
msgstr "更改分区类型"
-#: disk-utils/cfdisk.c:153
+#: disk-utils/cfdisk.c:173
msgid "Help"
msgstr "帮助"
-#: disk-utils/cfdisk.c:153
+#: disk-utils/cfdisk.c:173
msgid "Print help screen"
msgstr "打印帮助界面"
-#: disk-utils/cfdisk.c:154
+#: disk-utils/cfdisk.c:174
msgid "Sort"
msgstr "排序"
-#: disk-utils/cfdisk.c:154
+#: disk-utils/cfdisk.c:174
msgid "Fix partitions order"
msgstr "修复分区顺序"
-#: disk-utils/cfdisk.c:155
+#: disk-utils/cfdisk.c:175
msgid "Write"
msgstr "写入"
-#: disk-utils/cfdisk.c:155
+#: disk-utils/cfdisk.c:175
msgid "Write partition table to disk (this might destroy data)"
msgstr "将分区表写入磁盘(可能损坏数据)"
-#: disk-utils/cfdisk.c:510 disk-utils/fdisk.c:347
+#: disk-utils/cfdisk.c:176
+msgid "Dump"
+msgstr ""
+
+#: disk-utils/cfdisk.c:176
+#, fuzzy
+msgid "Dump partition table to sfdisk compatible script file"
+msgstr "向屏幕或文件打印分区表"
+
+#: disk-utils/cfdisk.c:557 disk-utils/fdisk.c:367
#, c-format
msgid "internal error: unsupported dialog type %d"
msgstr "内部错误:不支持的对话类型 %d"
-#: disk-utils/cfdisk.c:1282
+#: disk-utils/cfdisk.c:1356
#, c-format
msgid "Disk: %s"
msgstr "磁盘:%s"
-#: disk-utils/cfdisk.c:1284
+#: disk-utils/cfdisk.c:1358
#, c-format
msgid "Size: %s, %ju bytes, %ju sectors"
msgstr "尺寸:%s,%ju 字节,%ju 个扇区"
-#: disk-utils/cfdisk.c:1287
+#: disk-utils/cfdisk.c:1361
#, c-format
msgid "Label: %s, identifier: %s"
msgstr "标签:%s,标识符:%s"
-#: disk-utils/cfdisk.c:1290
+#: disk-utils/cfdisk.c:1364
#, c-format
msgid "Label: %s"
msgstr "标签:%s"
-#: disk-utils/cfdisk.c:1431
+#: disk-utils/cfdisk.c:1508
msgid "May be followed by {M,B,G,T}iB (the \"iB\" is optional) or S for sectors."
msgstr "后面可以加 {M,B,G,T}iB (“iB”为可选)或 S(扇区)。"
-#: disk-utils/cfdisk.c:1435
+#: disk-utils/cfdisk.c:1512
msgid "Please, specify size."
msgstr "请指定文件大小。"
-#: disk-utils/cfdisk.c:1457
+#: disk-utils/cfdisk.c:1534
#, c-format
msgid "Minimal size is %ju"
msgstr "最小为 %ju"
-#: disk-utils/cfdisk.c:1466
+#: disk-utils/cfdisk.c:1543
#, c-format
msgid "Maximal size is %ju bytes."
msgstr "最大尺寸为 %ju 字节。"
-#: disk-utils/cfdisk.c:1470
+#: disk-utils/cfdisk.c:1550
msgid "Failed to parse size."
msgstr "解析大小失败。"
-#: disk-utils/cfdisk.c:1525
+#: disk-utils/cfdisk.c:1608
msgid "Select partition type"
msgstr "选择分区类型"
-#: disk-utils/cfdisk.c:1588 disk-utils/fdisk.c:968
+#: disk-utils/cfdisk.c:1653 disk-utils/cfdisk.c:1682
+#, fuzzy
+msgid "Enter script file name: "
+msgstr "无法写脚本文件"
+
+#: disk-utils/cfdisk.c:1654
+msgid "The script file will be applied to in-memory partition table."
+msgstr ""
+
+#: disk-utils/cfdisk.c:1663 disk-utils/cfdisk.c:1704
+#: disk-utils/fdisk-menu.c:462 disk-utils/fdisk-menu.c:500
+#, fuzzy, c-format
+msgid "Cannot open: %s"
+msgstr "打不开 %s"
+
+#: disk-utils/cfdisk.c:1665 disk-utils/fdisk-menu.c:464
+#, fuzzy, c-format
+msgid "Failed to parse script file %s"
+msgstr "读 typescript 文件 %s 失败"
+
+#: disk-utils/cfdisk.c:1667 disk-utils/fdisk-menu.c:466
+#, fuzzy, c-format
+msgid "Failed to apply script %s"
+msgstr "读 typescript 文件 %s 失败"
+
+#: disk-utils/cfdisk.c:1683
+msgid "The current in-memory partition table will be dumped to the file."
+msgstr ""
+
+#: disk-utils/cfdisk.c:1691 disk-utils/fdisk-menu.c:488
+#, fuzzy
+msgid "Failed to allocate script handler"
+msgstr "分配 GPT 头失败"
+
+#: disk-utils/cfdisk.c:1697 disk-utils/fdisk-menu.c:494
+#, fuzzy
+msgid "Failed to read disk layout into script."
+msgstr "向输出添加行出错"
+
+#: disk-utils/cfdisk.c:1711
+msgid "Disk layout successfully dumped."
+msgstr ""
+
+#: disk-utils/cfdisk.c:1714 disk-utils/fdisk-menu.c:506
+#, fuzzy, c-format
+msgid "Failed to write script %s"
+msgstr "读 typescript 文件 %s 失败"
+
+#: disk-utils/cfdisk.c:1747 disk-utils/fdisk.c:861
msgid "Device does not contain a recognized partition table."
msgstr "设备不包含可识别的分区表。"
-#: disk-utils/cfdisk.c:1590
-msgid "Please, select a type to create a new disk label."
-msgstr "请选择创建新磁盘标签的类型。"
+#: disk-utils/cfdisk.c:1749
+msgid "Select a type to create a new label or press 'L' to load script file."
+msgstr ""
-#: disk-utils/cfdisk.c:1595
+#: disk-utils/cfdisk.c:1754
msgid "Select label type"
msgstr "选择标签类型"
-#: disk-utils/cfdisk.c:1632
+#: disk-utils/cfdisk.c:1800
msgid "Help Screen for cfdisk"
msgstr "cfdisk 帮助页面"
# 以下三句连贯,一起翻译
-#: disk-utils/cfdisk.c:1634
+#: disk-utils/cfdisk.c:1802
msgid "This is cfdisk, a curses based disk partitioning program, which"
msgstr "这是 cfdisk,一款基于 curses 的磁盘分区程序,"
-#: disk-utils/cfdisk.c:1635
+#: disk-utils/cfdisk.c:1803
msgid "allows you to create, delete and modify partitions on your hard"
msgstr "您可以通过它创建、删除和修改您硬盘驱动器上的"
-#: disk-utils/cfdisk.c:1636
+#: disk-utils/cfdisk.c:1804
msgid "disk drive."
msgstr "分区。"
-#: disk-utils/cfdisk.c:1638
+#: disk-utils/cfdisk.c:1806
msgid "Copyright (C) 2014 Karel Zak <kzak@redhat.com> "
msgstr "Copyright (C) 2014 Karel Zak <kzak@redhat.com> "
-#: disk-utils/cfdisk.c:1639
+#: disk-utils/cfdisk.c:1807
msgid "Based on the original cfdisk from Kevin E. Martin & aeb."
msgstr "基于由 Kevin E. Martin & aeb 编写的原 cfdisk。"
# 以下两条注意对齐
-#: disk-utils/cfdisk.c:1641
+#: disk-utils/cfdisk.c:1809
msgid "Command Meaning"
msgstr "命令 意义"
-#: disk-utils/cfdisk.c:1642
+#: disk-utils/cfdisk.c:1810
msgid "------- -------"
msgstr "------- -------"
-#: disk-utils/cfdisk.c:1643
+#: disk-utils/cfdisk.c:1811
msgid " b Toggle bootable flag of the current partition"
msgstr " b 切换当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:1644
+#: disk-utils/cfdisk.c:1812
msgid " d Delete the current partition"
msgstr " d 删除当前分区"
-#: disk-utils/cfdisk.c:1645
+#: disk-utils/cfdisk.c:1813
msgid " h Print this screen"
msgstr " h 打印此屏幕"
-#: disk-utils/cfdisk.c:1646
+#: disk-utils/cfdisk.c:1814
msgid " n Create new partition from free space"
msgstr " n 从空闲空间创建新分区"
-#: disk-utils/cfdisk.c:1647
+#: disk-utils/cfdisk.c:1815
msgid " q Quit program without writing partition table"
msgstr " q 退出程序但不写入分区表"
-#: disk-utils/cfdisk.c:1648
+#: disk-utils/cfdisk.c:1816
msgid " t Change the partition type"
msgstr " t 更改分区类型"
-#: disk-utils/cfdisk.c:1649
+#: disk-utils/cfdisk.c:1817
msgid " s Fix partitions order (only when in disarray)"
msgstr " s 修复分区顺序(仅磁盘阵列)"
-#: disk-utils/cfdisk.c:1650
+#: disk-utils/cfdisk.c:1818
+msgid " u Dump disk layout to sfdisk compatible script file"
+msgstr ""
+
+#: disk-utils/cfdisk.c:1819
msgid " W Write partition table to disk (must enter upper case W)"
msgstr " W 将分区表写入磁盘(必须输入大写 W)"
-#: disk-utils/cfdisk.c:1651
+#: disk-utils/cfdisk.c:1820
msgid " Since this might destroy data on the disk, you must"
msgstr " 由于这可能破坏磁盘上的数据,您必须"
-#: disk-utils/cfdisk.c:1652
+#: disk-utils/cfdisk.c:1821
msgid " either confirm or deny the write by entering `yes' or"
msgstr " 通过输入“yes”或“no”来确实或拒绝"
-#: disk-utils/cfdisk.c:1653
+#: disk-utils/cfdisk.c:1822
msgid " `no'"
msgstr " 写入"
-#: disk-utils/cfdisk.c:1654
+#: disk-utils/cfdisk.c:1823
msgid "Up Arrow Move cursor to the previous partition"
msgstr "上箭头 光标移到上一分区"
-#: disk-utils/cfdisk.c:1655
+#: disk-utils/cfdisk.c:1824
msgid "Down Arrow Move cursor to the next partition"
msgstr "下箭头 光标移到下一分区"
-#: disk-utils/cfdisk.c:1656
+#: disk-utils/cfdisk.c:1825
msgid "Left Arrow Move cursor to the previous menu item"
msgstr "上箭头 光标移到上一菜单项"
-#: disk-utils/cfdisk.c:1657
+#: disk-utils/cfdisk.c:1826
msgid "Right Arrow Move cursor to the next menu item"
msgstr "下箭头 光标移到下一菜单项"
-#: disk-utils/cfdisk.c:1660
+#: disk-utils/cfdisk.c:1829
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "注:所有命令均可以大写或小写"
-#: disk-utils/cfdisk.c:1661
+#: disk-utils/cfdisk.c:1830
msgid "case letters (except for Writes)."
msgstr "字母输入(写入命令除外)。"
-#: disk-utils/cfdisk.c:1663
+#: disk-utils/cfdisk.c:1832
msgid "Use lsblk(8) or partx(8) to see more details about the device."
msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。"
-#: disk-utils/cfdisk.c:1670
+#: disk-utils/cfdisk.c:1839
msgid "Press a key to continue."
msgstr "按下一个键继续。"
-#: disk-utils/cfdisk.c:1746
+#: disk-utils/cfdisk.c:1915
msgid "Could not toggle the flag."
msgstr "无法切换标志。"
-#: disk-utils/cfdisk.c:1756
+#: disk-utils/cfdisk.c:1925
#, c-format
msgid "Could not delete partition %zu."
msgstr "无法删除分区 %zu。"
-#: disk-utils/cfdisk.c:1758 disk-utils/fdisk-menu.c:504
+#: disk-utils/cfdisk.c:1927 disk-utils/fdisk-menu.c:589
#, c-format
msgid "Partition %zu has been deleted."
msgstr "分区 %zu 已删除。"
-#: disk-utils/cfdisk.c:1779
+#: disk-utils/cfdisk.c:1948
msgid "Partition size: "
msgstr "分区大小:"
-#: disk-utils/cfdisk.c:1810
+#: disk-utils/cfdisk.c:1954
+#, fuzzy
+msgid "Too small partition size specified."
+msgstr "未定义分区。"
+
+#: disk-utils/cfdisk.c:1992
#, c-format
msgid "Changed type of partition %zu."
msgstr "已更改分区 %zu 的类型。"
-#: disk-utils/cfdisk.c:1812
+#: disk-utils/cfdisk.c:1994
#, c-format
msgid "The type of partition %zu is unchanged."
msgstr "分区 %zu 的类型未更改。"
-#: disk-utils/cfdisk.c:1827
+#: disk-utils/cfdisk.c:2011
msgid "Device open in read-only mode"
msgstr "设备以只读方式打开"
-#: disk-utils/cfdisk.c:1832
+#: disk-utils/cfdisk.c:2016
msgid "Are you sure you want to write the partition table to disk? "
msgstr "您确定想将分区表写入磁盘吗?"
-#: disk-utils/cfdisk.c:1834
+#: disk-utils/cfdisk.c:2018
msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
msgstr "输入“yes”或“no”或按 ESC 取消对话框。"
-#: disk-utils/cfdisk.c:1839 login-utils/lslogins.c:209 sys-utils/lscpu.c:1249
+#: disk-utils/cfdisk.c:2023 login-utils/lslogins.c:210 sys-utils/lscpu.c:1249
#: sys-utils/lscpu.c:1259
#, c-format
msgid "yes"
msgstr "是"
-#: disk-utils/cfdisk.c:1840
+#: disk-utils/cfdisk.c:2024
msgid "Did not write partition table to disk"
msgstr "不将分区表写入磁盘"
-#: disk-utils/cfdisk.c:1845
+#: disk-utils/cfdisk.c:2029
msgid "Failed to write disklabel"
msgstr "写磁盘标签失败"
-#: disk-utils/cfdisk.c:1848 disk-utils/fdisk-menu.c:459
+#: disk-utils/cfdisk.c:2032 disk-utils/fdisk-menu.c:544
msgid "The partition table has been altered."
msgstr "分区表已调整。"
-#: disk-utils/cfdisk.c:1868
+#: disk-utils/cfdisk.c:2054
msgid "Note that partition table entries are not in disk order now."
msgstr "注意,现在分区表记录没有按磁盘顺序。"
-#: disk-utils/cfdisk.c:1891
+#: disk-utils/cfdisk.c:2079
msgid "failed to create a new disklabel"
msgstr "创建新磁盘标签失败"
-#: disk-utils/cfdisk.c:1899
+#: disk-utils/cfdisk.c:2087
msgid "failed to read partitions"
msgstr "读分区失败"
-#: disk-utils/cfdisk.c:1909 disk-utils/fdisk.c:960 disk-utils/fdisk-menu.c:451
+#: disk-utils/cfdisk.c:2097 disk-utils/fdisk.c:853 disk-utils/fdisk-menu.c:536
msgid "Device open in read-only mode."
msgstr "设备以只读方式打开。"
-#: disk-utils/cfdisk.c:1980
+#: disk-utils/cfdisk.c:2167
#, c-format
msgid " %1$s [options] <disk>\n"
msgstr " %1$s [选项] <磁盘>\n"
-#: disk-utils/cfdisk.c:1983
+#: disk-utils/cfdisk.c:2170 disk-utils/fdisk.c:640 disk-utils/sfdisk.c:1314
+#, fuzzy
+msgid "Display or manipulate a disk partition table.\n"
+msgstr "%s:读取分区表失败"
+
+#: disk-utils/cfdisk.c:2173
msgid " -L --color[=<when>] colorize output (auto, always or never)\n"
msgstr " -L --color[=<何时>] 彩色输出(auto自动,always总是或never从不)\n"
-#: disk-utils/cfdisk.c:1984
+#: disk-utils/cfdisk.c:2174
msgid " -z --zero start with zeroed partition table\n"
msgstr " -z, --zero 以空分区表开始\n"
-#: disk-utils/cfdisk.c:2023 disk-utils/fdisk.c:880 misc-utils/cal.c:373
-#: sys-utils/dmesg.c:1295 text-utils/hexdump.c:114
+#: disk-utils/cfdisk.c:2213 disk-utils/fdisk.c:766 misc-utils/cal.c:373
+#: sys-utils/dmesg.c:1302 text-utils/hexdump.c:114
msgid "unsupported color mode"
msgstr "不支持的颜色模式"
-#: disk-utils/cfdisk.c:2026 include/c.h:286 schedutils/chrt.c:266
-#: schedutils/taskset.c:166 sys-utils/chcpu.c:330 sys-utils/dmesg.c:1335
-#: sys-utils/hwclock.c:1549 sys-utils/lscpu.c:1727 sys-utils/renice.c:102
-#: sys-utils/rtcwake.c:474 sys-utils/tunelp.c:249 term-utils/agetty.c:740
-#: term-utils/script.c:220 term-utils/scriptreplay.c:177
-#: term-utils/write.c:113 text-utils/col.c:208 text-utils/colcrt.c:118
-#: text-utils/colrm.c:174 text-utils/column.c:152 text-utils/rev.c:124
-#: text-utils/tailf.c:264 text-utils/ul.c:196
-#, c-format
-msgid "%s from %s\n"
-msgstr "%s,来自 %s\n"
-
-#: disk-utils/cfdisk.c:2042 disk-utils/fdisk.c:820
+#: disk-utils/cfdisk.c:2231 disk-utils/fdisk.c:706 disk-utils/sfdisk.c:192
msgid "failed to allocate libfdisk context"
msgstr "分配 libfdisk 环境(context)失败"
@@ -572,116 +637,153 @@ msgstr "分配 libfdisk 环境(context)失败"
msgid " %s <disk device> <partition number>\n"
msgstr " %s <磁盘设备> <分区号>\n"
-#: disk-utils/delpart.c:57
+#: disk-utils/delpart.c:18
+msgid "Tell the kernel to forget about a specified partition.\n"
+msgstr ""
+
+#: disk-utils/delpart.c:61
msgid "failed to remove partition"
msgstr "移除分区失败"
-#: disk-utils/fdformat.c:28
+#: disk-utils/fdformat.c:52
#, c-format
msgid "Formatting ... "
msgstr "正在格式化 ... "
-#: disk-utils/fdformat.c:48 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:67 disk-utils/fdformat.c:137
#, c-format
msgid "done\n"
msgstr "完成\n"
-#: disk-utils/fdformat.c:59
+#: disk-utils/fdformat.c:79
#, c-format
msgid "Verifying ... "
msgstr "正在验证 ... "
-#: disk-utils/fdformat.c:71
+#: disk-utils/fdformat.c:107
msgid "Read: "
msgstr "读: "
-#: disk-utils/fdformat.c:73
-#, c-format
-msgid "Problem reading cylinder %d, expected %d, read %d\n"
+#: disk-utils/fdformat.c:109
+#, fuzzy, c-format
+msgid "Problem reading track/head %u/%u, expected %d, read %d\n"
msgstr "读柱面 %d 时有问题, 期望 %d, 读取 %d\n"
-#: disk-utils/fdformat.c:81
-#, c-format
+#: disk-utils/fdformat.c:126
+#, fuzzy, c-format
msgid ""
-"bad data in cyl %d\n"
+"bad data in track/head %u/%u\n"
"Continuing ... "
msgstr ""
"柱面 %d 中有坏数据\n"
"继续 ... "
-#: disk-utils/fdformat.c:95
+#: disk-utils/fdformat.c:143 disk-utils/fsck.minix.c:196
+#: disk-utils/swaplabel.c:117 misc-utils/wipefs.c:453
+#: sys-utils/blkdiscard.c:63 sys-utils/tunelp.c:89
#, c-format
-msgid "Usage: %s [options] device\n"
-msgstr "用法:%s [选项] 设备\n"
+msgid " %s [options] <device>\n"
+msgstr " %s [选项] <设备>\n"
-#: disk-utils/fdformat.c:98
-#, c-format
+#: disk-utils/fdformat.c:147
+msgid "Do a low-level formatting of a floppy disk.\n"
+msgstr ""
+
+#: disk-utils/fdformat.c:150
+#, fuzzy
+msgid " -f, --from <N> start at the track N (default 0)\n"
+msgstr " -a, --all 全部(默认)\n"
+
+#: disk-utils/fdformat.c:151
+#, fuzzy
+msgid " -t, --to <N> stop at the track N\n"
+msgstr " -t, --time <time_t> 指定唤醒时刻\n"
+
+#: disk-utils/fdformat.c:152
msgid ""
-"\n"
-"Options:\n"
-" -n, --no-verify disable the verification after the format\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
+" -r, --repair <N> try to repair tracks failed during\n"
+" the verification (max N retries)\n"
msgstr ""
-"\n"
-"选项:\n"
-" -n, --no-verify 禁止格式化后的校验\n"
-" -V, --version 输出版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
-"\n"
-#: disk-utils/fdformat.c:145 disk-utils/fsck.cramfs.c:141
-#: disk-utils/mkfs.bfs.c:180 disk-utils/mkfs.cramfs.c:751
-#: disk-utils/mkfs.cramfs.c:788 disk-utils/mkfs.minix.c:746
-#: disk-utils/partx.c:888 login-utils/last.c:657 misc-utils/namei.c:231
-#: sys-utils/blkdiscard.c:138 sys-utils/dmesg.c:515 sys-utils/fallocate.c:195
-#: sys-utils/fsfreeze.c:127 sys-utils/fstrim.c:76 sys-utils/swapon.c:457
-#: sys-utils/switch_root.c:93 sys-utils/switch_root.c:133
-#: term-utils/mesg.c:124 text-utils/tailf.c:101 text-utils/tailf.c:279
+#: disk-utils/fdformat.c:154
+msgid " -n, --no-verify disable the verification after the format\n"
+msgstr ""
+
+#: disk-utils/fdformat.c:193
+#, fuzzy
+msgid "invalid argument - from"
+msgstr "无效参数:%s"
+
+#: disk-utils/fdformat.c:197
+#, fuzzy
+msgid "invalid argument - to"
+msgstr "无效参数:%s"
+
+#: disk-utils/fdformat.c:200
+#, fuzzy
+msgid "invalid argument - repair"
+msgstr "无效参数:%s"
+
+#: disk-utils/fdformat.c:220 disk-utils/fsck.cramfs.c:146
+#: disk-utils/mkfs.bfs.c:185 disk-utils/mkfs.cramfs.c:331
+#: disk-utils/mkfs.cramfs.c:751 disk-utils/mkfs.cramfs.c:788
+#: disk-utils/mkfs.minix.c:750 disk-utils/mkswap.c:242 disk-utils/partx.c:891
+#: login-utils/last.c:673 misc-utils/namei.c:231 sys-utils/blkdiscard.c:157
+#: sys-utils/dmesg.c:521 sys-utils/fallocate.c:198 sys-utils/fsfreeze.c:131
+#: sys-utils/fstrim.c:76 sys-utils/swapon.c:482 sys-utils/switch_root.c:93
+#: sys-utils/switch_root.c:133 term-utils/mesg.c:128 text-utils/more.c:598
+#: text-utils/tailf.c:101 text-utils/tailf.c:281
#, c-format
msgid "stat failed %s"
msgstr "stat 失败:%s"
-#: disk-utils/fdformat.c:148 disk-utils/partx.c:946 misc-utils/lsblk.c:1352
-#: sys-utils/blkdiscard.c:140 sys-utils/mountpoint.c:108
+#: disk-utils/fdformat.c:223 disk-utils/partx.c:949 misc-utils/lsblk.c:1394
+#: sys-utils/blkdiscard.c:159 sys-utils/mountpoint.c:107
#, c-format
msgid "%s: not a block device"
msgstr "%s:不是一个块设备"
-#: disk-utils/fdformat.c:150
+#: disk-utils/fdformat.c:225
#, c-format
msgid "cannot access file %s"
msgstr "无法访问文件 %s"
-#: disk-utils/fdformat.c:156
-msgid "Could not determine current format type"
+#: disk-utils/fdformat.c:231
+#, fuzzy
+msgid "could not determine current format type"
msgstr "不能决定当前格式类型"
-#: disk-utils/fdformat.c:158
+#: disk-utils/fdformat.c:233
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%s-面, %d 磁道, %d 秒/磁道. 总容量 %d kB.\n"
-#: disk-utils/fdformat.c:159
+#: disk-utils/fdformat.c:234
msgid "Double"
msgstr "双面"
-#: disk-utils/fdformat.c:159
+#: disk-utils/fdformat.c:234
msgid "Single"
msgstr "单面"
-#: disk-utils/fdformat.c:163 disk-utils/fsck.minix.c:1389
-#: disk-utils/mkfs.minix.c:804 disk-utils/mkswap.c:661 disk-utils/partx.c:1001
-#: disk-utils/resizepart.c:108 disk-utils/sfdisk.c:2997
-#: disk-utils/sfdisk.c:3049 disk-utils/sfdisk.c:3086
-#: login-utils/utmpdump.c:385 sys-utils/dmesg.c:643 sys-utils/wdctl.c:344
-#: sys-utils/wdctl.c:409 term-utils/script.c:337 term-utils/script.c:378
-#: term-utils/script.c:491 text-utils/pg.c:1236
-msgid "write failed"
-msgstr "写失败"
+#: disk-utils/fdformat.c:241
+msgid "user defined start track exceeds the medium specific maximum"
+msgstr ""
+
+#: disk-utils/fdformat.c:243
+msgid "user defined end track exceeds the medium specific maximum"
+msgstr ""
-#: disk-utils/fdisk.c:62
+#: disk-utils/fdformat.c:245
+msgid "user defined start track exceeds the user defined end track"
+msgstr ""
+
+#: disk-utils/fdformat.c:253 misc-utils/logger.c:505
+#, fuzzy
+msgid "close failed"
+msgstr "关闭失败:%s"
+
+#: disk-utils/fdisk.c:73
#, c-format
msgid ""
"\n"
@@ -690,135 +792,90 @@ msgstr ""
"\n"
"您确实要退出吗?"
-#: disk-utils/fdisk.c:108
+#: disk-utils/fdisk.c:119
#, c-format
msgid "Select (default %c): "
msgstr "选择 (默认 %c):"
-#: disk-utils/fdisk.c:111
+#: disk-utils/fdisk.c:122
#, c-format
msgid "Using default response %c."
msgstr "将使用默认回应 %c。"
-#: disk-utils/fdisk.c:124 disk-utils/fdisk.c:197 disk-utils/fdisk.c:268
+#: disk-utils/fdisk.c:135 disk-utils/fdisk.c:208 disk-utils/fdisk.c:279
msgid "Value out of range."
msgstr "值超出范围。"
-#: disk-utils/fdisk.c:153
+#: disk-utils/fdisk.c:164
#, c-format
msgid "%s (%s, default %c): "
msgstr "%s (%s,默认 %c):"
-#: disk-utils/fdisk.c:156 disk-utils/fdisk.c:222
+#: disk-utils/fdisk.c:167 disk-utils/fdisk.c:233
#, c-format
msgid "%s (%s, default %ju): "
msgstr "%s (%s,默认 %ju):"
-#: disk-utils/fdisk.c:161
+#: disk-utils/fdisk.c:172
#, c-format
msgid "%s (%c-%c, default %c): "
msgstr "%s (%c-%c,默认为 %c):"
-#: disk-utils/fdisk.c:164 disk-utils/fdisk.c:224
+#: disk-utils/fdisk.c:175 disk-utils/fdisk.c:235
#, c-format
msgid "%s (%ju-%ju, default %ju): "
msgstr "%s (%ju-%ju,默认 %ju):"
-#: disk-utils/fdisk.c:167
+#: disk-utils/fdisk.c:178
#, c-format
msgid "%s (%c-%c): "
msgstr "%s (%c-%c):"
-#: disk-utils/fdisk.c:170 disk-utils/fdisk.c:226
+#: disk-utils/fdisk.c:181 disk-utils/fdisk.c:237
#, c-format
msgid "%s (%ju-%ju): "
msgstr "%s (%ju-%ju): "
-#: disk-utils/fdisk.c:330
+#: disk-utils/fdisk.c:344 disk-utils/sfdisk.c:165
msgid " [Y]es/[N]o: "
msgstr "是[Y]/否[N]:"
-#: disk-utils/fdisk.c:361
+#: disk-utils/fdisk.c:385
msgid "Partition type (type L to list all types): "
msgstr "分区类型(输入 L 列出所有类型):"
-#: disk-utils/fdisk.c:362
+#: disk-utils/fdisk.c:386
msgid "Hex code (type L to list all codes): "
msgstr "Hex 代码(输入 L 列出所有代码):"
-#: disk-utils/fdisk.c:456
+#: disk-utils/fdisk.c:483
msgid "DOS Compatibility flag is set (DEPRECATED!)"
msgstr "已设置 DOS 兼容性标志(已废弃!)"
-#: disk-utils/fdisk.c:457
+#: disk-utils/fdisk.c:484
msgid "DOS Compatibility flag is not set"
msgstr "DOS 兼容性标志未设置"
-#: disk-utils/fdisk.c:479
+#: disk-utils/fdisk.c:505
#, c-format
msgid "Partition %zu does not exist yet!"
msgstr "分区 %zu 还不存在!"
-#: disk-utils/fdisk.c:484 disk-utils/fdisk.c:493 disk-utils/sfdisk.c:586
-#: libfdisk/src/ask.c:751
+#: disk-utils/fdisk.c:510 disk-utils/fdisk.c:519 libfdisk/src/ask.c:999
msgid "Unknown"
msgstr "未知"
-#: disk-utils/fdisk.c:492
+#: disk-utils/fdisk.c:518
#, c-format
msgid "Changed type of partition '%s' to '%s'."
msgstr "已将分区“%s”的类型更改为“%s”。"
-#: disk-utils/fdisk.c:496
+#: disk-utils/fdisk.c:522
#, c-format
msgid "Type of partition %zu is unchanged: %s."
msgstr "分区 %zu 的类型未更改:%s。"
-#: disk-utils/fdisk.c:509
-#, c-format
-msgid "Disk %s: %s, %ju bytes, %ju sectors"
-msgstr "Disk %s:%s,%ju 字节,%ju 个扇区"
-
-#: disk-utils/fdisk.c:515
-#, c-format
-msgid "Geometry: %d heads, %llu sectors/track, %llu cylinders"
-msgstr "几何属性:%d 个磁头, %llu 个扇区/磁道, %llu 个柱面"
-
-#: disk-utils/fdisk.c:518
-#, c-format
-msgid "Units: %s of %d * %ld = %ld bytes"
-msgstr "单元:%s / %d * %ld = %ld 字节"
-
-#: disk-utils/fdisk.c:524
-#, c-format
-msgid "Sector size (logical/physical): %lu bytes / %lu bytes"
-msgstr "扇区大小(逻辑/物理):%lu 字节 / %lu 字节"
-
-#: disk-utils/fdisk.c:526
-#, c-format
-msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes"
-msgstr "I/O 大小(最小/最佳):%lu 字节 / %lu 字节"
-
-#: disk-utils/fdisk.c:529
-#, c-format
-msgid "Alignment offset: %lu bytes"
-msgstr "对齐偏移量:%lu 字节"
-
-#: disk-utils/fdisk.c:532
-#, c-format
-msgid "Disklabel type: %s"
-msgstr "磁盘标签类型:%s"
-
-#: disk-utils/fdisk.c:535
-#, c-format
-msgid "Disk identifier: %s"
-msgstr "磁盘标识符:%s"
-
-#: disk-utils/fdisk.c:579
-msgid "Partition table entries are not in disk order."
-msgstr "分区表记录没有按磁盘顺序。"
-
-#: disk-utils/fdisk.c:630
+#: disk-utils/fdisk.c:575
#, c-format
msgid ""
"\n"
@@ -827,25 +884,25 @@ msgstr ""
"\n"
"%s: 偏移 = %ju, 大小 = %zu 字节。"
-#: disk-utils/fdisk.c:634
+#: disk-utils/fdisk.c:581
msgid "cannot seek"
msgstr "无法 seek"
-#: disk-utils/fdisk.c:639
+#: disk-utils/fdisk.c:586
msgid "cannot read"
msgstr "不能读"
-#: disk-utils/fdisk.c:653 libfdisk/src/bsd.c:233 libfdisk/src/dos.c:930
-#: libfdisk/src/gpt.c:1845
+#: disk-utils/fdisk.c:599 libfdisk/src/bsd.c:260 libfdisk/src/dos.c:935
+#: libfdisk/src/gpt.c:2040
msgid "First sector"
msgstr "第一个扇区"
-#: disk-utils/fdisk.c:748
+#: disk-utils/fdisk.c:626
#, c-format
msgid "BLKGETSIZE ioctl failed on %s"
msgstr "对 %s 进行 BLKGETSIZE ioctl 失败"
-#: disk-utils/fdisk.c:757
+#: disk-utils/fdisk.c:635
#, c-format
msgid ""
" %1$s [options] <disk> change partition table\n"
@@ -854,86 +911,86 @@ msgstr ""
" %1$s [选项] <磁盘> 更改分区表\n"
" %1$s [选项] -l <磁盘> 列出分区表\n"
-#: disk-utils/fdisk.c:762
+#: disk-utils/fdisk.c:643
msgid " -b, --sector-size <size> physical and logical sector size\n"
msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n"
-#: disk-utils/fdisk.c:763
+#: disk-utils/fdisk.c:644
msgid " -c, --compatibility[=<mode>] mode is 'dos' or 'nondos' (default)\n"
msgstr " -c, --compatibility[=<模式>] 模式,为“dos”或“nondos”(默认)\n"
-#: disk-utils/fdisk.c:764
+#: disk-utils/fdisk.c:645
msgid " -L, --color[=<when>] colorize output (auto, always or never)\n"
msgstr " -L, --color[=<时机>] 彩色输出(auto, always 或 never)\n"
-#: disk-utils/fdisk.c:765
+#: disk-utils/fdisk.c:646
msgid " -l, --list display partitions end exit\n"
msgstr " -l, --list 显示分区信息并退出\n"
-#: disk-utils/fdisk.c:766
+#: disk-utils/fdisk.c:647
msgid " -t, --type <type> recognize specified partition table type only\n"
msgstr " -t, --type <类型> 只识别指定的分区表类型\n"
-#: disk-utils/fdisk.c:767
+#: disk-utils/fdisk.c:648
msgid " -u, --units[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"
msgstr " -u, --units[=<单位>] 显示单位,“cylinders”柱面或“sectors”扇区(默认)\n"
-#: disk-utils/fdisk.c:768
+#: disk-utils/fdisk.c:649
msgid " -s, --getsz display device size in 512-byte sectors [DEPRECATED]\n"
msgstr " -s, --getsz 以 512-字节扇区显示设备大小[已废弃]\n"
-#: disk-utils/fdisk.c:771
+#: disk-utils/fdisk.c:652
msgid " -C, --cylinders <number> specify the number of cylinders\n"
msgstr " -C, --cylinders <数字> 指定柱面数\n"
-#: disk-utils/fdisk.c:772
+#: disk-utils/fdisk.c:653
msgid " -H, --heads <number> specify the number of heads\n"
msgstr " -H, --heads <数字> 指定磁头数\n"
-#: disk-utils/fdisk.c:773
+#: disk-utils/fdisk.c:654
msgid " -S, --sectors <number> specify the number of sectors per track\n"
msgstr " -S, --sectors <数字> 指定每条磁道的扇区数\n"
-#: disk-utils/fdisk.c:830
+#: disk-utils/fdisk.c:716
msgid "invalid sector size argument"
msgstr "无效的 扇区大小 参数"
-#: disk-utils/fdisk.c:839 disk-utils/sfdisk.c:2611
+#: disk-utils/fdisk.c:725
msgid "invalid cylinders argument"
msgstr "无效的 柱面数 参数"
-#: disk-utils/fdisk.c:851
+#: disk-utils/fdisk.c:737
msgid "not found DOS label driver"
msgstr "未找到 DOS 标签驱动"
-#: disk-utils/fdisk.c:857
+#: disk-utils/fdisk.c:743
#, c-format
msgid "unknown compatibility mode '%s'"
msgstr "未知兼容模式“%s”"
-#: disk-utils/fdisk.c:866 disk-utils/sfdisk.c:2620
+#: disk-utils/fdisk.c:752
msgid "invalid heads argument"
msgstr "无效的 磁头数 参数"
-#: disk-utils/fdisk.c:872 disk-utils/sfdisk.c:2638
+#: disk-utils/fdisk.c:758
msgid "invalid sectors argument"
msgstr "无效的 扇区数 参数"
-#: disk-utils/fdisk.c:894
+#: disk-utils/fdisk.c:783
#, c-format
msgid "unsupported disklabel: %s"
msgstr "不支持的磁盘标签:%s"
-#: disk-utils/fdisk.c:915
+#: disk-utils/fdisk.c:805
msgid "The device properties (sector size and geometry) should be used with one specified device only."
msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。"
-#: disk-utils/fdisk.c:951
+#: disk-utils/fdisk.c:844
#, c-format
msgid "Welcome to fdisk (%s)."
msgstr "欢迎使用 fdisk (%s)。"
-#: disk-utils/fdisk.c:953
+#: disk-utils/fdisk.c:846 disk-utils/sfdisk.c:1135
msgid ""
"Changes will remain in memory only, until you decide to write them.\n"
"Be careful before using the write command.\n"
@@ -941,10 +998,88 @@ msgstr ""
"更改将停留在内存中,直到您决定将更改写入磁盘。\n"
"使用写入命令前请三思。\n"
-#: disk-utils/fdisk.c:973
+#: disk-utils/fdisk.c:866
msgid "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert command 'M')."
msgstr "检测到混合 GPT。您需要手动同步混合 MBR (用专家命令“M”)"
+#: disk-utils/fdisk-list.c:47
+#, c-format
+msgid "Disk %s: %s, %ju bytes, %ju sectors"
+msgstr "Disk %s:%s,%ju 字节,%ju 个扇区"
+
+#: disk-utils/fdisk-list.c:54
+#, c-format
+msgid "Geometry: %d heads, %llu sectors/track, %llu cylinders"
+msgstr "几何属性:%d 个磁头, %llu 个扇区/磁道, %llu 个柱面"
+
+#: disk-utils/fdisk-list.c:59
+#, c-format
+msgid "Units: %s of %d * %ld = %ld bytes"
+msgstr "单元:%s / %d * %ld = %ld 字节"
+
+#: disk-utils/fdisk-list.c:65
+#, c-format
+msgid "Sector size (logical/physical): %lu bytes / %lu bytes"
+msgstr "扇区大小(逻辑/物理):%lu 字节 / %lu 字节"
+
+#: disk-utils/fdisk-list.c:68
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes"
+msgstr "I/O 大小(最小/最佳):%lu 字节 / %lu 字节"
+
+#: disk-utils/fdisk-list.c:72
+#, c-format
+msgid "Alignment offset: %lu bytes"
+msgstr "对齐偏移量:%lu 字节"
+
+#: disk-utils/fdisk-list.c:75
+#, c-format
+msgid "Disklabel type: %s"
+msgstr "磁盘标签类型:%s"
+
+#: disk-utils/fdisk-list.c:79
+#, c-format
+msgid "Disk identifier: %s"
+msgstr "磁盘标识符:%s"
+
+#: disk-utils/fdisk-list.c:107
+#, fuzzy
+msgid "faild to allocate iterator"
+msgstr "分配迭代器失败"
+
+#: disk-utils/fdisk-list.c:113
+#, fuzzy
+msgid "faild to allocate output table"
+msgstr "初始化输出表失败"
+
+#: disk-utils/fdisk-list.c:154
+#, fuzzy
+msgid "faild to allocate output line"
+msgstr "初始化输出行失败"
+
+#: disk-utils/fdisk-list.c:181
+#, fuzzy, c-format
+msgid "Partition %zu does not start on physical sector boundary."
+msgstr "分区 %i 未起始于物理扇区边界。\n"
+
+#: disk-utils/fdisk-list.c:190
+msgid "Partition table entries are not in disk order."
+msgstr "分区表记录没有按磁盘顺序。"
+
+#: disk-utils/fdisk-list.c:290
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Available columns (for -o):\n"
+msgstr ""
+"\n"
+"可用列(用于 --show):\n"
+
+#: disk-utils/fdisk-list.c:331
+#, fuzzy, c-format
+msgid "%s unknown column: %s"
+msgstr "未知列: %s"
+
#: disk-utils/fdisk-menu.c:95
msgid "Generic"
msgstr "常规"
@@ -1002,206 +1137,218 @@ msgid "extra functionality (experts only)"
msgstr "更多功能(仅限专业人员)"
#: disk-utils/fdisk-menu.c:112
+msgid "Script"
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:113
+msgid "load disk layout from sfdisk script file"
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:114
+msgid "dump disk layout to sfdisk script file"
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:116
msgid "Save & Exit"
msgstr "保存并退出"
-#: disk-utils/fdisk-menu.c:113
+#: disk-utils/fdisk-menu.c:117
msgid "write table to disk and exit"
msgstr "将分区表写入磁盘并退出"
-#: disk-utils/fdisk-menu.c:114
+#: disk-utils/fdisk-menu.c:118
msgid "write table to disk"
msgstr "将分区表写入磁盘"
-#: disk-utils/fdisk-menu.c:115
+#: disk-utils/fdisk-menu.c:119
msgid "quit without saving changes"
msgstr "退出而不保存更改"
-#: disk-utils/fdisk-menu.c:116
+#: disk-utils/fdisk-menu.c:120
msgid "return to main menu"
msgstr "返回主菜单"
-#: disk-utils/fdisk-menu.c:118
+#: disk-utils/fdisk-menu.c:122
msgid "return from BSD to DOS"
msgstr "从 BSD 回到 DOS"
-#: disk-utils/fdisk-menu.c:129
+#: disk-utils/fdisk-menu.c:133
msgid "Create a new label"
msgstr "新建空磁盘标签"
-#: disk-utils/fdisk-menu.c:130
+#: disk-utils/fdisk-menu.c:134
msgid "create a new empty GPT partition table"
msgstr "新建一份 GPT 分区表"
-#: disk-utils/fdisk-menu.c:131
+#: disk-utils/fdisk-menu.c:135
msgid "create a new empty SGI (IRIX) partition table"
msgstr "新建一份空 GPT (IRIX) 分区表"
-#: disk-utils/fdisk-menu.c:132
+#: disk-utils/fdisk-menu.c:136
msgid "create a new empty DOS partition table"
msgstr "新建一份的空 DOS 分区表"
-#: disk-utils/fdisk-menu.c:133
+#: disk-utils/fdisk-menu.c:137
msgid "create a new empty Sun partition table"
msgstr "新建一份空 Sun 分区表"
-#: disk-utils/fdisk-menu.c:137
+#: disk-utils/fdisk-menu.c:141
msgid "create an IRIX (SGI) partition table"
msgstr "创建一份 IRIX(SGI) 分区表"
-#: disk-utils/fdisk-menu.c:146
+#: disk-utils/fdisk-menu.c:150
msgid "Geometry"
msgstr "几何属性"
-#: disk-utils/fdisk-menu.c:147
+#: disk-utils/fdisk-menu.c:151
msgid "change number of cylinders"
msgstr "更改柱面数"
-#: disk-utils/fdisk-menu.c:148
+#: disk-utils/fdisk-menu.c:152
msgid "change number of heads"
msgstr "更改磁头数"
-#: disk-utils/fdisk-menu.c:149
+#: disk-utils/fdisk-menu.c:153
msgid "change number of sectors/track"
msgstr "更改扇区/磁道数"
-#: disk-utils/fdisk-menu.c:158 include/pt-mbr-partnames.h:91
+#: disk-utils/fdisk-menu.c:162 include/pt-mbr-partnames.h:91
msgid "GPT"
msgstr "GPT"
-#: disk-utils/fdisk-menu.c:159
+#: disk-utils/fdisk-menu.c:163
msgid "change disk GUID"
msgstr "更改磁盘 GUID"
-#: disk-utils/fdisk-menu.c:160
+#: disk-utils/fdisk-menu.c:164
msgid "change partition name"
msgstr "更改分区名"
-#: disk-utils/fdisk-menu.c:161
+#: disk-utils/fdisk-menu.c:165
msgid "change partition UUID"
msgstr "更改分区 UUID"
-#: disk-utils/fdisk-menu.c:162
+#: disk-utils/fdisk-menu.c:166
msgid "enter protective/hybrid MBR"
msgstr "进入 保护/混合 MBR"
-#: disk-utils/fdisk-menu.c:165
+#: disk-utils/fdisk-menu.c:169
msgid "toggle the legacy BIOS bootable flag"
msgstr "开关旧 BIOS 的 可启动 标志"
-#: disk-utils/fdisk-menu.c:166
+#: disk-utils/fdisk-menu.c:170
msgid "toggle the no block IO protocol flag"
msgstr "开关 不阻塞 IO 协议 标志"
-#: disk-utils/fdisk-menu.c:167
+#: disk-utils/fdisk-menu.c:171
msgid "toggle the required partition flag"
msgstr "开关 必需分区 标志"
-#: disk-utils/fdisk-menu.c:168
+#: disk-utils/fdisk-menu.c:172
msgid "toggle the GUID specific bits"
msgstr "开/关 GUID 特定位"
-#: disk-utils/fdisk-menu.c:178
+#: disk-utils/fdisk-menu.c:182
msgid "Sun"
msgstr "Sun"
-#: disk-utils/fdisk-menu.c:179
+#: disk-utils/fdisk-menu.c:183
msgid "toggle the read-only flag"
msgstr "开关 只读 标志"
-#: disk-utils/fdisk-menu.c:180
+#: disk-utils/fdisk-menu.c:184
msgid "toggle the mountable flag"
msgstr "开关 可挂臷 标志"
-#: disk-utils/fdisk-menu.c:182
+#: disk-utils/fdisk-menu.c:186
msgid "change number of alternate cylinders"
msgstr "更改备选柱面数"
-#: disk-utils/fdisk-menu.c:183
+#: disk-utils/fdisk-menu.c:187
msgid "change number of extra sectors per cylinder"
msgstr "更改每柱面的额外扇区数"
-#: disk-utils/fdisk-menu.c:184
+#: disk-utils/fdisk-menu.c:188
msgid "change interleave factor"
msgstr "更改交错系数"
-#: disk-utils/fdisk-menu.c:185
+#: disk-utils/fdisk-menu.c:189
msgid "change rotation speed (rpm)"
msgstr "更改转速(转/分)"
-#: disk-utils/fdisk-menu.c:186
+#: disk-utils/fdisk-menu.c:190
msgid "change number of physical cylinders"
msgstr "更改物理柱面数"
-#: disk-utils/fdisk-menu.c:195
+#: disk-utils/fdisk-menu.c:199
msgid "SGI"
msgstr "SGI"
-#: disk-utils/fdisk-menu.c:196
+#: disk-utils/fdisk-menu.c:200
msgid "select bootable partition"
msgstr "选择可启动分区"
-#: disk-utils/fdisk-menu.c:197
+#: disk-utils/fdisk-menu.c:201
msgid "edit bootfile entry"
msgstr "编辑启动文件记录"
-#: disk-utils/fdisk-menu.c:198
+#: disk-utils/fdisk-menu.c:202
msgid "select sgi swap partition"
msgstr "选择 sgi 交换分区"
-#: disk-utils/fdisk-menu.c:199
+#: disk-utils/fdisk-menu.c:203
msgid "create SGI info"
msgstr "创建 SGI 信息"
-#: disk-utils/fdisk-menu.c:208
+#: disk-utils/fdisk-menu.c:212
msgid "DOS (MBR)"
msgstr "DOS (MBR)"
-#: disk-utils/fdisk-menu.c:209
+#: disk-utils/fdisk-menu.c:213
msgid "toggle a bootable flag"
msgstr "开关 可启动 标志"
-#: disk-utils/fdisk-menu.c:210
+#: disk-utils/fdisk-menu.c:214
msgid "edit nested BSD disklabel"
msgstr "编辑嵌套的 BSD 磁盘标签"
-#: disk-utils/fdisk-menu.c:211
+#: disk-utils/fdisk-menu.c:215
msgid "toggle the dos compatibility flag"
msgstr "开关 dos 兼容性标志"
-#: disk-utils/fdisk-menu.c:213
+#: disk-utils/fdisk-menu.c:217
msgid "move beginning of data in a partition"
msgstr "移动分区数据的起始点"
-#: disk-utils/fdisk-menu.c:214
+#: disk-utils/fdisk-menu.c:218
msgid "change the disk identifier"
msgstr "更改磁盘标识符"
-#: disk-utils/fdisk-menu.c:216
+#: disk-utils/fdisk-menu.c:220
msgid "return from protective/hybrid MBR to GPT"
msgstr "从 保护/混合 MBR 回到 GPT"
-#: disk-utils/fdisk-menu.c:226
+#: disk-utils/fdisk-menu.c:230
msgid "BSD"
msgstr "BSD"
-#: disk-utils/fdisk-menu.c:227
+#: disk-utils/fdisk-menu.c:231
msgid "edit drive data"
msgstr "编辑驱动数据"
-#: disk-utils/fdisk-menu.c:228
+#: disk-utils/fdisk-menu.c:232
msgid "install bootstrap"
msgstr "安装引导程序"
-#: disk-utils/fdisk-menu.c:229
+#: disk-utils/fdisk-menu.c:233
msgid "show complete disklabel"
msgstr "显示完整磁盘标签"
-#: disk-utils/fdisk-menu.c:230
+#: disk-utils/fdisk-menu.c:234
msgid "link BSD partition to non-BSD partition"
msgstr "将 BSD 分区链接到非 BSD 分区"
-#: disk-utils/fdisk-menu.c:352
+#: disk-utils/fdisk-menu.c:365
#, c-format
msgid ""
"\n"
@@ -1210,7 +1357,7 @@ msgstr ""
"\n"
"帮助 (专业命令):\n"
-#: disk-utils/fdisk-menu.c:354
+#: disk-utils/fdisk-menu.c:367 disk-utils/sfdisk.c:928
#, c-format
msgid ""
"\n"
@@ -1219,62 +1366,83 @@ msgstr ""
"\n"
"帮助:\n"
-#: disk-utils/fdisk-menu.c:371
+#: disk-utils/fdisk-menu.c:387
#, c-format
msgid "You're editing nested '%s' partition table, primary partition table is '%s'."
msgstr "您正在编辑嵌套的“%s”分区表,主分区表为“%s”。"
-#: disk-utils/fdisk-menu.c:400
+#: disk-utils/fdisk-menu.c:417
msgid "Expert command (m for help): "
msgstr "专家命令(输入 m 显示帮助):"
-#: disk-utils/fdisk-menu.c:402
+#: disk-utils/fdisk-menu.c:419
msgid "Command (m for help): "
msgstr "命令(输入 m 获取帮助):"
-#: disk-utils/fdisk-menu.c:412
+#: disk-utils/fdisk-menu.c:429
#, c-format
msgid "%c: unknown command"
msgstr "%c:未知命令"
-#: disk-utils/fdisk-menu.c:456
+#: disk-utils/fdisk-menu.c:455 disk-utils/fdisk-menu.c:482
+#, fuzzy
+msgid "Enter script file name"
+msgstr "无法写脚本文件"
+
+#: disk-utils/fdisk-menu.c:468
+msgid "Script successfully applied."
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:508
+msgid "Script successfully saved."
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:541
msgid "failed to write disklabel"
msgstr "写磁盘标签失败"
-#: disk-utils/fdisk-menu.c:502
+#: disk-utils/fdisk-menu.c:587
#, c-format
msgid "Could not delete partition %zu"
msgstr "无法删除分区 %zu"
-#: disk-utils/fdisk-menu.c:520
+#: disk-utils/fdisk-menu.c:611
msgid "Changing display/entry units to cylinders (DEPRECATED!)."
msgstr "将显示/记录单位更改为柱面(已废弃!)。"
-#: disk-utils/fdisk-menu.c:522
+#: disk-utils/fdisk-menu.c:613
msgid "Changing display/entry units to sectors."
msgstr "将显示/记录单位更改为盲区。"
-#: disk-utils/fdisk-menu.c:532 disk-utils/fdisk-menu.c:672
+#: disk-utils/fdisk-menu.c:623 disk-utils/fdisk-menu.c:787
msgid "Leaving nested disklabel."
msgstr "离开嵌套的磁盘标签。"
-#: disk-utils/fdisk-menu.c:573
+#: disk-utils/fdisk-menu.c:664
msgid "Entering protective/hybrid MBR disklabel."
msgstr "进入 保护/混合 MBR 磁盘标签。"
-#: disk-utils/fdisk-menu.c:643
+#: disk-utils/fdisk-menu.c:680
+msgid "New UUID (in 8-4-4-4-12 format)"
+msgstr "新 UUID (以 8-4-4-4-12 格式)"
+
+#: disk-utils/fdisk-menu.c:695
+msgid "New name"
+msgstr "新名称"
+
+#: disk-utils/fdisk-menu.c:758
msgid "Entering nested BSD disklabel."
msgstr "进入嵌套的 BSD 磁盘标签。"
-#: disk-utils/fdisk-menu.c:829
+#: disk-utils/fdisk-menu.c:944
msgid "Number of cylinders"
msgstr "柱面数"
-#: disk-utils/fdisk-menu.c:833
+#: disk-utils/fdisk-menu.c:948
msgid "Number of heads"
msgstr "磁头数"
-#: disk-utils/fdisk-menu.c:837
+#: disk-utils/fdisk-menu.c:952
msgid "Number of sectors"
msgstr "扇区数"
@@ -1288,13 +1456,13 @@ msgstr "%s 已经挂载\n"
msgid "%s is not mounted\n"
msgstr "%s 未挂载\n"
-#: disk-utils/fsck.c:323 disk-utils/fsck.cramfs.c:164
-#: disk-utils/fsck.cramfs.c:171 disk-utils/fsck.cramfs.c:225
-#: disk-utils/fsck.cramfs.c:243 libfdisk/src/bsd.c:508 lib/path.c:113
-#: lib/path.c:134 lib/path.c:155 lib/path.c:203 login-utils/last.c:196
-#: login-utils/last.c:233 login-utils/sulogin.c:675 sys-utils/setpriv.c:233
-#: term-utils/setterm.c:726 term-utils/setterm.c:783 term-utils/setterm.c:787
-#: term-utils/setterm.c:794
+#: disk-utils/fsck.c:323 disk-utils/fsck.cramfs.c:169
+#: disk-utils/fsck.cramfs.c:176 disk-utils/fsck.cramfs.c:230
+#: disk-utils/fsck.cramfs.c:248 disk-utils/sfdisk.c:249 libfdisk/src/bsd.c:587
+#: lib/path.c:113 lib/path.c:134 lib/path.c:155 lib/path.c:203
+#: login-utils/last.c:196 login-utils/last.c:233 login-utils/sulogin.c:675
+#: sys-utils/setpriv.c:239 term-utils/setterm.c:731 term-utils/setterm.c:788
+#: term-utils/setterm.c:792 term-utils/setterm.c:799
#, c-format
msgid "cannot read %s"
msgstr "不能读 %s"
@@ -1348,10 +1516,10 @@ msgstr "%s:第 %d 行解析出错 -- 忽略"
msgid "%s: failed to parse fstab"
msgstr "%s:解析 fstab 失败"
-#: disk-utils/fsck.c:659 login-utils/login.c:964 login-utils/sulogin.c:1038
-#: login-utils/vipw.c:213 sys-utils/flock.c:293 sys-utils/nsenter.c:138
-#: sys-utils/swapon.c:277 sys-utils/unshare.c:166 term-utils/script.c:273
-#: term-utils/script.c:283
+#: disk-utils/fsck.c:659 login-utils/login.c:979 login-utils/sulogin.c:1041
+#: login-utils/vipw.c:204 sys-utils/flock.c:295 sys-utils/nsenter.c:142
+#: sys-utils/swapon.c:302 sys-utils/unshare.c:221 term-utils/script.c:277
+#: term-utils/script.c:287
msgid "fork failed"
msgstr "fork 失败"
@@ -1364,8 +1532,8 @@ msgstr "%s:执行失败"
msgid "wait: no more child process?!?"
msgstr "等待:没有剩余子进程了?!?"
-#: disk-utils/fsck.c:757 sys-utils/flock.c:310 sys-utils/swapon.c:301
-#: sys-utils/unshare.c:171
+#: disk-utils/fsck.c:757 sys-utils/flock.c:312 sys-utils/swapon.c:326
+#: sys-utils/unshare.c:226
msgid "waitpid failed"
msgstr "waitpid 失败"
@@ -1440,46 +1608,51 @@ msgid " %s [options] -- [fs-options] [<filesystem> ...]\n"
msgstr " %s [选项] -- [文件系统选项] [<文件系统> ...]\n"
#: disk-utils/fsck.c:1359
+#, fuzzy
+msgid "Check and repair a Linux filesystem.\n"
+msgstr "正在检查所有文件系统。\n"
+
+#: disk-utils/fsck.c:1362
msgid " -A check all filesystems\n"
msgstr " -A 检查所有文件系统\n"
-#: disk-utils/fsck.c:1360
+#: disk-utils/fsck.c:1363
msgid " -C [<fd>] display progress bar; file descriptor is for GUIs\n"
msgstr " -C [<fd>] 显示进度条;文件描述符 fd 用于图形用户界面\n"
-#: disk-utils/fsck.c:1361
+#: disk-utils/fsck.c:1364
msgid " -l lock the device to guarantee exclusive access\n"
msgstr " -l 锁定设备以确保独占访问\n"
-#: disk-utils/fsck.c:1362
+#: disk-utils/fsck.c:1365
msgid " -M do not check mounted filesystems\n"
msgstr " -M 不检查已挂臷的文件系统\n"
-#: disk-utils/fsck.c:1363
+#: disk-utils/fsck.c:1366
msgid " -N do not execute, just show what would be done\n"
msgstr " -N 不执行,只显示将执行的操作\n"
-#: disk-utils/fsck.c:1364
+#: disk-utils/fsck.c:1367
msgid " -P check filesystems in parallel, including root\n"
msgstr " -P 并行检查文件系统,包括 root\n"
-#: disk-utils/fsck.c:1365
+#: disk-utils/fsck.c:1368
msgid " -R skip root filesystem; useful only with '-A'\n"
msgstr " -R 跳过根文件系统;只在指定 '-A' 时有用\n"
-#: disk-utils/fsck.c:1366
+#: disk-utils/fsck.c:1369
msgid " -r report statistics for each device checked\n"
msgstr " -r 报告对每个已检查设备的统计\n"
-#: disk-utils/fsck.c:1367
+#: disk-utils/fsck.c:1370
msgid " -s serialize the checking operations\n"
msgstr " -s 串行化检查操作\n"
-#: disk-utils/fsck.c:1368
+#: disk-utils/fsck.c:1371
msgid " -T do not show the title on startup\n"
msgstr " -T 启动时不显示标题\n"
-#: disk-utils/fsck.c:1369
+#: disk-utils/fsck.c:1372
msgid ""
" -t <type> specify filesystem types to be checked;\n"
" <type> is allowed to be a comma-separated list\n"
@@ -1487,398 +1660,400 @@ msgstr ""
" -t <类型> 指定要检查的文件系统类型;\n"
" <类型> 可以是以英文逗号分隔的列表\n"
-#: disk-utils/fsck.c:1371
+#: disk-utils/fsck.c:1374
msgid " -V explain what is being done\n"
msgstr " -V 解释正在进行的操作\n"
-#: disk-utils/fsck.c:1372
+#: disk-utils/fsck.c:1375
msgid " -? display this help and exit\n"
msgstr " -? 显示此帮助并退出\n"
-#: disk-utils/fsck.c:1375
+#: disk-utils/fsck.c:1378
msgid "See the specific fsck.* commands for available fs-options."
msgstr "参见特定的 fsck.* 命令了解可用的文件系统选项。"
-#: disk-utils/fsck.c:1413
+#: disk-utils/fsck.c:1416
msgid "too many devices"
msgstr "设备过多"
-#: disk-utils/fsck.c:1425
+#: disk-utils/fsck.c:1428
msgid "Is /proc mounted?"
msgstr "/proc 挂载了吗?"
-#: disk-utils/fsck.c:1433
+#: disk-utils/fsck.c:1436
#, c-format
msgid "must be root to scan for matching filesystems: %s"
msgstr "必须以 root 用户进行匹配文件系统扫描:%s"
-#: disk-utils/fsck.c:1437
+#: disk-utils/fsck.c:1440
#, c-format
msgid "couldn't find matching filesystem: %s"
msgstr "找不到匹配的文件系统:%s"
-#: disk-utils/fsck.c:1445 disk-utils/fsck.c:1533 misc-utils/kill.c:364
-#: sys-utils/eject.c:292
+#: disk-utils/fsck.c:1448 disk-utils/fsck.c:1536 misc-utils/kill.c:367
+#: sys-utils/eject.c:287
msgid "too many arguments"
msgstr "参数过多"
-#: disk-utils/fsck.c:1585
+#: disk-utils/fsck.c:1588
msgid "the -l option can be used with one device only -- ignore"
msgstr "-l 选项只能用于一个设备 -- 忽略"
-#: disk-utils/fsck.cramfs.c:108 misc-utils/whereis.c:168
+#: disk-utils/fsck.cramfs.c:108 misc-utils/whereis.c:188
#, c-format
msgid " %s [options] <file>\n"
msgstr " %s [选项] <文件>\n"
-#: disk-utils/fsck.cramfs.c:110
+#: disk-utils/fsck.cramfs.c:111
+msgid "Check and repair a compressed ROM filesystem.\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:114
msgid " -a for compatibility only, ignored\n"
msgstr " -a 纯兼容性选项,忽略\n"
-#: disk-utils/fsck.cramfs.c:111
+#: disk-utils/fsck.cramfs.c:115
msgid " -v, --verbose be more verbose\n"
msgstr " -v, --verbose 更详尽\n"
-#: disk-utils/fsck.cramfs.c:112
+#: disk-utils/fsck.cramfs.c:116
msgid " -y for compatibility only, ignored\n"
msgstr " -y 纯兼容性选项,忽略\n"
-#: disk-utils/fsck.cramfs.c:113
+#: disk-utils/fsck.cramfs.c:117
msgid " -b, --blocksize <size> use this blocksize, defaults to page size\n"
msgstr " -b, --blocksize <大小> 使用指定的块大小,默认为页的大小\n"
-#: disk-utils/fsck.cramfs.c:114
+#: disk-utils/fsck.cramfs.c:118
msgid " --extract[=<dir>] test uncompression, optionally extract into <dir>\n"
msgstr " --extract[=<目录>] 测试解压,可指定解压到<目录>\n"
-#: disk-utils/fsck.cramfs.c:151
+#: disk-utils/fsck.cramfs.c:156
#, c-format
msgid "ioctl failed: unable to determine device size: %s"
msgstr "ioctl 失败:无法确定设备大小:%s"
-#: disk-utils/fsck.cramfs.c:157
+#: disk-utils/fsck.cramfs.c:162
#, c-format
msgid "not a block device or file: %s"
msgstr "不是一个块设备或文件:%s"
-#: disk-utils/fsck.cramfs.c:160 disk-utils/fsck.cramfs.c:196
+#: disk-utils/fsck.cramfs.c:165 disk-utils/fsck.cramfs.c:201
msgid "file length too short"
msgstr "文件长度过短"
-#: disk-utils/fsck.cramfs.c:169 disk-utils/fsck.cramfs.c:223
-#: disk-utils/fsck.cramfs.c:239 libfdisk/src/bsd.c:575 libfdisk/src/bsd.c:748
-#: login-utils/last.c:191 login-utils/last.c:225 sys-utils/fallocate.c:200
+#: disk-utils/fsck.cramfs.c:174 disk-utils/fsck.cramfs.c:228
+#: disk-utils/fsck.cramfs.c:244 libfdisk/src/bsd.c:659 libfdisk/src/bsd.c:831
+#: login-utils/last.c:191 login-utils/last.c:225 sys-utils/fallocate.c:203
#, c-format
msgid "seek on %s failed"
msgstr "在 %s 上定位失败"
-#: disk-utils/fsck.cramfs.c:175 disk-utils/fsck.cramfs.c:177
+#: disk-utils/fsck.cramfs.c:180 disk-utils/fsck.cramfs.c:182
msgid "superblock magic not found"
msgstr "超级块魔数(magic)未找到"
-#: disk-utils/fsck.cramfs.c:180
+#: disk-utils/fsck.cramfs.c:185
#, c-format
msgid "cramfs endianness is %s\n"
msgstr "cramfs 大小端为 %s\n"
-#: disk-utils/fsck.cramfs.c:181
+#: disk-utils/fsck.cramfs.c:186
msgid "big"
msgstr "大端"
-#: disk-utils/fsck.cramfs.c:181
+#: disk-utils/fsck.cramfs.c:186
msgid "little"
msgstr "小端"
-#: disk-utils/fsck.cramfs.c:185
+#: disk-utils/fsck.cramfs.c:190
msgid "unsupported filesystem features"
msgstr "不支持的文件系统特性"
-#: disk-utils/fsck.cramfs.c:189
+#: disk-utils/fsck.cramfs.c:194
#, c-format
msgid "superblock size (%d) too small"
msgstr "超级块尺寸(%d)过小"
-#: disk-utils/fsck.cramfs.c:194
+#: disk-utils/fsck.cramfs.c:199
msgid "zero file count"
msgstr "零文件计数"
-#: disk-utils/fsck.cramfs.c:198
+#: disk-utils/fsck.cramfs.c:203
msgid "file extends past end of filesystem"
msgstr "警告:文件超过了文件系统终点"
-#: disk-utils/fsck.cramfs.c:200
+#: disk-utils/fsck.cramfs.c:205
msgid "old cramfs format"
msgstr "旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:209
+#: disk-utils/fsck.cramfs.c:214
msgid "unable to test CRC: old cramfs format"
msgstr "无法检测 CRC:旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:262
+#: disk-utils/fsck.cramfs.c:267
msgid "crc error"
msgstr "crc 错误"
-#: disk-utils/fsck.cramfs.c:292 disk-utils/fsck.minix.c:551
+#: disk-utils/fsck.cramfs.c:297 disk-utils/fsck.minix.c:556
msgid "seek failed"
msgstr "定位失败"
-#: disk-utils/fsck.cramfs.c:296
+#: disk-utils/fsck.cramfs.c:301
msgid "read romfs failed"
msgstr "读取 romfs 失败"
-#: disk-utils/fsck.cramfs.c:328
+#: disk-utils/fsck.cramfs.c:333
msgid "root inode is not directory"
msgstr "根 inode 不是一个目录"
-#: disk-utils/fsck.cramfs.c:332
+#: disk-utils/fsck.cramfs.c:337
#, c-format
msgid "bad root offset (%lu)"
msgstr "错误的根偏移(%lu)"
-#: disk-utils/fsck.cramfs.c:350
+#: disk-utils/fsck.cramfs.c:355
msgid "data block too large"
msgstr "数据块过大"
-#: disk-utils/fsck.cramfs.c:354
+#: disk-utils/fsck.cramfs.c:359
#, c-format
msgid "decompression error: %s"
msgstr "解压出错:%s"
-#: disk-utils/fsck.cramfs.c:380
+#: disk-utils/fsck.cramfs.c:385
#, c-format
msgid " hole at %ld (%zd)\n"
msgstr " 位于 %ld 的空洞(%zd)\n"
-#: disk-utils/fsck.cramfs.c:387 disk-utils/fsck.cramfs.c:542
+#: disk-utils/fsck.cramfs.c:392 disk-utils/fsck.cramfs.c:547
#, c-format
msgid " uncompressing block at %ld to %ld (%ld)\n"
msgstr " 正在将 %ld 处的块解压到 %ld (%ld)\n"
-#: disk-utils/fsck.cramfs.c:394
+#: disk-utils/fsck.cramfs.c:399
#, c-format
msgid "non-block (%ld) bytes"
msgstr "非块(%ld)字节 "
-#: disk-utils/fsck.cramfs.c:398
+#: disk-utils/fsck.cramfs.c:403
#, c-format
msgid "non-size (%ld vs %ld) bytes"
msgstr "无大小(%ld : %ld)字节"
-#: disk-utils/fsck.cramfs.c:404 disk-utils/fsck.cramfs.c:508
-#: disk-utils/sfdisk.c:255 disk-utils/sfdisk.c:263 disk-utils/sfdisk.c:325
-#: disk-utils/swaplabel.c:149 misc-utils/uuidd.c:347 sys-utils/fallocate.c:378
-#: sys-utils/setpriv.c:529 sys-utils/setpriv.c:552 sys-utils/swapon.c:338
+#: disk-utils/fsck.cramfs.c:409 disk-utils/fsck.cramfs.c:513
+#: disk-utils/swaplabel.c:104 misc-utils/uuidd.c:350 sys-utils/fallocate.c:382
+#: sys-utils/setpriv.c:535 sys-utils/setpriv.c:558 sys-utils/swapon.c:363
#: term-utils/ttymsg.c:175
#, c-format
msgid "write failed: %s"
msgstr "写失败:%s"
-#: disk-utils/fsck.cramfs.c:416
+#: disk-utils/fsck.cramfs.c:421
#, c-format
msgid "lchown failed: %s"
msgstr "lchown 失败:%s"
-#: disk-utils/fsck.cramfs.c:420
+#: disk-utils/fsck.cramfs.c:425
#, c-format
msgid "chown failed: %s"
msgstr "chown 失败:%s"
-#: disk-utils/fsck.cramfs.c:425
+#: disk-utils/fsck.cramfs.c:430
#, c-format
msgid "utime failed: %s"
msgstr "utime 失败:%s"
-#: disk-utils/fsck.cramfs.c:437
+#: disk-utils/fsck.cramfs.c:442
#, c-format
msgid "directory inode has zero offset and non-zero size: %s"
msgstr "目录 inode 偏移为 0,大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:452
+#: disk-utils/fsck.cramfs.c:457
#, c-format
msgid "mkdir failed: %s"
msgstr "mkdir 失败:%s"
-#: disk-utils/fsck.cramfs.c:468
+#: disk-utils/fsck.cramfs.c:473
msgid "filename length is zero"
msgstr "文件名长度为 0"
-#: disk-utils/fsck.cramfs.c:470
+#: disk-utils/fsck.cramfs.c:475
msgid "bad filename length"
msgstr "文件名长度有误"
-#: disk-utils/fsck.cramfs.c:476
+#: disk-utils/fsck.cramfs.c:481
msgid "bad inode offset"
msgstr "inode 偏移有误"
-#: disk-utils/fsck.cramfs.c:491
+#: disk-utils/fsck.cramfs.c:496
msgid "file inode has zero offset and non-zero size"
msgstr "文件 inode 偏移为 0,大小不为 0"
-#: disk-utils/fsck.cramfs.c:494
+#: disk-utils/fsck.cramfs.c:499
msgid "file inode has zero size and non-zero offset"
msgstr "文件 inode 大小为 0,偏移不为 0"
-#: disk-utils/fsck.cramfs.c:523
+#: disk-utils/fsck.cramfs.c:528
msgid "symbolic link has zero offset"
msgstr "符号链接偏移为 0"
-#: disk-utils/fsck.cramfs.c:525
+#: disk-utils/fsck.cramfs.c:530
msgid "symbolic link has zero size"
msgstr "符号链接大小为 0"
-#: disk-utils/fsck.cramfs.c:534
+#: disk-utils/fsck.cramfs.c:539
#, c-format
msgid "size error in symlink: %s"
msgstr "符号链接大小出错:%s"
-#: disk-utils/fsck.cramfs.c:548
+#: disk-utils/fsck.cramfs.c:553
#, c-format
msgid "symlink failed: %s"
msgstr "symlink 失败:%s"
-#: disk-utils/fsck.cramfs.c:561
+#: disk-utils/fsck.cramfs.c:566
#, c-format
msgid "special file has non-zero offset: %s"
msgstr "特殊文件的偏移不为 0:%s"
-#: disk-utils/fsck.cramfs.c:571
+#: disk-utils/fsck.cramfs.c:576
#, c-format
msgid "fifo has non-zero size: %s"
msgstr "FIFO 的大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:577
+#: disk-utils/fsck.cramfs.c:582
#, c-format
msgid "socket has non-zero size: %s"
msgstr "套接字的大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:585
#, c-format
msgid "bogus mode: %s (%o)"
msgstr "伪(bogus)模式:%s (%o)"
-#: disk-utils/fsck.cramfs.c:589
+#: disk-utils/fsck.cramfs.c:594
#, c-format
msgid "mknod failed: %s"
msgstr "mknod 失败:%s"
-#: disk-utils/fsck.cramfs.c:621
+#: disk-utils/fsck.cramfs.c:626
#, c-format
msgid "directory data start (%lu) < sizeof(struct cramfs_super) + start (%zu)"
msgstr "目录数据起点(%lu) < sizeof(struct cramfs_super) + 起点 (%zu)"
-#: disk-utils/fsck.cramfs.c:625
+#: disk-utils/fsck.cramfs.c:630
#, c-format
msgid "directory data end (%lu) != file data start (%lu)"
msgstr "目录数据终点 (%lu) != 文件数据起点 (%lu)"
-#: disk-utils/fsck.cramfs.c:630
+#: disk-utils/fsck.cramfs.c:635
msgid "invalid file data offset"
msgstr "无效的文件数据偏移"
-#: disk-utils/fsck.cramfs.c:677 disk-utils/mkfs.cramfs.c:729
+#: disk-utils/fsck.cramfs.c:682 disk-utils/mkfs.cramfs.c:729
msgid "invalid blocksize argument"
msgstr "无效的 块大小 参数"
-#: disk-utils/fsck.cramfs.c:698
+#: disk-utils/fsck.cramfs.c:703
#, c-format
msgid "%s: OK\n"
msgstr "%s:OK\n"
-#: disk-utils/fsck.minix.c:195 disk-utils/swaplabel.c:162
-#: misc-utils/wipefs.c:453 sys-utils/blkdiscard.c:56 sys-utils/tunelp.c:80
-#, c-format
-msgid " %s [options] <device>\n"
-msgstr " %s [选项] <设备>\n"
+#: disk-utils/fsck.minix.c:199
+#, fuzzy
+msgid "Check the consistency of a Minix filesystem.\n"
+msgstr "正在检查所有文件系统。\n"
-#: disk-utils/fsck.minix.c:197
+#: disk-utils/fsck.minix.c:202
msgid " -l list all filenames\n"
msgstr " -l 列出所有文件名\n"
-#: disk-utils/fsck.minix.c:198
+#: disk-utils/fsck.minix.c:203
msgid " -a automatic repair\n"
msgstr " -a 自动修复\n"
-#: disk-utils/fsck.minix.c:199
+#: disk-utils/fsck.minix.c:204
msgid " -r interactive repair\n"
msgstr " -r 交互式修复\n"
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:205
msgid " -v be verbose\n"
msgstr " -v 详尽输出\n"
-#: disk-utils/fsck.minix.c:201
+#: disk-utils/fsck.minix.c:206
msgid " -s output super-block information\n"
msgstr " -s 输出超级块信息\n"
-#: disk-utils/fsck.minix.c:202
+#: disk-utils/fsck.minix.c:207
msgid " -m activate mode not cleared warnings\n"
msgstr " -m 激活 模式未清除 警告\n"
-#: disk-utils/fsck.minix.c:203
+#: disk-utils/fsck.minix.c:208
msgid " -f force check\n"
msgstr " -f 强制检查\n"
#. TRANSLATORS: these yes no questions uses rpmatch(), and should be
#. * translated.
-#: disk-utils/fsck.minix.c:262
+#: disk-utils/fsck.minix.c:267
#, c-format
msgid "%s (y/n)? "
msgstr "%s (是/否)? "
-#: disk-utils/fsck.minix.c:262
+#: disk-utils/fsck.minix.c:267
#, c-format
msgid "%s (n/y)? "
msgstr "%s (否/是)? "
-#: disk-utils/fsck.minix.c:279
+#: disk-utils/fsck.minix.c:284
#, c-format
msgid "y\n"
msgstr "是\n"
-#: disk-utils/fsck.minix.c:281
+#: disk-utils/fsck.minix.c:286
#, c-format
msgid "n\n"
msgstr "否\n"
-#: disk-utils/fsck.minix.c:297
+#: disk-utils/fsck.minix.c:302
#, c-format
msgid "%s is mounted.\t "
msgstr "%s 已经挂载.\t"
-#: disk-utils/fsck.minix.c:299
+#: disk-utils/fsck.minix.c:304
msgid "Do you really want to continue"
msgstr "你确认要继续"
-#: disk-utils/fsck.minix.c:303
+#: disk-utils/fsck.minix.c:308
#, c-format
msgid "check aborted.\n"
msgstr "检查失败.\n"
-#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:324 disk-utils/fsck.minix.c:345
#, c-format
msgid "Zone nr < FIRSTZONE in file `%s'."
msgstr "nr 区 < 文件“%s”中的 FIRSTZONE。"
-#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:343
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:348
#, c-format
msgid "Zone nr >= ZONES in file `%s'."
msgstr "nr 区 >= 文件“%s”中的 FIRSTZONE。"
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:347
+#: disk-utils/fsck.minix.c:331 disk-utils/fsck.minix.c:352
msgid "Remove block"
msgstr "删除块"
-#: disk-utils/fsck.minix.c:363
+#: disk-utils/fsck.minix.c:368
#, c-format
msgid "Read error: unable to seek to block in file '%s'\n"
msgstr "读取错误: 不能在文件 '%s' 中定位到该块\n"
-#: disk-utils/fsck.minix.c:369
+#: disk-utils/fsck.minix.c:374
#, c-format
msgid "Read error: bad block in file '%s'\n"
msgstr "读取错误: 文件 '%s' 中有坏块\n"
-#: disk-utils/fsck.minix.c:381
+#: disk-utils/fsck.minix.c:386
#, c-format
msgid ""
"Internal error: trying to write bad block\n"
@@ -1887,127 +2062,127 @@ msgstr ""
"内部错误: 试图写坏块\n"
"写请求忽略\n"
-#: disk-utils/fsck.minix.c:387
+#: disk-utils/fsck.minix.c:392
msgid "seek failed in write_block"
msgstr "在 write_block 中定位失败"
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:395
#, c-format
msgid "Write error: bad block in file '%s'\n"
msgstr "写入错误: 文件 '%s' 中有坏块\n"
-#: disk-utils/fsck.minix.c:502
+#: disk-utils/fsck.minix.c:507
msgid "seek failed in write_super_block"
msgstr "在 write_super_block 中定位失败"
-#: disk-utils/fsck.minix.c:504
+#: disk-utils/fsck.minix.c:509
msgid "unable to write super-block"
msgstr "不能写超级块"
-#: disk-utils/fsck.minix.c:517
+#: disk-utils/fsck.minix.c:522
msgid "Unable to write inode map"
msgstr "不能写 inode map"
-#: disk-utils/fsck.minix.c:520
+#: disk-utils/fsck.minix.c:525
msgid "Unable to write zone map"
msgstr "不能写 zone map"
-#: disk-utils/fsck.minix.c:523
+#: disk-utils/fsck.minix.c:528
msgid "Unable to write inodes"
msgstr "不能写 inodes"
-#: disk-utils/fsck.minix.c:555
+#: disk-utils/fsck.minix.c:560
msgid "unable to alloc buffer for superblock"
msgstr "无法为超级块分配缓冲区"
-#: disk-utils/fsck.minix.c:558
+#: disk-utils/fsck.minix.c:563
msgid "unable to read super block"
msgstr "不能读超级块"
-#: disk-utils/fsck.minix.c:576
+#: disk-utils/fsck.minix.c:581
msgid "bad magic number in super-block"
msgstr "超级块中的魔数数字损坏"
-#: disk-utils/fsck.minix.c:578
+#: disk-utils/fsck.minix.c:583
msgid "Only 1k blocks/zones supported"
msgstr "只支持 1k 块/区"
-#: disk-utils/fsck.minix.c:580
+#: disk-utils/fsck.minix.c:585
msgid "bad s_imap_blocks field in super-block"
msgstr "不正确的 s_imap_blocks 域在超级块中"
-#: disk-utils/fsck.minix.c:583
+#: disk-utils/fsck.minix.c:588
msgid "bad s_zmap_blocks field in super-block"
msgstr "不正确的 s_zmap_blocks 域在超级块中"
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:604
msgid "Unable to allocate buffer for inode map"
msgstr "不能为 inode map 分配缓冲区"
-#: disk-utils/fsck.minix.c:602
+#: disk-utils/fsck.minix.c:607
msgid "Unable to allocate buffer for zone map"
msgstr "不能为 zone map 分配缓冲区"
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
msgid "Unable to allocate buffer for inodes"
msgstr "不能为 inodes 分配缓冲区"
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
msgid "Unable to allocate buffer for inode count"
msgstr "不能为 inode count 分配缓冲区"
-#: disk-utils/fsck.minix.c:611
+#: disk-utils/fsck.minix.c:616
msgid "Unable to allocate buffer for zone count"
msgstr "不能为 zone count 分配缓冲区"
-#: disk-utils/fsck.minix.c:615
+#: disk-utils/fsck.minix.c:620
msgid "Unable to read inode map"
msgstr "不能读 inode map"
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
msgid "Unable to read zone map"
msgstr "不能读 zone map"
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:628
msgid "Unable to read inodes"
msgstr "不能读 inodes"
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:630
#, c-format
msgid "Warning: Firstzone != Norm_firstzone\n"
msgstr "警告: Firstzone != Norm_firstzone\n"
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:635
#, c-format
msgid "%ld inodes\n"
msgstr "%ld inodes\n"
-#: disk-utils/fsck.minix.c:631
+#: disk-utils/fsck.minix.c:636
#, c-format
msgid "%ld blocks\n"
msgstr "%ld 块\n"
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:546
+#: disk-utils/fsck.minix.c:637 disk-utils/mkfs.minix.c:550
#, c-format
msgid "Firstdatazone=%jd (%jd)\n"
msgstr "Firstdatazone=%jd (%jd)\n"
-#: disk-utils/fsck.minix.c:633
+#: disk-utils/fsck.minix.c:638
#, c-format
msgid "Zonesize=%d\n"
msgstr "Zonesize=%d\n"
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:639
#, c-format
msgid "Maxsize=%zu\n"
msgstr "Maxsize=%zu\n"
-#: disk-utils/fsck.minix.c:635
+#: disk-utils/fsck.minix.c:640
#, c-format
msgid "Filesystem state=%d\n"
msgstr "Filesystem state=%d\n"
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:641
#, c-format
msgid ""
"namelen=%zd\n"
@@ -2016,161 +2191,161 @@ msgstr ""
"namelen=%zd\n"
"\n"
-#: disk-utils/fsck.minix.c:651 disk-utils/fsck.minix.c:701
+#: disk-utils/fsck.minix.c:656 disk-utils/fsck.minix.c:706
#, c-format
msgid "Inode %d marked unused, but used for file '%s'\n"
msgstr "Inode %d 标记为未使用, 但用于文件 '%s'\n"
-#: disk-utils/fsck.minix.c:654 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:659 disk-utils/fsck.minix.c:709
msgid "Mark in use"
msgstr "标记为已使用"
-#: disk-utils/fsck.minix.c:676 disk-utils/fsck.minix.c:724
+#: disk-utils/fsck.minix.c:681 disk-utils/fsck.minix.c:729
#, c-format
msgid "The file `%s' has mode %05o\n"
msgstr "文件 `%s' 的模式 %05o\n"
-#: disk-utils/fsck.minix.c:683 disk-utils/fsck.minix.c:730
+#: disk-utils/fsck.minix.c:688 disk-utils/fsck.minix.c:735
#, c-format
msgid "Warning: inode count too big.\n"
msgstr "警告: inode 计数太大.\n"
-#: disk-utils/fsck.minix.c:742 disk-utils/fsck.minix.c:750
+#: disk-utils/fsck.minix.c:747 disk-utils/fsck.minix.c:755
msgid "root inode isn't a directory"
msgstr "根 inode 不是一个目录"
-#: disk-utils/fsck.minix.c:762 disk-utils/fsck.minix.c:793
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:798
#, c-format
msgid "Block has been used before. Now in file `%s'."
msgstr "块已经被使用, 现在在文件 `%s' 中."
-#: disk-utils/fsck.minix.c:764 disk-utils/fsck.minix.c:795
-#: disk-utils/fsck.minix.c:1116 disk-utils/fsck.minix.c:1125
-#: disk-utils/fsck.minix.c:1172 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:800
+#: disk-utils/fsck.minix.c:1127 disk-utils/fsck.minix.c:1136
+#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1192
msgid "Clear"
msgstr "清除"
-#: disk-utils/fsck.minix.c:774 disk-utils/fsck.minix.c:805
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
#, c-format
msgid "Block %d in file `%s' is marked not in use."
msgstr "文件中块 %d `%s' 标记为没有使用."
-#: disk-utils/fsck.minix.c:776 disk-utils/fsck.minix.c:807
+#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:812
msgid "Correct"
msgstr "正确"
-#: disk-utils/fsck.minix.c:946 disk-utils/fsck.minix.c:1014
+#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1023
#, c-format
msgid "The directory '%s' contains a bad inode number for file '%.*s'."
msgstr "目录 '%s' 包含了一个不正确的 inode number 文件 '%.*s'. "
-#: disk-utils/fsck.minix.c:948 disk-utils/fsck.minix.c:1016
+#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1025
msgid " Remove"
msgstr " 删除"
-#: disk-utils/fsck.minix.c:962 disk-utils/fsck.minix.c:1030
+#: disk-utils/fsck.minix.c:969 disk-utils/fsck.minix.c:1041
#, c-format
msgid "%s: bad directory: '.' isn't first\n"
msgstr "%s: 不正确的目录: '.' 不是第一个\n"
-#: disk-utils/fsck.minix.c:971 disk-utils/fsck.minix.c:1039
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1050
#, c-format
msgid "%s: bad directory: '..' isn't second\n"
msgstr "%s: 不正确的目录: '.' 不是第二个\n"
-#: disk-utils/fsck.minix.c:1073 disk-utils/fsck.minix.c:1090
+#: disk-utils/fsck.minix.c:1084 disk-utils/fsck.minix.c:1101
msgid "internal error"
msgstr "内部错误"
-#: disk-utils/fsck.minix.c:1076 disk-utils/fsck.minix.c:1093
+#: disk-utils/fsck.minix.c:1087 disk-utils/fsck.minix.c:1104
#, c-format
msgid "%s: bad directory: size < 32"
msgstr "%s: 不正确的目录: 大小 < 32"
-#: disk-utils/fsck.minix.c:1105
+#: disk-utils/fsck.minix.c:1116
msgid "seek failed in bad_zone"
msgstr "bad_zone 中定位失败"
-#: disk-utils/fsck.minix.c:1115 disk-utils/fsck.minix.c:1171
+#: disk-utils/fsck.minix.c:1126 disk-utils/fsck.minix.c:1182
#, c-format
msgid "Inode %lu mode not cleared."
msgstr "Inode %lu 模式未清除。"
-#: disk-utils/fsck.minix.c:1124 disk-utils/fsck.minix.c:1180
+#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1191
#, c-format
msgid "Inode %lu not used, marked used in the bitmap."
msgstr "Inode %lu 未使用,但在位图(bitmap)中标记为已使用。"
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
#, c-format
msgid "Inode %lu used, marked unused in the bitmap."
msgstr "Inode %lu 已使用,但在位图(bitmap)中标记为未使用。"
-#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1187
+#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1198
msgid "Set"
msgstr "设置"
-#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1191
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1202
#, c-format
msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
msgstr "Inode %lu (模式 = %07o), i_nlinks=%d, 已计数=%d。"
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1194
+#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1205
msgid "Set i_nlinks to count"
msgstr "将 i_nlinks 设为计数"
-#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1217
#, c-format
msgid "Zone %lu: marked in use, no file uses it."
msgstr "%lu 区:标记为使用,但没有文件使用它。"
-#: disk-utils/fsck.minix.c:1152 disk-utils/fsck.minix.c:1208
+#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
msgid "Unmark"
msgstr "清标记"
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1224
#, c-format
msgid "Zone %lu: in use, counted=%d\n"
msgstr "区 %lu:使用中,已计数=%d\n"
-#: disk-utils/fsck.minix.c:1160 disk-utils/fsck.minix.c:1216
+#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1227
#, c-format
msgid "Zone %lu: not in use, counted=%d\n"
msgstr "区 %lu:未使用,已计数=%d\n"
-#: disk-utils/fsck.minix.c:1257
+#: disk-utils/fsck.minix.c:1268
msgid "bad inode size"
msgstr "inode 大小有误"
-#: disk-utils/fsck.minix.c:1259
+#: disk-utils/fsck.minix.c:1270
msgid "bad v2 inode size"
msgstr "v2 inode 大小有误"
-#: disk-utils/fsck.minix.c:1303
+#: disk-utils/fsck.minix.c:1314
msgid "need terminal for interactive repairs"
msgstr "需要终端来进行交互式修复"
-#: disk-utils/fsck.minix.c:1307
+#: disk-utils/fsck.minix.c:1318
#, c-format
msgid "cannot open %s: %s"
msgstr "无法打开 %s:%s"
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1329
#, c-format
msgid "%s is clean, no check.\n"
msgstr "%s 是干净的,不检查。\n"
-#: disk-utils/fsck.minix.c:1321
+#: disk-utils/fsck.minix.c:1332
#, c-format
msgid "Forcing filesystem check on %s.\n"
msgstr "强制在 %s 上进行文件系统检查。\n"
-#: disk-utils/fsck.minix.c:1323
+#: disk-utils/fsck.minix.c:1334
#, c-format
msgid "Filesystem on %s is dirty, needs checking.\n"
msgstr "%s 上的文件系统有问题,需要检查。\n"
-#: disk-utils/fsck.minix.c:1355
+#: disk-utils/fsck.minix.c:1366
#, c-format
msgid ""
"\n"
@@ -2179,12 +2354,12 @@ msgstr ""
"\n"
"已使用 %6ld inodes(%ld%%)\n"
-#: disk-utils/fsck.minix.c:1361
+#: disk-utils/fsck.minix.c:1372
#, c-format
msgid "%6ld zones used (%ld%%)\n"
msgstr "已使用 %6ld 区(%ld%%)\n"
-#: disk-utils/fsck.minix.c:1363
+#: disk-utils/fsck.minix.c:1374
#, c-format
msgid ""
"\n"
@@ -2207,7 +2382,7 @@ msgstr ""
"------\n"
"%6d 个文件\n"
-#: disk-utils/fsck.minix.c:1377
+#: disk-utils/fsck.minix.c:1388
#, c-format
msgid ""
"----------------------------\n"
@@ -2218,6 +2393,15 @@ msgstr ""
"文件系统已经更改\n"
"----------------\n"
+#: disk-utils/fsck.minix.c:1400 disk-utils/mkfs.minix.c:808
+#: disk-utils/mkswap.c:540 disk-utils/partx.c:1004 disk-utils/resizepart.c:112
+#: login-utils/utmpdump.c:388 misc-utils/logger.c:316 misc-utils/logger.c:382
+#: misc-utils/logger.c:431 sys-utils/dmesg.c:649 sys-utils/wdctl.c:346
+#: sys-utils/wdctl.c:411 term-utils/script.c:341 term-utils/script.c:382
+#: term-utils/script.c:501 text-utils/pg.c:1249
+msgid "write failed"
+msgstr "写失败"
+
#: disk-utils/isosize.c:136
#, c-format
msgid "%s: might not be an ISO filesystem"
@@ -2243,15 +2427,20 @@ msgstr "扇区计数:%d,扇区大小:%d\n"
msgid " %s [options] <iso9660_image_file>\n"
msgstr " %s [选项] <iso9660镜像文件>\n"
-#: disk-utils/isosize.c:173
+#: disk-utils/isosize.c:174
+#, fuzzy
+msgid "Show the length of an ISO-9660 filesystem.\n"
+msgstr "%s:可能不是 ISO 文件系统"
+
+#: disk-utils/isosize.c:177
msgid " -d, --divisor=<number> divide the amount of bytes by <number>\n"
msgstr " -d, --divisor=<数字> 将字节数除以 <数字>\n"
-#: disk-utils/isosize.c:174
+#: disk-utils/isosize.c:178
msgid " -x, --sectors show sector count and size\n"
msgstr " -x, --sectors 显示扇区计数和大小\n"
-#: disk-utils/isosize.c:206
+#: disk-utils/isosize.c:210
msgid "invalid divisor argument"
msgstr "无效的 divisor(除数) 参数"
@@ -2260,7 +2449,11 @@ msgstr "无效的 divisor(除数) 参数"
msgid "Usage: %s [options] device [block-count]\n"
msgstr "Usage: %s [选项] 设备 [块数]\n"
-#: disk-utils/mkfs.bfs.c:75
+#: disk-utils/mkfs.bfs.c:77
+msgid "Make an SCO bfs filesystem.\n"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:79
#, c-format
msgid ""
"\n"
@@ -2289,159 +2482,146 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: disk-utils/mkfs.bfs.c:139
+#: disk-utils/mkfs.bfs.c:144
msgid "invalid number of inodes"
msgstr "无效的 inodes 数目"
-#: disk-utils/mkfs.bfs.c:145
+#: disk-utils/mkfs.bfs.c:150
msgid "volume name too long"
msgstr "卷名过长"
-#: disk-utils/mkfs.bfs.c:152
+#: disk-utils/mkfs.bfs.c:157
msgid "fsname name too long"
msgstr "fsname 名过长"
-#: disk-utils/mkfs.bfs.c:183
+#: disk-utils/mkfs.bfs.c:188
#, c-format
msgid "%s is not a block special device"
msgstr "%s 不是一个块特殊设备"
-#: disk-utils/mkfs.bfs.c:191
+#: disk-utils/mkfs.bfs.c:196
msgid "invalid block-count"
msgstr "无效的块计数"
-#: disk-utils/mkfs.bfs.c:197
+#: disk-utils/mkfs.bfs.c:202
#, c-format
msgid "cannot get size of %s"
msgstr "无法获得 %s 的大小"
-#: disk-utils/mkfs.bfs.c:202
+#: disk-utils/mkfs.bfs.c:207
#, c-format
msgid "blocks argument too large, max is %llu"
msgstr "块参数过大,最大值是 %llu"
-#: disk-utils/mkfs.bfs.c:217
+#: disk-utils/mkfs.bfs.c:222
msgid "too many inodes - max is 512"
msgstr "inodes 过多 - 最多 512"
-#: disk-utils/mkfs.bfs.c:227
+#: disk-utils/mkfs.bfs.c:232
#, c-format
msgid "not enough space, need at least %llu blocks"
msgstr "空间不足,至少需要 %llu 个块"
-#: disk-utils/mkfs.bfs.c:239
+#: disk-utils/mkfs.bfs.c:244
#, c-format
msgid "Device: %s\n"
msgstr "设备:%s\n"
-#: disk-utils/mkfs.bfs.c:240
+#: disk-utils/mkfs.bfs.c:245
#, c-format
msgid "Volume: <%-6s>\n"
msgstr "卷:<%-6s>\n"
-#: disk-utils/mkfs.bfs.c:241
+#: disk-utils/mkfs.bfs.c:246
#, c-format
msgid "FSname: <%-6s>\n"
msgstr "文件系统名:<%-6s>\n"
-#: disk-utils/mkfs.bfs.c:242
+#: disk-utils/mkfs.bfs.c:247
#, c-format
msgid "BlockSize: %d\n"
msgstr "块大小:%d\n"
-#: disk-utils/mkfs.bfs.c:244
+#: disk-utils/mkfs.bfs.c:249
#, c-format
msgid "Inodes: %lu (in 1 block)\n"
msgstr "Inodes:%lu (在 1 个块中)\n"
-#: disk-utils/mkfs.bfs.c:247
+#: disk-utils/mkfs.bfs.c:252
#, c-format
msgid "Inodes: %lu (in %llu blocks)\n"
msgstr "Inodes:%lu (在 %llu 个块中)\n"
-#: disk-utils/mkfs.bfs.c:249
+#: disk-utils/mkfs.bfs.c:254
#, c-format
msgid "Blocks: %lld\n"
msgstr "块:%lld\n"
-#: disk-utils/mkfs.bfs.c:250
+#: disk-utils/mkfs.bfs.c:255
#, c-format
msgid "Inode end: %d, Data end: %d\n"
msgstr "Inode 终点:%d,数据终点:%d\n"
-#: disk-utils/mkfs.bfs.c:255
+#: disk-utils/mkfs.bfs.c:260
msgid "error writing superblock"
msgstr "写超级块出错"
-#: disk-utils/mkfs.bfs.c:276
+#: disk-utils/mkfs.bfs.c:281
msgid "error writing root inode"
msgstr "写 根 inode 出错"
-#: disk-utils/mkfs.bfs.c:281
+#: disk-utils/mkfs.bfs.c:286
msgid "error writing inode"
msgstr "写 inode 出错"
-#: disk-utils/mkfs.bfs.c:284
+#: disk-utils/mkfs.bfs.c:289
msgid "seek error"
msgstr "定位出错"
-#: disk-utils/mkfs.bfs.c:290
+#: disk-utils/mkfs.bfs.c:295
msgid "error writing . entry"
msgstr "写 . 记录出错"
-#: disk-utils/mkfs.bfs.c:294
+#: disk-utils/mkfs.bfs.c:299
msgid "error writing .. entry"
msgstr "写 .. 记录出错"
-#: disk-utils/mkfs.bfs.c:297
+#: disk-utils/mkfs.bfs.c:302
#, c-format
msgid "error closing %s"
msgstr "关闭 %s 出错"
-#: disk-utils/mkfs.c:38
-#, c-format
-msgid "Usage:\n"
-msgstr "用法:\n"
-
-#: disk-utils/mkfs.c:39
+#: disk-utils/mkfs.c:48
#, c-format
msgid " %s [options] [-t <type>] [fs-options] <device> [<size>]\n"
msgstr " %s [选项] [-t <类型>] [文件系统选项] <设备> [<大小>]\n"
-#: disk-utils/mkfs.c:42 include/c.h:280 misc-utils/getopt.c:322
-#: misc-utils/look.c:370 misc-utils/namei.c:431 misc-utils/uuidd.c:75
-#: misc-utils/uuidgen.c:35 misc-utils/wipefs.c:455 sys-utils/hwclock.c:1590
-#: sys-utils/renice.c:62 term-utils/script.c:145 term-utils/scriptreplay.c:45
-#: term-utils/write.c:85
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"选项:\n"
+#: disk-utils/mkfs.c:52
+#, fuzzy
+msgid "Make a Linux filesystem.\n"
+msgstr "Linux 文件系统"
-#: disk-utils/mkfs.c:43
+#: disk-utils/mkfs.c:55
#, c-format
msgid " -t, --type=<type> filesystem type; when unspecified, ext2 is used\n"
msgstr " -t, --type=<类型> 文件系统类型;若不指定,将使用 ext2\n"
-#: disk-utils/mkfs.c:44
+#: disk-utils/mkfs.c:56
#, c-format
msgid " fs-options parameters for the real filesystem builder\n"
msgstr " fs-options 实际文件系统构建程序的参数\n"
-#: disk-utils/mkfs.c:45
+#: disk-utils/mkfs.c:57
#, c-format
msgid " <device> path to the device to be used\n"
msgstr " <设备> 要使用设备的路径\n"
-#: disk-utils/mkfs.c:46
+#: disk-utils/mkfs.c:58
#, c-format
msgid " <size> number of blocks to be used on the device\n"
msgstr " <大小> 要使用设备上的块数\n"
-#: disk-utils/mkfs.c:47
+#: disk-utils/mkfs.c:59
#, c-format
msgid ""
" -V, --verbose explain what is being done;\n"
@@ -2450,7 +2630,7 @@ msgstr ""
" -V, --verbose 解释正在进行的操作;\n"
" 多次指定 -V 将导致空运行(dry-run)\n"
-#: disk-utils/mkfs.c:49
+#: disk-utils/mkfs.c:61
#, c-format
msgid ""
" -V, --version display version information and exit;\n"
@@ -2459,19 +2639,22 @@ msgstr ""
" -V, --version 显示版本信息并退出\n"
" 将 -V 作为 --version 选项时必须是惟一选项\n"
-#: disk-utils/mkfs.c:51
+#: disk-utils/mkfs.c:63
#, c-format
msgid " -h, --help display this help text and exit\n"
msgstr " -h, --help 显示此帮助并退出\n"
-#: disk-utils/mkfs.c:53
+#: disk-utils/mkfs.c:154 lib/exec_shell.c:45 login-utils/newgrp.c:233
+#: login-utils/su-common.c:649 login-utils/su-common.c:978
+#: login-utils/sulogin.c:811 login-utils/sulogin.c:815 schedutils/chrt.c:332
+#: schedutils/ionice.c:262 schedutils/taskset.c:239 sys-utils/flock.c:301
+#: sys-utils/nsenter.c:375 sys-utils/prlimit.c:643 sys-utils/rtcwake.c:589
+#: sys-utils/setarch.c:314 sys-utils/setarch.c:389 sys-utils/setsid.c:117
+#: sys-utils/swapon.c:318 sys-utils/switch_root.c:243 sys-utils/unshare.c:258
+#: term-utils/script.c:557 text-utils/pg.c:1376
#, c-format
-msgid ""
-"\n"
-"For more information see mkfs(8).\n"
-msgstr ""
-"\n"
-"更多信息请参阅 mkfs(8)。\n"
+msgid "failed to execute %s"
+msgstr "执行 %s 失败"
#: disk-utils/mkfs.cramfs.c:122
#, c-format
@@ -2696,39 +2879,39 @@ msgstr "%s:坏块太多"
msgid "%s: not enough good blocks"
msgstr "%s:好块不够"
-#: disk-utils/mkfs.minix.c:485
+#: disk-utils/mkfs.minix.c:489
#, c-format
msgid "%s: unable to allocate buffer for superblock"
msgstr "%s:不能为超级块分配缓冲区"
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:535
#, c-format
msgid "%s: unable to allocate buffers for maps"
msgstr "%s:不能为 maps 分配缓冲区"
-#: disk-utils/mkfs.minix.c:541
+#: disk-utils/mkfs.minix.c:545
#, c-format
msgid "%s: unable to allocate buffer for inodes"
msgstr "%s:不能为 inodes 分配缓冲区"
-#: disk-utils/mkfs.minix.c:544
+#: disk-utils/mkfs.minix.c:548
#, c-format
msgid "%lu inode\n"
msgid_plural "%lu inodes\n"
msgstr[0] "%lu 个 inode\n"
-#: disk-utils/mkfs.minix.c:545
+#: disk-utils/mkfs.minix.c:549
#, c-format
msgid "%lu block\n"
msgid_plural "%lu blocks\n"
msgstr[0] "%lu 个块\n"
-#: disk-utils/mkfs.minix.c:547
+#: disk-utils/mkfs.minix.c:551
#, c-format
msgid "Zonesize=%zu\n"
msgstr "Zonesize=%zu\n"
-#: disk-utils/mkfs.minix.c:548
+#: disk-utils/mkfs.minix.c:552
#, c-format
msgid ""
"Maxsize=%zu\n"
@@ -2737,123 +2920,114 @@ msgstr ""
"Maxsize=%zu\n"
"\n"
-#: disk-utils/mkfs.minix.c:561
+#: disk-utils/mkfs.minix.c:565
#, c-format
msgid "%s: seek failed during testing of blocks"
msgstr "%s:在测试块时定位失败"
-#: disk-utils/mkfs.minix.c:568
+#: disk-utils/mkfs.minix.c:572
#, c-format
msgid "Weird values in do_check: probably bugs\n"
msgstr "do_check 中的值异常:可能有 bug\n"
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:605
#, c-format
msgid "%s: seek failed in check_blocks"
msgstr "%s:在 check_blocks 中定位失败"
-#: disk-utils/mkfs.minix.c:611
+#: disk-utils/mkfs.minix.c:615
#, c-format
msgid "%s: bad blocks before data-area: cannot make fs"
msgstr "%s:数据区前有坏块:无法创建文件系统"
-#: disk-utils/mkfs.minix.c:618 disk-utils/mkfs.minix.c:642
+#: disk-utils/mkfs.minix.c:622 disk-utils/mkfs.minix.c:646
#, c-format
msgid "%d bad block\n"
msgid_plural "%d bad blocks\n"
msgstr[0] "%d 个坏块\n"
-#: disk-utils/mkfs.minix.c:627
+#: disk-utils/mkfs.minix.c:631
#, c-format
msgid "%s: can't open file of bad blocks"
msgstr "%s: 打不开坏块文件"
-#: disk-utils/mkfs.minix.c:632
+#: disk-utils/mkfs.minix.c:636
#, c-format
msgid "badblock number input error on line %d\n"
msgstr "第 %d 行坏块数输入错误\n"
-#: disk-utils/mkfs.minix.c:633
+#: disk-utils/mkfs.minix.c:637
#, c-format
msgid "%s: cannot read badblocks file"
msgstr "%s: 打不开 badblocks 文件"
-#: disk-utils/mkfs.minix.c:664
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
-#: disk-utils/mkfs.minix.c:669 disk-utils/mkfs.minix.c:671
+#: disk-utils/mkfs.minix.c:673 disk-utils/mkfs.minix.c:675
#, c-format
msgid "%s: bad inode size"
msgstr "%s:不正确的 inode 大小"
-#: disk-utils/mkfs.minix.c:680
+#: disk-utils/mkfs.minix.c:684
msgid "failed to parse number of inodes"
msgstr "解析 inode 数 失败"
-#: disk-utils/mkfs.minix.c:686
+#: disk-utils/mkfs.minix.c:690
msgid "failed to parse maximum length of filenames"
msgstr "解析文件名最大长度失败"
-#: disk-utils/mkfs.minix.c:719
+#: disk-utils/mkfs.minix.c:723
msgid "failed to parse number of blocks"
msgstr "解析块数失败"
-#: disk-utils/mkfs.minix.c:762
+#: disk-utils/mkfs.minix.c:766
#, c-format
msgid "%s: device is misaligned"
msgstr "%s:设备未正确对齐"
-#: disk-utils/mkfs.minix.c:765
+#: disk-utils/mkfs.minix.c:769
#, c-format
msgid "block size smaller than physical sector size of %s"
msgstr "块尺寸比 %s 的物理扇区尺寸小"
-#: disk-utils/mkfs.minix.c:769
+#: disk-utils/mkfs.minix.c:773
#, c-format
msgid "cannot determine size of %s"
msgstr "无法确定 %s 的大小"
-#: disk-utils/mkfs.minix.c:778
+#: disk-utils/mkfs.minix.c:782
#, c-format
msgid "will not try to make filesystem on '%s'"
msgstr "将不会尝试在“%s”上创建文件系统"
-#: disk-utils/mkfs.minix.c:780
+#: disk-utils/mkfs.minix.c:784
#, c-format
msgid "%s: number of blocks too small"
msgstr "%s:块数太小"
-#: disk-utils/mkswap.c:161
+#: disk-utils/mkswap.c:81
#, c-format
msgid "Bad user-specified page size %u"
msgstr "用户指定的页大小 %u 有误"
-#: disk-utils/mkswap.c:167
+#: disk-utils/mkswap.c:84
#, c-format
msgid "Using user-specified page size %d, instead of the system value %d"
msgstr "将使用用户指定的页大小 %d 来取代系统值 %d"
-#: disk-utils/mkswap.c:189
-msgid "Bad swap header size, no label written."
-msgstr "交换头(header)大小有误,未写入标签。"
-
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:125
msgid "Label was truncated."
msgstr "标签已截短。"
-#: disk-utils/mkswap.c:205
+#: disk-utils/mkswap.c:133
#, c-format
msgid "no label, "
msgstr "无标签,"
-#: disk-utils/mkswap.c:213
+#: disk-utils/mkswap.c:141
#, c-format
msgid "no uuid\n"
msgstr "无 uuid\n"
-#: disk-utils/mkswap.c:278
+#: disk-utils/mkswap.c:148
#, c-format
msgid ""
"\n"
@@ -2864,7 +3038,11 @@ msgstr ""
"用法\n"
" %s [选项] 设备 [大小]\n"
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:153
+msgid "Set up a Linux swap area.\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:156
#, c-format
msgid ""
"\n"
@@ -2891,152 +3069,158 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: disk-utils/mkswap.c:302
-msgid "too many bad pages"
+#: disk-utils/mkswap.c:175
+#, fuzzy, c-format
+msgid "too many bad pages: %lu"
msgstr "坏页过多"
-#: disk-utils/mkswap.c:322
+#: disk-utils/mkswap.c:196
msgid "seek failed in check_blocks"
msgstr "check_blocks (检查块)时定位失败"
-#: disk-utils/mkswap.c:330
+#: disk-utils/mkswap.c:204
#, c-format
msgid "%lu bad page\n"
msgid_plural "%lu bad pages\n"
msgstr[0] "%lu 个坏页\n"
-#: disk-utils/mkswap.c:359
+#: disk-utils/mkswap.c:229
msgid "unable to alloc new libblkid probe"
msgstr "无法分配新的 libblkid 探针"
-#: disk-utils/mkswap.c:361
+#: disk-utils/mkswap.c:231
msgid "unable to assign device to libblkid probe"
msgstr "无法将设备分配给 libblkid 探针"
-#: disk-utils/mkswap.c:376 disk-utils/mkswap.c:402 disk-utils/mkswap.c:618
+#: disk-utils/mkswap.c:249
+#, c-format
+msgid "warning: checking bad blocks from swap file is not supported: %s"
+msgstr ""
+
+#: disk-utils/mkswap.c:259
+#, c-format
+msgid "warning: %s is misaligned"
+msgstr "警告:%s 未正确对齐"
+
+#: disk-utils/mkswap.c:271 disk-utils/mkswap.c:297 disk-utils/mkswap.c:344
msgid "unable to rewind swap-device"
msgstr "无法倒回(rewind)交换设备"
-#: disk-utils/mkswap.c:406
+#: disk-utils/mkswap.c:300
msgid "unable to erase bootbits sectors"
msgstr "不能擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:422
+#: disk-utils/mkswap.c:316
#, c-format
msgid "%s: warning: wiping old %s signature."
msgstr "%s:警告,将擦除旧的 %s 签名。"
-#: disk-utils/mkswap.c:427
+#: disk-utils/mkswap.c:321
#, c-format
msgid "%s: warning: don't erase bootbits sectors"
msgstr "%s:警告,不要擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:430
+#: disk-utils/mkswap.c:324
#, c-format
msgid " (%s partition table detected). "
msgstr " (检测到 %s 分区表)。"
-#: disk-utils/mkswap.c:432
+#: disk-utils/mkswap.c:326
#, c-format
msgid " (compiled without libblkid). "
msgstr " (编译时未链接 libblkid)。"
-#: disk-utils/mkswap.c:433
+#: disk-utils/mkswap.c:327
#, c-format
msgid "Use -f to force.\n"
msgstr "使用 -f 选项强制执行。\n"
-#: disk-utils/mkswap.c:484
+#: disk-utils/mkswap.c:349
+#, c-format
+msgid "%s: unable to write signature page"
+msgstr "%s:无法写签名页"
+
+#: disk-utils/mkswap.c:390
msgid "parsing page size failed"
msgstr "解析页大小失败"
-#: disk-utils/mkswap.c:490
+#: disk-utils/mkswap.c:396
msgid "parsing version number failed"
msgstr "解析版本号失败"
-#: disk-utils/mkswap.c:496
+#: disk-utils/mkswap.c:399
+#, c-format
+msgid "swapspace version %d is not supported"
+msgstr "不支持交换空间版本 %d"
+
+#: disk-utils/mkswap.c:405
#, c-format
msgid "warning: ignoring -U (UUIDs are unsupported by %s)"
msgstr "警告:将忽略 -U 选项(%s 不支持 UUID)"
-#: disk-utils/mkswap.c:514
+#: disk-utils/mkswap.c:424
msgid "only one device argument is currently supported"
msgstr "当前只支持一个设备参数"
-#: disk-utils/mkswap.c:520
-#, c-format
-msgid "swapspace version %d is not supported"
-msgstr "不支持交换空间版本 %d"
-
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:431
msgid "error: parsing UUID failed"
msgstr "错误:解析 UUID 失败"
-#: disk-utils/mkswap.c:534
+#: disk-utils/mkswap.c:440
msgid "error: Nowhere to set up swap on?"
msgstr "错误:没有设置交换空间的地方?"
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:446
msgid "invalid block count argument"
msgstr "无效的 块计数 参数"
-#: disk-utils/mkswap.c:548
-#, c-format
-msgid "error: size %llu KiB is larger than device size %llu KiB"
+#: disk-utils/mkswap.c:455
+#, fuzzy, c-format
+msgid "error: size %llu KiB is larger than device size %ju KiB"
msgstr "错误:尺寸 %llu KiB 大于设备尺寸 %llu KiB"
-#: disk-utils/mkswap.c:554
+#: disk-utils/mkswap.c:461
#, c-format
msgid "error: swap area needs to be at least %ld KiB"
msgstr "错误:交换区至少需要 %ld KiB"
-#: disk-utils/mkswap.c:568
+#: disk-utils/mkswap.c:466
#, c-format
msgid "warning: truncating swap area to %llu KiB"
msgstr "警告:将把交换区截短为 %llu KiB"
-#: disk-utils/mkswap.c:573
+#: disk-utils/mkswap.c:471
#, c-format
msgid "error: %s is mounted; will not make swapspace"
msgstr "错误:%s 已挂载;将不会创建交换空间"
-#: disk-utils/mkswap.c:594
-#, c-format
-msgid "warning: %s is misaligned"
-msgstr "警告:%s 未正确对齐"
-
-#: disk-utils/mkswap.c:607
+#: disk-utils/mkswap.c:488
msgid "Unable to set up swap-space: unreadable"
msgstr "无法设置交换空间:不可读"
-#: disk-utils/mkswap.c:610
-#, c-format
-msgid "Setting up swapspace version %d, size = %llu KiB\n"
+#: disk-utils/mkswap.c:493
+#, fuzzy, c-format
+msgid "Setting up swapspace version %d, size = %s (%ju bytes)\n"
msgstr "正在设置交换空间版本 %d,大小 = %llu KiB\n"
-#: disk-utils/mkswap.c:622
-#, c-format
-msgid "%s: unable to write signature page"
-msgstr "%s:无法写签名页"
-
-#: disk-utils/mkswap.c:634
+#: disk-utils/mkswap.c:513
#, c-format
msgid "%s: unable to obtain selinux file label"
msgstr "%s:无法获得 selinux 文件标签"
-#: disk-utils/mkswap.c:637
+#: disk-utils/mkswap.c:516
msgid "unable to matchpathcon()"
msgstr "无法执行 matchpathcon()"
-#: disk-utils/mkswap.c:640
+#: disk-utils/mkswap.c:519
msgid "unable to create new selinux context"
msgstr "无法创建新的 selinux 环境(context)"
-#: disk-utils/mkswap.c:642
+#: disk-utils/mkswap.c:521
msgid "couldn't compute selinux context"
msgstr "无法计算 selinux 环境(context)"
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:527
#, c-format
msgid "unable to relabel %s to %s"
msgstr "无法将 %s 标签改为 %s"
@@ -3065,7 +3249,7 @@ msgstr "易读形式的大小"
msgid "partition name"
msgstr "分区名"
-#: disk-utils/partx.c:93 misc-utils/findmnt.c:130 misc-utils/lsblk.c:148
+#: disk-utils/partx.c:93 misc-utils/findmnt.c:130 misc-utils/lsblk.c:150
msgid "partition UUID"
msgstr "分区 UUID"
@@ -3073,7 +3257,7 @@ msgstr "分区 UUID"
msgid "partition table type (dos, gpt, ...)"
msgstr "分区表类型(dos、gpt、...)"
-#: disk-utils/partx.c:95 misc-utils/lsblk.c:149
+#: disk-utils/partx.c:95 misc-utils/lsblk.c:151
msgid "partition flags"
msgstr "分区标志"
@@ -3081,7 +3265,7 @@ msgstr "分区标志"
msgid "partition type (a string, a UUID, or hex)"
msgstr "分区类型(字符串,UUID 或十六进制数)"
-#: disk-utils/partx.c:114 sys-utils/losetup.c:479
+#: disk-utils/partx.c:114 sys-utils/losetup.c:482
msgid "failed to initialize loopcxt"
msgstr "初始化 loopcxt 失败"
@@ -3100,15 +3284,15 @@ msgstr "尝试将“%s”用作回环设备\n"
msgid "%s: failed to set backing file"
msgstr "%s:设置后备文件失败"
-#: disk-utils/partx.c:131 sys-utils/losetup.c:668
+#: disk-utils/partx.c:131 sys-utils/losetup.c:671
#, c-format
msgid "%s: failed to set up loop device"
msgstr "%s:设置回环设备失败"
-#: disk-utils/partx.c:161 login-utils/lslogins.c:322 misc-utils/findmnt.c:388
-#: misc-utils/lsblk.c:319 misc-utils/lslocks.c:340 sys-utils/losetup.c:101
-#: sys-utils/lscpu.c:327 sys-utils/prlimit.c:274 sys-utils/swapon.c:124
-#: sys-utils/wdctl.c:151
+#: disk-utils/partx.c:161 login-utils/lslogins.c:324 misc-utils/findmnt.c:388
+#: misc-utils/lsblk.c:323 misc-utils/lslocks.c:340 sys-utils/losetup.c:101
+#: sys-utils/lscpu.c:327 sys-utils/prlimit.c:277 sys-utils/swapon.c:135
+#: sys-utils/wdctl.c:151 sys-utils/zramctl.c:113
#, c-format
msgid "unknown column: %s"
msgstr "未知列: %s"
@@ -3128,7 +3312,7 @@ msgstr "%s:删除分区 %d 出错"
msgid "%s: error deleting partitions %d-%d"
msgstr "%s:删除分区 %d-%d 出错"
-#: disk-utils/partx.c:299 disk-utils/partx.c:446 disk-utils/partx.c:971
+#: disk-utils/partx.c:299 disk-utils/partx.c:446 disk-utils/partx.c:974
#, c-format
msgid "specified range <%d:%d> does not make sense"
msgstr "指定的范围 <%d:%d> 无效"
@@ -3139,8 +3323,8 @@ msgid "%s: partition #%d removed\n"
msgstr "%s:分区 #%d 已移除\n"
#: disk-utils/partx.c:312
-#, c-format
-msgid "%s: partition #%d already doesn't exist\n"
+#, fuzzy, c-format
+msgid "%s: partition #%d doesn't exist\n"
msgstr "%s:分区 #%d 已不存在\n"
#: disk-utils/partx.c:317
@@ -3208,17 +3392,17 @@ msgstr "向输出添加行出错"
msgid "failed to add data to output table"
msgstr "向输出表添加数据出错"
-#: disk-utils/partx.c:632 login-utils/lslogins.c:884 misc-utils/findmnt.c:1527
-#: misc-utils/lsblk.c:1720 misc-utils/lslocks.c:461 sys-utils/losetup.c:300
-#: sys-utils/lscpu.c:1420 sys-utils/prlimit.c:294 sys-utils/swapon.c:243
-#: sys-utils/wdctl.c:257
+#: disk-utils/partx.c:632 login-utils/lslogins.c:899 misc-utils/findmnt.c:1530
+#: misc-utils/lsblk.c:1766 misc-utils/lslocks.c:461 sys-utils/losetup.c:300
+#: sys-utils/lscpu.c:1420 sys-utils/prlimit.c:297 sys-utils/swapon.c:268
+#: sys-utils/wdctl.c:259 sys-utils/zramctl.c:339
msgid "failed to initialize output table"
msgstr "初始化输出表失败"
-#: disk-utils/partx.c:643 misc-utils/findmnt.c:1549 misc-utils/lsblk.c:1736
+#: disk-utils/partx.c:643 misc-utils/findmnt.c:1552 misc-utils/lsblk.c:1782
#: misc-utils/lslocks.c:471 sys-utils/losetup.c:308 sys-utils/losetup.c:344
-#: sys-utils/lscpu.c:1425 sys-utils/prlimit.c:303 sys-utils/swapon.c:252
-#: sys-utils/wdctl.c:268
+#: sys-utils/lscpu.c:1425 sys-utils/prlimit.c:306 sys-utils/swapon.c:277
+#: sys-utils/wdctl.c:270 sys-utils/zramctl.c:348
msgid "failed to initialize output column"
msgstr "初始化输出列失败"
@@ -3248,18 +3432,22 @@ msgid " %s [-a|-d|-s|-u] [--nr <n:m> | <partition>] <disk>\n"
msgstr " %s [-a|-d|-s|-u] [--nr <n:m> | <分区>] <磁盘>\n"
#: disk-utils/partx.c:717
+msgid "Tell the kernel about the presence and numbering of partitions.\n"
+msgstr ""
+
+#: disk-utils/partx.c:720
msgid " -a, --add add specified partitions or all of them\n"
msgstr " -a, --add 添加指定的分区或所有分区\n"
-#: disk-utils/partx.c:718
+#: disk-utils/partx.c:721
msgid " -d, --delete delete specified partitions or all of them\n"
msgstr " -d, --delete 删除指定的分区或所有分区\n"
-#: disk-utils/partx.c:719
+#: disk-utils/partx.c:722
msgid " -u, --update update specified partitions or all of them\n"
msgstr " -u, --update 更新指定的分区或所有分区\n"
-#: disk-utils/partx.c:720
+#: disk-utils/partx.c:723
msgid ""
" -s, --show list partitions\n"
"\n"
@@ -3267,39 +3455,39 @@ msgstr ""
" -s, --show 列出分区\n"
"\n"
-#: disk-utils/partx.c:721 misc-utils/lsblk.c:1486
+#: disk-utils/partx.c:724 misc-utils/lsblk.c:1532
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
-#: disk-utils/partx.c:722
+#: disk-utils/partx.c:725
msgid " -g, --noheadings don't print headings for --show\n"
msgstr " -g, --noheadings --show 时不打印标题\n"
-#: disk-utils/partx.c:723
+#: disk-utils/partx.c:726
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:724
+#: disk-utils/partx.c:727
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <列表> 定义使用哪个输出列\n"
-#: disk-utils/partx.c:725 misc-utils/lsblk.c:1499
+#: disk-utils/partx.c:728 misc-utils/lsblk.c:1545
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 key=“value” 输出格式\n"
-#: disk-utils/partx.c:726 misc-utils/lsblk.c:1500
+#: disk-utils/partx.c:729 misc-utils/lsblk.c:1546
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: disk-utils/partx.c:727
+#: disk-utils/partx.c:730
msgid " -t, --type <type> specify the partition type (dos, bsd, solaris, etc.)\n"
msgstr " -t, --type <类型> 指定分区类型(dos、bsd、solaris 等)\n"
-#: disk-utils/partx.c:728 sys-utils/fallocate.c:88
+#: disk-utils/partx.c:731 sys-utils/fallocate.c:91
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: disk-utils/partx.c:734
+#: disk-utils/partx.c:737
msgid ""
"\n"
"Available columns (for --show, --raw or --pairs):\n"
@@ -3307,30 +3495,30 @@ msgstr ""
"\n"
"可用的列(针对 --show、--raw 或 --pairs):\n"
-#: disk-utils/partx.c:807
+#: disk-utils/partx.c:810
msgid "failed to parse --nr <M-N> range"
msgstr "解析 --nr <M-N> 范围失败"
-#: disk-utils/partx.c:907
+#: disk-utils/partx.c:910
msgid "--nr and <partition> are mutually exclusive"
msgstr "--nr 和 <分区> 相互排斥"
-#: disk-utils/partx.c:926
+#: disk-utils/partx.c:929
#, c-format
msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
msgstr "分区:%s,磁盘:%s,从分区:%d,到分区:%d\n"
-#: disk-utils/partx.c:938
+#: disk-utils/partx.c:941
#, c-format
msgid "%s: cannot delete partitions"
msgstr "%s:不能删除分区"
-#: disk-utils/partx.c:941
+#: disk-utils/partx.c:944
#, c-format
msgid "%s: partitioned loop devices unsupported"
msgstr "%s:不支持已分区的回环设备"
-#: disk-utils/partx.c:958
+#: disk-utils/partx.c:961
#, c-format
msgid "%s: failed to initialize blkid prober"
msgstr "%s:初始化 blkid 探针失败"
@@ -3348,64 +3536,68 @@ msgstr ""
" %1$s -q %2$srawN\n"
" %1$s -qa\n"
-#: disk-utils/raw.c:58
+#: disk-utils/raw.c:59
+msgid "Bind a raw character device to a block device.\n"
+msgstr ""
+
+#: disk-utils/raw.c:62
msgid " -q, --query set query mode\n"
msgstr " -q, --query 设置查询模式\n"
-#: disk-utils/raw.c:59
+#: disk-utils/raw.c:63
msgid " -a, --all query all raw devices\n"
msgstr " -a, --all 查询所有 raw 设备\n"
-#: disk-utils/raw.c:161
+#: disk-utils/raw.c:165
#, c-format
msgid "Device '%s' is the control raw device (use raw<N> where <N> is greater than zero)"
msgstr "设备“%s”是控制原生设备(请使用 raw<N>,其中 <N> 大于 0)"
-#: disk-utils/raw.c:178
+#: disk-utils/raw.c:182
#, c-format
msgid "Cannot locate block device '%s'"
msgstr "无法定位块设备“%s”"
-#: disk-utils/raw.c:181
+#: disk-utils/raw.c:185
#, c-format
msgid "Device '%s' is not a block device"
msgstr "设备“%s”不是块设备"
-#: disk-utils/raw.c:190 disk-utils/raw.c:193 sys-utils/ipcrm.c:340
-#: sys-utils/ipcrm.c:353 sys-utils/ipcrm.c:366
+#: disk-utils/raw.c:194 disk-utils/raw.c:197 sys-utils/ipcrm.c:351
+#: sys-utils/ipcrm.c:364 sys-utils/ipcrm.c:377
msgid "failed to parse argument"
msgstr "解析参数失败"
-#: disk-utils/raw.c:210
+#: disk-utils/raw.c:214
#, c-format
msgid "Cannot open master raw device '%s'"
msgstr "无法打开主 Raw 设备“%s”"
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:229
#, c-format
msgid "Cannot locate raw device '%s'"
msgstr "无法定位 raw 设备“%s”"
-#: disk-utils/raw.c:228
+#: disk-utils/raw.c:232
#, c-format
msgid "Raw device '%s' is not a character dev"
msgstr "设备“%s”不是字符设备"
-#: disk-utils/raw.c:232
+#: disk-utils/raw.c:236
#, c-format
msgid "Device '%s' is not a raw dev"
msgstr "设备“%s”不是 raw 设备"
-#: disk-utils/raw.c:242
+#: disk-utils/raw.c:246
msgid "Error querying raw device"
msgstr "查询原生(raw)设备失败"
-#: disk-utils/raw.c:251 disk-utils/raw.c:266
+#: disk-utils/raw.c:255 disk-utils/raw.c:270
#, c-format
msgid "%sraw%d: bound to major %d, minor %d\n"
msgstr "%sraw%d:绑定到主设备号 %d, 次设备号 %d\n"
-#: disk-utils/raw.c:265
+#: disk-utils/raw.c:269
msgid "Error setting raw device"
msgstr "设置原生(raw)设备出错"
@@ -3414,144 +3606,73 @@ msgstr "设置原生(raw)设备出错"
msgid " %s <disk device> <partition number> <length>\n"
msgstr " %s <磁盘设备> <分区号> <长度>\n"
-#: disk-utils/resizepart.c:100
+#: disk-utils/resizepart.c:23
+msgid "Tell the kernel about the new size of a partition.\n"
+msgstr ""
+
+#: disk-utils/resizepart.c:104
#, c-format
msgid "%s: failed to get start of the partition number %s"
msgstr "%s:获取分区号 %s 的起点失败"
-#: disk-utils/resizepart.c:105
+#: disk-utils/resizepart.c:109
msgid "failed to resize partition"
msgstr "调整分区大小失败"
-#: disk-utils/sfdisk.c:113
-#, c-format
-msgid "seek error on %s - cannot seek to %lu"
-msgstr "在 %s 上定位出错 - 无法定位到 %lu"
-
-#: disk-utils/sfdisk.c:118
-#, c-format
-msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x"
-msgstr "定位出错:想要 0x%08x%08x,得到了 0x%08x%08x"
-
-#: disk-utils/sfdisk.c:166 disk-utils/sfdisk.c:244
-#, c-format
-msgid "read error on %s - cannot read sector %llu"
-msgstr "在 %s 上定位出错 - 无法定位到 %llu"
-
-#: disk-utils/sfdisk.c:196
-#, c-format
-msgid "write error on %s - cannot write sector %llu"
-msgstr "在 %s 上定位出错 - 无法定位到 %llu"
-
-#: disk-utils/sfdisk.c:233
-#, c-format
-msgid "cannot open partition sector save file (%s)"
-msgstr "打不开分区扇区保存文件(%s)"
-
-#: disk-utils/sfdisk.c:249
-#, c-format
-msgid "write error on %s"
-msgstr "%s 写出错"
-
-#: disk-utils/sfdisk.c:278
-#, c-format
-msgid "cannot stat partition restore file (%s)"
-msgstr "无法 stat 分区恢复文件(%s)"
-
-#: disk-utils/sfdisk.c:283
-msgid "partition restore file has wrong size - not restoring"
-msgstr "分区恢复文件大小有误 - 将不恢复"
-
-#: disk-utils/sfdisk.c:292
-#, c-format
-msgid "cannot open partition restore file (%s)"
-msgstr "无法打开分区恢复文件(%s)"
-
-#: disk-utils/sfdisk.c:297
-#, c-format
-msgid "error reading %s"
-msgstr "读 %s 出错"
-
-#: disk-utils/sfdisk.c:303
-#, c-format
-msgid "cannot open device %s for writing"
-msgstr "不能打开 %s 以写入"
-
-#: disk-utils/sfdisk.c:313
-#, c-format
-msgid "error writing sector %lu on %s"
-msgstr "写 %2$s 上的 %1$lu 扇区出错"
+#: disk-utils/sfdisk.c:199
+#, fuzzy
+msgid "failed to allocate nested libfdisk context"
+msgstr "分配 libfdisk 环境(context)失败"
-#: disk-utils/sfdisk.c:384
-#, c-format
-msgid "Disk %s: cannot get geometry"
-msgstr "磁盘 %s:无法获取几何属性"
+#: disk-utils/sfdisk.c:243
+#, fuzzy, c-format
+msgid "cannot seek %s"
+msgstr "无法 seek"
-#: disk-utils/sfdisk.c:401
+#: disk-utils/sfdisk.c:253 libfdisk/src/bsd.c:664 libfdisk/src/bsd.c:835
+#: sys-utils/hwclock.c:161 sys-utils/hwclock.c:163
#, c-format
-msgid "Disk %s: cannot get size"
-msgstr "磁盘 %s:无法获取尺寸"
+msgid "cannot write %s"
+msgstr "无法写 %s"
-#: disk-utils/sfdisk.c:433
-#, c-format
-msgid ""
-"Warning: start=%lu - this looks like a partition rather than\n"
-"the entire disk. Using fdisk on it is probably meaningless.\n"
-"[Use the --force option if you really want this]"
+#: disk-utils/sfdisk.c:259
+#, fuzzy, c-format
+msgid "%12s (offset %5ju, size %5ju): %s"
msgstr ""
-"警告:起点为%lu - 这似乎是一个分区,而不是整个盘。对它执行\n"
-"fdisk 可能没有意义。[如果您真想这么做,请使用 --force 选项]"
-
-#: disk-utils/sfdisk.c:441
-#, c-format
-msgid "Warning: HDIO_GETGEO says that there are %lu heads"
-msgstr "警告:HDIO_GETGEO 表明有 %lu 个磁头"
+"\n"
+"%s: 偏移 = %ju, 大小 = %zu 字节。"
-#: disk-utils/sfdisk.c:444
-#, c-format
-msgid "Warning: HDIO_GETGEO says that there are %lu sectors"
-msgstr "警告:HDIO_GETGEO 表明有 %lu 个扇区"
+#: disk-utils/sfdisk.c:265
+#, fuzzy, c-format
+msgid "%s: failed to create a backup"
+msgstr "%s:创建签名备份失败"
-#: disk-utils/sfdisk.c:448
-#, c-format
-msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders"
-msgstr "警告:BLKGETSIZE/HDIO_GETGEO 表明有 %lu 个柱面"
+#: disk-utils/sfdisk.c:285 misc-utils/wipefs.c:383
+msgid "failed to create a signature backup, $HOME undefined"
+msgstr "创建签名备份失败,未定义 $HOME"
-#: disk-utils/sfdisk.c:453
-#, c-format
-msgid ""
-"Warning: unlikely number of sectors (%lu) - usually at most 63\n"
-"This will give problems with all software that uses C/H/S addressing."
+#: disk-utils/sfdisk.c:291
+msgid "Backup files:"
msgstr ""
-"警告:扇区数异常(%lu) - 通常最多是 63\n"
-"这会给所有使用 C/H/S 地址的软件带来问题。"
-#: disk-utils/sfdisk.c:457
-#, c-format
+#: disk-utils/sfdisk.c:307
+#, fuzzy
+msgid "The partition table unchanged (--no-act)."
+msgstr "分区表已调整。"
+
+#: disk-utils/sfdisk.c:311
+#, fuzzy
msgid ""
"\n"
-"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
-msgstr ""
-"\n"
-"磁盘 %s:%lu 个柱面,%lu 个磁头,%lu 个扇区/磁道\n"
-
-#: disk-utils/sfdisk.c:543
-#, c-format
-msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)"
-msgstr "分区 %2$s 的 %1$s 的磁头数有误:%3$lu (应在 0-%4$lu 范围)"
-
-#: disk-utils/sfdisk.c:548
-#, c-format
-msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)"
-msgstr "分区 %2$s 的 %1$s 的扇区数有误:%3$lu (应在 1-%4$lu 范围)"
+"The partition table has been altered."
+msgstr "分区表已调整。"
-#: disk-utils/sfdisk.c:553
-#, c-format
-msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)"
-msgstr "分区 %2$s 的 %1$s 的柱面数有误:%3$lu (应在 0-%4$lu 范围)"
+#: disk-utils/sfdisk.c:359
+#, fuzzy, c-format
+msgid "unsupported label '%s'"
+msgstr "不支持的磁盘标签:%s"
-#: disk-utils/sfdisk.c:593
-#, c-format
+#: disk-utils/sfdisk.c:362
msgid ""
"Id Name\n"
"\n"
@@ -3559,830 +3680,551 @@ msgstr ""
"Id 名称\n"
"\n"
-#: disk-utils/sfdisk.c:756
-#, c-format
-msgid "Re-reading the partition table ...\n"
-msgstr "正在重新读取分区表...;\n"
-
-#: disk-utils/sfdisk.c:758
-msgid ""
-"The command to re-read the partition table failed.\n"
-"Run partprobe(8), kpartx(8) or reboot your system now,\n"
-"before using mkfs"
-msgstr ""
-"重新读取分区表的命令失败。\n"
-"在使用 mkfs 前,请先运行 partprobe(8)、kpartx(8) 或\n"
-"重启系统。"
-
-#: disk-utils/sfdisk.c:766
-#, c-format
-msgid "Error closing %s"
-msgstr "关闭 %s 出错"
-
-#: disk-utils/sfdisk.c:807
-#, c-format
-msgid "%s: no such partition\n"
-msgstr "%s:没有此分区\n"
+#: disk-utils/sfdisk.c:383 disk-utils/sfdisk.c:439 disk-utils/sfdisk.c:493
+#: term-utils/agetty.c:2499
+#, fuzzy, c-format
+msgid "cannot open: %s"
+msgstr "打不开 %s"
-#: disk-utils/sfdisk.c:830
-msgid "unrecognized format - using sectors"
-msgstr "无法识别的格式 - 将使用扇区"
+#: disk-utils/sfdisk.c:392
+#, fuzzy
+msgid "unrecognized partition table type"
+msgstr " %s:未识别的分区表类型"
-#: disk-utils/sfdisk.c:891
+#: disk-utils/sfdisk.c:445
#, c-format
-msgid "unimplemented format - using %s"
-msgstr "未实现的格式 - 将使用 %s"
-
-#: disk-utils/sfdisk.c:892 libfdisk/src/bsd.c:478
-msgid "cylinders"
-msgstr "柱面"
-
-#: disk-utils/sfdisk.c:892
-msgid "sectors"
-msgstr "扇区"
+msgid "Cannot get size of %s"
+msgstr "无法获得 %s 的大小"
-#: disk-utils/sfdisk.c:896
-#, c-format
-msgid ""
-"Units: cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
-"\n"
-msgstr ""
-"单位:%lu 的柱面,1024字节的块,从 %d 开始计算\n"
-"\n"
+#: disk-utils/sfdisk.c:482
+#, fuzzy, c-format
+msgid "total: %ju blocks\n"
+msgstr "共计:%llu 个块\n"
-#: disk-utils/sfdisk.c:898
-#, c-format
-msgid " Device Boot Start End #cyls #blocks Id System\n"
-msgstr " 设备 启动 开头 结束 #柱面 #块 Id 系统\n"
+#: disk-utils/sfdisk.c:544 disk-utils/sfdisk.c:615 disk-utils/sfdisk.c:677
+#: disk-utils/sfdisk.c:741 disk-utils/sfdisk.c:796 disk-utils/sfdisk.c:852
+#: disk-utils/sfdisk.c:1094
+#, fuzzy
+msgid "no disk device specified"
+msgstr "未指定设备"
-#: disk-utils/sfdisk.c:903
-#, c-format
-msgid ""
-"Units: sectors of 512 bytes, counting from %d\n"
-"\n"
+#: disk-utils/sfdisk.c:555
+msgid "toggle boot flags is supported for MBR only"
msgstr ""
-"单位:512字节的扇区,从 %d 开始计算\n"
-"\n"
-#: disk-utils/sfdisk.c:905
-#, c-format
-msgid " Device Boot Start End #sectors Id System\n"
-msgstr " 设备 启动 开头 结束 #扇区 Id 系统\n"
+#: disk-utils/sfdisk.c:586 disk-utils/sfdisk.c:682 disk-utils/sfdisk.c:746
+#: disk-utils/sfdisk.c:801 disk-utils/sfdisk.c:857 disk-utils/sfdisk.c:1092
+#: disk-utils/sfdisk.c:1476
+#, fuzzy
+msgid "failed to parse partition number"
+msgstr "%s:获取分区号失败"
-#: disk-utils/sfdisk.c:908
+#: disk-utils/sfdisk.c:591
#, c-format
-msgid ""
-"Units: blocks of 1024 bytes, counting from %d\n"
-"\n"
+msgid "%s: partition %d: failed to toggle bootable flag"
msgstr ""
-"单位:1024字节的块,从 %d 开始计算\n"
-"\n"
-
-#: disk-utils/sfdisk.c:910
-#, c-format
-msgid " Device Boot Start End #blocks Id System\n"
-msgstr " 设备 启动 开头 结束 #块 Id 系统\n"
-#: disk-utils/sfdisk.c:913
-#, c-format
-msgid ""
-"Units: 1MiB = 1024*1024 bytes, blocks of 1024 bytes, counting from %d\n"
-"\n"
-msgstr ""
-"单位:1MiB = 1024*1024 字节,1024字节的块,从 %d 开始计算\n"
-"\n"
+#: disk-utils/sfdisk.c:623
+#, fuzzy
+msgid "failed to allocate dump struct"
+msgstr "分配(callocate) CPU 组 失败"
-#: disk-utils/sfdisk.c:915
-#, c-format
-msgid " Device Boot Start End MiB #blocks Id System\n"
-msgstr " 设备 启动 开头 结束 MiB #块 Id 系统\n"
+#: disk-utils/sfdisk.c:627
+#, fuzzy
+msgid "failed to dump partition table"
+msgstr "%s:读取分区表失败"
-#: disk-utils/sfdisk.c:1074
-#, c-format
-msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "\t\t开头:(c,h,s) 应为 (%ld,%ld,%ld) 找到的为 (%ld,%ld,%ld)\n"
+#: disk-utils/sfdisk.c:655
+#, fuzzy, c-format
+msgid "%s: not found partition table."
+msgstr "无分区表。\n"
-#: disk-utils/sfdisk.c:1081
-#, c-format
-msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "\t\t结束:(c,h,s) 应为 (%ld,%ld,%ld) 找到的为 (%ld,%ld,%ld)\n"
+#: disk-utils/sfdisk.c:659
+#, fuzzy, c-format
+msgid "%s: partition %zu: partition table contains %zu partitions only."
+msgstr "%s:分区表中无分区"
-#: disk-utils/sfdisk.c:1084
-#, c-format
-msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
-msgstr "分区结束在柱面 %ld,超过了磁盘的末尾\n"
+#: disk-utils/sfdisk.c:662
+#, fuzzy, c-format
+msgid "%s: partition %zu: partition unnused"
+msgstr "分区 %zu:与 分区 %zu 重叠。"
-#: disk-utils/sfdisk.c:1095
-msgid "No partitions found"
-msgstr "未找到分区"
+#: disk-utils/sfdisk.c:681 disk-utils/sfdisk.c:745 disk-utils/sfdisk.c:800
+#: disk-utils/sfdisk.c:856
+#, fuzzy
+msgid "no partition number specified"
+msgstr "分区号"
-#: disk-utils/sfdisk.c:1098
-#, c-format
-msgid ""
-"Warning: The partition table looks like it was made\n"
-" for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
-"For this listing I'll assume that geometry."
-msgstr ""
-"警告:分区表似乎是为 C/H/S=*/%ld/%ld 制作的\n"
-"(而非 %ld/%ld/%ld)。\n"
-"对这次列表程序将使用该几何属性。"
+#: disk-utils/sfdisk.c:687 disk-utils/sfdisk.c:751 disk-utils/sfdisk.c:806
+#: disk-utils/sfdisk.c:862
+#, fuzzy
+msgid "uneexpected arguments"
+msgstr "参数数量异常"
-#: disk-utils/sfdisk.c:1147
-msgid "no partition table present"
-msgstr "不存在分区表"
+#: disk-utils/sfdisk.c:702
+#, fuzzy, c-format
+msgid "%s: partition %zu: failed to get partition type"
+msgstr "%s:获取分区号失败"
-#: disk-utils/sfdisk.c:1149
-#, c-format
-msgid "strange, only %d partition defined"
-msgid_plural "strange, only %d partitions defined"
-msgstr[0] "异常,只定义了 %d 个分区"
+#: disk-utils/sfdisk.c:721
+#, fuzzy, c-format
+msgid "failed to parse %s partition type '%s'"
+msgstr "解析设施“%s”失败"
-#: disk-utils/sfdisk.c:1159
-#, c-format
-msgid "Warning: partition %s has size 0 but is not marked Empty"
-msgstr "警告:分区 %s 大小为 0 但未标记为 空"
+#: disk-utils/sfdisk.c:725
+#, fuzzy, c-format
+msgid "%s: partition %zu: failed to set partition type"
+msgstr "%s:分区表中无分区"
-#: disk-utils/sfdisk.c:1162
-#, c-format
-msgid "Warning: partition %s has size 0 and is bootable"
-msgstr "警告:分区 %s 大小为 0 并且标记了 可启动"
+#: disk-utils/sfdisk.c:763
+#, fuzzy, c-format
+msgid "%s: partition %zu: failed to get partition UUID"
+msgstr "%s:分区表中无分区"
-#: disk-utils/sfdisk.c:1165
-#, c-format
-msgid "Warning: partition %s has size 0 and nonzero start"
-msgstr "警告:分区 %s 大小为 0 且起始位置不为 0"
+#: disk-utils/sfdisk.c:776 disk-utils/sfdisk.c:831 disk-utils/sfdisk.c:885
+#, fuzzy
+msgid "failed to allocate partition object"
+msgstr "分配迭代器失败"
-#: disk-utils/sfdisk.c:1177
-#, c-format
-msgid "Warning: partition %s is not contained in partition %s"
-msgstr "警告:分区 %s 未包含在分区 %s 中"
+#: disk-utils/sfdisk.c:780
+#, fuzzy, c-format
+msgid "%s: partition %zu: failed to set partition UUID"
+msgstr "%s:分区表中无分区"
-#: disk-utils/sfdisk.c:1189
-#, c-format
-msgid "Warning: partitions %s and %s overlap"
-msgstr "警告:分区 %s 和 %s 有重叠"
+#: disk-utils/sfdisk.c:818
+#, fuzzy, c-format
+msgid "%s: partition %zu: failed to get partition name"
+msgstr "%s:获取分区号失败"
-#: disk-utils/sfdisk.c:1201
-#, c-format
-msgid ""
-"Warning: partition %s contains part of the partition table (sector %llu),\n"
-"and will destroy it when filled"
-msgstr "警告:分区 %s 包含部分分区表(%llu),填充会破坏它。"
+#: disk-utils/sfdisk.c:835
+#, fuzzy, c-format
+msgid "%s: partition %zu: failed to set partition name"
+msgstr "%s:获取分区号失败"
-#: disk-utils/sfdisk.c:1214
-#, c-format
-msgid "Warning: partition %s starts at sector 0"
-msgstr "警告:分区 %s 起始于扇区 0"
+#: disk-utils/sfdisk.c:889
+#, fuzzy, c-format
+msgid "%s: partition %zu: failed to set partition attributes"
+msgstr "%s:分区表中无分区"
-#: disk-utils/sfdisk.c:1219
-#, c-format
-msgid "Warning: partition %s extends past end of disk"
-msgstr "警告:分区 %s 超出了磁盘终点"
+#: disk-utils/sfdisk.c:932
+#, fuzzy
+msgid " Commands:\n"
+msgstr "没有命令?"
-#: disk-utils/sfdisk.c:1235
-#, c-format
-msgid ""
-"Warning: partition %s has size %d.%d TB (%llu bytes),\n"
-"which is larger than the %llu bytes limit imposed\n"
-"by the DOS partition table for %d-byte sectors"
-msgstr ""
-"警告:分区 %s 大小为 %d.%d TB (%llu 字节),大于\n"
-"%llu 字节(DOS 分区表对 %d-字节扇区的强制限定值)"
+#: disk-utils/sfdisk.c:934
+#, fuzzy
+msgid " write write table to disk and exit\n"
+msgstr "将分区表写入磁盘并退出"
-#: disk-utils/sfdisk.c:1251
-#, c-format
-msgid ""
-"Warning: partition %s starts at sector %llu (%d.%d TB for %d-byte sectors),\n"
-"which exceeds the DOS partition table limit of %llu sectors"
+#: disk-utils/sfdisk.c:935
+msgid " quit show new situation and wait for user's feedbadk before write\n"
msgstr ""
-"警告:分区 %s 起点为第 %llu 扇区 (%d.%d TB,对于 %d-字节扇区),\n"
-"这超过了 DOS 分区表 %llu 个扇区的限制"
-#: disk-utils/sfdisk.c:1271
-msgid ""
-"Among the primary partitions, at most one can be extended\n"
-" (although this is not a problem under Linux)"
+#: disk-utils/sfdisk.c:936
+msgid " abort exit sfdisk shell\n"
msgstr ""
-"主分区中只有一个可设为扩展分区\n"
-"(尽管 Linux 下不存在这个问题)"
-#: disk-utils/sfdisk.c:1291
-#, c-format
-msgid "Warning: partition %s does not start at a cylinder boundary"
-msgstr "警告:分区 %s 未起始于柱面边界。"
+#: disk-utils/sfdisk.c:937
+#, fuzzy
+msgid " print print partition table.\n"
+msgstr "打印分区表"
-#: disk-utils/sfdisk.c:1297
-#, c-format
-msgid "Warning: partition %s does not end at a cylinder boundary"
-msgstr "警告:分区 %s 未结束于柱面边界。"
+#: disk-utils/sfdisk.c:938
+#, fuzzy
+msgid " help this help.\n"
+msgstr " --help 显示此帮助并退出\n"
-#: disk-utils/sfdisk.c:1316
-msgid ""
-"Warning: more than one primary partition is marked bootable (active)\n"
-"This does not matter for LILO, but the DOS MBR will not boot this disk."
+#: disk-utils/sfdisk.c:940
+msgid " CTRL-D the same like 'quit' command\n"
msgstr ""
-"超过一个主分区被标记为 可启动(活动)。这对 LILO 没有影响,但 \n"
-"DOS MBR 将无法启动该磁盘。"
-#: disk-utils/sfdisk.c:1323
-msgid ""
-"Warning: usually one can boot from primary partitions only\n"
-"LILO disregards the `bootable' flag."
-msgstr ""
-"警告:通常只能从主分区启动\n"
-"LILO 会忽略“可启动”标志。"
+#: disk-utils/sfdisk.c:944
+#, fuzzy
+msgid " Input format:\n"
+msgstr "输出格式:\n"
-#: disk-utils/sfdisk.c:1329
-msgid ""
-"Warning: no primary partition is marked bootable (active)\n"
-"This does not matter for LILO, but the DOS MBR will not boot this disk."
+#: disk-utils/sfdisk.c:946
+msgid " <start>, <size>, <typy>, <bootable>\n"
msgstr ""
-"警告:没有一个主分区被标记为 可启动(活动)。这对 LILO 没有影响,但 \n"
-"DOS MBR 将无法启动该磁盘。"
-
-#: disk-utils/sfdisk.c:1343
-msgid "start"
-msgstr "起点"
-#: disk-utils/sfdisk.c:1346
-#, c-format
-msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)"
-msgstr "分区 %s:起点:(c,h,s) 应为 (%ld,%ld,%ld) 找到的为 (%ld,%ld,%ld)"
-
-#: disk-utils/sfdisk.c:1352
-msgid "end"
-msgstr "末尾"
-
-#: disk-utils/sfdisk.c:1355
-#, c-format
-msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)"
-msgstr "分区 %s:终点:(c,h,s) 应为 (%ld,%ld,%ld) 找到的为 (%ld,%ld,%ld)"
-
-#: disk-utils/sfdisk.c:1358
-#, c-format
-msgid "partition %s ends on cylinder %ld, beyond the end of the disk"
-msgstr "分区 %s 结束于 %ld,超出了磁盘的末尾"
-
-#: disk-utils/sfdisk.c:1383
-#, c-format
+#: disk-utils/sfdisk.c:949
msgid ""
-"Warning: shifted start of the extd partition from %lld to %lld\n"
-"(For listing purposes only. Do not change its contents.)"
+" <start> begin of the partition in sectors. The default is the first\n"
+" free space.\n"
msgstr ""
-"警告:扩展分区的起点从 %lld 移到了 %lld\n"
-"(仅用于列表。不改变其内容。)"
-#: disk-utils/sfdisk.c:1388
+#: disk-utils/sfdisk.c:953
msgid ""
-"Warning: extended partition does not start at a cylinder boundary.\n"
-"DOS and Linux will interpret the contents differently."
+" <size> size of the partition in sectors if specified in format\n"
+" <number>{K,M,G,T,P,E,Z,Y} then it's interpreted as size\n"
+" in bytes. The default is all available space.\n"
msgstr ""
-"警告:扩展分区未开始于柱面边界处。\n"
-"DOS 和 Linux 对其内容的解释会有分歧。"
-
-#: disk-utils/sfdisk.c:1401
-#, c-format
-msgid "ERROR: sector %llu does not have an msdos signature"
-msgstr "错误:扇区 %llu 没有 msdos 签名"
-#: disk-utils/sfdisk.c:1408 disk-utils/sfdisk.c:1485
-#, c-format
-msgid "too many partitions - ignoring those past nr (%zu)"
-msgstr "分区过多 - 将忽略超过 nr (%zu) 的那些分区"
-
-#: disk-utils/sfdisk.c:1423
-msgid "tree of partitions?"
-msgstr "分区树?"
-
-#: disk-utils/sfdisk.c:1532
-msgid "detected Disk Manager - unable to handle that"
-msgstr "检测到磁盘管理器 - 无法处理它"
-
-#: disk-utils/sfdisk.c:1540
-msgid "DM6 signature found - giving up"
-msgstr "找到 DM6 签名 - 将放弃"
-
-#: disk-utils/sfdisk.c:1560
-msgid "strange..., an extended partition of size 0?"
-msgstr "不对呀...,一个大小为 0 的扩展分区?"
-
-#: disk-utils/sfdisk.c:1567 disk-utils/sfdisk.c:1578
-msgid "strange..., a BSD partition of size 0?"
-msgstr "不对呀...,一个大小为 0 的 BSD 分区?"
-
-#: disk-utils/sfdisk.c:1622
-#, c-format
-msgid " %s: unrecognized partition table type"
-msgstr " %s:未识别的分区表类型"
-
-#: disk-utils/sfdisk.c:1634
-msgid "-n flag was given: Nothing changed"
-msgstr "指定了 -n 标志:未做更改"
-
-#: disk-utils/sfdisk.c:1651
-msgid "Failed saving the old sectors - aborting\n"
-msgstr "保存旧扇区失败 - 将中止\n"
-
-#: disk-utils/sfdisk.c:1656 disk-utils/sfdisk.c:1660
-#, c-format
-msgid "Failed writing the partition on %s"
-msgstr "写 %s 上的分区失败"
-
-#: disk-utils/sfdisk.c:1738
-msgid "long or incomplete input line - quitting"
-msgstr "输入行太长或不完整 - 将退出"
-
-#: disk-utils/sfdisk.c:1774
-#, c-format
-msgid "input error: `=' expected after %s field"
-msgstr "输入错误:%s 字段后应为“=”"
-
-#: disk-utils/sfdisk.c:1781
-#, c-format
-msgid "input error: unexpected character %c after %s field"
-msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
-
-#: disk-utils/sfdisk.c:1787
-#, c-format
-msgid "unrecognized input: %s"
-msgstr "无法识别的输入:%s"
+#: disk-utils/sfdisk.c:958
+msgid " <type> partition type. The default is Linux data partition.\n"
+msgstr ""
-#: disk-utils/sfdisk.c:1828 disk-utils/sfdisk.c:1865
-msgid "number too big"
-msgstr "数字过大"
+#: disk-utils/sfdisk.c:959
+msgid " MBR: hex or L,S,E,X shortcuts.\n"
+msgstr ""
-#: disk-utils/sfdisk.c:1832 disk-utils/sfdisk.c:1869
-msgid "trailing junk after number"
-msgstr "数字后有垃圾内容"
+#: disk-utils/sfdisk.c:960
+msgid " GPT: uuid or L,S,H shortcuts.\n"
+msgstr ""
-#: disk-utils/sfdisk.c:1994
-msgid "no room for partition descriptor"
-msgstr "没有空间放置分区描述符"
+#: disk-utils/sfdisk.c:963
+msgid " <bootable> '*' to mark MBR partition as bootable. \n"
+msgstr ""
-#: disk-utils/sfdisk.c:2027
-msgid "cannot build surrounding extended partition"
-msgstr "无法创建环绕扩展分区"
+#: disk-utils/sfdisk.c:967
+msgid " Example:\n"
+msgstr ""
-#: disk-utils/sfdisk.c:2078
-msgid "too many input fields"
-msgstr "输入字段过多"
+#: disk-utils/sfdisk.c:969
+#, fuzzy
+msgid " , 4G creates 4GiB partition on default start offset.\n"
+msgstr " n 从空闲空间创建新分区"
-#: disk-utils/sfdisk.c:2112
-msgid "No room for more"
-msgstr "空间不足"
+#: disk-utils/sfdisk.c:1001 sys-utils/dmesg.c:1427
+msgid "unsupported command"
+msgstr "不支持的命令"
-#: disk-utils/sfdisk.c:2131
-msgid "Illegal type"
-msgstr "非法类型"
+#: disk-utils/sfdisk.c:1003
+#, fuzzy, c-format
+msgid "line %d: unsupported command"
+msgstr "不支持的命令"
-#: disk-utils/sfdisk.c:2165
-#, c-format
-msgid "Warning: given size (%llu) exceeds max allowable size (%llu)"
-msgstr "警告:指定大小(%llu)超过了最大允许大小(%llu)"
+#: disk-utils/sfdisk.c:1102
+#, fuzzy
+msgid "failed to allocate script handler"
+msgstr "分配 GPT 头失败"
-#: disk-utils/sfdisk.c:2171
-msgid "Warning: empty partition"
-msgstr "警告:空分区"
+#: disk-utils/sfdisk.c:1113
+#, fuzzy, c-format
+msgid "%s: cannot modify partition %d, not found partition table."
+msgstr "%s:读取分区表失败"
-#: disk-utils/sfdisk.c:2185
+#: disk-utils/sfdisk.c:1118
#, c-format
-msgid "Warning: bad partition start (earliest %llu)"
-msgstr "警告:分区起点有误(最早 %llu)"
-
-#: disk-utils/sfdisk.c:2198
-msgid "unrecognized bootable flag - choose - or *"
-msgstr "无法识别的可启动标志 - 选择 - 或 *"
-
-#: disk-utils/sfdisk.c:2215 disk-utils/sfdisk.c:2229
-msgid "partial c,h,s specification?"
-msgstr "不完整的 c,h,s 说明?"
-
-#: disk-utils/sfdisk.c:2240
-msgid "Extended partition not where expected"
-msgstr "扩展分区位置异常"
-
-#: disk-utils/sfdisk.c:2272
-msgid "bad input"
-msgstr "输入错误"
-
-#: disk-utils/sfdisk.c:2295
-msgid "too many partitions"
-msgstr "分区过多"
+msgid "%s: cannot modify partition %d, partition table contains %zu partitions only."
+msgstr ""
-#: disk-utils/sfdisk.c:2328
+#: disk-utils/sfdisk.c:1133
+#, fuzzy, c-format
msgid ""
-"Input in the following format; absent fields get a default value.\n"
-"<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
-"Usually you only need to specify <start> and <size> (and perhaps <type>)."
-msgstr ""
-"按以下格式输入,未指定的字段将以默认值填充。\n"
-"<起始> <大小> <类型 [E,S,L,X,hex]> <可启动 [-,*]> <c,h,s> <c,h,s>\n"
-"通常您只须指定 <起始> 和 <大小> (可能还要指定 <类型>)。"
+"\n"
+"Welcome to sfdisk (%s)."
+msgstr "欢迎使用 fdisk (%s)。"
-#: disk-utils/sfdisk.c:2350
-#, c-format
-msgid " %s [options] <device>...\n"
-msgstr " %s [选项] <设备>...\n"
+#: disk-utils/sfdisk.c:1141
+msgid "Checking that no-one is using this disk right now ..."
+msgstr "请检查现在是不是有人在使用此磁盘..."
-#: disk-utils/sfdisk.c:2353
+#: disk-utils/sfdisk.c:1143
msgid ""
-" -s, --show-size list size of a partition\n"
-" -c, --id change or print partition Id\n"
-" --change-id change Id\n"
-" --print-id print Id\n"
+" FAILED\n"
+"\n"
msgstr ""
-" -s, --show-size 列出每个分区的大小\n"
-" -c, --id 更改或打印分区 Id\n"
-" --change-id 更改 Id\n"
-" --print-id 打印 Id\n"
-#: disk-utils/sfdisk.c:2357
-msgid ""
-" -l, --list list partitions of each device\n"
-" -d, --dump idem, but in a format suitable for later input\n"
-" -i, --increment number cylinders etc. from 1 instead of from 0\n"
-" -u, --unit <letter> units to be used; <letter> can be one of\n"
-" S (sectors), C (cylinders), B (blocks), or M (MB)\n"
-msgstr ""
-" -l, --list 列出每个设备的分区\n"
-" -d, --dump 同上,但以适合稍后输入的格式列出\n"
-" -i, --increment 给柱面等计数时从 1 而非从 0 开始\n"
-" -u, --unit <字母> 要使用的单位;<字母> 可以是以下之一\n"
-" S(扇区),C(柱面),B(块)或 M(MB)\n"
-
-#: disk-utils/sfdisk.c:2362
-msgid ""
-" -1, --one-only reserved option that does nothing currently\n"
-" -T, --list-types list the known partition types\n"
-" -D, --DOS for DOS-compatibility: waste a little space\n"
-" -E, --DOS-extended DOS extended partition compatibility\n"
-" -R, --re-read make the kernel reread the partition table\n"
-msgstr ""
-" -1, --one-only 预留选项,目前没有作用\n"
-" -T, --list-types 列出已知的分区类型\n"
-" -D, --DOS 与 DOS 兼容;会浪费一点空间\n"
-" -E, --DOS-extended 与 DOS 扩展分区兼容\n"
-" -R, --re-read 让内核重新读取分区表\n"
-
-#: disk-utils/sfdisk.c:2367
+#: disk-utils/sfdisk.c:1146
+#, fuzzy
msgid ""
-" -N <number> change only the partition with this <number>\n"
-" -n do not actually write to disk\n"
-" -O <file> save the sectors that will be overwritten to <file>\n"
-" -I <file> restore sectors from <file>\n"
+"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"
msgstr ""
-" -N <数字> 只更改分区号为 <数字> 的分区\n"
-" -n 并不真的写入磁盘\n"
-" -O <文件> 将要覆盖的分区保存到 <文件> 中\n"
-" -I <文件> 从 <文件> 恢复扇区\n"
+"\n"
+"该磁盘目前正在使用 - 不建议您重新分区。\n"
+"请卸载此磁盘上所有的文件系统,并关闭(swapoff)上面的交换分区。\n"
+"可使用 --no-reread 标志阻止此检查。"
-#: disk-utils/sfdisk.c:2371
-msgid ""
-" -V, --verify check that the listed partitions are reasonable\n"
-" -v, --version display version information and exit\n"
-" -h, --help display this help text and exit\n"
-msgstr ""
-" -V, --verify 检查列出扇区的有效性\n"
-" -v, --version 显示版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
+#: disk-utils/sfdisk.c:1151
+msgid "Use the --force flag to overrule all checks."
+msgstr "使用 --force 标志否决所有检查。"
-#: disk-utils/sfdisk.c:2375
+#: disk-utils/sfdisk.c:1153
+#, fuzzy
msgid ""
+" OK\n"
"\n"
-"Dangerous options:\n"
-msgstr ""
-"\n"
-"危险选项:\n"
+msgstr "%s:OK\n"
-#: disk-utils/sfdisk.c:2376
+#: disk-utils/sfdisk.c:1162
+#, fuzzy
msgid ""
-" -f, --force disable all consistency checking\n"
-" --no-reread do not check whether the partition is in use\n"
-" -q, --quiet suppress warning messages\n"
-" -L, --Linux do not complain about things irrelevant for Linux\n"
-msgstr ""
-" -f, --force 禁止所有一致性检查\n"
-" --no-reread 不检查分区是否正在使用\n"
-" -q, --quiet 抑制警告消息输出\n"
-" -L, --Linux 不报告与 Linux 无关的事情\n"
+"\n"
+"Old situation:"
+msgstr "旧状况:\n"
-#: disk-utils/sfdisk.c:2380
+#: disk-utils/sfdisk.c:1179
+#, c-format
msgid ""
-" -g, --show-geometry print the kernel's idea of the geometry\n"
-" -G, --show-pt-geometry print geometry guessed from the partition table\n"
+"\n"
+"sfdisk is going to create a new '%s' disk label.\n"
+"Use 'label: <name>' before you define a first partition\n"
+"to override the default."
msgstr ""
-" -g, --show-geometry 打印内核检测到的几何属性\n"
-" -G, --show-pt-geometry 打印从分区表推测出的几何属性\n"
-#: disk-utils/sfdisk.c:2382
+#: disk-utils/sfdisk.c:1182
+#, fuzzy
msgid ""
-" -A, --activate[=<device>] activate the bootable flag\n"
-" -U, --unhide[=<device>] set partition as unhidden\n"
-" -x, --show-extended also list extended partitions in the output,\n"
-" or expect descriptors for them in the input\n"
+"\n"
+"Type 'help' to get more information.\n"
+msgstr "请尝试执行“%s --help”了解更多信息。\n"
+
+#: disk-utils/sfdisk.c:1200
+#, fuzzy
+msgid "All partitions used."
+msgstr "未找到分区"
+
+#: disk-utils/sfdisk.c:1208
+#, fuzzy
+msgid "failed to allocate partition name"
+msgstr "添加分区失败"
+
+#: disk-utils/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Ignore partition %zu"
+msgstr "无法创建分区 %zu"
+
+#: disk-utils/sfdisk.c:1244
+#, fuzzy
+msgid "Failed to apply script headers, disk label not created."
+msgstr "写磁盘标签失败"
+
+#: disk-utils/sfdisk.c:1256
+#, fuzzy
+msgid "Failed to add partition"
+msgstr "添加分区失败"
+
+#: disk-utils/sfdisk.c:1267
+msgid "Script header accepted."
msgstr ""
-" -A, --activate[=<设备>] 激活 可启动 标志\n"
-" -U, --unhide[=<设备>] 取消分区隐藏\n"
-" -x, --show-extended 输出时也列出扩展分区,\n"
-" 或输入时请求提供它们的描述符\n"
-#: disk-utils/sfdisk.c:2386
+#: disk-utils/sfdisk.c:1276
+#, fuzzy
msgid ""
-" --leave-last do not allocate the last cylinder\n"
-" --IBM same as --leave-last\n"
+"\n"
+"New situation:"
+msgstr "新状况:\n"
+
+#: disk-utils/sfdisk.c:1285
+#, fuzzy
+msgid "Do you want to write this to disk?"
+msgstr "您想把这些写入磁盘吗?[ynq] "
+
+#: disk-utils/sfdisk.c:1287
+msgid "Leaving."
msgstr ""
-" --leave-last 不分配最后一个柱面\n"
-" --IBM 同 --leave-last\n"
-#: disk-utils/sfdisk.c:2388
-msgid ""
-" --in-order partitions are in order\n"
-" --not-in-order partitions are not in order\n"
-" --inside-outer all logicals inside outermost extended\n"
-" --not-inside-outer not all logicals inside outermost extended\n"
+#: disk-utils/sfdisk.c:1297
+msgid "Leaving.\n"
msgstr ""
-" --in-order 分区按顺序\n"
-" --not-in-order 分区不按顺序\n"
-" --inside-outer 所有逻辑分区位于最外的扩展分区内\n"
-" --not-inside-outer 不要求所有逻辑分区位于最外的扩展分区内\n"
-#: disk-utils/sfdisk.c:2392
+#: disk-utils/sfdisk.c:1310
+#, fuzzy, c-format
msgid ""
-" --nested every partition is disjoint from all others\n"
-" --chained like nested, but extended partitions may lie outside\n"
-" --onesector partitions are mutually disjoint\n"
+" %1$s [options] <dev> [[-N] <part>]\n"
+" %1$s [options] <command>\n"
msgstr ""
-" --nested 每个分区与所有其他分区不相交\n"
-" --chained 与 nested 相似,但扩展分区可以超界\n"
-" --onesector 各分区互不相交\n"
+" %1$s [选项] [<回环设备>]\n"
+" %1$s [选项] -f | <回环设备> <文件>\n"
-#: disk-utils/sfdisk.c:2396
+#: disk-utils/sfdisk.c:1316
msgid ""
"\n"
-"Override the detected geometry using:\n"
-" -C, --cylinders <number> set the number of cylinders to use\n"
-" -H, --heads <number> set the number of heads to use\n"
-" -S, --sectors <number> set the number of sectors to use\n"
+"Commands:\n"
msgstr ""
-"\n"
-"用以下选项覆盖检测到的几何属性:\n"
-" -C, --cylinders <数字> 设置要使用的柱面数\n"
-" -H, --heads <数字> 设置要使用的磁头数\n"
-" -S, --sectors <数字> 设置要使用的扇区数n\n"
-
-#: disk-utils/sfdisk.c:2414
-#, c-format
-msgid " %s%sdevice list active partitions on device\n"
-msgstr " %s%sdevice 列出设备上的活动分区\n"
-
-#: disk-utils/sfdisk.c:2416
-#, c-format
-msgid " %s%sdevice n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr " %s%s设备 n1 n2 ... 激活分区 n1 ..., 取消激活其他分区\n"
-#: disk-utils/sfdisk.c:2557
-msgid "no command?"
-msgstr "没有命令?"
-
-#: disk-utils/sfdisk.c:2626
-msgid "invalid number of partitions argument"
-msgstr "无效的 分区数 参数"
-
-#: disk-utils/sfdisk.c:2696
-#, c-format
-msgid "cannot open %s\n"
-msgstr "打不开 %s\n"
+#: disk-utils/sfdisk.c:1317
+msgid " -a, --activate <dev> [<part> ...] list or set bootable MBR partitions\n"
+msgstr ""
-#: disk-utils/sfdisk.c:2715
-#, c-format
-msgid "total: %llu blocks\n"
-msgstr "共计:%llu 个块\n"
+#: disk-utils/sfdisk.c:1318
+#, fuzzy
+msgid " -d, --dump <dev> dump partition table (usable for later input)\n"
+msgstr " -H, --human 易读格式输出\n"
-#: disk-utils/sfdisk.c:2752
-msgid "usage: sfdisk --print-id device partition-number"
-msgstr "用法:sfdisk --print-id 设备 分区号"
+#: disk-utils/sfdisk.c:1319
+msgid " -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n"
+msgstr ""
-#: disk-utils/sfdisk.c:2754
-msgid "usage: sfdisk --change-id device partition-number Id"
-msgstr "用法:sfdisk --change-id 设备 分区号 Id"
+#: disk-utils/sfdisk.c:1320
+#, fuzzy
+msgid " -l, --list [<dev> ...] list partitions of each device\n"
+msgstr " -l, --list 显示分区信息并退出\n"
-#: disk-utils/sfdisk.c:2756
-msgid "usage: sfdisk --id device partition-number [Id]"
-msgstr "用法:sfdisk --id 设备 分区号 [Id]"
+#: disk-utils/sfdisk.c:1321
+#, fuzzy
+msgid " -s, --show-size [<dev> ...] list sizes of all or specified devices\n"
+msgstr " -l, --list 列出所有或指定的信息(默认)\n"
-#: disk-utils/sfdisk.c:2763
-msgid "can specify only one device (except with -l or -s)"
-msgstr "只能指定一台设备(除非指定 -l 或 -s)"
+#: disk-utils/sfdisk.c:1322
+#, fuzzy
+msgid " -T, --list-types print the recognized types (see -X)\n"
+msgstr " -r, --raw 打印原生消息缓冲区\n"
-#: disk-utils/sfdisk.c:2788
-#, c-format
-msgid "cannot open %s read-write"
-msgstr "不能以读写方式打开 %s"
+#: disk-utils/sfdisk.c:1323
+#, fuzzy
+msgid " -V, --verify test whether partitions seem correct\n"
+msgstr " -l, --list 显示分区信息并退出\n"
-#: disk-utils/sfdisk.c:2790
-#, c-format
-msgid "cannot open %s for reading"
-msgstr "不能以读方式打开 %s"
+#: disk-utils/sfdisk.c:1326
+msgid " --part-label <dev> <part> [<str>] print or change partition label\n"
+msgstr ""
-#: disk-utils/sfdisk.c:2815
-#, c-format
-msgid "%s: OK"
-msgstr "%s:OK"
+#: disk-utils/sfdisk.c:1327
+msgid " --part-type <dev> <part> [<type>] print or change partition type\n"
+msgstr ""
-#: disk-utils/sfdisk.c:2834 disk-utils/sfdisk.c:2866
-#, c-format
-msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
-msgstr "%s:%ld 个柱面,%ld 个磁头,%ld 个扇区/磁道\n"
+#: disk-utils/sfdisk.c:1328
+msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n"
+msgstr ""
-#: disk-utils/sfdisk.c:2884
-#, c-format
-msgid "Cannot get size of %s"
-msgstr "无法获得 %s 的大小"
+#: disk-utils/sfdisk.c:1329
+msgid " --part-attrs <dev> <part> [<str>] print or change partition attributes\n"
+msgstr ""
-#: disk-utils/sfdisk.c:2964
-#, c-format
-msgid "bad active byte: 0x%x instead of 0x80"
-msgstr "错误的 活动 字节:0x%x 而非 0x80"
+#: disk-utils/sfdisk.c:1332
+#, fuzzy
+msgid " <dev> device (usually disk) path\n"
+msgstr " --help 显示此帮助并退出\n"
-#: disk-utils/sfdisk.c:2983 disk-utils/sfdisk.c:3044 disk-utils/sfdisk.c:3080
-msgid "Done"
-msgstr "完成"
+#: disk-utils/sfdisk.c:1333
+#, fuzzy
+msgid " <part> partition number\n"
+msgstr " -l, --list 显示分区信息并退出\n"
-#: disk-utils/sfdisk.c:2992
-#, c-format
-msgid ""
-"You have %d active primary partitions. This does not matter for LILO,\n"
-"but the DOS MBR will only boot a disk with 1 active partition."
+#: disk-utils/sfdisk.c:1334
+msgid " <type> partition type, GUID for GPT, hex for MBR\n"
msgstr ""
-"您有 %d 个活动的主分区。这对 LILO 没有影响,但 DOS MBR 只能启动带一个活动分区\n"
-"的磁盘。"
-
-#: disk-utils/sfdisk.c:3013
-#, c-format
-msgid "partition %s has id %x and is not hidden"
-msgstr "分区 %s 标识为 %x,不是隐藏的"
-
-#: disk-utils/sfdisk.c:3076
-#, c-format
-msgid "Bad Id %lx"
-msgstr "错误的 Id %lx"
-#: disk-utils/sfdisk.c:3097
-msgid "This disk is currently in use."
-msgstr "此分区正在使用中。"
+#: disk-utils/sfdisk.c:1337
+#, fuzzy
+msgid " -A, --append append partitions to existing partition table\n"
+msgstr " -z, --zero 以空分区表开始\n"
-#: disk-utils/sfdisk.c:3117
-#, c-format
-msgid "Fatal error: cannot find %s"
-msgstr "致命错误:找不到 %s"
+#: disk-utils/sfdisk.c:1338
+#, fuzzy
+msgid " -b, --backup backup partition table sectors (see -O)\n"
+msgstr " -t, --type <类型> 只识别指定的分区表类型\n"
-#: disk-utils/sfdisk.c:3119
-#, c-format
-msgid "Warning: %s is not a block device"
-msgstr "警告:%s 不是一个块设备"
+#: disk-utils/sfdisk.c:1339
+#, fuzzy
+msgid " -f, --force disable all consistency checking\n"
+msgstr " -r, --reset 重置所有计数(限 root 用户)\n"
-#: disk-utils/sfdisk.c:3125
-msgid "Checking that no-one is using this disk right now ..."
-msgstr "请检查现在是不是有人在使用此磁盘..."
+#: disk-utils/sfdisk.c:1340
+#, fuzzy
+msgid " -o, --output <list> output columns\n"
+msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/sfdisk.c:3127
-msgid ""
-"\n"
-"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."
+#: disk-utils/sfdisk.c:1341
+msgid " -O, --backup-file <path> override default backout file name\n"
msgstr ""
-"\n"
-"该磁盘目前正在使用 - 不建议您重新分区。\n"
-"请卸载此磁盘上所有的文件系统,并关闭(swapoff)上面的交换分区。\n"
-"可使用 --no-reread 标志阻止此检查。"
-
-#: disk-utils/sfdisk.c:3131
-msgid "Use the --force flag to overrule all checks."
-msgstr "使用 --force 标志否决所有检查。"
-#: disk-utils/sfdisk.c:3133
-msgid "OK"
-msgstr "正常"
-
-#: disk-utils/sfdisk.c:3142
-#, c-format
-msgid "Old situation:\n"
-msgstr "旧状况:\n"
+#: disk-utils/sfdisk.c:1342
+#, fuzzy
+msgid " -N, --partno <num> specify partition number\n"
+msgstr " -H, --heads <数字> 指定磁头数\n"
-#: disk-utils/sfdisk.c:3146
-#, c-format
-msgid "Partition %d does not exist, cannot change it"
-msgstr "分区 %d 不存在,无法更改它"
+#: disk-utils/sfdisk.c:1343
+#, fuzzy
+msgid " -X, --label <name> specify label type (dos, gpt, ...)\n"
+msgstr " -i, --irq <数字> 指定并口中断号\n"
-#: disk-utils/sfdisk.c:3154
-#, c-format
-msgid "New situation:\n"
-msgstr "新状况:\n"
+#: disk-utils/sfdisk.c:1344
+#, fuzzy
+msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n"
+msgstr " -t, --type <类型> 指定分区类型(dos、bsd、solaris 等)\n"
-#: disk-utils/sfdisk.c:3159
-msgid ""
-"I don't like these partitions - nothing changed.\n"
-"(If you really want this, use the --force option.)"
-msgstr ""
-"我不愿这样分区 - 未做更改。\n"
-"(如果您真的想这样做,可使用 --force 选项。)"
+#: disk-utils/sfdisk.c:1345
+#, fuzzy
+msgid " -q, --quiet suppress extra info messages\n"
+msgstr " -U, --user 取消共享用户名字空间\n"
-#: disk-utils/sfdisk.c:3162
-msgid "I don't like this - probably you should answer No"
-msgstr "我不愿这样做 - 建议您取消"
+#: disk-utils/sfdisk.c:1346
+#, fuzzy
+msgid " -n, --no-act do everything except write to device\n"
+msgstr " -n, --no-mtab 不写 /etc/mtab\n"
-#. TRANSLATORS: sfdisk uses rpmatch which means the answers y and n
-#. * should be translated, but that is not the case with q answer.
-#: disk-utils/sfdisk.c:3169
-#, c-format
-msgid "Are you satisfied with this? [ynq] "
-msgstr "这样您满意吗?[ynq] "
+#: disk-utils/sfdisk.c:1347
+#, fuzzy
+msgid " --no-reread do not check whether the device is in use\n"
+msgstr " -J --noclear 提示之前不清屏\n"
-#: disk-utils/sfdisk.c:3171
-#, c-format
-msgid "Do you want to write this to disk? [ynq] "
-msgstr "您想把这些写入磁盘吗?[ynq] "
+#: disk-utils/sfdisk.c:1349
+#, fuzzy
+msgid " -u, --unit S deprecated, only sector unit is supported\n"
+msgstr " -i, --info 只打印有关采样步骤(sampling step)的信息\n"
-#: disk-utils/sfdisk.c:3174
-msgid "Quitting - nothing changed"
-msgstr "将退出 - 未做更改"
+#: disk-utils/sfdisk.c:1350
+#, fuzzy
+msgid " -L, --Linux deprecated, only for backward copatibility\n"
+msgstr " --4gb 忽略(纯为兼容)\n"
-#: disk-utils/sfdisk.c:3180
-#, c-format
-msgid "Please answer one of y,n,q\n"
-msgstr "请回答 y, n 或 q\n"
+#: disk-utils/sfdisk.c:1354 login-utils/chfn.c:103 login-utils/chsh.c:80
+msgid " -v, --version output version information and exit\n"
+msgstr " -v, --version 输出版本信息并退出\n"
-#: disk-utils/sfdisk.c:3188
+#: disk-utils/sfdisk.c:1440
#, c-format
-msgid ""
-"Successfully wrote the new partition table\n"
-"\n"
+msgid "%s is deprecated in favour of ---part-type"
msgstr ""
-"成功写入了新分区表\n"
-"\n"
-#: disk-utils/sfdisk.c:3196
-msgid ""
-"If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
-"to zero the first 512 bytes: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
-"(See fdisk(8).)"
+#: disk-utils/sfdisk.c:1444
+msgid "--id s deprecated in favour of ---part-type"
msgstr ""
-"如果您创建或更改了 DOS 分区,如 /dev/foo7,请使用 dd(1)\n"
-"将前 512 个字节清零:dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
-"(参阅 fdisk(8)。)"
-#: disk-utils/swaplabel.c:50 disk-utils/swaplabel.c:63
-#, c-format
-msgid "%s: unable to probe device"
-msgstr "%s:无法探测设备"
-
-#: disk-utils/swaplabel.c:65
-#, c-format
-msgid "%s: ambivalent probing result, use wipefs(8)"
-msgstr "%s:探测结果矛盾,使用 wipefs(8)"
+#: disk-utils/sfdisk.c:1463
+msgid "--Linux option is unnecessary and deprecated"
+msgstr ""
-#: disk-utils/swaplabel.c:67
-#, c-format
-msgid "%s: not a valid swap partition"
-msgstr "%s:不是有效的交换分区"
+#: disk-utils/sfdisk.c:1489
+#, fuzzy, c-format
+msgid "unssupported unit '%c'"
+msgstr "不支持的参数:%s"
-#: disk-utils/swaplabel.c:74
+#: disk-utils/sfdisk.c:1492 include/c.h:294
#, c-format
-msgid "%s: unsupported swap version '%s'"
-msgstr "%s:不支持的交换版本“%s”"
+msgid "%s from %s\n"
+msgstr "%s,来自 %s\n"
-#: disk-utils/swaplabel.c:114
+#: disk-utils/swaplabel.c:69
#, c-format
msgid "failed to parse UUID: %s"
msgstr "解析 UUID 失败:%s"
-#: disk-utils/swaplabel.c:118
+#: disk-utils/swaplabel.c:73
#, c-format
msgid "%s: failed to seek to swap UUID"
msgstr "%s:定位到交换区 UUID 失败"
-#: disk-utils/swaplabel.c:122
+#: disk-utils/swaplabel.c:77
#, c-format
msgid "%s: failed to write UUID"
msgstr "%s:写 UUID 失败"
-#: disk-utils/swaplabel.c:133
+#: disk-utils/swaplabel.c:88
#, c-format
msgid "%s: failed to seek to swap label "
msgstr "%s:无法定位到交换区标签 "
-#: disk-utils/swaplabel.c:140
+#: disk-utils/swaplabel.c:95
#, c-format
msgid "label is too long. Truncating it to '%s'"
msgstr "标签过长。将截短到“%s”"
-#: disk-utils/swaplabel.c:143
+#: disk-utils/swaplabel.c:98
#, c-format
msgid "%s: failed to write label"
msgstr "%s:写标签失败"
-#: disk-utils/swaplabel.c:165
+#: disk-utils/swaplabel.c:121
+msgid "Display or change the label or UUID of a swap area.\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:124
msgid ""
" -L, --label <label> specify a new label\n"
" -U, --uuid <uuid> specify a new uuid\n"
@@ -4390,14 +4232,11 @@ msgstr ""
" -L, --label <标签> 指定一个新标签\n"
" -U, --uuid <uuid> 指定一个新 uuid\n"
-#: disk-utils/swaplabel.c:208
+#: disk-utils/swaplabel.c:167
msgid "ignore -U (UUIDs are unsupported)"
msgstr "忽略 -U (不支持 UUID)"
-#: include/c.h:279 misc-utils/getopt.c:314 misc-utils/look.c:366
-#: misc-utils/namei.c:427 misc-utils/uuidd.c:71 misc-utils/uuidgen.c:31
-#: misc-utils/wipefs.c:451 sys-utils/hwclock.c:1569 sys-utils/renice.c:55
-#: term-utils/script.c:141 term-utils/scriptreplay.c:40 term-utils/write.c:80
+#: include/c.h:287
msgid ""
"\n"
"Usage:\n"
@@ -4405,15 +4244,23 @@ msgstr ""
"\n"
"用法:\n"
-#: include/c.h:282
+#: include/c.h:288
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"选项:\n"
+
+#: include/c.h:290
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help 显示此帮助并退出\n"
-#: include/c.h:283
+#: include/c.h:291
msgid " -V, --version output version information and exit\n"
msgstr " -V, --version 输出版本信息并退出\n"
-#: include/c.h:284
+#: include/c.h:292
#, c-format
msgid ""
"\n"
@@ -4422,16 +4269,16 @@ msgstr ""
"\n"
"更多信息请参阅 %s。\n"
-#: include/closestream.h:42 include/closestream.h:44 login-utils/vipw.c:280
-#: login-utils/vipw.c:299 sys-utils/rtcwake.c:276 term-utils/script.c:585
-#: term-utils/script.c:589 term-utils/setterm.c:814 term-utils/wall.c:310
-#: text-utils/col.c:144
+#: include/closestream.h:42 include/closestream.h:44 login-utils/vipw.c:271
+#: login-utils/vipw.c:290 sys-utils/rtcwake.c:279 term-utils/script.c:595
+#: term-utils/script.c:599 term-utils/setterm.c:819 term-utils/wall.c:314
+#: text-utils/col.c:157
msgid "write error"
msgstr "写出错"
#: include/optutils.h:81
-#, c-format
-msgid "%s: these options aremutually exclusive:"
+#, fuzzy, c-format
+msgid "%s: these options are mutually exclusive:"
msgstr "%s:以下选项相互排斥:"
#: include/pt-mbr-partnames.h:1
@@ -4663,8 +4510,8 @@ msgstr "NTFS 卷集"
msgid "Linux plaintext"
msgstr "Linux 纯文本"
-#: include/pt-mbr-partnames.h:59 libfdisk/src/gpt.c:181 libfdisk/src/sgi.c:57
-#: libfdisk/src/sun.c:48
+#: include/pt-mbr-partnames.h:59 libfdisk/src/gpt.c:186 libfdisk/src/sgi.c:63
+#: libfdisk/src/sun.c:54
msgid "Linux LVM"
msgstr "Linux LVM"
@@ -4724,7 +4571,7 @@ msgstr "BSDI swap"
msgid "Boot Wizard hidden"
msgstr "Boot Wizard 隐藏"
-#: include/pt-mbr-partnames.h:74 libfdisk/src/gpt.c:202
+#: include/pt-mbr-partnames.h:74 libfdisk/src/gpt.c:207
msgid "Solaris boot"
msgstr "Solaris 启动"
@@ -4796,7 +4643,7 @@ msgstr "VMware VMFS"
msgid "VMware VMKCORE"
msgstr "VMware VMKCORE"
-#: include/pt-mbr-partnames.h:99 libfdisk/src/sun.c:49
+#: include/pt-mbr-partnames.h:99 libfdisk/src/sun.c:55
msgid "Linux raid autodetect"
msgstr "Linux raid 自动检测"
@@ -4808,1202 +4655,1187 @@ msgstr "LANstep"
msgid "BBT"
msgstr "BBT"
-#: lib/boottime.c:22
-msgid "gettimeofday failed"
-msgstr "gettimeofday 失败"
-
-#: lib/boottime.c:35
-msgid "sysinfo failed"
-msgstr "sysinfo 失败"
-
-#: lib/exec_shell.c:45 login-utils/newgrp.c:186 login-utils/su-common.c:643
-#: login-utils/su-common.c:972 login-utils/sulogin.c:811
-#: login-utils/sulogin.c:815 schedutils/chrt.c:334 schedutils/ionice.c:259
-#: schedutils/taskset.c:237 sys-utils/flock.c:299 sys-utils/nsenter.c:342
-#: sys-utils/prlimit.c:640 sys-utils/rtcwake.c:587 sys-utils/setarch.c:315
-#: sys-utils/setarch.c:381 sys-utils/setsid.c:114 sys-utils/swapon.c:293
-#: sys-utils/switch_root.c:239 sys-utils/unshare.c:192 term-utils/script.c:547
-#: text-utils/pg.c:1363
-#, c-format
-msgid "failed to execute %s"
-msgstr "执行 %s 失败"
-
-#: libfdisk/src/alignment.c:108
-#, c-format
-msgid "Partition %i does not start on physical sector boundary.\n"
-msgstr "分区 %i 未起始于物理扇区边界。\n"
-
-#: libfdisk/src/alignment.c:521
+#: libfdisk/src/alignment.c:636
msgid "Calling ioctl() to re-read partition table."
msgstr "将调用 ioctl() 来重新读分区表。"
-#: libfdisk/src/alignment.c:530
+#: libfdisk/src/alignment.c:645
msgid "Re-reading the partition table failed."
msgstr "重新读取分区表失败。"
-#: libfdisk/src/alignment.c:532
+#: libfdisk/src/alignment.c:647
msgid "The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or kpartx(8)."
msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 kpartx(8) 后生效。"
-#: libfdisk/src/ask.c:342 libfdisk/src/ask.c:354
+#: libfdisk/src/ask.c:476 libfdisk/src/ask.c:488
#, c-format
msgid "Selected partition %ju"
msgstr "已选择分区 %ju"
-#: libfdisk/src/ask.c:345
+#: libfdisk/src/ask.c:479
msgid "No partition is defined yet!"
msgstr "还没有定义分区!"
-#: libfdisk/src/ask.c:357
+#: libfdisk/src/ask.c:491
msgid "No free partition available!"
msgstr "无空闲分区可用!"
-#: libfdisk/src/ask.c:367
+#: libfdisk/src/ask.c:501
msgid "Partition number"
msgstr "分区号"
-#: libfdisk/src/ask.c:750
+#: libfdisk/src/ask.c:998
#, c-format
msgid "Created a new partition %d of type '%s' and of size %s."
msgstr "创建了一个新分区 %d,类型为“%s”,大小为 %s。"
-#: libfdisk/src/bsd.c:161
+#: libfdisk/src/bsd.c:167
#, c-format
msgid "Partition %zd: has invalid starting sector 0."
msgstr "分区 %zd:无效的起始扇区 0。"
-#: libfdisk/src/bsd.c:176
+#: libfdisk/src/bsd.c:182
#, c-format
msgid "There is no *BSD partition on %s."
msgstr "%s 上没有 *BSD 分区。"
-#: libfdisk/src/bsd.c:233 libfdisk/src/dos.c:930
+#: libfdisk/src/bsd.c:260 libfdisk/src/dos.c:935
msgid "First cylinder"
msgstr "第一个柱面"
-#: libfdisk/src/bsd.c:266 libfdisk/src/dos.c:1092
+#: libfdisk/src/bsd.c:293 libfdisk/src/dos.c:1159
msgid "Last cylinder, +cylinders or +size{K,M,G,T,P}"
msgstr "最后一个柱面, +cylinders 或 +size{K,M,G,T,P}"
-#: libfdisk/src/bsd.c:271 libfdisk/src/dos.c:1097 libfdisk/src/gpt.c:1886
+#: libfdisk/src/bsd.c:298 libfdisk/src/dos.c:1164 libfdisk/src/gpt.c:2080
msgid "Last sector, +sectors or +size{K,M,G,T,P}"
msgstr "上个扇区,+sectors 或 +size{K,M,G,T,P}"
-#: libfdisk/src/bsd.c:310
+#: libfdisk/src/bsd.c:382
#, c-format
msgid "The device %s does not contain BSD disklabel."
msgstr "设备 %s 不包含BSD 磁盘标签。"
-#: libfdisk/src/bsd.c:312
+#: libfdisk/src/bsd.c:384
msgid "Do you want to create a BSD disklabel?"
msgstr "您想创建一个 BSD 磁盘标签吗?"
-#: libfdisk/src/bsd.c:373
+#: libfdisk/src/bsd.c:445
#, c-format
msgid "type: %s"
msgstr "类型:%s"
-#: libfdisk/src/bsd.c:375
+#: libfdisk/src/bsd.c:447
#, c-format
msgid "type: %d"
msgstr "类型:%d"
-#: libfdisk/src/bsd.c:377
+#: libfdisk/src/bsd.c:449
#, c-format
msgid "disk: %.*s"
msgstr "磁盘:%.*s"
-#: libfdisk/src/bsd.c:378
+#: libfdisk/src/bsd.c:450
#, c-format
msgid "label: %.*s"
msgstr "标签:%.*s"
-#: libfdisk/src/bsd.c:380
+#: libfdisk/src/bsd.c:452
#, c-format
msgid "flags: %s"
msgstr "标志:%s"
-#: libfdisk/src/bsd.c:381
+#: libfdisk/src/bsd.c:453
msgid " removable"
msgstr " 可移动"
-#: libfdisk/src/bsd.c:382
+#: libfdisk/src/bsd.c:454
msgid " ecc"
msgstr " ecc"
-#: libfdisk/src/bsd.c:383
+#: libfdisk/src/bsd.c:455
msgid " badsect"
msgstr " 坏扇区"
-#: libfdisk/src/bsd.c:387
+#: libfdisk/src/bsd.c:459
#, c-format
msgid "bytes/sector: %ld"
msgstr "字节/扇区:%ld"
-#: libfdisk/src/bsd.c:388
+#: libfdisk/src/bsd.c:460
#, c-format
msgid "sectors/track: %ld"
msgstr "扇区/磁道:%ld"
-#: libfdisk/src/bsd.c:389
+#: libfdisk/src/bsd.c:461
#, c-format
msgid "tracks/cylinder: %ld"
msgstr "磁道/柱面:%ld"
-#: libfdisk/src/bsd.c:390
+#: libfdisk/src/bsd.c:462
#, c-format
msgid "sectors/cylinder: %ld"
msgstr "扇区/柱面:%ld"
-#: libfdisk/src/bsd.c:391
+#: libfdisk/src/bsd.c:463
#, c-format
msgid "cylinders: %ld"
msgstr "柱面:%ld"
-#: libfdisk/src/bsd.c:392
+#: libfdisk/src/bsd.c:464
#, c-format
msgid "rpm: %d"
msgstr "转/分:%d"
-#: libfdisk/src/bsd.c:393
+#: libfdisk/src/bsd.c:465
#, c-format
msgid "interleave: %d"
msgstr "交错:%d"
-#: libfdisk/src/bsd.c:394
+#: libfdisk/src/bsd.c:466
#, c-format
msgid "trackskew: %d"
msgstr "磁道螺距:%d"
-#: libfdisk/src/bsd.c:395
+#: libfdisk/src/bsd.c:467
#, c-format
msgid "cylinderskew: %d"
msgstr "柱面螺距:%d"
-#: libfdisk/src/bsd.c:396
+#: libfdisk/src/bsd.c:468
#, c-format
msgid "headswitch: %ld (milliseconds)"
msgstr "磁头切换:%ld (毫秒)"
-#: libfdisk/src/bsd.c:397
+#: libfdisk/src/bsd.c:469
#, c-format
msgid "track-to-track seek: %ld (milliseconds)"
msgstr "跨磁道定位:%ld (毫秒)"
-#: libfdisk/src/bsd.c:400
+#: libfdisk/src/bsd.c:472
#, c-format
msgid "partitions: %d"
msgstr "分区数:%d"
-#: libfdisk/src/bsd.c:473
+#: libfdisk/src/bsd.c:552
msgid "bytes/sector"
msgstr "字节/扇区"
-#: libfdisk/src/bsd.c:476
+#: libfdisk/src/bsd.c:555
msgid "sectors/track"
msgstr "扇区/磁道"
-#: libfdisk/src/bsd.c:477
+#: libfdisk/src/bsd.c:556
msgid "tracks/cylinder"
msgstr "磁道/柱面"
-#: libfdisk/src/bsd.c:482
+#: libfdisk/src/bsd.c:557
+msgid "cylinders"
+msgstr "柱面"
+
+#: libfdisk/src/bsd.c:561
msgid "sectors/cylinder"
msgstr "扇区/柱面"
-#: libfdisk/src/bsd.c:485
+#: libfdisk/src/bsd.c:564
msgid "rpm"
msgstr "rpm"
-#: libfdisk/src/bsd.c:486
+#: libfdisk/src/bsd.c:565
msgid "interleave"
msgstr "交错"
-#: libfdisk/src/bsd.c:487
+#: libfdisk/src/bsd.c:566
msgid "trackskew"
msgstr "磁道螺距"
-#: libfdisk/src/bsd.c:488
+#: libfdisk/src/bsd.c:567
msgid "cylinderskew"
msgstr "柱头螺距"
-#: libfdisk/src/bsd.c:490
+#: libfdisk/src/bsd.c:569
msgid "headswitch"
msgstr "磁头切换"
-#: libfdisk/src/bsd.c:491
+#: libfdisk/src/bsd.c:570
msgid "track-to-track seek"
msgstr "跨磁道定位"
-#: libfdisk/src/bsd.c:514
+#: libfdisk/src/bsd.c:592
#, c-format
msgid "The bootstrap file %s successfully loaded."
msgstr "成功加载了引导程序文件 %s。"
-#: libfdisk/src/bsd.c:530
+#: libfdisk/src/bsd.c:614
#, c-format
msgid "Bootstrap: %1$sboot -> boot%1$s (default %1$s)"
msgstr "引导:%1$sboot -> boot%1$s (默认 %1$s)"
-#: libfdisk/src/bsd.c:561
+#: libfdisk/src/bsd.c:645
msgid "Bootstrap overlaps with disklabel!"
msgstr "引导程序与磁盘标签重叠!"
-#: libfdisk/src/bsd.c:580 libfdisk/src/bsd.c:752 sys-utils/hwclock.c:160
-#: sys-utils/hwclock.c:162
-#, c-format
-msgid "cannot write %s"
-msgstr "无法写 %s"
-
-#: libfdisk/src/bsd.c:586
+#: libfdisk/src/bsd.c:669
#, c-format
msgid "Bootstrap installed on %s."
msgstr "已在 %s 上安装引导程序。"
-#: libfdisk/src/bsd.c:758
+#: libfdisk/src/bsd.c:840
#, c-format
msgid "Disklabel written to %s."
msgstr "磁盘标签已写入 %s。"
-#: libfdisk/src/bsd.c:764 libfdisk/src/context.c:312
+#: libfdisk/src/bsd.c:846 libfdisk/src/context.c:575
msgid "Syncing disks."
msgstr "正在同步磁盘。"
-#: libfdisk/src/bsd.c:800
+#: libfdisk/src/bsd.c:887
msgid "BSD label is not nested within a DOS partition."
msgstr "BSD 标签未嵌套在 DOS 分区中。"
-#: libfdisk/src/bsd.c:829
+#: libfdisk/src/bsd.c:915
#, c-format
msgid "BSD partition '%c' linked to DOS partition %zu."
msgstr "BSD 分区“%c”已链接到 DOS 分区 %zu。"
-#: libfdisk/src/bsd.c:884
+#: libfdisk/src/bsd.c:951
msgid "Slice"
msgstr "片"
-#: libfdisk/src/bsd.c:885 libfdisk/src/dos.c:2027 libfdisk/src/gpt.c:2412
-#: libfdisk/src/sgi.c:1087 libfdisk/src/sun.c:1001
+#: libfdisk/src/bsd.c:952 libfdisk/src/dos.c:2232 libfdisk/src/gpt.c:2546
+#: libfdisk/src/sgi.c:1133 libfdisk/src/sun.c:1077
msgid "Start"
msgstr "起点"
-#: libfdisk/src/bsd.c:886 libfdisk/src/dos.c:2028 libfdisk/src/gpt.c:2413
-#: libfdisk/src/sgi.c:1088 libfdisk/src/sun.c:1002
+#: libfdisk/src/bsd.c:953 libfdisk/src/dos.c:2233 libfdisk/src/gpt.c:2547
+#: libfdisk/src/sgi.c:1134 libfdisk/src/sun.c:1078
msgid "End"
msgstr "末尾"
-#: libfdisk/src/bsd.c:887 libfdisk/src/dos.c:2029 libfdisk/src/gpt.c:2414
-#: libfdisk/src/sgi.c:1089 libfdisk/src/sun.c:1003
+#: libfdisk/src/bsd.c:954 libfdisk/src/dos.c:2234 libfdisk/src/gpt.c:2548
+#: libfdisk/src/sgi.c:1135 libfdisk/src/sun.c:1079
msgid "Sectors"
msgstr "扇区"
-#: libfdisk/src/bsd.c:888 libfdisk/src/dos.c:2030 libfdisk/src/gpt.c:2415
-#: libfdisk/src/sgi.c:1090 libfdisk/src/sun.c:189 libfdisk/src/sun.c:1004
+#: libfdisk/src/bsd.c:955 libfdisk/src/dos.c:2235 libfdisk/src/sgi.c:1136
+#: libfdisk/src/sun.c:196 libfdisk/src/sun.c:1080
msgid "Cylinders"
msgstr "柱面"
-#: libfdisk/src/bsd.c:889 libfdisk/src/dos.c:2031 libfdisk/src/gpt.c:2416
-#: libfdisk/src/sgi.c:1091 libfdisk/src/sun.c:1005
+#: libfdisk/src/bsd.c:956 libfdisk/src/dos.c:2236 libfdisk/src/gpt.c:2549
+#: libfdisk/src/sgi.c:1137 libfdisk/src/sun.c:1081
msgid "Size"
msgstr "大小"
-#: libfdisk/src/bsd.c:891
+#: libfdisk/src/bsd.c:958
msgid "Fsize"
msgstr "Fsize"
-#: libfdisk/src/bsd.c:892
+#: libfdisk/src/bsd.c:959
msgid "Bsize"
msgstr "Bsize"
-#: libfdisk/src/bsd.c:893
+#: libfdisk/src/bsd.c:960
msgid "Cpg"
msgstr "Cpg"
-#: libfdisk/src/context.c:230
+#: libfdisk/src/context.c:446
#, fuzzy, c-format
-msgid "%s: device contains a valid '%s' signature, it's strongly recommended to wipe the device by command wipefs(8) if this setup is unexpected to avoid possible collisions."
+msgid "%s: device contains a valid '%s' signature; it is strongly recommended to wipe the device with wipefs(8) if this is unexpected, in order to avoid possible collisions"
msgstr "%s:设备包含有效的“%s”签名,如果发觉错误运行了本设置,强烈建议您使用 wipefs(8)来擦除该设备,以避免潜在的冲突。"
-#: libfdisk/src/context.c:307
+#: libfdisk/src/context.c:569
#, c-format
msgid "%s: close device failed"
msgstr "%s:关闭设备失败"
-#: libfdisk/src/context.c:448
+#: libfdisk/src/context.c:736
msgid "cylinder"
msgid_plural "cylinders"
msgstr[0] "柱面"
-#: libfdisk/src/context.c:449
+#: libfdisk/src/context.c:737
msgid "sector"
msgid_plural "sectors"
msgstr[0] "扇区"
-#: libfdisk/src/dos.c:201
+#: libfdisk/src/context.c:1013
+msgid "Incomplete geometry setting."
+msgstr "不完整的几何属性设置。"
+
+#: libfdisk/src/dos.c:214
msgid "All primary partitions have been defined already."
msgstr "已经定义了所有主分区。"
-#: libfdisk/src/dos.c:254
+#: libfdisk/src/dos.c:265
#, c-format
msgid "Failed to read extended partition table (offset=%ju)"
msgstr "读取扩展分区表失败(偏移=%ju)"
-#: libfdisk/src/dos.c:317
+#: libfdisk/src/dos.c:328
msgid "You can set geometry from the extra functions menu."
msgstr "您可以从 更多功能 菜单获取几何属性。"
-#: libfdisk/src/dos.c:320
+#: libfdisk/src/dos.c:331
msgid "DOS-compatible mode is deprecated."
msgstr "DOS 兼容模式已废弃。"
-#: libfdisk/src/dos.c:324
+#: libfdisk/src/dos.c:335
msgid "The device presents a logical sector size that is smaller than the physical sector size. Aligning to a physical sector (or optimal I/O) size boundary is recommended, or performance may be impacted."
msgstr "设备上存在一个小于物理扇区尺寸的逻辑扇区尺寸。建议您对齐到物理扇区(或最佳 I/O)尺寸边界,否则性能可能受影响。"
-#: libfdisk/src/dos.c:330
+#: libfdisk/src/dos.c:341
msgid "Cylinders as display units are deprecated."
msgstr "以柱面为显示单位的方式已废弃。"
-#: libfdisk/src/dos.c:337
+#: libfdisk/src/dos.c:348
#, c-format
msgid "The size of this disk is %s (%ju bytes). DOS partition table format can not be used on drives for volumes larger than %lu bytes for %lu-byte sectors. Use GUID partition table format (GPT)."
msgstr "该磁盘的大小为 %s (%ju 个字节)。DOS 分区表不能用于卷容量大于 %lu 字节,%lu 字节扇区的驱动器。请使用 GUID 分区表格式(GPT)。"
-#: libfdisk/src/dos.c:485
+#: libfdisk/src/dos.c:496
msgid "Bad offset in primary extended partition."
msgstr "主扩展分区中的偏移错误。"
-#: libfdisk/src/dos.c:501
+#: libfdisk/src/dos.c:512
#, c-format
msgid "Omitting partitions after #%zu. They will be deleted if you save this partition table."
msgstr "警告:将忽略 #%zu 后的扇区。如果您保存此分区表,它们会被删除。"
-#: libfdisk/src/dos.c:528
+#: libfdisk/src/dos.c:539
#, c-format
msgid "Extra link pointer in partition table %zu."
msgstr "在分区表 %zu 中有额外链接指针。"
-#: libfdisk/src/dos.c:536
+#: libfdisk/src/dos.c:547
#, c-format
msgid "Ignoring extra data in partition table %zu."
msgstr "将忽略分区表 %zu 中的额外数据。"
-#: libfdisk/src/dos.c:591
+#: libfdisk/src/dos.c:602
#, c-format
msgid "omitting empty partition (%zu)"
msgstr "将忽略空分区(%zu)"
-#: libfdisk/src/dos.c:664
+#: libfdisk/src/dos.c:666
+#, fuzzy, c-format
+msgid "Created a new DOS disklabel with disk identifier 0x%08x."
+msgstr "使用磁盘标识符 0x%08x 创建新的 DOS 磁盘标签。\n"
+
+#: libfdisk/src/dos.c:687
msgid "Enter the new disk identifier"
msgstr "输入新磁盘标识符"
-#: libfdisk/src/dos.c:671
+#: libfdisk/src/dos.c:694
msgid "Incorrect value."
msgstr "无效的值。"
-#: libfdisk/src/dos.c:681
+#: libfdisk/src/dos.c:703
#, c-format
msgid "Disk identifier changed from 0x%08x to 0x%08x."
msgstr "磁盘标识从 0x%08x 改为 0x%08x。"
-#: libfdisk/src/dos.c:773
+#: libfdisk/src/dos.c:795
#, c-format
msgid "Ignoring extra extended partition %zu"
msgstr "将忽略额外的扩展分区 %zu"
-#: libfdisk/src/dos.c:786
+#: libfdisk/src/dos.c:808
#, c-format
msgid "Invalid flag 0x%02x%02x of EBR (for partition %zu) will be corrected by w(rite)."
msgstr "分区表 %3$zu 的无效标志 0x%1$02x%2$02x 将通过写入来更正"
-#: libfdisk/src/dos.c:917
+#: libfdisk/src/dos.c:922
#, c-format
msgid "Start sector %ju out of range."
msgstr "起始扇区 %ju 超出范围。"
-#: libfdisk/src/dos.c:970 libfdisk/src/gpt.c:1799 libfdisk/src/sgi.c:787
-#: libfdisk/src/sun.c:502
+#: libfdisk/src/dos.c:1027 libfdisk/src/gpt.c:1968 libfdisk/src/sgi.c:814
+#: libfdisk/src/sun.c:514
#, c-format
msgid "Partition %zu is already defined. Delete it before re-adding it."
msgstr "分区 %zu 已经定义过。请删除后再重新添加它。"
-#: libfdisk/src/dos.c:1027
+#: libfdisk/src/dos.c:1097
#, c-format
msgid "Sector %llu is already allocated."
msgstr "扇区 %llu 已经分配."
-#: libfdisk/src/dos.c:1067 libfdisk/src/gpt.c:1809
+#: libfdisk/src/dos.c:1134 libfdisk/src/gpt.c:1978
msgid "No free sectors available."
msgstr "无空闲扇区可用。"
-#: libfdisk/src/dos.c:1181
+#: libfdisk/src/dos.c:1265
#, c-format
msgid "Adding logical partition %zu"
msgstr "添加逻辑分区 %zu"
-#: libfdisk/src/dos.c:1200
+#: libfdisk/src/dos.c:1296
#, c-format
msgid "Partition %zu: contains sector 0"
msgstr "分区 %zu:包含扇区 0"
-#: libfdisk/src/dos.c:1202
+#: libfdisk/src/dos.c:1298
#, c-format
msgid "Partition %zu: head %d greater than maximum %d"
msgstr "分区 %zu:磁头 %d 大于最大值 %d"
-#: libfdisk/src/dos.c:1205
+#: libfdisk/src/dos.c:1301
#, c-format
msgid "Partition %zu: sector %d greater than maximum %llu"
msgstr "分区 %zu:扇区 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1208
+#: libfdisk/src/dos.c:1304
#, c-format
msgid "Partition %zu: cylinder %d greater than maximum %llu"
msgstr "分区 %zu:柱面 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1214
+#: libfdisk/src/dos.c:1310
#, c-format
msgid "Partition %zu: previous sectors %u disagrees with total %u"
msgstr "分区 %zu:之前的扇区数 %u 与总数 %u 不符"
-#: libfdisk/src/dos.c:1267
+#: libfdisk/src/dos.c:1363
#, c-format
msgid "Partition %zu: different physical/logical beginnings (non-Linux?): phys=(%d, %d, %d), logical=(%d, %d, %d)"
msgstr "分区 %zu 的物理/逻辑起点不同(非 Linux 分区?):物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
-#: libfdisk/src/dos.c:1278
+#: libfdisk/src/dos.c:1374
#, c-format
msgid "Partition %zu: different physical/logical endings: phys=(%d, %d, %d), logical=(%d, %d, %d)"
msgstr "分区 %zu 的物理/逻辑终点不同:物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
-#: libfdisk/src/dos.c:1287
+#: libfdisk/src/dos.c:1383
#, c-format
msgid "Partition %zu: does not end on cylinder boundary."
msgstr "分区 %zu 未结束在柱面边界上。"
-#: libfdisk/src/dos.c:1314
+#: libfdisk/src/dos.c:1409
#, c-format
msgid "Partition %zu: bad start-of-data."
msgstr "分区 %zu:数据起点错误。"
-#: libfdisk/src/dos.c:1327
+#: libfdisk/src/dos.c:1422
#, c-format
msgid "Partition %zu: overlaps partition %zu."
msgstr "分区 %zu:与 分区 %zu 重叠。"
-#: libfdisk/src/dos.c:1353
+#: libfdisk/src/dos.c:1448
#, c-format
msgid "Partition %zu: empty."
msgstr "分区 %zu:空分区。"
-#: libfdisk/src/dos.c:1358
+#: libfdisk/src/dos.c:1453
#, c-format
msgid "Logical partition %zu: not entirely in partition %zu."
msgstr "逻辑分区 %zu:没有完全在分区 %zu 中。"
-#: libfdisk/src/dos.c:1366
+#: libfdisk/src/dos.c:1461
#, c-format
msgid "Total allocated sectors %llu greater than the maximum %llu."
msgstr "分配的总扇区数 %llu 大于最大值 %llu。"
-#: libfdisk/src/dos.c:1369
+#: libfdisk/src/dos.c:1464
#, c-format
msgid "Remaining %lld unallocated %ld-byte sectors."
msgstr "剩余 %lld 未分配的 %ld字节 扇区。"
-#: libfdisk/src/dos.c:1421
+#: libfdisk/src/dos.c:1512
+#, fuzzy
+msgid "Extended partition already exists."
+msgstr "扩展分区位置异常"
+
+#: libfdisk/src/dos.c:1555
msgid "The maximum number of partitions has been created."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/dos.c:1429
+#: libfdisk/src/dos.c:1566
msgid "All primary partitions are in use."
msgstr "所有主分区都在使用中。"
-#: libfdisk/src/dos.c:1432
-msgid "If you want to create more than four partitions, you must replace a primary partition with an extended partition first."
+#: libfdisk/src/dos.c:1568
+#, fuzzy
+msgid "All space for primary partitions is in use."
+msgstr "所有主分区都在使用中。"
+
+#: libfdisk/src/dos.c:1573
+#, fuzzy
+msgid "Impossible to create another primary partition. If you want to create more partitions, you must replace a primary partition with an extended partition first."
msgstr "要想创建多于 4 个分区,您需要先将一个主分区替换为扩展分区。"
-#: libfdisk/src/dos.c:1440
+#: libfdisk/src/dos.c:1580
msgid "All logical partitions are in use. Adding a primary partition."
msgstr "所有逻辑分区都在使用中。将添加一个主分区。"
-#: libfdisk/src/dos.c:1454
+#: libfdisk/src/dos.c:1602
msgid "Partition type"
msgstr "分区类型"
-#: libfdisk/src/dos.c:1458
+#: libfdisk/src/dos.c:1606
#, c-format
msgid "%zu primary, %d extended, %zu free"
msgstr "%zu个主分区,%d个扩展分区,%zu空闲"
-#: libfdisk/src/dos.c:1463
+#: libfdisk/src/dos.c:1611
msgid "primary"
msgstr "主分区"
-#: libfdisk/src/dos.c:1465
+#: libfdisk/src/dos.c:1613
msgid "extended"
msgstr "扩展分区"
-#: libfdisk/src/dos.c:1465
+#: libfdisk/src/dos.c:1613
msgid "container for logical partitions"
msgstr "逻辑分区容器"
-#: libfdisk/src/dos.c:1467
+#: libfdisk/src/dos.c:1615
msgid "logical"
msgstr "逻辑分区"
-#: libfdisk/src/dos.c:1467
+#: libfdisk/src/dos.c:1615
msgid "numbered from 5"
msgstr "从 5 开始编号"
-#: libfdisk/src/dos.c:1498
+#: libfdisk/src/dos.c:1653
#, c-format
msgid "Invalid partition type `%c'."
msgstr "无效的分区类型“%c”。"
-#: libfdisk/src/dos.c:1513
+#: libfdisk/src/dos.c:1671
#, c-format
msgid "Cannot write sector %jd: seek failed"
msgstr "写扇区 %jd 失败:定位失败"
-#: libfdisk/src/dos.c:1637
+#: libfdisk/src/dos.c:1882
msgid "You cannot change a partition into an extended one or vice versa. Delete it first."
msgstr "您不能将分区更改为扩展分区或从扩展分区改回。请先删除该分区。"
-#: libfdisk/src/dos.c:1643
-msgid "If you have created or modified any DOS 6.x partitions, please see the fdisk documentation for additional information."
-msgstr "如果您创建或修改了 DOS 6.x 分区,请查阅 cfdisk 手册页面了解其他信息。"
-
-#: libfdisk/src/dos.c:1648
+#: libfdisk/src/dos.c:1888
msgid "Type 0 means free space to many systems. Having partitions of type 0 is probably unwise."
msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。"
-#: libfdisk/src/dos.c:1869
+#: libfdisk/src/dos.c:2074
msgid "Nothing to do. Ordering is correct already."
msgstr "无须操作。顺序已经是正确的了。"
-#: libfdisk/src/dos.c:1898 libfdisk/src/gpt.c:2329
+#: libfdisk/src/dos.c:2103 libfdisk/src/gpt.c:2464
msgid "Done."
msgstr "完成。"
-#: libfdisk/src/dos.c:1918
+#: libfdisk/src/dos.c:2124
#, c-format
msgid "Partition %zu: no data area."
msgstr "分区 %zu:无数据区。"
-#: libfdisk/src/dos.c:1948
+#: libfdisk/src/dos.c:2154
msgid "New beginning of data"
msgstr "新数据起点"
-#: libfdisk/src/dos.c:2004
+#: libfdisk/src/dos.c:2210
#, c-format
msgid "Partition %zu: is an extended partition."
msgstr "分区 %zu:是一个扩展分区。"
-#: libfdisk/src/dos.c:2011
+#: libfdisk/src/dos.c:2216
#, c-format
msgid "The bootable flag on partition %zu is enabled now."
msgstr "分区 %zu 的 可启动 标志已启用。"
-#: libfdisk/src/dos.c:2012
+#: libfdisk/src/dos.c:2217
#, c-format
msgid "The bootable flag on partition %zu is disabled now."
msgstr "分区 %zu 的 可启动 标志已禁用。"
-#: libfdisk/src/dos.c:2025 libfdisk/src/gpt.c:2411 libfdisk/src/sgi.c:1086
-#: libfdisk/src/sun.c:1000
+#: libfdisk/src/dos.c:2230 libfdisk/src/gpt.c:2545 libfdisk/src/sgi.c:1132
+#: libfdisk/src/sun.c:1076
msgid "Device"
msgstr "设备"
-#: libfdisk/src/dos.c:2026 libfdisk/src/sun.c:35
+#: libfdisk/src/dos.c:2231 libfdisk/src/sun.c:41
msgid "Boot"
msgstr "启动"
-#: libfdisk/src/dos.c:2032 libfdisk/src/sgi.c:1092 libfdisk/src/sun.c:1006
+#: libfdisk/src/dos.c:2237 libfdisk/src/sgi.c:1138 libfdisk/src/sun.c:1082
msgid "Id"
msgstr "Id"
-#: libfdisk/src/dos.c:2036
+#: libfdisk/src/dos.c:2241
msgid "Start-C/H/S"
msgstr "始-C/H/S"
-#: libfdisk/src/dos.c:2037
+#: libfdisk/src/dos.c:2242
msgid "End-C/H/S"
msgstr "终-C/H/S"
-#: libfdisk/src/dos.c:2038 libfdisk/src/gpt.c:2422 libfdisk/src/sgi.c:1094
+#: libfdisk/src/dos.c:2243 libfdisk/src/gpt.c:2555 libfdisk/src/sgi.c:1140
msgid "Attrs"
msgstr "属性"
-#: libfdisk/src/gpt.c:150
+#: libfdisk/src/gpt.c:155
msgid "EFI System"
msgstr "EFI 系统"
-#: libfdisk/src/gpt.c:152
+#: libfdisk/src/gpt.c:157
msgid "MBR partition scheme"
msgstr "MBR 分区方案"
-#: libfdisk/src/gpt.c:153
+#: libfdisk/src/gpt.c:158
msgid "Intel Fast Flash"
msgstr "Intel Fast Flash"
-#: libfdisk/src/gpt.c:156
+#: libfdisk/src/gpt.c:161
msgid "BIOS boot"
msgstr "BIOS 启动"
-#: libfdisk/src/gpt.c:159
+#: libfdisk/src/gpt.c:164
msgid "Microsoft reserved"
msgstr "Microsoft 保留"
-#: libfdisk/src/gpt.c:160
+#: libfdisk/src/gpt.c:165
msgid "Microsoft basic data"
msgstr "Microsoft 基本数据"
-#: libfdisk/src/gpt.c:161
+#: libfdisk/src/gpt.c:166
msgid "Microsoft LDM metadata"
msgstr "Microsoft LDM 元数据"
-#: libfdisk/src/gpt.c:162
+#: libfdisk/src/gpt.c:167
msgid "Microsoft LDM data"
msgstr "Microsoft LDM 数据"
-#: libfdisk/src/gpt.c:163
+#: libfdisk/src/gpt.c:168
msgid "Windows recovery environment"
msgstr "Windows 恢复环境"
-#: libfdisk/src/gpt.c:164
+#: libfdisk/src/gpt.c:169
msgid "IBM General Parallel Fs"
msgstr "IBM 通用并行文件系统"
-#: libfdisk/src/gpt.c:165
+#: libfdisk/src/gpt.c:170
msgid "Microsoft Storage Spaces"
msgstr "Microsoft 存储空间"
-#: libfdisk/src/gpt.c:168
+#: libfdisk/src/gpt.c:173
msgid "HP-UX data"
msgstr "HP-UX 数据"
-#: libfdisk/src/gpt.c:169
+#: libfdisk/src/gpt.c:174
msgid "HP-UX service"
msgstr "HP-UX 服务"
-#: libfdisk/src/gpt.c:172 libfdisk/src/sgi.c:55 libfdisk/src/sun.c:46
+#: libfdisk/src/gpt.c:177 libfdisk/src/sgi.c:61 libfdisk/src/sun.c:52
msgid "Linux swap"
msgstr "Linux swap"
-#: libfdisk/src/gpt.c:173
+#: libfdisk/src/gpt.c:178
msgid "Linux filesystem"
msgstr "Linux 文件系统"
-#: libfdisk/src/gpt.c:174
+#: libfdisk/src/gpt.c:179
msgid "Linux server data"
msgstr "Linux 保留数据"
-#: libfdisk/src/gpt.c:175
+#: libfdisk/src/gpt.c:180
msgid "Linux root (x86)"
msgstr "Linux root (x86)"
-#: libfdisk/src/gpt.c:176
+#: libfdisk/src/gpt.c:181
msgid "Linux root (x86-64)"
msgstr "Linux root (x86-64)"
-#: libfdisk/src/gpt.c:177
+#: libfdisk/src/gpt.c:182
msgid "Linux reserved"
msgstr "Linux 保留"
-#: libfdisk/src/gpt.c:178
+#: libfdisk/src/gpt.c:183
msgid "Linux home"
msgstr "Linux home"
-#: libfdisk/src/gpt.c:179 libfdisk/src/sgi.c:58
+#: libfdisk/src/gpt.c:184 libfdisk/src/sgi.c:64
msgid "Linux RAID"
msgstr "Linux RAID"
-#: libfdisk/src/gpt.c:180
+#: libfdisk/src/gpt.c:185
msgid "Linux extended boot"
msgstr "Linux 扩展启动"
-#: libfdisk/src/gpt.c:184
+#: libfdisk/src/gpt.c:189
msgid "FreeBSD data"
msgstr "FreeBSD 数据"
-#: libfdisk/src/gpt.c:185
+#: libfdisk/src/gpt.c:190
msgid "FreeBSD boot"
msgstr "FreeBSD 启动"
-#: libfdisk/src/gpt.c:186
+#: libfdisk/src/gpt.c:191
msgid "FreeBSD swap"
msgstr "FreeBSD 交换"
-#: libfdisk/src/gpt.c:187
+#: libfdisk/src/gpt.c:192
msgid "FreeBSD UFS"
msgstr "FreeBSD UFS"
-#: libfdisk/src/gpt.c:188
+#: libfdisk/src/gpt.c:193
msgid "FreeBSD ZFS"
msgstr "FreeBSD ZFS"
-#: libfdisk/src/gpt.c:189
+#: libfdisk/src/gpt.c:194
msgid "FreeBSD Vinum"
msgstr "FreeBSD Vinum"
-#: libfdisk/src/gpt.c:192
+#: libfdisk/src/gpt.c:197
msgid "Apple HFS/HFS+"
msgstr "Apple HFS/HFS+"
-#: libfdisk/src/gpt.c:193
+#: libfdisk/src/gpt.c:198
msgid "Apple UFS"
msgstr "Apple UFS"
-#: libfdisk/src/gpt.c:194
+#: libfdisk/src/gpt.c:199
msgid "Apple RAID"
msgstr "Apple RAID"
-#: libfdisk/src/gpt.c:195
+#: libfdisk/src/gpt.c:200
msgid "Apple RAID offline"
msgstr "Apple RAID 离线"
-#: libfdisk/src/gpt.c:196
+#: libfdisk/src/gpt.c:201
msgid "Apple boot"
msgstr "Apple 启动"
-#: libfdisk/src/gpt.c:197
+#: libfdisk/src/gpt.c:202
msgid "Apple label"
msgstr "Apple 标签"
-#: libfdisk/src/gpt.c:198
+#: libfdisk/src/gpt.c:203
msgid "Apple TV recovery"
msgstr "Apple TV 恢复"
-#: libfdisk/src/gpt.c:199
+#: libfdisk/src/gpt.c:204
msgid "Apple Core storage"
msgstr "Apple Core 存储"
-#: libfdisk/src/gpt.c:203
+#: libfdisk/src/gpt.c:208
msgid "Solaris root"
msgstr "Solaris root"
-#: libfdisk/src/gpt.c:205
+#: libfdisk/src/gpt.c:210
msgid "Solaris /usr & Apple ZFS"
msgstr "Solaris /usr & Apple ZFS"
-#: libfdisk/src/gpt.c:206
+#: libfdisk/src/gpt.c:211
msgid "Solaris swap"
msgstr "Solaris 交换"
-#: libfdisk/src/gpt.c:207
+#: libfdisk/src/gpt.c:212
msgid "Solaris backup"
msgstr "Solaris 备份"
-#: libfdisk/src/gpt.c:208
+#: libfdisk/src/gpt.c:213
msgid "Solaris /var"
msgstr "Solaris /var"
-#: libfdisk/src/gpt.c:209
+#: libfdisk/src/gpt.c:214
msgid "Solaris /home"
msgstr "Solaris /home"
-#: libfdisk/src/gpt.c:210
+#: libfdisk/src/gpt.c:215
msgid "Solaris alternate sector"
msgstr "Solaris 备选扇区"
-#: libfdisk/src/gpt.c:211
+#: libfdisk/src/gpt.c:216
msgid "Solaris reserved 1"
msgstr "Solaris 保留 1"
-#: libfdisk/src/gpt.c:212
+#: libfdisk/src/gpt.c:217
msgid "Solaris reserved 2"
msgstr "Solaris 保留 2"
-#: libfdisk/src/gpt.c:213
+#: libfdisk/src/gpt.c:218
msgid "Solaris reserved 3"
msgstr "Solaris 保留 3"
-#: libfdisk/src/gpt.c:214
+#: libfdisk/src/gpt.c:219
msgid "Solaris reserved 4"
msgstr "Solaris 保留 4"
-#: libfdisk/src/gpt.c:215
+#: libfdisk/src/gpt.c:220
msgid "Solaris reserved 5"
msgstr "Solaris 保留 5"
-#: libfdisk/src/gpt.c:218
+#: libfdisk/src/gpt.c:223
msgid "NetBSD swap"
msgstr "NetBSD 交换"
-#: libfdisk/src/gpt.c:219
+#: libfdisk/src/gpt.c:224
msgid "NetBSD FFS"
msgstr "NetBSD FFS"
-#: libfdisk/src/gpt.c:220
+#: libfdisk/src/gpt.c:225
msgid "NetBSD LFS"
msgstr "NetBSD LFS"
-#: libfdisk/src/gpt.c:221
+#: libfdisk/src/gpt.c:226
msgid "NetBSD concatenated"
msgstr "NetBSD concatenated"
-#: libfdisk/src/gpt.c:222
+#: libfdisk/src/gpt.c:227
msgid "NetBSD encrypted"
msgstr "NetBSD 加密"
-#: libfdisk/src/gpt.c:223
+#: libfdisk/src/gpt.c:228
msgid "NetBSD RAID"
msgstr "NetBSD RAID"
-#: libfdisk/src/gpt.c:226
+#: libfdisk/src/gpt.c:231
msgid "ChromeOS kernel"
msgstr "ChromeOS 内核"
-#: libfdisk/src/gpt.c:227
+#: libfdisk/src/gpt.c:232
msgid "ChromeOS root fs"
msgstr "ChromeOS 根文件系统"
-#: libfdisk/src/gpt.c:228
+#: libfdisk/src/gpt.c:233
msgid "ChromeOS reserved"
msgstr "ChromeOS 保留"
-#: libfdisk/src/gpt.c:231
+#: libfdisk/src/gpt.c:236
msgid "MidnightBSD data"
msgstr "MidnightBSD 数据"
-#: libfdisk/src/gpt.c:232
+#: libfdisk/src/gpt.c:237
msgid "MidnightBSD boot"
msgstr "MidnightBSD 启动"
-#: libfdisk/src/gpt.c:233
+#: libfdisk/src/gpt.c:238
msgid "MidnightBSD swap"
msgstr "MidnightBSD 交换"
-#: libfdisk/src/gpt.c:234
+#: libfdisk/src/gpt.c:239
msgid "MidnightBSD UFS"
msgstr "MidnightBSD UFS"
-#: libfdisk/src/gpt.c:235
+#: libfdisk/src/gpt.c:240
msgid "MidnightBSD ZFS"
msgstr "MidnightBSD ZFS"
-#: libfdisk/src/gpt.c:236
+#: libfdisk/src/gpt.c:241
msgid "MidnightBSD Vinum"
msgstr "MidnightBSD Vinum"
-#: libfdisk/src/gpt.c:451
+#: libfdisk/src/gpt.c:491
msgid "failed to allocate GPT header"
msgstr "分配 GPT 头失败"
-#: libfdisk/src/gpt.c:597
+#: libfdisk/src/gpt.c:653
#, c-format
msgid "GPT PMBR size mismatch (%u != %u) will be corrected by w(rite)."
msgstr "GPT PMBR 大小不符(%u != %u) 将用 w(写) 予以更正。"
-#: libfdisk/src/gpt.c:615
+#: libfdisk/src/gpt.c:671
msgid "gpt: stat() failed"
msgstr "gpt:stat() 失败"
-#: libfdisk/src/gpt.c:625
+#: libfdisk/src/gpt.c:681
#, c-format
msgid "gpt: cannot handle files with mode %o"
msgstr "gpt:无法操作模式为 %o 的文件"
-#: libfdisk/src/gpt.c:887
+#: libfdisk/src/gpt.c:947
msgid "GPT Header"
msgstr "GPT 头"
-#: libfdisk/src/gpt.c:892
+#: libfdisk/src/gpt.c:952
msgid "GPT Entries"
msgstr "GPT 记录项"
-#: libfdisk/src/gpt.c:1203
+#: libfdisk/src/gpt.c:1267
msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used."
msgstr "备份 GPT 表损坏,但主表似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1212
+#: libfdisk/src/gpt.c:1276
msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used."
msgstr "主 GPT 表损坏,但备份似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1394
+#: libfdisk/src/gpt.c:1450
+#, fuzzy, c-format
+msgid "unssuported GPT attribute bit '%s'"
+msgstr "不支持的参数:%s"
+
+#: libfdisk/src/gpt.c:1545
+#, c-format
+msgid "Partition UUID changed from %s to %s."
+msgstr "分区 UUID 已从 %s 更改为 %s。"
+
+#: libfdisk/src/gpt.c:1553
+#, c-format
+msgid "Partition name changed from '%s' to '%.*s'."
+msgstr "分区名已由“%s”改为“%.*s”。"
+
+#: libfdisk/src/gpt.c:1611
#, c-format
msgid "First LBA: %ju"
msgstr "第一个 LBA:%ju"
-#: libfdisk/src/gpt.c:1395
+#: libfdisk/src/gpt.c:1612
#, c-format
msgid "Last LBA: %ju"
msgstr "上个 LBA: %ju"
-#: libfdisk/src/gpt.c:1396
+#. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header.
+#: libfdisk/src/gpt.c:1614
#, c-format
msgid "Alternative LBA: %ju"
msgstr "替代 LBA:%ju"
-#: libfdisk/src/gpt.c:1397
-#, c-format
-msgid "Partitions entries LBA: %ju"
+#. TRANSLATORS: The start of the array of partition entries.
+#: libfdisk/src/gpt.c:1616
+#, fuzzy, c-format
+msgid "Partition entries LBA: %ju"
msgstr "分区记录项 LBA:%ju"
-#: libfdisk/src/gpt.c:1398
+#: libfdisk/src/gpt.c:1617
#, c-format
msgid "Allocated partition entries: %u"
msgstr "已分配的分区项:%u"
-#: libfdisk/src/gpt.c:1545
+#: libfdisk/src/gpt.c:1768
msgid "The device contains hybrid MBR -- writing GPT only. You have to sync the MBR manually."
msgstr "该设备包含混合 MBR -- 将只写入 GPT。您需要手动同步 MBR。"
-#: libfdisk/src/gpt.c:1580
+#: libfdisk/src/gpt.c:1803
msgid "Disk does not contain a valid backup header."
msgstr "磁盘不含有效的备用磁头。"
-#: libfdisk/src/gpt.c:1585
+#: libfdisk/src/gpt.c:1808
msgid "Invalid primary header CRC checksum."
msgstr "无效的主磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:1589
+#: libfdisk/src/gpt.c:1812
msgid "Invalid backup header CRC checksum."
msgstr "无效的备份磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:1594
+#: libfdisk/src/gpt.c:1817
msgid "Invalid partition entry checksum."
msgstr "无效的分区记录校验和。"
-#: libfdisk/src/gpt.c:1599
+#: libfdisk/src/gpt.c:1822
msgid "Invalid primary header LBA sanity checks."
msgstr "无效的主磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:1603
+#: libfdisk/src/gpt.c:1826
msgid "Invalid backup header LBA sanity checks."
msgstr "无效的备用磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:1608
+#: libfdisk/src/gpt.c:1831
msgid "MyLBA mismatch with real position at primary header."
msgstr "MyLBA 不匹配,真正位置在主磁头。"
-#: libfdisk/src/gpt.c:1612
+#: libfdisk/src/gpt.c:1835
msgid "MyLBA mismatch with real position at backup header."
msgstr "MyLBA 不匹配,真正位置在备份磁头。"
-#: libfdisk/src/gpt.c:1617
+#: libfdisk/src/gpt.c:1840
msgid "Disk is too small to hold all data."
msgstr "磁盘太小,放不下所有数据。"
-#: libfdisk/src/gpt.c:1627
+#: libfdisk/src/gpt.c:1850
msgid "Primary and backup header mismatch."
msgstr "主磁头和备份磁头不匹配。"
-#: libfdisk/src/gpt.c:1633
+#: libfdisk/src/gpt.c:1856
#, c-format
msgid "Partition %u overlaps with partition %u."
msgstr "分区 %u 与 %u 重叠。"
-#: libfdisk/src/gpt.c:1640
+#: libfdisk/src/gpt.c:1863
#, c-format
msgid "Partition %u is too big for the disk."
msgstr "分区 %u 对于该磁盘而言过大。"
-#: libfdisk/src/gpt.c:1647
+#: libfdisk/src/gpt.c:1870
#, c-format
msgid "Partition %u ends before it starts."
msgstr "分区 %u 结束于起点之前。"
-#: libfdisk/src/gpt.c:1656
+#: libfdisk/src/gpt.c:1879
msgid "No errors detected."
msgstr "未检测到错误。"
-#: libfdisk/src/gpt.c:1657
+#: libfdisk/src/gpt.c:1880
#, c-format
msgid "Header version: %s"
msgstr "磁头版本:%s"
-#: libfdisk/src/gpt.c:1658
+#: libfdisk/src/gpt.c:1881
#, c-format
msgid "Using %u out of %d partitions."
msgstr "使用着 %2$d 个分区中的 %1$u 个。"
-#: libfdisk/src/gpt.c:1669
+#: libfdisk/src/gpt.c:1892
#, 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:1677
+#: libfdisk/src/gpt.c:1900
#, c-format
msgid "%d error detected."
msgid_plural "%d errors detected."
msgstr[0] "检测到 %d 个错误。"
-#: libfdisk/src/gpt.c:1805
+#: libfdisk/src/gpt.c:1974
msgid "All partitions are already in use."
msgstr "所有分区均已占用。"
-#: libfdisk/src/gpt.c:1830 libfdisk/src/gpt.c:1857
+#: libfdisk/src/gpt.c:2027 libfdisk/src/gpt.c:2052
#, c-format
msgid "Sector %ju already used."
msgstr "扇区 %ju 已使用。"
-#: libfdisk/src/gpt.c:1913
+#: libfdisk/src/gpt.c:2109
#, c-format
msgid "Could not create partition %zu"
msgstr "无法创建分区 %zu"
-#: libfdisk/src/gpt.c:1998
+#: libfdisk/src/gpt.c:2240
#, c-format
msgid "Created a new GPT disklabel (GUID: %s)."
msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
-#: libfdisk/src/gpt.c:2035
+#: libfdisk/src/gpt.c:2277
msgid "Enter new disk UUID (in 8-4-4-4-12 format)"
msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)"
-#: libfdisk/src/gpt.c:2042 libfdisk/src/gpt.c:2135
+#: libfdisk/src/gpt.c:2284
msgid "Failed to parse your UUID."
msgstr "解析您的 UUID 失败。"
-#: libfdisk/src/gpt.c:2057
+#: libfdisk/src/gpt.c:2298
#, c-format
msgid "Disk identifier changed from %s to %s."
msgstr "将磁盘标识从 %s 更改为 %s 失败。"
-#: libfdisk/src/gpt.c:2128
-msgid "New UUID (in 8-4-4-4-12 format)"
-msgstr "新 UUID (以 8-4-4-4-12 格式)"
-
-#: libfdisk/src/gpt.c:2150
-#, c-format
-msgid "Partition UUID changed from %s to %s."
-msgstr "分区 UUID 已从 %s 更改为 %s。"
-
-#: libfdisk/src/gpt.c:2173
-msgid "New name"
-msgstr "新名称"
-
-#: libfdisk/src/gpt.c:2195
-#, c-format
-msgid "Partition name changed from '%s' to '%.*s'."
-msgstr "分区名已由“%s”改为“%.*s”。"
-
-#: libfdisk/src/gpt.c:2247
+#: libfdisk/src/gpt.c:2384
msgid "Enter GUID specific bit"
msgstr "输入 GUID 特定位"
-#: libfdisk/src/gpt.c:2262
+#: libfdisk/src/gpt.c:2399
#, c-format
msgid "failed to toggle unsupported bit %lu"
msgstr "开/关不支持的位 %lu 失败"
-#: libfdisk/src/gpt.c:2276
+#: libfdisk/src/gpt.c:2412
#, c-format
msgid "The GUID specific bit %d on partition %zu is enabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。"
-#: libfdisk/src/gpt.c:2277
+#: libfdisk/src/gpt.c:2413
#, c-format
msgid "The GUID specific bit %d on partition %zu is disabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。"
-#: libfdisk/src/gpt.c:2282
+#: libfdisk/src/gpt.c:2417
#, c-format
msgid "The %s flag on partition %zu is enabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已启用。"
-#: libfdisk/src/gpt.c:2283
+#: libfdisk/src/gpt.c:2418
#, c-format
msgid "The %s flag on partition %zu is disabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。"
-#: libfdisk/src/gpt.c:2419
+#: libfdisk/src/gpt.c:2552
msgid "Type-UUID"
msgstr "类型-UUID"
-#: libfdisk/src/gpt.c:2420
+#: libfdisk/src/gpt.c:2553
msgid "UUID"
msgstr "UUID"
-#: libfdisk/src/gpt.c:2421 login-utils/chfn.c:235 login-utils/chfn.c:315
+#: libfdisk/src/gpt.c:2554 login-utils/chfn.c:151 login-utils/chfn.c:153
+#: login-utils/chfn.c:308
msgid "Name"
msgstr "名称"
-#: libfdisk/src/label.c:104
-msgid "Incomplete geometry setting."
-msgstr "不完整的几何属性设置。"
-
-#: libfdisk/src/partition.c:336
+#: libfdisk/src/partition.c:670
msgid "Free space"
msgstr "剩余空间"
-#: libfdisk/src/parttype.c:85 misc-utils/findmnt.c:664 schedutils/ionice.c:79
-#: sys-utils/hwclock.c:322
+#: libfdisk/src/parttype.c:259 misc-utils/findmnt.c:664 schedutils/ionice.c:79
+#: sys-utils/hwclock.c:335
msgid "unknown"
msgstr "未知"
-#: libfdisk/src/sgi.c:41
+#: libfdisk/src/sgi.c:47
msgid "SGI volhdr"
msgstr "SGI volhdr"
-#: libfdisk/src/sgi.c:42
+#: libfdisk/src/sgi.c:48
msgid "SGI trkrepl"
msgstr "SGI trkrepl"
-#: libfdisk/src/sgi.c:43
+#: libfdisk/src/sgi.c:49
msgid "SGI secrepl"
msgstr "SGI secrepl"
-#: libfdisk/src/sgi.c:44
+#: libfdisk/src/sgi.c:50
msgid "SGI raw"
msgstr "SGI raw"
-#: libfdisk/src/sgi.c:45
+#: libfdisk/src/sgi.c:51
msgid "SGI bsd"
msgstr "SGI bsd"
-#: libfdisk/src/sgi.c:46
+#: libfdisk/src/sgi.c:52
msgid "SGI sysv"
msgstr "SGI sysv"
-#: libfdisk/src/sgi.c:47
+#: libfdisk/src/sgi.c:53
msgid "SGI volume"
msgstr "SGI volume"
-#: libfdisk/src/sgi.c:48
+#: libfdisk/src/sgi.c:54
msgid "SGI efs"
msgstr "SGI efs"
-#: libfdisk/src/sgi.c:49
+#: libfdisk/src/sgi.c:55
msgid "SGI lvol"
msgstr "SGI lvol"
-#: libfdisk/src/sgi.c:50
+#: libfdisk/src/sgi.c:56
msgid "SGI rlvol"
msgstr "SGI rlvol"
-#: libfdisk/src/sgi.c:51
+#: libfdisk/src/sgi.c:57
msgid "SGI xfs"
msgstr "SGI xfs"
-#: libfdisk/src/sgi.c:52
+#: libfdisk/src/sgi.c:58
msgid "SGI xfslog"
msgstr "SGI xfslog"
-#: libfdisk/src/sgi.c:53
+#: libfdisk/src/sgi.c:59
msgid "SGI xlv"
msgstr "SGI xlv"
-#: libfdisk/src/sgi.c:54
+#: libfdisk/src/sgi.c:60
msgid "SGI xvm"
msgstr "SGI xvm"
-#: libfdisk/src/sgi.c:56 libfdisk/src/sun.c:47
+#: libfdisk/src/sgi.c:62 libfdisk/src/sun.c:53
msgid "Linux native"
msgstr "Linux native"
-#: libfdisk/src/sgi.c:143
+#: libfdisk/src/sgi.c:159
msgid "SGI info created on second sector."
msgstr "在第二扇区创建了 SGI 信息。"
-#: libfdisk/src/sgi.c:243
+#: libfdisk/src/sgi.c:259
msgid "Detected an SGI disklabel with wrong checksum."
msgstr "检测到校验和错误的 sgi 磁盘标签。"
-#: libfdisk/src/sgi.c:259
+#: libfdisk/src/sgi.c:275
#, c-format
msgid ""
"Label geometry: %d heads, %llu sectors\n"
@@ -6014,265 +5846,265 @@ msgstr ""
" %llu 个柱面,%d 个物理柱面\n"
" %d 个额外扇区/柱面,交错 %d:1\n"
-#: libfdisk/src/sgi.c:266
+#: libfdisk/src/sgi.c:282
#, c-format
msgid "Bootfile: %s"
msgstr "启动文件:%s"
-#: libfdisk/src/sgi.c:354
+#: libfdisk/src/sgi.c:369
msgid "Invalid bootfile! The bootfile must be an absolute non-zero pathname, e.g. \"/unix\" or \"/unix.save\"."
msgstr "无效的启动文件!启动文件必须为绝对非零路径名,例如“/unix”或“/unix.save”。"
-#: libfdisk/src/sgi.c:360
+#: libfdisk/src/sgi.c:375
#, c-format
msgid "Name of bootfile is too long: %zu byte maximum."
msgid_plural "Name of bootfile is too long: %zu bytes maximum."
msgstr[0] "启动文件名过长:最多 %zu 个字节。"
-#: libfdisk/src/sgi.c:367
+#: libfdisk/src/sgi.c:382
msgid "Bootfile must have a fully qualified pathname."
msgstr "启动文件必须用完全限定路径名。"
-#: libfdisk/src/sgi.c:373
+#: libfdisk/src/sgi.c:388
msgid "Be aware that the bootfile is not checked for existence. SGI's default is \"/unix\", and for backup \"/unix.save\"."
msgstr "注意,不会检查启动文件是否存在。SGI 默认值为“/unix”,备份为“/unix.save”。"
-#: libfdisk/src/sgi.c:389
+#: libfdisk/src/sgi.c:413
#, c-format
msgid "The current boot file is: %s"
msgstr "当前启动文件为:%s"
-#: libfdisk/src/sgi.c:391
+#: libfdisk/src/sgi.c:415
msgid "Enter of the new boot file"
msgstr "输入新启动文件的路径"
-#: libfdisk/src/sgi.c:396
+#: libfdisk/src/sgi.c:420
msgid "Boot file is unchanged."
msgstr "启动文件未改变。"
-#: libfdisk/src/sgi.c:408
+#: libfdisk/src/sgi.c:431
#, c-format
msgid "Bootfile has been changed to \"%s\"."
msgstr "启动文件已更改为“%s”。"
-#: libfdisk/src/sgi.c:548
+#: libfdisk/src/sgi.c:571
msgid "More than one entire disk entry present."
msgstr "存在超过一个整磁盘记录。"
-#: libfdisk/src/sgi.c:555 libfdisk/src/sun.c:444
+#: libfdisk/src/sgi.c:578 libfdisk/src/sun.c:455
msgid "No partitions defined."
msgstr "未定义分区。"
-#: libfdisk/src/sgi.c:563
+#: libfdisk/src/sgi.c:588
msgid "IRIX likes it when partition 11 covers the entire disk."
msgstr "IRIX 偏向于让分区 11 覆盖整个磁盘。"
-#: libfdisk/src/sgi.c:567
+#: libfdisk/src/sgi.c:592
#, c-format
msgid "The entire disk partition should start at block 0, not at block %d."
msgstr "整磁盘分区应开始于块 0,而非块 %d。"
-#: libfdisk/src/sgi.c:578
+#: libfdisk/src/sgi.c:603
msgid "Partition 11 should cover the entire disk."
msgstr "分区 11 应覆盖整个磁盘。"
-#: libfdisk/src/sgi.c:602
+#: libfdisk/src/sgi.c:627
#, c-format
msgid "Partitions %d and %d overlap by %d sector."
msgid_plural "Partitions %d and %d overlap by %d sectors."
msgstr[0] "分区 %d 与 %d 重叠了 %d 个扇区。"
-#: libfdisk/src/sgi.c:613 libfdisk/src/sgi.c:635
+#: libfdisk/src/sgi.c:638 libfdisk/src/sgi.c:660
#, c-format
msgid "Unused gap of %8u sector: sector %8u"
msgid_plural "Unused gap of %8u sectors: sectors %8u-%u"
msgstr[0] "有未使用的 %8u 个扇区的间隙:扇区 %8u-%u"
-#: libfdisk/src/sgi.c:648
+#: libfdisk/src/sgi.c:673
msgid "The boot partition does not exist."
msgstr "启动分区不存在。"
-#: libfdisk/src/sgi.c:652
+#: libfdisk/src/sgi.c:677
msgid "The swap partition does not exist."
msgstr "交换分区不存在。"
-#: libfdisk/src/sgi.c:656
+#: libfdisk/src/sgi.c:681
msgid "The swap partition has no swap type."
msgstr "交换分区不是交换类型。"
-#: libfdisk/src/sgi.c:659
+#: libfdisk/src/sgi.c:684
msgid "You have chosen an unusual bootfile name."
msgstr "您选择了一个不常用的启动文件名。"
-#: libfdisk/src/sgi.c:709
+#: libfdisk/src/sgi.c:734
msgid "Partition overlap on the disk."
msgstr "磁盘上的分区重叠。"
-#: libfdisk/src/sgi.c:792
+#: libfdisk/src/sgi.c:819
msgid "Attempting to generate entire disk entry automatically."
msgstr "尝试自动生成整磁盘记录。"
-#: libfdisk/src/sgi.c:797
+#: libfdisk/src/sgi.c:824
msgid "The entire disk is already covered with partitions."
msgstr "整个磁盘已经被分区覆盖。"
-#: libfdisk/src/sgi.c:801
+#: libfdisk/src/sgi.c:828
msgid "You got a partition overlap on the disk. Fix it first!"
msgstr "磁盘上有重叠分区。请先修复它!"
-#: libfdisk/src/sgi.c:823 libfdisk/src/sun.c:529
+#: libfdisk/src/sgi.c:850 libfdisk/src/sun.c:541
#, c-format
msgid "First %s"
msgstr "起始 %s"
-#: libfdisk/src/sgi.c:847 libfdisk/src/sgi.c:897
+#: libfdisk/src/sgi.c:874 libfdisk/src/sgi.c:924
msgid "It is highly recommended that the eleventh partition covers the entire disk and is of type 'SGI volume'."
msgstr "强烈建议第十一分区覆盖整个磁盘,并使用“SGI volume”类型。"
-#: libfdisk/src/sgi.c:862 libfdisk/src/sun.c:624
+#: libfdisk/src/sgi.c:889 libfdisk/src/sun.c:636
#, c-format
msgid "Last %s or +%s or +size{K,M,G,T,P}"
msgstr "最后 %s 或+%s 或 +大小{K,M,G,T,P}"
-#: libfdisk/src/sgi.c:933 libfdisk/src/sun.c:235
+#: libfdisk/src/sgi.c:961 libfdisk/src/sun.c:242
#, c-format
msgid "BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %llu. This value may be truncated for devices > 33.8 GB."
msgstr "对 %s 执行 BLKGETSIZE ioctl 失败。将使用几何 柱面 属性值 %llu。对于大于 33.8 GB 的设备,这个值可能被截短。"
-#: libfdisk/src/sgi.c:997
+#: libfdisk/src/sgi.c:1027
msgid "Created a new SGI disklabel."
msgstr "创建新的SGI 磁盘标签。"
-#: libfdisk/src/sgi.c:1011
+#: libfdisk/src/sgi.c:1049
msgid "Sorry, only for non-empty partitions you can change the tag."
msgstr "抱歉,只有非空分区才能更改标志(tag)。"
-#: libfdisk/src/sgi.c:1017
+#: libfdisk/src/sgi.c:1055
msgid "Consider leaving partition 9 as volume header (0), and partition 11 as entire volume (6), as IRIX expects it."
msgstr "考虑将分区 9 留作卷头(volume header) (0),分区 11 作为整卷(6),以符合 IRIX 规定。"
-#: libfdisk/src/sgi.c:1025
+#: libfdisk/src/sgi.c:1064
msgid "It is highly recommended that the partition at offset 0 is of type \"SGI volhdr\", the IRIX system will rely on it to retrieve from its directory standalone tools like sash and fx. Only the \"SGI volume\" entire disk section may violate this. Are you sure about tagging this partition differently?"
msgstr "强烈建议偏移 0 处的分区设为“SGI volhdr”类型,IRIX 会依靠它从它的目录中获取独立的工具,如 sash 和 fx。只有“SGI volume”整磁盘部分(entire disk section)能违反这一规定。您确定要将这一分区标记成其他类型吗?"
-#: libfdisk/src/sun.c:34
+#: libfdisk/src/sun.c:40
msgid "Unassigned"
msgstr "未分配"
-#: libfdisk/src/sun.c:36
+#: libfdisk/src/sun.c:42
msgid "SunOS root"
msgstr "SunOS 根"
-#: libfdisk/src/sun.c:37
+#: libfdisk/src/sun.c:43
msgid "SunOS swap"
msgstr "SunOS 交换"
-#: libfdisk/src/sun.c:38
+#: libfdisk/src/sun.c:44
msgid "SunOS usr"
msgstr "SunOS usr"
-#: libfdisk/src/sun.c:39
+#: libfdisk/src/sun.c:45
msgid "Whole disk"
msgstr "整盘"
-#: libfdisk/src/sun.c:40
+#: libfdisk/src/sun.c:46
msgid "SunOS stand"
msgstr "SunOS stand"
-#: libfdisk/src/sun.c:41
+#: libfdisk/src/sun.c:47
msgid "SunOS var"
msgstr "SunOS var"
-#: libfdisk/src/sun.c:42
+#: libfdisk/src/sun.c:48
msgid "SunOS home"
msgstr "SunOS home"
-#: libfdisk/src/sun.c:43
+#: libfdisk/src/sun.c:49
msgid "SunOS alt sectors"
msgstr "SunOS alt sectors"
-#: libfdisk/src/sun.c:44
+#: libfdisk/src/sun.c:50
msgid "SunOS cachefs"
msgstr "SunOS cachefs"
-#: libfdisk/src/sun.c:45
+#: libfdisk/src/sun.c:51
msgid "SunOS reserved"
msgstr "SunOS 保留"
-#: libfdisk/src/sun.c:130
+#: libfdisk/src/sun.c:137
msgid "Detected sun disklabel with wrong checksum. Probably you'll have to set all the values, e.g. heads, sectors, cylinders and partitions or force a fresh label (s command in main menu)"
msgstr "检测到校验和错误的 sun 磁盘标签。您可能要设置所有的值(如磁头、扇区、柱面和分区)或强制一个新标签(主菜单中的 s 命令)"
-#: libfdisk/src/sun.c:143
+#: libfdisk/src/sun.c:150
#, c-format
msgid "Detected sun disklabel with wrong version [%d]."
msgstr "检测到带错误版本 [%d] 的 sun 磁盘标签 。"
-#: libfdisk/src/sun.c:148
+#: libfdisk/src/sun.c:155
#, c-format
msgid "Detected sun disklabel with wrong vtoc.sanity [0x%08x]."
msgstr "检测到带错误的 vtoc.sanity [0x%08x] 的 sun 磁盘标签。"
-#: libfdisk/src/sun.c:153
+#: libfdisk/src/sun.c:160
#, c-format
msgid "Detected sun disklabel with wrong vtoc.nparts [%u]."
msgstr "检测到带错误 vtoc.nparts [%u] 的 sun 磁盘标签。"
-#: libfdisk/src/sun.c:158
+#: libfdisk/src/sun.c:165
msgid "Warning: Wrong values need to be fixed up and will be corrected by w(rite)"
msgstr "警告:错误值需要修复,并且将通过 w(写) 操作修正。"
-#: libfdisk/src/sun.c:185
+#: libfdisk/src/sun.c:192
msgid "Heads"
msgstr "磁头"
-#: libfdisk/src/sun.c:187
+#: libfdisk/src/sun.c:194
msgid "Sectors/track"
msgstr "扇区/磁道"
-#: libfdisk/src/sun.c:288
+#: libfdisk/src/sun.c:299
msgid "Created a new Sun disklabel."
msgstr "创建新的 Sun 磁盘标签。"
-#: libfdisk/src/sun.c:402
+#: libfdisk/src/sun.c:413
#, c-format
msgid "Partition %u doesn't end on cylinder boundary."
msgstr "分区 %u 未结束在柱面边界上。"
-#: libfdisk/src/sun.c:421
+#: libfdisk/src/sun.c:432
#, c-format
msgid "Partition %u overlaps with others in sectors %u-%u."
msgstr "分区 %u 在扇区 %u-%u 与其他分区重叠。"
-#: libfdisk/src/sun.c:449
+#: libfdisk/src/sun.c:460
#, c-format
msgid "Unused gap - sectors 0-%u."
msgstr "未使用的间隙 - 扇区 0-%u。"
-#: libfdisk/src/sun.c:451 libfdisk/src/sun.c:457
+#: libfdisk/src/sun.c:462 libfdisk/src/sun.c:468
#, c-format
msgid "Unused gap - sectors %u-%u."
msgstr "未使用的间隙 - 扇区 %u-%u。"
-#: libfdisk/src/sun.c:513
+#: libfdisk/src/sun.c:525
msgid "Other partitions already cover the whole disk. Delete some/shrink them before retry."
msgstr "其他分区已覆盖了整个磁盘。删除几个分区或压缩它们,然后重试。"
-#: libfdisk/src/sun.c:578
+#: libfdisk/src/sun.c:590
#, c-format
msgid "Sector %d is already allocated"
msgstr "扇区 %d 已分配"
-#: libfdisk/src/sun.c:585
+#: libfdisk/src/sun.c:597
msgid "It is highly recommended that the third partition covers the whole disk and is of type `Whole disk'"
msgstr "强烈建议让第三个分区覆盖整个磁盘,并设为“整盘”类型"
-#: libfdisk/src/sun.c:595
+#: libfdisk/src/sun.c:607
#, c-format
msgid "Aligning the first sector from %u to %u to be on cylinder boundary."
msgstr "将把从 %u 到 %u 的首个扇区对齐到柱面边界。"
-#: libfdisk/src/sun.c:670
+#: libfdisk/src/sun.c:682
#, c-format
msgid ""
"You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -6282,12 +6114,12 @@ msgstr ""
"您没有使第三个分区覆盖整个磁盘,但是值 %lu %s 覆盖了其他分区。\n"
"您的记录已经更改为 %lu %s"
-#: libfdisk/src/sun.c:709
+#: libfdisk/src/sun.c:723
#, c-format
msgid "If you want to maintain SunOS/Solaris compatibility, consider leaving this partition as Whole disk (5), starting at 0, with %u sectors"
msgstr "如果您想与 SunOS/Solaris 兼容,请保持此分区为 整盘 (5),以 0 开始,大小为 %u 个扇区"
-#: libfdisk/src/sun.c:733
+#: libfdisk/src/sun.c:747
#, c-format
msgid ""
"Label geometry: %d rpm, %d alternate and %d physical cylinders,\n"
@@ -6296,41 +6128,41 @@ msgstr ""
"标签任何属性:%d rpm, %d 个备用柱面和 %d 个物理柱面,\n"
" %d 个额外扇区/柱面,交错 %d:1"
-#: libfdisk/src/sun.c:740
+#: libfdisk/src/sun.c:754
#, c-format
msgid "Label ID: %s"
msgstr "标签 ID:%s"
-#: libfdisk/src/sun.c:741
+#: libfdisk/src/sun.c:755
#, c-format
msgid "Volume ID: %s"
msgstr "卷 ID:%s"
-#: libfdisk/src/sun.c:742
+#: libfdisk/src/sun.c:756
msgid "<none>"
msgstr "<无>"
-#: libfdisk/src/sun.c:816
+#: libfdisk/src/sun.c:838
msgid "Number of alternate cylinders"
msgstr "备用柱面的数量"
-#: libfdisk/src/sun.c:832
+#: libfdisk/src/sun.c:863
msgid "Extra sectors per cylinder"
msgstr "每个柱面的额外扇区数"
-#: libfdisk/src/sun.c:847
+#: libfdisk/src/sun.c:887
msgid "Interleave factor"
msgstr "交错系数"
-#: libfdisk/src/sun.c:862
+#: libfdisk/src/sun.c:911
msgid "Rotation speed (rpm)"
msgstr "转速(转/分)"
-#: libfdisk/src/sun.c:877
+#: libfdisk/src/sun.c:935
msgid "Number of physical cylinders"
msgstr "物理柱面数"
-#: libfdisk/src/sun.c:938
+#: libfdisk/src/sun.c:1004
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -6338,7 +6170,7 @@ msgstr ""
"考虑保持分区 3 为 整盘 (5),\n"
"这是 SunOS/Solaris 的规定,Linux 也建议这么做。\n"
-#: libfdisk/src/sun.c:947
+#: libfdisk/src/sun.c:1015
msgid ""
"It is highly recommended that the partition at offset 0\n"
"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -6350,10 +6182,18 @@ msgstr ""
"和启动锁。\n"
"您确信要把该分区标记为 Linux 交换分区吗?"
-#: libfdisk/src/sun.c:1008
+#: libfdisk/src/sun.c:1084
msgid "Flags"
msgstr "标志"
+#: lib/monotonic.c:25
+msgid "gettimeofday failed"
+msgstr "gettimeofday 失败"
+
+#: lib/monotonic.c:38
+msgid "sysinfo failed"
+msgstr "sysinfo 失败"
+
#: lib/pager.c:102
#, c-format
msgid "waitpid failed (%s)"
@@ -6377,171 +6217,227 @@ msgstr "解析 CPU 掩码 %s 失败"
msgid "libc pseudo-random functions"
msgstr "libc 伪随机函数"
-#: login-utils/chfn.c:83 login-utils/chsh.c:72
+#: lib/swapprober.c:17 lib/swapprober.c:30
+#, c-format
+msgid "%s: unable to probe device"
+msgstr "%s:无法探测设备"
+
+#: lib/swapprober.c:32
+#, fuzzy, c-format
+msgid "%s: ambiguous probing result; use wipefs(8)"
+msgstr "%s:探测结果矛盾,使用 wipefs(8)"
+
+#: lib/swapprober.c:34
+#, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s:不是有效的交换分区"
+
+#: lib/swapprober.c:41
+#, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s:不支持的交换版本“%s”"
+
+#: login-utils/chfn.c:91 login-utils/chsh.c:70
#, c-format
msgid " %s [options] [<username>]\n"
msgstr " %s [选项] [<用户名>]\n"
-#: login-utils/chfn.c:85
+#: login-utils/chfn.c:94
+#, fuzzy
+msgid "Change your finger information.\n"
+msgstr "正在更改 %s 的 finger 信息。\n"
+
+#: login-utils/chfn.c:97
msgid " -f, --full-name <full-name> real name\n"
msgstr " -f, --full-name <全名> 真实姓名\n"
-#: login-utils/chfn.c:86
+#: login-utils/chfn.c:98
msgid " -o, --office <office> office number\n"
msgstr " -o, --office <办公> 办公号码\n"
-#: login-utils/chfn.c:87
+#: login-utils/chfn.c:99
msgid " -p, --office-phone <phone> office phone number\n"
msgstr " -p, --office-phone <电话> 办公电话\n"
-#: login-utils/chfn.c:88
+#: login-utils/chfn.c:100
msgid " -h, --home-phone <phone> home phone number\n"
msgstr " -h, --home-phone <电话> 住宅电话\n"
-#: login-utils/chfn.c:90 login-utils/chsh.c:77
+#: login-utils/chfn.c:102 login-utils/chsh.c:79
msgid " -u, --help display this help and exit\n"
msgstr " -u, --help 显示此帮助并退出\n"
-#: login-utils/chfn.c:91 login-utils/chsh.c:78
-msgid " -v, --version output version information and exit\n"
-msgstr " -v, --version 输出版本信息并退出\n"
+#: login-utils/chfn.c:118
+#, c-format
+msgid "field %s is too long"
+msgstr "字段 %s 过长"
+
+#: login-utils/chfn.c:122 login-utils/chsh.c:206
+#, c-format
+msgid "%s: has illegal characters"
+msgstr ""
+
+#: login-utils/chfn.c:151 login-utils/chfn.c:157 login-utils/chfn.c:163
+#: login-utils/chfn.c:169
+#, c-format
+msgid "login.defs forbids setting %s"
+msgstr ""
-#: login-utils/chfn.c:127 login-utils/chsh.c:104
+#: login-utils/chfn.c:157 login-utils/chfn.c:159 login-utils/chfn.c:310
+msgid "Office"
+msgstr "办公"
+
+#: login-utils/chfn.c:163 login-utils/chfn.c:165 login-utils/chfn.c:312
+msgid "Office Phone"
+msgstr "办公电话"
+
+#: login-utils/chfn.c:169 login-utils/chfn.c:171 login-utils/chfn.c:314
+msgid "Home Phone"
+msgstr "住宅电话"
+
+#: login-utils/chfn.c:234
+msgid "Aborted."
+msgstr "已中止。"
+
+#: login-utils/chfn.c:295
+#, c-format
+msgid "%s: CHFN_RESTRICT has unexpected value: %s"
+msgstr ""
+
+#: login-utils/chfn.c:297
+#, c-format
+msgid "%s: CHFN_RESTRICT does not allow any changes"
+msgstr ""
+
+#: login-utils/chfn.c:380
+#, c-format
+msgid "Finger information *NOT* changed. Try again later.\n"
+msgstr "Finger 信息*没有*更改。请稍后重试。\n"
+
+#: login-utils/chfn.c:384
+#, c-format
+msgid "Finger information changed.\n"
+msgstr "Finger 信息已更改。\n"
+
+#: login-utils/chfn.c:409 login-utils/chsh.c:243
#, c-format
msgid "you (user %d) don't exist."
msgstr "您(用户 %d)不存在。"
-#: login-utils/chfn.c:132 login-utils/chsh.c:109 login-utils/libuser.c:59
+#: login-utils/chfn.c:415 login-utils/chsh.c:248 login-utils/libuser.c:59
#, c-format
msgid "user \"%s\" does not exist."
msgstr "用户“%s”不存在。"
-#: login-utils/chfn.c:138 login-utils/chsh.c:115
+#: login-utils/chfn.c:421 login-utils/chsh.c:254
msgid "can only change local entries"
msgstr "只能更改本地记录"
-#: login-utils/chfn.c:149
+#: login-utils/chfn.c:432
#, c-format
msgid "%s is not authorized to change the finger info of %s"
msgstr "%s 未得到授权更改 %s 的 finger 信息"
-#: login-utils/chfn.c:151 login-utils/chsh.c:129
+#: login-utils/chfn.c:434 login-utils/chsh.c:268
msgid "Unknown user context"
msgstr "未知用户环境(context)"
-#: login-utils/chfn.c:157 login-utils/chsh.c:135
+#: login-utils/chfn.c:440 login-utils/chsh.c:274
#, c-format
msgid "can't set default context for %s"
msgstr "无法设置 %s 默认环境(context)"
-#: login-utils/chfn.c:168
+#: login-utils/chfn.c:451
msgid "running UID doesn't match UID of user we're altering, change denied"
msgstr "运行中的 UID 与要改变的用户的 UID 不匹配,更改被拒绝"
-#: login-utils/chfn.c:172
+#: login-utils/chfn.c:455
#, c-format
msgid "Changing finger information for %s.\n"
msgstr "正在更改 %s 的 finger 信息。\n"
-#: login-utils/chfn.c:184
+#: login-utils/chfn.c:469
#, c-format
msgid "Finger information not changed.\n"
msgstr "Finger 信息未更改。\n"
-#: login-utils/chfn.c:239 login-utils/chfn.c:316
-msgid "Office"
-msgstr "办公"
-
-#: login-utils/chfn.c:243 login-utils/chfn.c:317
-msgid "Office Phone"
-msgstr "办公电话"
-
-#: login-utils/chfn.c:247 login-utils/chfn.c:318
-msgid "Home Phone"
-msgstr "住宅电话"
+#: login-utils/chsh.c:73
+#, fuzzy
+msgid "Change your login shell.\n"
+msgstr "正在更改 %s 的 shell。\n"
-#: login-utils/chfn.c:338 login-utils/chsh.c:260
-msgid "Aborted."
-msgstr "已中止。"
+#: login-utils/chsh.c:76
+msgid " -s, --shell <shell> specify login shell\n"
+msgstr " -s, --shell <shell> 指定登录 shell\n"
-#: login-utils/chfn.c:370
-#, c-format
-msgid "field %s is too long"
-msgstr "字段 %s 过长"
+#: login-utils/chsh.c:77
+msgid " -l, --list-shells print list of shells and exit\n"
+msgstr " -l, --list-shells 打印 shell 列表并退出\n"
-#: login-utils/chfn.c:372
-msgid "field is too long"
-msgstr "字段过长"
+#: login-utils/chsh.c:101
+msgid "No known shells."
+msgstr "无已知 shell。"
-#: login-utils/chfn.c:380
-#, c-format
-msgid "%s: '%c' is not allowed"
-msgstr "%s:不允许“%c”"
+#: login-utils/chsh.c:200
+msgid "shell must be a full path name"
+msgstr "shell 必须为完整路径名称"
-#: login-utils/chfn.c:382 login-utils/chsh.c:304
+#: login-utils/chsh.c:202
#, c-format
-msgid "'%c' is not allowed"
-msgstr "'%c' 不允许使用"
+msgid "\"%s\" does not exist"
+msgstr "“%s”不存在"
-#: login-utils/chfn.c:388
+#: login-utils/chsh.c:204
#, c-format
-msgid "%s: control characters are not allowed"
-msgstr "%s:不允许使用控制字符"
-
-#: login-utils/chfn.c:391 login-utils/chsh.c:308
-msgid "control characters are not allowed"
-msgstr "不允许使用控制字符"
+msgid "\"%s\" is not executable"
+msgstr "“%s”不可执行"
-#: login-utils/chfn.c:473
+#: login-utils/chsh.c:210
#, c-format
-msgid "Finger information *NOT* changed. Try again later.\n"
-msgstr "Finger 信息*没有*更改。请稍后重试。\n"
+msgid "Warning: \"%s\" is not listed in %s."
+msgstr "警告:“%s”未在 %s 中列出。"
-#: login-utils/chfn.c:476
+#: login-utils/chsh.c:214 login-utils/chsh.c:218
#, c-format
-msgid "Finger information changed.\n"
-msgstr "Finger 信息已更改。\n"
-
-#: login-utils/chsh.c:74
-msgid " -s, --shell <shell> specify login shell\n"
-msgstr " -s, --shell <shell> 指定登录 shell\n"
-
-#: login-utils/chsh.c:75
-msgid " -l, --list-shells print list of shells and exit\n"
-msgstr " -l, --list-shells 打印 shell 列表并退出\n"
+msgid ""
+"\"%s\" is not listed in %s.\n"
+"Use %s -l to see list."
+msgstr ""
+"“%s”未列在 %s 中。\n"
+"请使用 %s -l 查看列表。"
-#: login-utils/chsh.c:128
+#: login-utils/chsh.c:267
#, c-format
msgid "%s is not authorized to change the shell of %s"
msgstr "%s 无权更改 %s 的 shell"
-#: login-utils/chsh.c:152
+#: login-utils/chsh.c:293
msgid "running UID doesn't match UID of user we're altering, shell change denied"
msgstr "运行 UID 与要更改的用户的 UID 不匹配,更改 shell 被拒绝"
-#: login-utils/chsh.c:157
+#: login-utils/chsh.c:298
#, c-format
msgid "your shell is not in %s, shell change denied"
msgstr "您的 shell 不在 %s 中,更改 shell 被拒绝"
-#: login-utils/chsh.c:163
+#: login-utils/chsh.c:302
#, c-format
msgid "Changing shell for %s.\n"
msgstr "正在更改 %s 的 shell。\n"
-#: login-utils/chsh.c:171
+#: login-utils/chsh.c:310
msgid "New shell"
msgstr "新 shell"
-#: login-utils/chsh.c:180
+#: login-utils/chsh.c:318
msgid "Shell not changed."
msgstr "shell 未更改。"
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:323
msgid "Shell *NOT* changed. Try again later."
msgstr "Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:189
+#: login-utils/chsh.c:327
msgid ""
"setpwnam failed\n"
"Shell *NOT* changed. Try again later."
@@ -6549,49 +6445,17 @@ msgstr ""
"setpwnam 失败\n"
"Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:193
+#: login-utils/chsh.c:331
#, c-format
msgid "Shell changed.\n"
msgstr "shell 已更改。\n"
-#: login-utils/chsh.c:289
-msgid "shell must be a full path name"
-msgstr "shell 必须为完整路径名称"
-
-#: login-utils/chsh.c:293
-#, c-format
-msgid "\"%s\" does not exist"
-msgstr "“%s”不存在"
-
-#: login-utils/chsh.c:297
-#, c-format
-msgid "\"%s\" is not executable"
-msgstr "“%s”不可执行"
-
-#: login-utils/chsh.c:316
-#, c-format
-msgid "Warning: \"%s\" is not listed in %s."
-msgstr "警告:“%s”未在 %s 中列出。"
-
-#: login-utils/chsh.c:320 login-utils/chsh.c:326
-#, c-format
-msgid ""
-"\"%s\" is not listed in %s.\n"
-"Use %s -l to see list."
-msgstr ""
-"“%s”未列在 %s 中。\n"
-"请使用 %s -l 查看列表。"
-
-#: login-utils/chsh.c:350
-msgid "No known shells."
-msgstr "无已知 shell。"
-
-#: login-utils/islocal.c:99
+#: login-utils/islocal.c:96
#, c-format
msgid "Usage: %s <passwordfile> <username>...\n"
msgstr "用法:%s <密码文件> <用户名>...\n"
-#: login-utils/last.c:156 sys-utils/dmesg.c:1174
+#: login-utils/last.c:156 login-utils/lslogins.c:1197 sys-utils/dmesg.c:1181
#, c-format
msgid "unknown time format: %s"
msgstr "未知时间格式: %s"
@@ -6601,69 +6465,73 @@ msgstr "未知时间格式: %s"
msgid "Interrupted %s"
msgstr "中断的 %s"
-#: login-utils/last.c:427
+#: login-utils/last.c:430
msgid "preallocation size exceeded"
msgstr "超过了预分配大小"
-#: login-utils/last.c:553
+#: login-utils/last.c:556
#, c-format
msgid " %s [options] [<username>...] [<tty>...]\n"
msgstr " %s [选项] [<用户名>...] [<tty>...]\n"
-#: login-utils/last.c:556
+#: login-utils/last.c:559
+msgid "Show a listing of last logged in users.\n"
+msgstr ""
+
+#: login-utils/last.c:562
msgid " -<number> how many lines to show\n"
msgstr " -<数字> 显示行数\n"
-#: login-utils/last.c:557
+#: login-utils/last.c:563
msgid " -a, --hostlast display hostnames in the last column\n"
msgstr " -a, --hostlast 最后一列显示主机名\n"
-#: login-utils/last.c:558
+#: login-utils/last.c:564
msgid " -d, --dns translate the IP number back into a hostname\n"
msgstr " -d, --dns 将 IP 号转换回主机名\n"
-#: login-utils/last.c:560
+#: login-utils/last.c:566
#, c-format
msgid " -f, --file <file> use a specific file instead of %s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: login-utils/last.c:561
+#: login-utils/last.c:567
msgid " -F, --fulltimes print full login and logout times and dates\n"
msgstr " -F, --fulltimes 打印完整的登录和注销时间和日期\n"
-#: login-utils/last.c:562
+#: login-utils/last.c:568
msgid " -i, --ip display IP numbers in numbers-and-dots notation\n"
msgstr " -i, --ip 以数字和点的形式显示 IP 号\n"
-#: login-utils/last.c:563
+#: login-utils/last.c:569
msgid " -n, --limit <number> how many lines to show\n"
msgstr " -n, --limit <数字> 要显示的行数\n"
-#: login-utils/last.c:564
+#: login-utils/last.c:570
msgid " -R, --nohostname don't display the hostname field\n"
msgstr " -R, --nohostname 不显示主机名字段\n"
-#: login-utils/last.c:565
+#: login-utils/last.c:571
msgid " -s, --since <time> display the lines since the specified time\n"
msgstr " -s, --since <时间> 显示从指定时间起的行\n"
-#: login-utils/last.c:566
+#: login-utils/last.c:572
msgid " -t, --until <time> display the lines until the specified time\n"
msgstr " -t, --until <时间> 显示到指定时间为止的行\n"
-#: login-utils/last.c:567
+#: login-utils/last.c:573
msgid " -p, --present <time> display who were present at the specified time\n"
msgstr " -p, --present <时间> 显示在指定时间谁在场(present)\n"
-#: login-utils/last.c:568
+#: login-utils/last.c:574
msgid " -w, --fullnames display full user and domain names\n"
msgstr " -w, --fullnames 显示完整的用户名和域名\n"
-#: login-utils/last.c:569
+#: login-utils/last.c:575
msgid " -x, --system display system shutdown entries and run level changes\n"
msgstr " -x, --system 显示系统关机项和运行级别更改\n"
-#: login-utils/last.c:570
+#: login-utils/last.c:576
msgid ""
" --time-format <format> show timestamps in the specified <format>:\n"
" notime|short|full|iso\n"
@@ -6671,7 +6539,7 @@ msgstr ""
" --time-format <格式> 以指定<格式>显示时间戳:\n"
" notime|short|full|iso\n"
-#: login-utils/last.c:849
+#: login-utils/last.c:865
#, c-format
msgid ""
"\n"
@@ -6680,11 +6548,11 @@ msgstr ""
"\n"
"%s 开始 %s"
-#: login-utils/last.c:919
+#: login-utils/last.c:935
msgid "failed to parse number"
msgstr "解析数字失败"
-#: login-utils/last.c:940 login-utils/last.c:945 login-utils/last.c:950
+#: login-utils/last.c:956 login-utils/last.c:961 login-utils/last.c:966
#, c-format
msgid "invalid time value \"%s\""
msgstr "无效的时间值\"%s\""
@@ -6743,104 +6611,104 @@ msgid "user attribute not changed: %s"
msgstr "用户属性未更改:%s"
#. TRANSLATORS: The standard value for %u is 60.
-#: login-utils/login.c:177
+#: login-utils/login.c:181
#, c-format
msgid "timed out after %u seconds"
msgstr "%u 秒后超时"
-#: login-utils/login.c:285
+#: login-utils/login.c:289
#, c-format
msgid "FATAL: can't reopen tty: %m"
msgstr "致命:无法重新打开 tty:%m"
-#: login-utils/login.c:291
+#: login-utils/login.c:295
#, c-format
msgid "FATAL: %s is not a terminal"
msgstr "致命:%s 不是终端"
-#: login-utils/login.c:309
+#: login-utils/login.c:313
#, c-format
msgid "chown (%s, %lu, %lu) failed: %m"
msgstr "chown (%s, %lu, %lu) 失败:%m"
-#: login-utils/login.c:313
+#: login-utils/login.c:317
#, c-format
msgid "chmod (%s, %u) failed: %m"
msgstr "chmod (%s, %u) 失败:%m"
-#: login-utils/login.c:374
+#: login-utils/login.c:378
msgid "FATAL: bad tty"
msgstr "致命:坏的 tty"
-#: login-utils/login.c:392
+#: login-utils/login.c:396
#, c-format
msgid "FATAL: %s: change permissions failed: %m"
msgstr "致命:%s:更改权限失败:%m"
-#: login-utils/login.c:520
+#: login-utils/login.c:532
#, c-format
msgid "Last login: %.*s "
msgstr "上次登录:%.*s "
-#: login-utils/login.c:522
+#: login-utils/login.c:534
#, c-format
msgid "from %.*s\n"
msgstr "来自 %.*s\n"
-#: login-utils/login.c:525
+#: login-utils/login.c:537
#, c-format
msgid "on %.*s\n"
msgstr "于 %.*s\n"
-#: login-utils/login.c:543
+#: login-utils/login.c:555
msgid "write lastlog failed"
msgstr "写 lastlog 失败"
-#: login-utils/login.c:640
+#: login-utils/login.c:655
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr "DIALUP AT %s BY %s"
-#: login-utils/login.c:645
+#: login-utils/login.c:660
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr "ROOT LOGIN ON %s FROM %s"
-#: login-utils/login.c:648
+#: login-utils/login.c:663
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr "ROOT LOGIN ON %s"
-#: login-utils/login.c:651
+#: login-utils/login.c:666
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr "LOGIN ON %s BY %s FROM %s"
-#: login-utils/login.c:654
+#: login-utils/login.c:669
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr "LOGIN ON %s BY %s"
-#: login-utils/login.c:715
+#: login-utils/login.c:730
msgid "login: "
msgstr "登录:"
-#: login-utils/login.c:741
+#: login-utils/login.c:756
#, c-format
msgid "PAM failure, aborting: %s"
msgstr "PAM 失败,将中止:%s"
-#: login-utils/login.c:742
+#: login-utils/login.c:757
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr "无法初始化 PAM:%s"
-#: login-utils/login.c:813
+#: login-utils/login.c:828
#, c-format
msgid "FAILED LOGIN %u FROM %s FOR %s, %s"
msgstr "FAILED LOGIN %u FROM %s FOR %s, %s"
-#: login-utils/login.c:821 login-utils/sulogin.c:1027
+#: login-utils/login.c:836 login-utils/sulogin.c:1030
#, c-format
msgid ""
"Login incorrect\n"
@@ -6849,17 +6717,17 @@ msgstr ""
"登录不正确\n"
"\n"
-#: login-utils/login.c:836
+#: login-utils/login.c:851
#, 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:842
+#: login-utils/login.c:857
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-#: login-utils/login.c:850
+#: login-utils/login.c:865
#, c-format
msgid ""
"\n"
@@ -6868,7 +6736,7 @@ msgstr ""
"\n"
"登录不正确\n"
-#: login-utils/login.c:878 login-utils/login.c:1213 login-utils/login.c:1236
+#: login-utils/login.c:893 login-utils/login.c:1235 login-utils/login.c:1258
msgid ""
"\n"
"Session setup problem, abort."
@@ -6876,69 +6744,74 @@ msgstr ""
"\n"
"会话设置问题,中止。"
-#: login-utils/login.c:879
+#: login-utils/login.c:894
#, c-format
msgid "NULL user name in %s:%d. Abort."
msgstr "%s:%d 中是空(NULL)用户名。中止。"
-#: login-utils/login.c:1016
+#: login-utils/login.c:1031
#, c-format
msgid "TIOCSCTTY failed: %m"
msgstr "TIOCSCTTY 失败:%m"
-#: login-utils/login.c:1157
+#: login-utils/login.c:1177
#, c-format
msgid "login: -h is for superuser only\n"
msgstr "login:-h 是超级用户专用选项\n"
-#: login-utils/login.c:1172
+#: login-utils/login.c:1192
#, c-format
msgid "Usage: login [-p] [-h <host>] [-H] [[-f] <username>]\n"
msgstr "用法:login [-p] [-h <主机>] [-H] [[-f] <用户名>]\n"
-#: login-utils/login.c:1214
+#: login-utils/login.c:1194
+#, fuzzy
+msgid "Begin a session on the system.\n"
+msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n"
+
+#: login-utils/login.c:1236
#, c-format
msgid "Invalid user name \"%s\" in %s:%d. Abort."
msgstr "%2$s:%3$d 中是无效用户名“%1$s”。中止。"
-#: login-utils/login.c:1235
+#: login-utils/login.c:1257
#, c-format
msgid "groups initialization failed: %m"
msgstr "组初始化失败:%m"
-#: login-utils/login.c:1260
+#: login-utils/login.c:1282
msgid "setgid() failed"
msgstr "setgid() 失败"
-#: login-utils/login.c:1290
+#: login-utils/login.c:1312
#, c-format
msgid "You have new mail.\n"
msgstr "有您的新邮件。\n"
-#: login-utils/login.c:1292
+#: login-utils/login.c:1314
#, c-format
msgid "You have mail.\n"
msgstr "有您的邮件。\n"
-#: login-utils/login.c:1306
+#: login-utils/login.c:1328
msgid "setuid() failed"
msgstr "setuid() 失败"
-#: login-utils/login.c:1312 login-utils/sulogin.c:749
+#: login-utils/login.c:1334 login-utils/sulogin.c:749
#, c-format
msgid "%s: change directory failed"
msgstr "%s:更改目录失败"
-#: login-utils/login.c:1319 login-utils/sulogin.c:750
+#: login-utils/login.c:1341 login-utils/sulogin.c:750
#, c-format
msgid "Logging in with home = \"/\".\n"
msgstr "以 home = “/” 登录。\n"
-#: login-utils/login.c:1348
+#: login-utils/login.c:1370
msgid "couldn't exec shell script"
msgstr "无法执行(exec) shell 脚本"
-#: login-utils/login.c:1350
+#: login-utils/login.c:1372
msgid "no shell"
msgstr "无 shell"
@@ -6951,235 +6824,235 @@ msgstr "%s:%s 包含无效的数字值:%s"
msgid "hush login status: restore original IDs failed"
msgstr "静默(hush)登录状态:恢复原 ID 失败"
-#: login-utils/lslogins.c:208 sys-utils/lscpu.c:1249 sys-utils/lscpu.c:1259
+#: login-utils/lslogins.c:209 sys-utils/lscpu.c:1249 sys-utils/lscpu.c:1259
#, c-format
msgid "no"
msgstr "否"
-#: login-utils/lslogins.c:217 misc-utils/lsblk.c:160
+#: login-utils/lslogins.c:218 misc-utils/lsblk.c:163
msgid "user name"
msgstr "用户名"
-#: login-utils/lslogins.c:217
+#: login-utils/lslogins.c:218
msgid "Username"
msgstr "用户名"
-#: login-utils/lslogins.c:218 sys-utils/renice.c:164
+#: login-utils/lslogins.c:219 sys-utils/renice.c:54
msgid "user ID"
msgstr "用户 ID"
-#: login-utils/lslogins.c:219
+#: login-utils/lslogins.c:220
msgid "password not required"
msgstr "无需密码"
-#: login-utils/lslogins.c:219
+#: login-utils/lslogins.c:220
msgid "Password not required"
msgstr "无需密码"
-#: login-utils/lslogins.c:220
+#: login-utils/lslogins.c:221
msgid "login by password disabled"
msgstr "已禁止使用密码登录"
-#: login-utils/lslogins.c:220
+#: login-utils/lslogins.c:221
msgid "Login by password disabled"
msgstr "已禁止使用密码登录"
-#: login-utils/lslogins.c:221
+#: login-utils/lslogins.c:222
msgid "password defined, but locked"
msgstr "定义了密码,但已锁定"
-#: login-utils/lslogins.c:221
+#: login-utils/lslogins.c:222
msgid "Password is locked"
msgstr "密码已锁定"
-#: login-utils/lslogins.c:222
+#: login-utils/lslogins.c:223
msgid "log in disabled by nologin(8) or pam_nologin(8)"
msgstr "nologin(8) 或 pam_nologin(8) 禁止了登录"
-#: login-utils/lslogins.c:222
+#: login-utils/lslogins.c:223
msgid "No login"
msgstr "不能登录"
-#: login-utils/lslogins.c:223
+#: login-utils/lslogins.c:224
msgid "primary group name"
msgstr "主组名"
-#: login-utils/lslogins.c:223
+#: login-utils/lslogins.c:224
msgid "Primary group"
msgstr "主组"
-#: login-utils/lslogins.c:224
+#: login-utils/lslogins.c:225
msgid "primary group ID"
msgstr " 主组 ID"
-#: login-utils/lslogins.c:225
+#: login-utils/lslogins.c:226
msgid "supplementary group names"
msgstr "附属组名"
-#: login-utils/lslogins.c:225
+#: login-utils/lslogins.c:226
msgid "Supplementary groups"
msgstr "附属组"
-#: login-utils/lslogins.c:226
+#: login-utils/lslogins.c:227
msgid "supplementary group IDs"
msgstr "附属组 ID"
-#: login-utils/lslogins.c:226
+#: login-utils/lslogins.c:227
msgid "Supplementary group IDs"
msgstr "附属组 ID"
-#: login-utils/lslogins.c:227
+#: login-utils/lslogins.c:228
msgid "home directory"
msgstr "主目录"
-#: login-utils/lslogins.c:227
+#: login-utils/lslogins.c:228
msgid "Home directory"
msgstr "主目录"
-#: login-utils/lslogins.c:228
+#: login-utils/lslogins.c:229
msgid "login shell"
msgstr "登录 shell"
-#: login-utils/lslogins.c:228
+#: login-utils/lslogins.c:229
msgid "Shell"
msgstr "shell"
-#: login-utils/lslogins.c:229
+#: login-utils/lslogins.c:230
msgid "full user name"
msgstr "完整用户名"
-#: login-utils/lslogins.c:229
+#: login-utils/lslogins.c:230
msgid "Gecos field"
msgstr "Gecos 字段"
-#: login-utils/lslogins.c:230
+#: login-utils/lslogins.c:231
msgid "date of last login"
msgstr "上次登录日期"
-#: login-utils/lslogins.c:230
+#: login-utils/lslogins.c:231
msgid "Last login"
msgstr "上次登录"
-#: login-utils/lslogins.c:231
+#: login-utils/lslogins.c:232
msgid "last tty used"
msgstr "上次使用的终端"
-#: login-utils/lslogins.c:231
+#: login-utils/lslogins.c:232
msgid "Last terminal"
msgstr "上次的终端"
-#: login-utils/lslogins.c:232
+#: login-utils/lslogins.c:233
msgid "hostname during the last session"
msgstr "上次会话时的主机名(hostname)"
-#: login-utils/lslogins.c:232
+#: login-utils/lslogins.c:233
msgid "Last hostname"
msgstr "上次的主机名"
-#: login-utils/lslogins.c:233
+#: login-utils/lslogins.c:234
msgid "date of last failed login"
msgstr "上次登录失败的日期"
-#: login-utils/lslogins.c:233
+#: login-utils/lslogins.c:234
msgid "Failed login"
msgstr "失败的登录"
-#: login-utils/lslogins.c:234
+#: login-utils/lslogins.c:235
msgid "where did the login fail?"
msgstr "登录在哪里失败的?"
-#: login-utils/lslogins.c:234
+#: login-utils/lslogins.c:235
msgid "Failed login terminal"
msgstr "登录终端失败"
-#: login-utils/lslogins.c:235
+#: login-utils/lslogins.c:236
msgid "user's hush settings"
msgstr "用户的静默(hush)设置"
-#: login-utils/lslogins.c:235
+#: login-utils/lslogins.c:236
msgid "Hushed"
msgstr "已静默"
-#: login-utils/lslogins.c:236
+#: login-utils/lslogins.c:237
msgid "days user is warned of password expiration"
msgstr "警告用户密码过期的天数"
-#: login-utils/lslogins.c:236
+#: login-utils/lslogins.c:237
msgid "Password expiration warn interval"
msgstr "密码过期警告的间隔"
-#: login-utils/lslogins.c:237
+#: login-utils/lslogins.c:238
msgid "password expiration date"
msgstr "密码过期日"
-#: login-utils/lslogins.c:237
+#: login-utils/lslogins.c:238
msgid "Password expiration"
msgstr "密码过期"
-#: login-utils/lslogins.c:238
+#: login-utils/lslogins.c:239
msgid "date of last password change"
msgstr "上次更改密码的日期"
-#: login-utils/lslogins.c:238
+#: login-utils/lslogins.c:239
msgid "Password changed"
msgstr "密码已更改"
-#: login-utils/lslogins.c:239
+#: login-utils/lslogins.c:240
#, fuzzy
msgid "number of days required between changes"
msgstr "限期更改密码的天数"
-#: login-utils/lslogins.c:239
+#: login-utils/lslogins.c:240
msgid "Minimum change time"
msgstr "最小更改时间"
-#: login-utils/lslogins.c:240
+#: login-utils/lslogins.c:241
#, fuzzy
msgid "max number of days a password may remain unchanged"
msgstr "密码使用的最大天数"
-#: login-utils/lslogins.c:240
+#: login-utils/lslogins.c:241
msgid "Maximum change time"
msgstr "最大更改时间"
-#: login-utils/lslogins.c:241
+#: login-utils/lslogins.c:242
msgid "the user's security context"
msgstr "用户的安全环境(context)"
-#: login-utils/lslogins.c:241
+#: login-utils/lslogins.c:242
msgid "Selinux context"
msgstr "Selinux 环境"
-#: login-utils/lslogins.c:242
+#: login-utils/lslogins.c:243
msgid "number of processes run by the user"
msgstr "用户运行的进程数"
-#: login-utils/lslogins.c:242
+#: login-utils/lslogins.c:243
msgid "Running processes"
msgstr "运行中的进程"
-#: login-utils/lslogins.c:287 misc-utils/findmnt.c:158 misc-utils/lsblk.c:208
+#: login-utils/lslogins.c:289 misc-utils/findmnt.c:158 misc-utils/lsblk.c:212
#, c-format
msgid "too many columns specified, the limit is %zu columns"
msgstr "指定了过多的列,限制是 %zu 列"
-#: login-utils/lslogins.c:352
+#: login-utils/lslogins.c:357
msgid "unsupported time type"
msgstr "不支持的时间类型"
-#: login-utils/lslogins.c:618
+#: login-utils/lslogins.c:623
msgid "failed to get supplementary groups"
msgstr "获得附属组失败"
-#: login-utils/lslogins.c:1033
+#: login-utils/lslogins.c:1048
msgid "internal error: unknown column"
msgstr "内部错误:未知的列"
-#: login-utils/lslogins.c:1037
+#: login-utils/lslogins.c:1052
msgid "failed to set data"
msgstr "设置数据失败"
-#: login-utils/lslogins.c:1134
+#: login-utils/lslogins.c:1146
#, c-format
msgid ""
"\n"
@@ -7188,105 +7061,106 @@ msgstr ""
"\n"
"上次的日志:\n"
-#: login-utils/lslogins.c:1184 login-utils/nologin.c:26
+#: login-utils/lslogins.c:1205 login-utils/nologin.c:25
#: misc-utils/lslocks.c:507 misc-utils/mcookie.c:82 misc-utils/uuidd.c:73
-#: misc-utils/uuidgen.c:33 sys-utils/dmesg.c:261 sys-utils/ipcmk.c:66
+#: misc-utils/uuidgen.c:33 sys-utils/dmesg.c:263 sys-utils/ipcmk.c:66
#: sys-utils/lscpu.c:1630 sys-utils/readprofile.c:104 sys-utils/rtcwake.c:72
-#: term-utils/setterm.c:403
+#: term-utils/setterm.c:404 text-utils/line.c:30
#, c-format
msgid " %s [options]\n"
msgstr " %s [选项]\n"
-#: login-utils/lslogins.c:1187
+#: login-utils/lslogins.c:1208
+msgid "Display information about known users in the system.\n"
+msgstr ""
+
+#: login-utils/lslogins.c:1211
msgid " -a, --acc-expiration display info about passwords expiration\n"
msgstr " -a, --acc-expiration 显示关于密码过期的信息\n"
-#: login-utils/lslogins.c:1188
+#: login-utils/lslogins.c:1212
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:1189
+#: login-utils/lslogins.c:1213
msgid " -e, --export display in an export-able output format\n"
msgstr " -e, --export 以可导出的格式显示\n"
-#: login-utils/lslogins.c:1190
+#: login-utils/lslogins.c:1214
msgid " -f, --failed display data about the users' last failed logins\n"
msgstr " -f, --failed 显示有关该用户上次登录失败的数据\n"
-#: login-utils/lslogins.c:1191
-msgid " -G, --groups-info display information about groups\n"
+#: login-utils/lslogins.c:1215
+#, fuzzy
+msgid " -G, --supp-groups display information about groups\n"
msgstr " -G, --groups-info 显示关于组的信息\n"
-#: login-utils/lslogins.c:1192
+#: login-utils/lslogins.c:1216
msgid " -g, --groups=<groups> display users belonging to a group in <groups>\n"
msgstr " -g, --groups=<groups> 显示属于<groups>中的组的用户\n"
-#: login-utils/lslogins.c:1193
+#: login-utils/lslogins.c:1217
msgid " -L, --last show info about the users' last login sessions\n"
msgstr " -L, --last 显示关于该用户上次登录会话的信息\n"
-#: login-utils/lslogins.c:1194
+#: login-utils/lslogins.c:1218
msgid " -l, --logins=<logins> display only users from <logins>\n"
msgstr " -l, --logins=<登录方式> 只显示以指定<登录方式>登录的用户\n"
-#: login-utils/lslogins.c:1195
-msgid " -m, --supp-groups display supplementary groups as well\n"
-msgstr " -m, --supp-groups 也显示附属组\n"
-
-#: login-utils/lslogins.c:1196
+#: login-utils/lslogins.c:1219
msgid " -n, --newline display each piece of information on a new line\n"
msgstr " -n, --newline 逐行显示每一部分信息\n"
-#: login-utils/lslogins.c:1197
+#: login-utils/lslogins.c:1220
msgid " --noheadings don't print headings\n"
msgstr " --noheadings 不打印标题\n"
-#: login-utils/lslogins.c:1198
+#: login-utils/lslogins.c:1221
msgid " --notruncate don't truncate output\n"
msgstr " --notruncate 不截断输出\n"
-#: login-utils/lslogins.c:1199
+#: login-utils/lslogins.c:1222
msgid " -o, --output[=<list>] define the columns to output\n"
msgstr " -o, --output[=<列表>] 定义要输出的列\n"
-#: login-utils/lslogins.c:1200
+#: login-utils/lslogins.c:1223
msgid " -p, --pwd display information related to login by password.\n"
msgstr " -p, --pwd 显示与 用密码登录 相关的信息。\n"
-#: login-utils/lslogins.c:1201
+#: login-utils/lslogins.c:1224
msgid " -r, --raw display in raw mode\n"
msgstr " -r, --raw 以原始方式显示\n"
-#: login-utils/lslogins.c:1202
+#: login-utils/lslogins.c:1225
msgid " -s, --system-accs display system accounts\n"
msgstr " -s, --system-accs 显示系统帐户\n"
-#: login-utils/lslogins.c:1203
+#: login-utils/lslogins.c:1226
msgid " --time-format=<type> display dates in short, full or iso format\n"
msgstr " --time-format=<格式> 以短、长或 iso 格式显示日期\n"
-#: login-utils/lslogins.c:1204
+#: login-utils/lslogins.c:1227
msgid " -u, --user-accs display user accounts\n"
msgstr " -u, --user-accs 显示用户帐户\n"
-#: login-utils/lslogins.c:1205
+#: login-utils/lslogins.c:1228
msgid " -Z, --context display SELinux contexts\n"
msgstr " -Z, --context 显示 SELinux 环境\n"
-#: login-utils/lslogins.c:1206
+#: login-utils/lslogins.c:1229
msgid " -z, --print0 delimit user entries with a nul character\n"
msgstr " -z, --print0 用空字符(nul)分隔用户记录项\n"
-#: login-utils/lslogins.c:1207
+#: login-utils/lslogins.c:1230
msgid " --wtmp-file <path> set an alternate path for wtmp\n"
msgstr " --wtmp-file <路径> 设置 wtmp 的可选路径\n"
-#: login-utils/lslogins.c:1208
+#: login-utils/lslogins.c:1231
msgid " --btmp-file <path> set an alternate path for btmp\n"
msgstr " --btmp-file <路径> 设置 btmp 的可选路径\n"
-#: login-utils/lslogins.c:1213 misc-utils/findmnt.c:1221
-#: sys-utils/lscpu.c:1644
+#: login-utils/lslogins.c:1236 misc-utils/findmnt.c:1224
+#: sys-utils/lscpu.c:1647
#, c-format
msgid ""
"\n"
@@ -7295,90 +7169,99 @@ msgstr ""
"\n"
"可用的列:\n"
-#: login-utils/lslogins.c:1219
-#, c-format
-msgid ""
-"\n"
-"For more details see lslogins(1).\n"
-msgstr ""
-"\n"
-"更多细节参见 lslogins(1)。\n"
-
-#: login-utils/lslogins.c:1408
+#: login-utils/lslogins.c:1419
msgid "failed to request selinux state"
msgstr "请求 selinux 状态失败"
-#: login-utils/lslogins.c:1422
+#: login-utils/lslogins.c:1433 login-utils/lslogins.c:1437
msgid "Only one user may be specified. Use -l for multiple users."
msgstr "只能指定一个用户。多用户请使用 -l。"
-#: login-utils/newgrp.c:102
+#: login-utils/newgrp.c:49 login-utils/newgrp.c:55
+#, fuzzy
+msgid "could not set terminal attributes"
+msgstr "取终端属性失败"
+
+#: login-utils/newgrp.c:57
+#, fuzzy
+msgid "getline() failed"
+msgstr "setgid() 失败"
+
+#: login-utils/newgrp.c:148
msgid "Password: "
msgstr "密码:"
-#: login-utils/newgrp.c:106
-msgid "crypt() failed"
-msgstr "crypt() 失败"
+#: login-utils/newgrp.c:154 login-utils/sulogin.c:1010
+msgid "crypt failed"
+msgstr "crypt 失败"
-#: login-utils/newgrp.c:118
+#: login-utils/newgrp.c:166
#, c-format
msgid " %s <group>\n"
msgstr " %s <组>\n"
-#: login-utils/newgrp.c:155
+#: login-utils/newgrp.c:169
+msgid "Log in to a new group.\n"
+msgstr ""
+
+#: login-utils/newgrp.c:207
msgid "who are you?"
msgstr "您是哪位?"
-#: login-utils/newgrp.c:162 login-utils/newgrp.c:174 sys-utils/nsenter.c:335
+#: login-utils/newgrp.c:211 login-utils/newgrp.c:223 sys-utils/nsenter.c:368
msgid "setgid failed"
msgstr "setgid 失败"
-#: login-utils/newgrp.c:167 login-utils/newgrp.c:170
+#: login-utils/newgrp.c:216 login-utils/newgrp.c:218
msgid "no such group"
msgstr "无此组"
-#: login-utils/newgrp.c:176 sys-utils/mount.c:480
+#: login-utils/newgrp.c:221 sys-utils/mount.c:480
msgid "permission denied"
msgstr "权限不足"
-#: login-utils/newgrp.c:181 sys-utils/nsenter.c:337
+#: login-utils/newgrp.c:227 sys-utils/nsenter.c:370
msgid "setuid failed"
msgstr "setuid 失败"
-#: login-utils/nologin.c:72
+#: login-utils/nologin.c:28
+msgid "Politely refuse a login.\n"
+msgstr ""
+
+#: login-utils/nologin.c:74
#, c-format
msgid "This account is currently not available.\n"
msgstr "此帐户目前不可用。\n"
-#: login-utils/su-common.c:285
+#: login-utils/su-common.c:292
#, c-format
msgid "cannot open session: %s"
msgstr "无法打开会话:%s"
-#: login-utils/su-common.c:297
+#: login-utils/su-common.c:304
msgid "cannot create child process"
msgstr "无法创建子进程"
-#: login-utils/su-common.c:309
+#: login-utils/su-common.c:316
#, c-format
msgid "cannot change directory to %s"
msgstr "无法更改到 %s 目录"
-#: login-utils/su-common.c:314
+#: login-utils/su-common.c:321
msgid "cannot block signals"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:328 login-utils/su-common.c:336
-#: login-utils/su-common.c:342
+#: login-utils/su-common.c:335 login-utils/su-common.c:343
+#: login-utils/su-common.c:349
msgid "cannot set signal handler"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:368
-#, c-format
-msgid "%s (core dumped)\n"
+#: login-utils/su-common.c:374
+#, fuzzy
+msgid " (core dumped)"
msgstr "%s (核心已转储)\n"
-#: login-utils/su-common.c:384
+#: login-utils/su-common.c:390
#, c-format
msgid ""
"\n"
@@ -7387,46 +7270,46 @@ msgstr ""
"\n"
"会话已终止,正在杀死 shell..."
-#: login-utils/su-common.c:394
+#: login-utils/su-common.c:400
#, c-format
msgid " ...killed.\n"
msgstr " ...已杀死。\n"
-#: login-utils/su-common.c:474
+#: login-utils/su-common.c:480
msgid "may not be used by non-root users"
msgstr "非 root 用户不能使用"
-#: login-utils/su-common.c:502
+#: login-utils/su-common.c:508
msgid "incorrect password"
msgstr "密码错误"
-#: login-utils/su-common.c:517
+#: login-utils/su-common.c:523
msgid "failed to set PATH"
msgstr "设置 PATH 失败"
-#: login-utils/su-common.c:584
+#: login-utils/su-common.c:590
msgid "cannot set groups"
msgstr "无法设置 组"
-#: login-utils/su-common.c:599 sys-utils/eject.c:675
+#: login-utils/su-common.c:605 sys-utils/eject.c:673
msgid "cannot set group id"
msgstr "无法设置 组 id"
-#: login-utils/su-common.c:601 sys-utils/eject.c:678
+#: login-utils/su-common.c:607 sys-utils/eject.c:676
msgid "cannot set user id"
msgstr "无法设置 用户 id"
-#: login-utils/su-common.c:674
+#: login-utils/su-common.c:680
#, c-format
msgid " %s [options] -u <user> <command>\n"
msgstr " %s [选项] -u <用户> <命令>\n"
-#: login-utils/su-common.c:675 login-utils/su-common.c:687
+#: login-utils/su-common.c:681 login-utils/su-common.c:693
#, c-format
msgid " %s [options] [-] [<user> [<argument>...]]\n"
msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
-#: login-utils/su-common.c:676
+#: login-utils/su-common.c:682
msgid ""
"\n"
"Run <command> with the effective user ID and group ID of <user>. If -u is\n"
@@ -7438,11 +7321,11 @@ msgstr ""
"将退而使用与 su(1) 兼容的语法并执行标准 shell。\n"
"选项 -c、-f、-l 及 -s 与 -u 相互排斥。\n"
-#: login-utils/su-common.c:683
+#: login-utils/su-common.c:689
msgid " -u, --user <user> username\n"
msgstr " -u, --user <用户> 用户名\n"
-#: login-utils/su-common.c:688
+#: login-utils/su-common.c:694
msgid ""
"\n"
"Change the effective user ID and group ID to that of <user>.\n"
@@ -7452,15 +7335,15 @@ msgstr ""
"将有效用户 id 和组 id 更改为<用户>的 id。\n"
"单个 - 视为 -l。如果未指定<用户>,将假定为 root。\n"
-#: login-utils/su-common.c:695
+#: login-utils/su-common.c:701
msgid " -m, -p, --preserve-environment do not reset environment variables\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: login-utils/su-common.c:696
+#: login-utils/su-common.c:702
msgid " -g, --group <group> specify the primary group\n"
msgstr " -g, --group <组> 指定主组\n"
-#: login-utils/su-common.c:697
+#: login-utils/su-common.c:703
msgid ""
" -G, --supp-group <group> specify a supplemental group\n"
"\n"
@@ -7468,15 +7351,15 @@ msgstr ""
" -G, --supp-group <组> 指定一个辅助组\n"
"\n"
-#: login-utils/su-common.c:699
+#: login-utils/su-common.c:705
msgid " -, -l, --login make the shell a login shell\n"
msgstr " -, -l, --login 使 shell 成为登录 shell\n"
-#: login-utils/su-common.c:700
+#: login-utils/su-common.c:706
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:701
+#: login-utils/su-common.c:707
msgid ""
" --session-command <command> pass a single command to the shell with -c\n"
" and do not create a new session\n"
@@ -7484,52 +7367,52 @@ msgstr ""
" --session-command <命令> 使用 -c 向 shell 传递一条命令\n"
" 而不创建新会话\n"
-#: login-utils/su-common.c:703
+#: login-utils/su-common.c:709
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:704
+#: login-utils/su-common.c:710
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:801 login-utils/su-common.c:816
+#: login-utils/su-common.c:807 login-utils/su-common.c:822
#, c-format
msgid "group %s does not exist"
msgstr "组 %s 不存在"
-#: login-utils/su-common.c:810
+#: login-utils/su-common.c:816
#, 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:860
+#: login-utils/su-common.c:866
msgid "ignoring --preserve-environment, it's mutually exclusive with --login"
msgstr "将忽略 --preserve-environment,它与 --login 互斥。"
-#: login-utils/su-common.c:871
+#: login-utils/su-common.c:877
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:875
+#: login-utils/su-common.c:881
msgid "no command was specified"
msgstr "没有指定命令"
-#: login-utils/su-common.c:889
+#: login-utils/su-common.c:895
msgid "only root can specify alternative groups"
msgstr "只有 root 用户能指定替代组"
-#: login-utils/su-common.c:896
+#: login-utils/su-common.c:902
#, c-format
msgid "user %s does not exist"
msgstr "用户 %s 不存在"
-#: login-utils/su-common.c:942
+#: login-utils/su-common.c:948
#, c-format
msgid "using restricted shell %s"
msgstr "将使用受限 shell %s"
-#: login-utils/su-common.c:966
+#: login-utils/su-common.c:972
#, c-format
msgid "warning: cannot change directory to %s"
msgstr "警告:无法更改到 %s 目录"
@@ -7596,6 +7479,10 @@ msgid " %s [options] [tty device]\n"
msgstr " %s [选项] [tty 设备]\n"
#: login-utils/sulogin.c:825
+msgid "Single-user login.\n"
+msgstr ""
+
+#: login-utils/sulogin.c:828
msgid ""
" -p, --login-shell start a login shell\n"
" -t, --timeout <seconds> max time to wait for a password (default: no limit)\n"
@@ -7605,28 +7492,24 @@ msgstr ""
" -t, --timeout <秒数> 等待密码的最大时间(默认:无限制)\n"
" -e, --force 如果 getpwnam(3) 失败,直接检查密码文件\n"
-#: login-utils/sulogin.c:876 misc-utils/findmnt.c:1419 sys-utils/wdctl.c:521
-#: term-utils/wall.c:131
+#: login-utils/sulogin.c:879 misc-utils/findmnt.c:1422 sys-utils/wdctl.c:523
+#: term-utils/wall.c:135
msgid "invalid timeout argument"
msgstr "无效的 timeout 超时参数"
-#: login-utils/sulogin.c:898
+#: login-utils/sulogin.c:901
msgid "only superuser can run this program"
msgstr "只有超级用户能运行此程序"
-#: login-utils/sulogin.c:941
+#: login-utils/sulogin.c:944
msgid "cannot open console"
msgstr "打不开终端"
-#: login-utils/sulogin.c:948
+#: login-utils/sulogin.c:951
msgid "cannot open password database"
msgstr "无法打开密码数据库"
-#: login-utils/sulogin.c:1007
-msgid "crypt failed"
-msgstr "crypt 失败"
-
-#: login-utils/sulogin.c:1024
+#: login-utils/sulogin.c:1027
#, c-format
msgid ""
"Can not execute su shell\n"
@@ -7635,7 +7518,7 @@ msgstr ""
"无法执行 su shell\n"
"\n"
-#: login-utils/sulogin.c:1031
+#: login-utils/sulogin.c:1034
msgid ""
"Timed out\n"
"\n"
@@ -7668,80 +7551,88 @@ msgid " %s [options] [filename]\n"
msgstr " %s [选项] [文件名]\n"
#: login-utils/utmpdump.c:301
+msgid "Dump UTMP and WTMP files in raw format.\n"
+msgstr ""
+
+#: login-utils/utmpdump.c:304
msgid " -f, --follow output appended data as the file grows\n"
msgstr " -f, --follow 随文件增长输出追加的数据\n"
-#: login-utils/utmpdump.c:302
+#: login-utils/utmpdump.c:305
msgid " -r, --reverse write back dumped data into utmp file\n"
msgstr " -r, --reverse 将转储的数据写回 utmp 文件\n"
-#: login-utils/utmpdump.c:303
+#: login-utils/utmpdump.c:306
msgid " -o, --output <file> write to file instead of standard output\n"
msgstr " -o, --output <文件> 写入文件而非标准输出\n"
-#: login-utils/utmpdump.c:370
+#: login-utils/utmpdump.c:373
msgid "following standard input is unsupported"
msgstr "不支持跟随(follow)标准输入"
-#: login-utils/utmpdump.c:376
+#: login-utils/utmpdump.c:379
#, c-format
msgid "Utmp undump of %s\n"
msgstr "%s 的 Utmp undump\n"
-#: login-utils/utmpdump.c:379
+#: login-utils/utmpdump.c:382
#, c-format
msgid "Utmp dump of %s\n"
msgstr "%s 的 Utmp dump\n"
-#: login-utils/vipw.c:151 term-utils/wall.c:196
+#: login-utils/vipw.c:142 term-utils/wall.c:200
msgid "can't open temporary file"
msgstr "无法打开临时文件"
-#: login-utils/vipw.c:167
+#: login-utils/vipw.c:158
#, c-format
msgid "%s: create a link to %s failed"
msgstr "%s:创建指向 %s 的链接失败"
-#: login-utils/vipw.c:174
+#: login-utils/vipw.c:165
#, c-format
msgid "Can't get context for %s"
msgstr "无法获取 %s 的环境"
-#: login-utils/vipw.c:180
+#: login-utils/vipw.c:171
#, c-format
msgid "Can't set context for %s"
msgstr "无法设置 %s 的环境"
-#: login-utils/vipw.c:245
+#: login-utils/vipw.c:236
#, c-format
msgid "%s unchanged"
msgstr "%s 未改变"
-#: login-utils/vipw.c:261
+#: login-utils/vipw.c:252
msgid "cannot get lock"
msgstr "无法获得锁"
-#: login-utils/vipw.c:288
+#: login-utils/vipw.c:279
msgid "no changes made"
msgstr "无改变"
-#: login-utils/vipw.c:297
+#: login-utils/vipw.c:288
msgid "cannot chmod file"
msgstr "无法对文件 chmod"
-#: login-utils/vipw.c:353
+#: login-utils/vipw.c:302
+msgid "Edit the password or group file.\n"
+msgstr ""
+
+#: login-utils/vipw.c:348
#, c-format
msgid "You are using shadow groups on this system.\n"
msgstr "您正在使用此系统上的遮蔽(shadow)组。\n"
-#: login-utils/vipw.c:354
+#: login-utils/vipw.c:349
#, c-format
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:357
+#: login-utils/vipw.c:352
#, c-format
msgid "Would you like to edit %s now [y/n]? "
msgstr "您想现在编辑 %s 吗[y/n]?"
@@ -7795,48 +7686,48 @@ msgstr "%d"
msgid "%s %d"
msgstr "%s %d"
-#: misc-utils/cal.c:922
+#: misc-utils/cal.c:924
#, c-format
msgid " %s [options] [[[day] month] year]\n"
msgstr " %s [选项] [[[日] 月] 年]\n"
-#: misc-utils/cal.c:925
+#: misc-utils/cal.c:927
msgid "Display a calendar, or some part of it.\n"
msgstr "显示日历或部分日历。\n"
-#: misc-utils/cal.c:926
+#: misc-utils/cal.c:928
msgid "Without any arguments, display the current month.\n"
msgstr "不带参数时,显示当月日历。\n"
-#: misc-utils/cal.c:929
+#: misc-utils/cal.c:931
msgid " -1, --one show only a single month (default)\n"
msgstr " -1, --one 只显示一个月(默认)\n"
-#: misc-utils/cal.c:930
+#: misc-utils/cal.c:932
msgid " -3, --three show three months spanning the date\n"
msgstr " -3, --three 显示该日期前后三个月\n"
-#: misc-utils/cal.c:931
+#: misc-utils/cal.c:933
msgid " -s, --sunday Sunday as first day of week\n"
msgstr " -s, --sunday 周日作为一周的第一天\n"
-#: misc-utils/cal.c:932
+#: misc-utils/cal.c:934
msgid " -m, --monday Monday as first day of week\n"
msgstr " -m, --monday 周一作为一周的第一天\n"
-#: misc-utils/cal.c:933
+#: misc-utils/cal.c:935
msgid " -j, --julian output Julian dates\n"
msgstr " -j, --julian 输出儒略日期\n"
-#: misc-utils/cal.c:934
+#: misc-utils/cal.c:936
msgid " -y, --year show the whole year\n"
msgstr " -y, --year 显示全年\n"
-#: misc-utils/cal.c:935
+#: misc-utils/cal.c:937
msgid " -w, --week[=<num>] show US or ISO-8601 week numbers\n"
msgstr " -w, --week[=<数字>] 显示美国或 ISO-8601 周数\n"
-#: misc-utils/cal.c:936
+#: misc-utils/cal.c:938
msgid " --color[=<when>] colorize messages (auto, always or never)\n"
msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n"
@@ -7845,7 +7736,12 @@ msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n"
msgid " %s [options] {LABEL,UUID,PARTUUID,PARTLABEL}=<value>\n"
msgstr " %s [选项] {LABEL,UUID,PARTUUID,PARTLABEL}=<值>\n"
-#: misc-utils/findfs.c:63
+#: misc-utils/findfs.c:32
+#, fuzzy
+msgid "Find a filesystem by label or UUID.\n"
+msgstr "强制在 %s 上进行文件系统检查。\n"
+
+#: misc-utils/findfs.c:67
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析“%s”"
@@ -7858,7 +7754,7 @@ msgstr "源设备"
msgid "mountpoint"
msgstr "挂载点"
-#: misc-utils/findmnt.c:123 misc-utils/lsblk.c:141
+#: misc-utils/findmnt.c:123 misc-utils/lsblk.c:143
msgid "filesystem type"
msgstr "文件系统类型"
@@ -7878,7 +7774,7 @@ msgstr "FS 的特定挂载选项"
msgid "filesystem label"
msgstr "文件系统标签"
-#: misc-utils/findmnt.c:128 misc-utils/lsblk.c:144
+#: misc-utils/findmnt.c:128 misc-utils/lsblk.c:146
msgid "filesystem UUID"
msgstr "文件系统 UUID"
@@ -7886,7 +7782,7 @@ msgstr "文件系统 UUID"
msgid "partition label"
msgstr "分区标签"
-#: misc-utils/findmnt.c:131 misc-utils/lsblk.c:140
+#: misc-utils/findmnt.c:131 misc-utils/lsblk.c:142
msgid "major:minor device number"
msgstr "主:次 设备号"
@@ -7972,8 +7868,8 @@ msgstr "移动"
msgid "%s: parse error at line %d"
msgstr "%s:第 %d 行解析出错"
-#: misc-utils/findmnt.c:820 misc-utils/findmnt.c:1063 sys-utils/eject.c:731
-#: sys-utils/mount.c:644
+#: misc-utils/findmnt.c:820 misc-utils/findmnt.c:1063 sys-utils/eject.c:727
+#: sys-utils/mount.c:647
msgid "failed to initialize libmount table"
msgstr "初始化 libmount table 失败"
@@ -7983,9 +7879,9 @@ msgid "can't read %s"
msgstr "不能读 %s"
#: misc-utils/findmnt.c:1003 misc-utils/findmnt.c:1069 sys-utils/fstrim.c:169
-#: sys-utils/mount.c:135 sys-utils/mount.c:183 sys-utils/swapoff.c:98
-#: sys-utils/swapon.c:207 sys-utils/swapon.c:237 sys-utils/swapon.c:631
-#: sys-utils/umount.c:272
+#: sys-utils/mount.c:135 sys-utils/mount.c:183 sys-utils/swapoff.c:56
+#: sys-utils/swapoff.c:152 sys-utils/swapon.c:232 sys-utils/swapon.c:262
+#: sys-utils/swapon.c:692 sys-utils/umount.c:275
msgid "failed to initialize libmount iterator"
msgstr "无法初始化 libmount 迭代器"
@@ -8011,14 +7907,19 @@ msgstr ""
" %1$s [选项] [--source <设备>] [--target <挂臷点>]\n"
#: misc-utils/findmnt.c:1180
+#, fuzzy
+msgid "Find a (mounted) filesystem.\n"
+msgstr "Linux 文件系统"
+
+#: misc-utils/findmnt.c:1183
msgid " -s, --fstab search in static table of filesystems\n"
msgstr " -s, --fstab 在文件系统表态表中搜索\n"
-#: misc-utils/findmnt.c:1181
+#: misc-utils/findmnt.c:1184
msgid " -m, --mtab search in table of mounted filesystems\n"
msgstr " -m, --mtab 在已挂载文件系统表中搜索\n"
-#: misc-utils/findmnt.c:1182
+#: misc-utils/findmnt.c:1185
msgid ""
" -k, --kernel search in kernel table of mounted\n"
" filesystems (default)\n"
@@ -8026,43 +7927,43 @@ msgstr ""
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/findmnt.c:1185
+#: misc-utils/findmnt.c:1188
msgid " -p, --poll[=<list>] monitor changes in table of mounted filesystems\n"
msgstr " -p, --poll[=<列表>] 监测已挂臷文件系统表的改变\n"
-#: misc-utils/findmnt.c:1186
+#: misc-utils/findmnt.c:1189
msgid " -w, --timeout <num> upper limit in milliseconds that --poll will block\n"
msgstr " -w, --timeout <数字> --poll 阻塞的时间上限(毫秒)\n"
-#: misc-utils/findmnt.c:1189
+#: misc-utils/findmnt.c:1192
msgid " -A, --all disable all built-in filters, print all filesystems\n"
msgstr " -A, --all 禁用所有内置过滤器,打印所有文件系统\n"
-#: misc-utils/findmnt.c:1190
+#: misc-utils/findmnt.c:1193
msgid " -a, --ascii use ASCII chars for tree formatting\n"
msgstr " -a, --ascii 用 ASCII 字符格式化树\n"
-#: misc-utils/findmnt.c:1191
+#: misc-utils/findmnt.c:1194
msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
-#: misc-utils/findmnt.c:1192
+#: misc-utils/findmnt.c:1195
msgid " -C, --nocanonicalize don't canonicalize when comparing paths\n"
msgstr " -c, --no-canonicalize 在比较路径时不对路径规范化\n"
-#: misc-utils/findmnt.c:1193
+#: misc-utils/findmnt.c:1196
msgid " -c, --canonicalize canonicalize printed paths\n"
msgstr " -c, --no-canonicalize 对打印的路径规范化\n"
-#: misc-utils/findmnt.c:1194
+#: misc-utils/findmnt.c:1197
msgid " -D, --df imitate the output of df(1)\n"
msgstr " -D, --df 仿照 df(1) 输出\n"
-#: misc-utils/findmnt.c:1195
+#: misc-utils/findmnt.c:1198
msgid " -d, --direction <word> direction of search, 'forward' or 'backward'\n"
msgstr " -d, --direction <单词> 搜索方向,“forward”(往前)或“backward”(往回)\n"
-#: misc-utils/findmnt.c:1196
+#: misc-utils/findmnt.c:1199
msgid ""
" -e, --evaluate convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n"
" to device names\n"
@@ -8070,51 +7971,51 @@ msgstr ""
" -e, --evaluate 将标签(LABEL,UUID,PARTUUID,PARTLABEL) 转换为\n"
" 设备名\n"
-#: misc-utils/findmnt.c:1198
+#: misc-utils/findmnt.c:1201
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:1199
+#: misc-utils/findmnt.c:1202
msgid " -f, --first-only print the first found filesystem only\n"
msgstr " -f, --first-only 只打印找到的第一个文件系统\n"
-#: misc-utils/findmnt.c:1200
+#: misc-utils/findmnt.c:1203
msgid " -i, --invert invert the sense of matching\n"
msgstr " -i, --invert 反转搜索的匹配\n"
-#: misc-utils/findmnt.c:1201
+#: misc-utils/findmnt.c:1204
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/findmnt.c:1202
+#: misc-utils/findmnt.c:1205
msgid " -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n"
msgstr " -N, --task <tid> 使用替代的名字空间(/proc/<tid>/mountinfo 文件)\n"
-#: misc-utils/findmnt.c:1203
+#: misc-utils/findmnt.c:1206
msgid " -n, --noheadings don't print column headings\n"
msgstr " -n, --noheadings 不打印列标题\n"
-#: misc-utils/findmnt.c:1204
+#: misc-utils/findmnt.c:1207
msgid " -O, --options <list> limit the set of filesystems by mount options\n"
msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n"
-#: misc-utils/findmnt.c:1205
+#: misc-utils/findmnt.c:1208
msgid " -o, --output <list> the output columns to be shown\n"
msgstr " -o, --output <列表> 要显示的列\n"
-#: misc-utils/findmnt.c:1206
+#: misc-utils/findmnt.c:1209
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 键=“值”的输出格式\n"
-#: misc-utils/findmnt.c:1207
+#: misc-utils/findmnt.c:1210
msgid " -R, --submounts print all submounts for the matching filesystems\n"
msgstr " -R, --submounts 打印匹配文件系统的所有子挂载(submount)\n"
-#: misc-utils/findmnt.c:1208
+#: misc-utils/findmnt.c:1211
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/findmnt.c:1209
+#: misc-utils/findmnt.c:1212
msgid ""
" -S, --source <string> the device to mount (by name, maj:min, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
@@ -8122,125 +8023,131 @@ msgstr ""
" -S, --source <字符串> 要挂载的设备(按 名称, 主:次设备号, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
-#: misc-utils/findmnt.c:1211
+#: misc-utils/findmnt.c:1214
msgid " -T, --target <string> the mountpoint to use\n"
msgstr " -T, --target <字符串> 要使用的挂载点\n"
-#: misc-utils/findmnt.c:1212
+#: misc-utils/findmnt.c:1215
msgid " -t, --types <list> limit the set of filesystems by FS types\n"
msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
-#: misc-utils/findmnt.c:1213
+#: misc-utils/findmnt.c:1216
msgid " -U, --uniq ignore filesystems with duplicate target\n"
msgstr " -U, --uniq 忽略目标重复的文件系统\n"
-#: misc-utils/findmnt.c:1214
+#: misc-utils/findmnt.c:1217
msgid " -u, --notruncate don't truncate text in columns\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
-#: misc-utils/findmnt.c:1215
+#: misc-utils/findmnt.c:1218
msgid " -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n"
msgstr " -v, --nofsroot 对绑定式或 btrfs 挂载不打印[/dir]\n"
-#: misc-utils/findmnt.c:1330
+#: misc-utils/findmnt.c:1333
#, c-format
msgid "unknown direction '%s'"
msgstr "未知方向“%s”"
-#: misc-utils/findmnt.c:1399
+#: misc-utils/findmnt.c:1402
msgid "invalid TID argument"
msgstr "无效的 TID 参数"
-#: misc-utils/findmnt.c:1459
+#: misc-utils/findmnt.c:1462
msgid "--poll accepts only one file, but more specified by --tab-file"
msgstr "--poll 只接受一个文件,但用 --tab-file 指定了多个"
-#: misc-utils/findmnt.c:1463
+#: misc-utils/findmnt.c:1466
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:1510
+#: misc-utils/findmnt.c:1513
msgid "failed to initialize libmount cache"
msgstr "初始化 libmount 缓存失败"
-#: misc-utils/findmnt.c:1543
+#: misc-utils/findmnt.c:1546
#, c-format
msgid "%s column is requested, but --poll is not enabled"
msgstr "请示了 %s 列,但未启用 --poll"
-#: misc-utils/getopt.c:219
+#: misc-utils/getopt.c:234
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "请尝试执行“%s --help”了解更多信息。\n"
-#: misc-utils/getopt.c:288
+#: misc-utils/getopt.c:285
msgid "empty long option after -l or --long argument"
msgstr "-l 或 --long 参数后的长选项为空"
-#: misc-utils/getopt.c:309
+#: misc-utils/getopt.c:310
msgid "unknown shell after -s or --shell argument"
msgstr "-s 或 --shell 参数后是未知的 shell"
#: misc-utils/getopt.c:317
-#, c-format
+#, fuzzy, c-format
msgid ""
-" %1$s optstring parameters\n"
-" %1$s [options] [--] optstring parameters\n"
-" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+" %1$s <optstring> <parameters>\n"
+" %1$s [options] [--] <optstring> <parameters>\n"
+" %1$s [options] -o|--options <optstring> [options] [--] <parameters>\n"
msgstr ""
" %1$s 选项字符串 参数\n"
" %1$s [options] [--] 选项字符串 参数\n"
" %1$s [options] -o|--options 选项字符串 [选项] [--] 参数\n"
#: misc-utils/getopt.c:323
-msgid " -a, --alternative Allow long options starting with single -\n"
-msgstr " -a, --alternative 允许长选项以 - 开始\n"
+#, fuzzy
+msgid "Parse command options.\n"
+msgstr "全部挂臷选项"
-#: misc-utils/getopt.c:324
-msgid " -h, --help This small usage guide\n"
-msgstr " -h, --help 这个简短的用法指南\n"
+#: misc-utils/getopt.c:326
+#, fuzzy
+msgid " -a, --alternative allow long options starting with single -\n"
+msgstr " -a, --alternative 允许长选项以 - 开始\n"
-#: misc-utils/getopt.c:325
-msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+#: misc-utils/getopt.c:327
+#, fuzzy
+msgid " -l, --longoptions <longopts> the long options to be recognized\n"
msgstr " -l, --longoptions <长选项> 要识别的长选项\n"
-#: misc-utils/getopt.c:326
-msgid " -n, --name <progname> The name under which errors are reported\n"
+#: misc-utils/getopt.c:328
+#, fuzzy
+msgid " -n, --name <progname> the name under which errors are reported\n"
msgstr " -n, --name <程序名> 将错误报告给的程序名\n"
-#: misc-utils/getopt.c:327
-msgid " -o, --options <optstring> Short options to be recognized\n"
+#: misc-utils/getopt.c:329
+#, fuzzy
+msgid " -o, --options <optstring> the short options to be recognized\n"
msgstr " -o, --options <选项字符串> 要识别的短选项\n"
-#: misc-utils/getopt.c:328
-msgid " -q, --quiet Disable error reporting by getopt(3)\n"
+#: misc-utils/getopt.c:330
+#, fuzzy
+msgid " -q, --quiet disable error reporting by getopt(3)\n"
msgstr " -q, --quiet 禁止 getopt(3) 的错误报告\n"
-#: misc-utils/getopt.c:329
-msgid " -Q, --quiet-output No normal output\n"
+#: misc-utils/getopt.c:331
+#, fuzzy
+msgid " -Q, --quiet-output no normal output\n"
msgstr " -Q, --quiet-output 无正常输出\n"
-#: misc-utils/getopt.c:330
-msgid " -s, --shell <shell> Set shell quoting conventions\n"
+#: misc-utils/getopt.c:332
+#, fuzzy
+msgid " -s, --shell <shell> set quoting conventions to those of <shell>\n"
msgstr " -s, --shell <shell> 设置 shell 引用规则\n"
-#: misc-utils/getopt.c:331
-msgid " -T, --test Test for getopt(1) version\n"
+#: misc-utils/getopt.c:333
+#, fuzzy
+msgid " -T, --test test for getopt(1) version\n"
msgstr " -T, --test 测试 getopt(1) 版本\n"
-#: misc-utils/getopt.c:332
-msgid " -u, --unquoted Do not quote the output\n"
+#: misc-utils/getopt.c:334
+#, fuzzy
+msgid " -u, --unquoted do not quote the output\n"
msgstr " -u, --unquoted 不引用输出\n"
-#: misc-utils/getopt.c:333
-msgid " -V, --version Output version information\n"
-msgstr " -V, --version 输出版本信息\n"
-
-#: misc-utils/getopt.c:383 misc-utils/getopt.c:442
+#: misc-utils/getopt.c:388 misc-utils/getopt.c:444
msgid "missing optstring argument"
msgstr "缺少 optstring 参数"
-#: misc-utils/getopt.c:437
+#: misc-utils/getopt.c:439
msgid "internal error, contact the author."
msgstr "内部错误,请联系作者。"
@@ -8255,6 +8162,10 @@ msgid " %s [options] <pid>|<name>...\n"
msgstr " %s [选项] <pid>|<名称> ...\n"
#: misc-utils/kill.c:309
+msgid "Forcibly terminate a process.\n"
+msgstr ""
+
+#: misc-utils/kill.c:312
msgid ""
" -a, --all do not restrict the name-to-pid conversion to processes\n"
" with the same uid as the present process\n"
@@ -8262,473 +8173,544 @@ msgstr ""
" -a, --all 不限于只对和当前进程的 uid 相同的进程进行\n"
" 名称-pid 转换\n"
-#: misc-utils/kill.c:311
+#: misc-utils/kill.c:314
msgid " -s, --signal <signal> send this <signal> instead of SIGTERM\n"
msgstr " -s, --signal <信号> 发送指定的<信号>而非 SIGTERM\n"
-#: misc-utils/kill.c:313
+#: misc-utils/kill.c:316
msgid " -q, --queue <value> use sigqueue(2), not kill(2), and pass <value> as data\n"
msgstr " -q, --queue <值> 使用 sigqueue(2) 代替 kill(2),并传递<值>数据\n"
-#: misc-utils/kill.c:315
+#: misc-utils/kill.c:318
msgid " -p, --pid print pids without signaling them\n"
msgstr " -p, --pid 打印 pid 而不向它们发送信号\n"
-#: misc-utils/kill.c:316
+#: misc-utils/kill.c:319
msgid " -l, --list[=<signal>] list signal names, or convert a signal number to a name\n"
msgstr " -l, --list [=<信号>] 列出信号名,或将一个信号数值转换为名称\n"
-#: misc-utils/kill.c:317
+#: misc-utils/kill.c:320
msgid " -L, --table list signal names and numbers\n"
msgstr " -L, --table 列出信号名和数值\n"
-#: misc-utils/kill.c:318
+#: misc-utils/kill.c:321
msgid " --verbose print pids that will be signaled\n"
msgstr " --verbose 打印将收到信号的 pid\n"
-#: misc-utils/kill.c:368 misc-utils/kill.c:377
+#: misc-utils/kill.c:371 misc-utils/kill.c:380
#, c-format
msgid "unknown signal: %s"
msgstr "未知信号:%s"
-#: misc-utils/kill.c:388 misc-utils/kill.c:391 misc-utils/kill.c:400
-#: misc-utils/kill.c:412 misc-utils/kill.c:435
+#: misc-utils/kill.c:391 misc-utils/kill.c:394 misc-utils/kill.c:403
+#: misc-utils/kill.c:415 misc-utils/kill.c:438
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s 和 %s 相互排斥"
-#: misc-utils/kill.c:397 misc-utils/kill.c:439 misc-utils/rename.c:153
-#: sys-utils/ipcrm.c:154 term-utils/agetty.c:753 term-utils/agetty.c:762
+#: misc-utils/kill.c:400 misc-utils/kill.c:442 misc-utils/rename.c:173
+#: sys-utils/ipcrm.c:160 term-utils/agetty.c:787 term-utils/agetty.c:796
msgid "not enough arguments"
msgstr "参数不够"
-#: misc-utils/kill.c:410
+#: misc-utils/kill.c:413
#, c-format
msgid "option '%s' requires an argument"
msgstr "“%s”选项需要一个参数"
-#: misc-utils/kill.c:415 term-utils/setterm.c:217 term-utils/setterm.c:255
-#: term-utils/setterm.c:293 term-utils/setterm.c:321 term-utils/setterm.c:335
-#: term-utils/setterm.c:346 term-utils/setterm.c:354 term-utils/setterm.c:369
-#: term-utils/setterm.c:383 term-utils/setterm.c:396
+#: misc-utils/kill.c:418 term-utils/setterm.c:218 term-utils/setterm.c:256
+#: term-utils/setterm.c:294 term-utils/setterm.c:322 term-utils/setterm.c:336
+#: term-utils/setterm.c:347 term-utils/setterm.c:355 term-utils/setterm.c:370
+#: term-utils/setterm.c:384 term-utils/setterm.c:397
msgid "argument error"
msgstr "参数出错"
-#: misc-utils/kill.c:432
+#: misc-utils/kill.c:435
#, c-format
msgid "invalid signal name or number: %s"
msgstr "无效的信号名或数字:%s"
-#: misc-utils/kill.c:449
+#: misc-utils/kill.c:452
#, c-format
msgid "sending signal %d to pid %d\n"
msgstr "将信号 %d 发送给 pid %d\n"
-#: misc-utils/kill.c:462
+#: misc-utils/kill.c:465
#, c-format
msgid "sending signal to %s failed"
msgstr "向 %s 发送信号失败"
-#: misc-utils/kill.c:478
+#: misc-utils/kill.c:481
msgid "use of 'kill --pid' option as command name is deprecated"
msgstr "将“kill --pid”选项当作命令的做法已经废弃"
-#: misc-utils/kill.c:512
+#: misc-utils/kill.c:515
#, c-format
msgid "cannot find process \"%s\""
msgstr "找不到进程“%s”"
-#: misc-utils/logger.c:133
+#: misc-utils/logger.c:155
#, c-format
msgid "unknown facility name: %s"
msgstr "未知设施名称:%s"
-#: misc-utils/logger.c:142
+#: misc-utils/logger.c:161
#, c-format
msgid "unknown priority name: %s"
msgstr "未知优先级名称:%s"
-#: misc-utils/logger.c:152
+#: misc-utils/logger.c:171
#, c-format
msgid "openlog %s: pathname too long"
msgstr "openlog %s:路径名过长"
-#: misc-utils/logger.c:174
+#: misc-utils/logger.c:193
#, c-format
msgid "socket %s"
msgstr "套接字 %s"
-#: misc-utils/logger.c:203
+#: misc-utils/logger.c:222
#, c-format
msgid "failed to resolve name %s port %s: %s"
msgstr "解析名称 %s 端口 %s 失败:%s"
-#: misc-utils/logger.c:220
+#: misc-utils/logger.c:239
#, c-format
msgid "failed to connect to %s port %s"
msgstr "连接 %s 端口 %s 失败"
-#: misc-utils/logger.c:247
+#: misc-utils/logger.c:266
#, c-format
msgid "maximum input lines (%d) exceeded"
msgstr "超过了最大输入行数(%d)"
-#: misc-utils/logger.c:292
+#: misc-utils/logger.c:346
+#, fuzzy
+msgid "localtime() failed"
+msgstr "fallocate 失败"
+
+#: misc-utils/logger.c:354
+#, fuzzy, c-format
+msgid "hostname '%s' is too long"
+msgstr "字段 %s 过长"
+
+#: misc-utils/logger.c:361
+#, fuzzy, c-format
+msgid "tag '%s' is too long"
+msgstr "字段 %s 过长"
+
+#: misc-utils/logger.c:406
+#, fuzzy, c-format
+msgid "ignoring unknown option argument: %s"
+msgstr "未知参数:%s"
+
+#: misc-utils/logger.c:511
#, c-format
msgid " %s [options] [<message>]\n"
msgstr " %s [选项] [<消息>]\n"
-#: misc-utils/logger.c:295
-msgid " -T, --tcp use TCP only\n"
-msgstr " -T, --tcp 只使用 TCP\n"
-
-#: misc-utils/logger.c:296
-msgid " -d, --udp use UDP only\n"
-msgstr " -d, --udp 只使用 UDP\n"
+#: misc-utils/logger.c:514
+#, fuzzy
+msgid "Enter messages into the system log.\n"
+msgstr "无法设置系统时钟。\n"
-#: misc-utils/logger.c:297
-msgid " -i, --id log the process ID too\n"
-msgstr " -i, --id 也记录进程 ID\n"
+#: misc-utils/logger.c:517
+#, fuzzy
+msgid " -i, --id[=<id>] log <id> (default is PID)\n"
+msgstr " -a, --all 全部(默认)\n"
-#: misc-utils/logger.c:298
+#: misc-utils/logger.c:518
msgid " -f, --file <file> log the contents of this file\n"
msgstr " -f, --file <文件> 记录此文件的内容\n"
-#: misc-utils/logger.c:299
-msgid " -n, --server <name> write to this remote syslog server\n"
-msgstr " -n, --server <名称> 写入此远程 syslog 服务器\n"
-
-#: misc-utils/logger.c:300
-msgid " -P, --port <number> use this UDP port\n"
-msgstr " -P, --port <数字> 使用此 UDP 端口\n"
-
-#: misc-utils/logger.c:301
+#: misc-utils/logger.c:519
msgid " -p, --priority <prio> mark given message with this priority\n"
msgstr " -p, --priority <级别> 将指定消息标记为此优先级\n"
-#: misc-utils/logger.c:302
+#: misc-utils/logger.c:520
msgid " --prio-prefix look for a prefix on every line read from stdin\n"
msgstr " --prio-prefix 在从 stdin 读取的每一行上查找前缀\n"
-#: misc-utils/logger.c:303
+#: misc-utils/logger.c:521
msgid " -s, --stderr output message to standard error as well\n"
msgstr " -s, --stderr 也向标准错误输出消息\n"
-#: misc-utils/logger.c:304
+#: misc-utils/logger.c:522
msgid " -t, --tag <tag> mark every line with this tag\n"
msgstr " -t, --tag <标志> 用此标志标记每一行\n"
-#: misc-utils/logger.c:305
+#: misc-utils/logger.c:523
+msgid " -n, --server <name> write to this remote syslog server\n"
+msgstr " -n, --server <名称> 写入此远程 syslog 服务器\n"
+
+#: misc-utils/logger.c:524
+msgid " -P, --port <number> use this UDP port\n"
+msgstr " -P, --port <数字> 使用此 UDP 端口\n"
+
+#: misc-utils/logger.c:525
+msgid " -T, --tcp use TCP only\n"
+msgstr " -T, --tcp 只使用 TCP\n"
+
+#: misc-utils/logger.c:526
+msgid " -d, --udp use UDP only\n"
+msgstr " -d, --udp 只使用 UDP\n"
+
+#: misc-utils/logger.c:527
+msgid " --rfc3164 use the obsolete BSD syslog protocol\n"
+msgstr ""
+
+#: misc-utils/logger.c:528
+msgid " --rfc5424[=<notime,notq,nohost>]\n"
+msgstr ""
+
+#: misc-utils/logger.c:529
+#, fuzzy
+msgid " use the syslog protocol (default)\n"
+msgstr " -l, --list 列出所有或指定的信息(默认)\n"
+
+#: misc-utils/logger.c:530
msgid " -u, --socket <socket> write to this Unix socket\n"
msgstr " -u, --socket <套接字> 写入此 Unix 套接字\n"
-#: misc-utils/logger.c:307
+#: misc-utils/logger.c:532
msgid " --journald[=<file>] write journald entry\n"
msgstr " --journald[=<文件>] 写 journald 记录\n"
-#: misc-utils/logger.c:369
+#: misc-utils/logger.c:602
#, c-format
msgid "file %s"
msgstr "文件 %s"
-#: misc-utils/look.c:368
-#, c-format
-msgid " %s [options] string [file]\n"
+#: misc-utils/logger.c:611
+#, fuzzy
+msgid "failed to parse id"
+msgstr "解析 pid 失败"
+
+#: misc-utils/logger.c:674
+msgid "--file <file> and <message> are mutually exclusive, message is ignored"
+msgstr ""
+
+#: misc-utils/logger.c:681
+msgid "journald entry could not be wrote"
+msgstr ""
+
+#: misc-utils/look.c:357
+#, fuzzy, c-format
+msgid " %s [options] <string> [<file>...]\n"
msgstr " %s [选项] 字符串 [文件]\n"
-#: misc-utils/look.c:371
-msgid ""
-" -a, --alternative use alternative dictionary\n"
-" -d, --alphanum compare only alphanumeric characters\n"
-" -f, --ignore-case ignore case differences when comparing\n"
-" -t, --terminate <char> define string termination character\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
+#: misc-utils/look.c:360
+msgid "Display lines beginning with a specified string.\n"
msgstr ""
-" -a, --alternative 使用替代词典\n"
-" -d, --alphanum 只比较字母和数字\n"
-" -f, --ignore-case 比较时忽略大小写\n"
-" -t, --terminate <字符> 定义字符串终止字符\n"
-" -V, --version 输出版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
-"\n"
-#: misc-utils/lsblk.c:137
+#: misc-utils/look.c:363
+#, fuzzy
+msgid " -a, --alternative use the alternative dictionary\n"
+msgstr " -a, --alternative 允许长选项以 - 开始\n"
+
+#: misc-utils/look.c:364
+#, fuzzy
+msgid " -d, --alphanum compare only alphanumeric characters\n"
+msgstr " -c, --chars <数字> 睡眠前输出的字符数\n"
+
+#: misc-utils/look.c:365
+#, fuzzy
+msgid " -f, --ignore-case ignore case differences when comparing\n"
+msgstr " -s, --inverse 反向依赖\n"
+
+#: misc-utils/look.c:366
+msgid " -t, --terminate <char> define the string-termination character\n"
+msgstr ""
+
+#: misc-utils/lsblk.c:139
msgid "device name"
msgstr "设备名"
-#: misc-utils/lsblk.c:138
+#: misc-utils/lsblk.c:140
msgid "internal kernel device name"
msgstr "内部内核设备名称"
-#: misc-utils/lsblk.c:139
+#: misc-utils/lsblk.c:141
msgid "internal parent kernel device name"
msgstr "内部上级内核设备名称"
-#: misc-utils/lsblk.c:142
+#: misc-utils/lsblk.c:144 sys-utils/zramctl.c:75
msgid "where the device is mounted"
msgstr "设备挂载位置"
-#: misc-utils/lsblk.c:143
+#: misc-utils/lsblk.c:145
msgid "filesystem LABEL"
msgstr "文件系统标签"
-#: misc-utils/lsblk.c:146
+#: misc-utils/lsblk.c:148
msgid "partition type UUID"
msgstr "分区类型 UUID"
-#: misc-utils/lsblk.c:147
+#: misc-utils/lsblk.c:149
msgid "partition LABEL"
msgstr "分区 LABEL"
-#: misc-utils/lsblk.c:151
+#: misc-utils/lsblk.c:153
msgid "read-ahead of the device"
msgstr "该设备的预读(read-ahead)"
-#: misc-utils/lsblk.c:152 sys-utils/losetup.c:71
+#: misc-utils/lsblk.c:154 sys-utils/losetup.c:71
msgid "read-only device"
msgstr "只读设备"
-#: misc-utils/lsblk.c:153
+#: misc-utils/lsblk.c:155
msgid "removable device"
msgstr "可移动设备"
-#: misc-utils/lsblk.c:154
+#: misc-utils/lsblk.c:156
+msgid "removable or hotplug device (usb, pcmcia, ...)"
+msgstr ""
+
+#: misc-utils/lsblk.c:157
msgid "rotational device"
msgstr "转动设备"
-#: misc-utils/lsblk.c:155
+#: misc-utils/lsblk.c:158
msgid "adds randomness"
msgstr "添加随机性"
-#: misc-utils/lsblk.c:156
+#: misc-utils/lsblk.c:159
msgid "device identifier"
msgstr "设备标识符"
-#: misc-utils/lsblk.c:157
+#: misc-utils/lsblk.c:160
msgid "disk serial number"
msgstr "磁盘序列号"
-#: misc-utils/lsblk.c:158
+#: misc-utils/lsblk.c:161
msgid "size of the device"
msgstr "磁盘容量"
-#: misc-utils/lsblk.c:159
+#: misc-utils/lsblk.c:162
msgid "state of the device"
msgstr "设备的状态"
-#: misc-utils/lsblk.c:161
+#: misc-utils/lsblk.c:164
msgid "group name"
msgstr "组名"
-#: misc-utils/lsblk.c:162
+#: misc-utils/lsblk.c:165
msgid "device node permissions"
msgstr "设备节点权限"
-#: misc-utils/lsblk.c:163
+#: misc-utils/lsblk.c:166
msgid "alignment offset"
msgstr "对齐偏移量"
-#: misc-utils/lsblk.c:164
+#: misc-utils/lsblk.c:167
msgid "minimum I/O size"
msgstr "最小 I/O 大小"
-#: misc-utils/lsblk.c:165
+#: misc-utils/lsblk.c:168
msgid "optimal I/O size"
msgstr "最优 I/O 大小"
-#: misc-utils/lsblk.c:166
+#: misc-utils/lsblk.c:169
msgid "physical sector size"
msgstr "物理扇区大小"
-#: misc-utils/lsblk.c:167
+#: misc-utils/lsblk.c:170
msgid "logical sector size"
msgstr "逻辑扇区大小"
-#: misc-utils/lsblk.c:168
+#: misc-utils/lsblk.c:171
msgid "I/O scheduler name"
msgstr "I/O 调度器名称"
-#: misc-utils/lsblk.c:169
+#: misc-utils/lsblk.c:172
msgid "request queue size"
msgstr "请求队列大小"
-#: misc-utils/lsblk.c:170
+#: misc-utils/lsblk.c:173
msgid "device type"
msgstr "设备类型"
-#: misc-utils/lsblk.c:171
+#: misc-utils/lsblk.c:174
msgid "discard alignment offset"
msgstr "忽略对齐偏移量"
-#: misc-utils/lsblk.c:172
+#: misc-utils/lsblk.c:175
msgid "discard granularity"
msgstr "忽略粒度"
-#: misc-utils/lsblk.c:173
+#: misc-utils/lsblk.c:176
msgid "discard max bytes"
msgstr "忽略最大字节数"
-#: misc-utils/lsblk.c:174
+#: misc-utils/lsblk.c:177
msgid "discard zeroes data"
msgstr "忽略零数据"
-#: misc-utils/lsblk.c:175
+#: misc-utils/lsblk.c:178
msgid "write same max bytes"
msgstr "写相同的最大字节数"
-#: misc-utils/lsblk.c:176
+#: misc-utils/lsblk.c:179
msgid "unique storage identifier"
msgstr "惟一存储标识符"
-#: misc-utils/lsblk.c:177
+#: misc-utils/lsblk.c:180
msgid "Host:Channel:Target:Lun for SCSI"
msgstr "SCSI 的 Host:Channel:Target:Lun"
-#: misc-utils/lsblk.c:178
+#: misc-utils/lsblk.c:181
msgid "device transport type"
msgstr "设备传输类型"
-#: misc-utils/lsblk.c:179
+#: misc-utils/lsblk.c:182
+msgid "de-duplicated chain of subsystems"
+msgstr ""
+
+#: misc-utils/lsblk.c:183
msgid "device revision"
msgstr "设备修订版本"
-#: misc-utils/lsblk.c:180
+#: misc-utils/lsblk.c:184
msgid "device vendor"
msgstr "设备制造商"
-#: misc-utils/lsblk.c:1076
+#: misc-utils/lsblk.c:1118
#, c-format
msgid "%s: failed to get device path"
msgstr "%s:获取设备路径失败"
-#: misc-utils/lsblk.c:1083
+#: misc-utils/lsblk.c:1125
#, c-format
msgid "%s: unknown device name"
msgstr "%s:未知设备名称"
-#: misc-utils/lsblk.c:1119
+#: misc-utils/lsblk.c:1161
#, c-format
msgid "%s: failed to get dm name"
msgstr "%s:获取 dm 名称失败"
-#: misc-utils/lsblk.c:1160
+#: misc-utils/lsblk.c:1202
msgid "failed to open device directory in sysfs"
msgstr "打开 sysfs 中的设备目录失败"
-#: misc-utils/lsblk.c:1328
+#: misc-utils/lsblk.c:1370
#, c-format
msgid "%s: failed to compose sysfs path"
msgstr "%s:组成 sysfs 路径失败"
-#: misc-utils/lsblk.c:1334
+#: misc-utils/lsblk.c:1376
#, c-format
msgid "%s: failed to read link"
msgstr "%s:读链接失败"
-#: misc-utils/lsblk.c:1357
+#: misc-utils/lsblk.c:1399
#, c-format
msgid "%s: failed to get sysfs name"
msgstr "%s:获取 sysfs 名称失败"
-#: misc-utils/lsblk.c:1366
+#: misc-utils/lsblk.c:1408
#, c-format
msgid "%s: failed to get whole-disk device number"
msgstr "%s:获取 整盘 设备号失败"
-#: misc-utils/lsblk.c:1418 misc-utils/lsblk.c:1420 misc-utils/lsblk.c:1445
-#: misc-utils/lsblk.c:1447
+#: misc-utils/lsblk.c:1460 misc-utils/lsblk.c:1462 misc-utils/lsblk.c:1487
+#: misc-utils/lsblk.c:1489
#, c-format
msgid "failed to parse list '%s'"
msgstr "解析列表“%s”失败"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1425
+#: misc-utils/lsblk.c:1467
#, 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:1452
+#: misc-utils/lsblk.c:1494
#, c-format
msgid "the list of included devices is too large (limit is %d devices)"
msgstr "包含设备列表过大(限制为 %d 台设备)"
-#: misc-utils/lsblk.c:1483 sys-utils/wdctl.c:174
+#: misc-utils/lsblk.c:1525 sys-utils/wdctl.c:174
#, c-format
msgid " %s [options] [<device> ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: misc-utils/lsblk.c:1485
+#: misc-utils/lsblk.c:1528
+#, fuzzy
+msgid "List information about block devices.\n"
+msgstr "%s:不是一个块设备"
+
+#: misc-utils/lsblk.c:1531
msgid " -a, --all print all devices\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/lsblk.c:1487
+#: misc-utils/lsblk.c:1533
msgid " -d, --nodeps don't print slaves or holders\n"
msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
-#: misc-utils/lsblk.c:1488
+#: misc-utils/lsblk.c:1534
msgid " -D, --discard print discard capabilities\n"
msgstr " -D, --discard 打印时丢弃能力\n"
-#: misc-utils/lsblk.c:1489
+#: misc-utils/lsblk.c:1535
msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认:内存盘)\n"
-#: misc-utils/lsblk.c:1490
+#: misc-utils/lsblk.c:1536
msgid " -f, --fs output info about filesystems\n"
msgstr " -f, --fs 输出文件系统信息\n"
-#: misc-utils/lsblk.c:1491
+#: misc-utils/lsblk.c:1537
msgid " -i, --ascii use ascii characters only\n"
msgstr " -i, --ascii 只使用 ascii 字符\n"
-#: misc-utils/lsblk.c:1492
+#: misc-utils/lsblk.c:1538
msgid " -I, --include <list> show only devices with specified major numbers\n"
msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
-#: misc-utils/lsblk.c:1493
+#: misc-utils/lsblk.c:1539
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/lsblk.c:1494
+#: misc-utils/lsblk.c:1540
msgid " -m, --perms output info about permissions\n"
msgstr " -m, --perms 输出权限信息\n"
-#: misc-utils/lsblk.c:1495
+#: misc-utils/lsblk.c:1541
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lsblk.c:1496
+#: misc-utils/lsblk.c:1542
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/lsblk.c:1497
+#: misc-utils/lsblk.c:1543
msgid " -O, --output-all output all columns\n"
msgstr " -O, --output-all 输出所有列\n"
-#: misc-utils/lsblk.c:1498
+#: misc-utils/lsblk.c:1544
msgid " -p, --paths print complete device path\n"
msgstr " -p, --paths 打印完整设备路径\n"
-#: misc-utils/lsblk.c:1501
+#: misc-utils/lsblk.c:1547
msgid " -s, --inverse inverse dependencies\n"
msgstr " -s, --inverse 反向依赖\n"
-#: misc-utils/lsblk.c:1502
+#: misc-utils/lsblk.c:1548
msgid " -S, --scsi output info about SCSI devices\n"
msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
-#: misc-utils/lsblk.c:1503
+#: misc-utils/lsblk.c:1549
msgid " -t, --topology output info about topology\n"
msgstr " -t, --topology 输出拓扑信息\n"
-#: misc-utils/lsblk.c:1504
+#: misc-utils/lsblk.c:1550
msgid " -x, --sort <column> sort output by <column>\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: misc-utils/lsblk.c:1509 misc-utils/lslocks.c:518 sys-utils/prlimit.c:193
+#: misc-utils/lsblk.c:1555 misc-utils/lslocks.c:521 sys-utils/prlimit.c:196
+#: sys-utils/zramctl.c:399
#, c-format
msgid ""
"\n"
@@ -8737,12 +8719,12 @@ msgstr ""
"\n"
"可用列(用于 --output):\n"
-#: misc-utils/lsblk.c:1522
+#: misc-utils/lsblk.c:1568
#, c-format
msgid "failed to access sysfs directory: %s"
msgstr "无法访问 sysfs 目录:%s"
-#: misc-utils/lsblk.c:1711
+#: misc-utils/lsblk.c:1757
msgid "the sort column has to be among the output columns"
msgstr "排序列必须是输出的列"
@@ -8790,7 +8772,7 @@ msgstr "阻塞锁的进程的 PID"
msgid "failed to parse ID"
msgstr "解析 ID 失败"
-#: misc-utils/lslocks.c:285 sys-utils/nsenter.c:206
+#: misc-utils/lslocks.c:285 sys-utils/nsenter.c:214
msgid "failed to parse pid"
msgstr "解析 pid 失败"
@@ -8807,6 +8789,11 @@ msgid "failed to parse end"
msgstr "解析 终点 失败"
#: misc-utils/lslocks.c:510
+#, fuzzy
+msgid "List local system locks.\n"
+msgstr "无法设置系统时钟。\n"
+
+#: misc-utils/lslocks.c:513
msgid ""
" -p, --pid <pid> process id\n"
" -o, --output <list> define which output columns to use\n"
@@ -8824,44 +8811,48 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
" -V, --version 输出版本信息并退出\n"
-#: misc-utils/lslocks.c:554 schedutils/chrt.c:257 schedutils/ionice.c:176
-#: schedutils/taskset.c:160 sys-utils/prlimit.c:582
+#: misc-utils/lslocks.c:557 schedutils/chrt.c:256 schedutils/ionice.c:179
+#: schedutils/taskset.c:163 sys-utils/prlimit.c:585
msgid "invalid PID argument"
msgstr "无效的 PID 参数"
#: misc-utils/mcookie.c:85
+msgid "Generate magic cookies for xauth.\n"
+msgstr ""
+
+#: misc-utils/mcookie.c:88
msgid " -f, --file <file> use file as a cookie seed\n"
msgstr " -f, --file <文件> 用指定文件作为 cookie 种子\n"
-#: misc-utils/mcookie.c:86
+#: misc-utils/mcookie.c:89
msgid " -m, --max-size <num> limit how much is read from seed files\n"
msgstr " -m, --max-size <数字> 限制从种子文件读取的大小\n"
-#: misc-utils/mcookie.c:87
+#: misc-utils/mcookie.c:90
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: misc-utils/mcookie.c:117
+#: misc-utils/mcookie.c:120
#, c-format
msgid "Got %zu byte from %s\n"
msgid_plural "Got %zu bytes from %s\n"
msgstr[0] "从 %2$s 获得 %1$zu 字节\n"
-#: misc-utils/mcookie.c:124
+#: misc-utils/mcookie.c:127
#, c-format
msgid "closing %s failed"
msgstr "关闭 %s 失败"
-#: misc-utils/mcookie.c:164 sys-utils/blkdiscard.c:105 sys-utils/fstrim.c:283
+#: misc-utils/mcookie.c:167 sys-utils/blkdiscard.c:120 sys-utils/fstrim.c:287
#: text-utils/hexdump.c:117
msgid "failed to parse length"
msgstr "解析长度失败"
-#: misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:180
msgid "--max-size ignored when used without --file"
msgstr "不带 --file 时忽略 --max-size"
-#: misc-utils/mcookie.c:185
+#: misc-utils/mcookie.c:188
#, c-format
msgid "Got %d byte from %s\n"
msgid_plural "Got %d bytes from %s\n"
@@ -8883,6 +8874,10 @@ msgid " %s [options] <pathname>...\n"
msgstr " %s [选项] <路径名> ...\n"
#: misc-utils/namei.c:432
+msgid "Follow a pathname until a terminal point is found.\n"
+msgstr ""
+
+#: misc-utils/namei.c:435
msgid ""
" -h, --help displays this help text\n"
" -V, --version output version information and exit\n"
@@ -8902,39 +8897,31 @@ msgstr ""
" -n, --nosymlinks 不显示符号链接\n"
" -v, --vertical 竖直对齐 模式 和 拥有者\n"
-#: misc-utils/namei.c:441
-msgid ""
-"\n"
-"For more information see namei(1).\n"
-msgstr ""
-"\n"
-"更多信息参见 namei(1)。\n"
-
-#: misc-utils/namei.c:501
+#: misc-utils/namei.c:504
msgid "pathname argument is missing"
msgstr "缺少 路径名 参数"
-#: misc-utils/namei.c:525
+#: misc-utils/namei.c:528
#, c-format
msgid "%s: exceeded limit of symlinks"
msgstr "%s:超过了符号链接限制"
-#: misc-utils/rename.c:38
+#: misc-utils/rename.c:63
#, c-format
msgid "%s: lstat failed"
msgstr "%s:lstat 失败"
-#: misc-utils/rename.c:41
+#: misc-utils/rename.c:67
#, c-format
msgid "%s: not a symbolic link"
msgstr "%s:不是符号链接"
-#: misc-utils/rename.c:45
+#: misc-utils/rename.c:72
#, c-format
msgid "%s: readlink failed"
msgstr "%s:readlink 失败"
-#: misc-utils/rename.c:81
+#: misc-utils/rename.c:80
#, c-format
msgid "%s: unlink failed"
msgstr "%s:unlink 失败"
@@ -8944,25 +8931,34 @@ msgstr "%s:unlink 失败"
msgid "%s: symlinking to %s failed"
msgstr "%s:符号链接到 %s 失败"
-#: misc-utils/rename.c:88
+#: misc-utils/rename.c:104
#, c-format
msgid "%s: rename to %s failed"
msgstr "%s:重命名为 %s 失败"
-#: misc-utils/rename.c:102
+#: misc-utils/rename.c:117
#, c-format
msgid " %s [options] <expression> <replacement> <file>...\n"
msgstr " %s [选项] <表达式> <替换> <文件>...\n"
-#: misc-utils/rename.c:105
+#: misc-utils/rename.c:121
+#, fuzzy
+msgid "Rename files.\n"
+msgstr "ttyname 失败"
+
+#: misc-utils/rename.c:124
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: misc-utils/rename.c:106
+#: misc-utils/rename.c:125
msgid " -s, --symlink act on the target of symlinks\n"
msgstr " -s, --symlink 在符号链接的目标上执行\n"
#: misc-utils/uuidd.c:76
+msgid "A daemon for generating UUIDs.\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:79
msgid ""
" -p, --pid <path> path to pid file\n"
" -s, --socket <path> path to socket\n"
@@ -8996,161 +8992,166 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: misc-utils/uuidd.c:130
+#: misc-utils/uuidd.c:133
msgid "bad arguments"
msgstr "参数错误"
-#: misc-utils/uuidd.c:137
+#: misc-utils/uuidd.c:140
msgid "socket"
msgstr "套接字"
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:151
msgid "connect"
msgstr "连接"
-#: misc-utils/uuidd.c:168
+#: misc-utils/uuidd.c:171
msgid "write"
msgstr "写"
-#: misc-utils/uuidd.c:176
+#: misc-utils/uuidd.c:179
msgid "read count"
msgstr "读计数"
-#: misc-utils/uuidd.c:182
+#: misc-utils/uuidd.c:185
msgid "bad response length"
msgstr "响应长度错误"
-#: misc-utils/uuidd.c:236
+#: misc-utils/uuidd.c:239
#, c-format
msgid "cannot lock %s"
msgstr "无法锁定 %s"
-#: misc-utils/uuidd.c:260
+#: misc-utils/uuidd.c:263
msgid "couldn't create unix stream socket"
msgstr "无法创建 unix 流套接字"
-#: misc-utils/uuidd.c:285
+#: misc-utils/uuidd.c:288
#, c-format
msgid "couldn't bind unix socket %s"
msgstr "无法绑定 unix 套接字 %s"
-#: misc-utils/uuidd.c:322
+#: misc-utils/uuidd.c:325
#, c-format
msgid "uuidd daemon is already running at pid %s"
msgstr "uuidd 守护进程已运行,pid 为 %s"
-#: misc-utils/uuidd.c:333
+#: misc-utils/uuidd.c:336
#, c-format
msgid "couldn't listen on unix socket %s"
msgstr "无法侦听 unix 套接字 %s"
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:346
#, c-format
msgid "could not truncate file: %s"
msgstr "无法截短文件:%s"
-#: misc-utils/uuidd.c:361
+#: misc-utils/uuidd.c:364
msgid "no or too many file descriptors received"
msgstr "未收到或收到过多的文件描述符"
-#: misc-utils/uuidd.c:382 text-utils/column.c:384
+#: misc-utils/uuidd.c:385 text-utils/column.c:387
msgid "read failed"
msgstr "read 失败"
-#: misc-utils/uuidd.c:384
+#: misc-utils/uuidd.c:387
#, c-format
msgid "error reading from client, len = %d"
msgstr "从客户端读取出错,长度 = %d"
-#: misc-utils/uuidd.c:393
+#: misc-utils/uuidd.c:396
#, c-format
msgid "operation %d, incoming num = %d\n"
msgstr "操作 %d,接收数 = %d\n"
-#: misc-utils/uuidd.c:396
+#: misc-utils/uuidd.c:399
#, c-format
msgid "operation %d\n"
msgstr "操作 %d\n"
-#: misc-utils/uuidd.c:412
+#: misc-utils/uuidd.c:415
#, c-format
msgid "Generated time UUID: %s\n"
msgstr "已生成时间 UUID:%s\n"
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:425
#, c-format
msgid "Generated random UUID: %s\n"
msgstr "已生成随机 UUID:%s\n"
-#: misc-utils/uuidd.c:431
+#: misc-utils/uuidd.c:434
#, 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:452
+#: misc-utils/uuidd.c:455
#, c-format
msgid "Generated %d UUID:\n"
msgid_plural "Generated %d UUIDs:\n"
msgstr[0] "已生成 %d 个 UUID:\n"
-#: misc-utils/uuidd.c:466
+#: misc-utils/uuidd.c:469
#, c-format
msgid "Invalid operation %d\n"
msgstr "无效操作 %d\n"
-#: misc-utils/uuidd.c:478
+#: misc-utils/uuidd.c:481
#, c-format
msgid "Unexpected reply length from server %d"
msgstr "服务器 %d 响应长度异常"
-#: misc-utils/uuidd.c:540
+#: misc-utils/uuidd.c:543
msgid "failed to parse --uuids"
msgstr "解析 --uuids 失败"
-#: misc-utils/uuidd.c:557
+#: misc-utils/uuidd.c:560
msgid "uuidd has been built without support for socket activation"
msgstr "uuidd 构建时没有添加套接字激活支持"
-#: misc-utils/uuidd.c:576
+#: misc-utils/uuidd.c:579
msgid "failed to parse --timeout"
msgstr "解析 --timeout 失败"
-#: misc-utils/uuidd.c:595
+#: misc-utils/uuidd.c:598
msgid "Both --socket-activation and --socket specified. Ignoring --socket."
msgstr "同时指定了 --socket-activation 和 --socket。将忽略 --socket"
-#: misc-utils/uuidd.c:602 misc-utils/uuidd.c:630
+#: misc-utils/uuidd.c:605 misc-utils/uuidd.c:633
#, c-format
msgid "error calling uuidd daemon (%s)"
msgstr "调用 uuidd 守护进程(%s)出错"
-#: misc-utils/uuidd.c:603 misc-utils/uuidd.c:631
+#: misc-utils/uuidd.c:606 misc-utils/uuidd.c:634
msgid "unexpected error"
msgstr "意外错误"
-#: misc-utils/uuidd.c:611
+#: misc-utils/uuidd.c:614
#, 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:615
+#: misc-utils/uuidd.c:618
#, c-format
msgid "List of UUIDs:\n"
msgstr "UUID 列表:\n"
-#: misc-utils/uuidd.c:647
+#: misc-utils/uuidd.c:650
#, c-format
msgid "couldn't kill uuidd running at pid %d"
msgstr "无法运行 pid 为 %d 的 uuidd"
-#: misc-utils/uuidd.c:652
+#: misc-utils/uuidd.c:655
#, c-format
msgid "Killed uuidd running at pid %d.\n"
msgstr "已杀死运行 pid 为 %d 的 uuidd。\n"
#: misc-utils/uuidgen.c:36
+#, fuzzy
+msgid "Create a new UUID value.\n"
+msgstr "新建空磁盘标签"
+
+#: misc-utils/uuidgen.c:39
msgid ""
" -r, --random generate random-based uuid\n"
" -t, --time generate time-based uuid\n"
@@ -9164,39 +9165,43 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: misc-utils/whereis.c:171
+#: misc-utils/whereis.c:191
+msgid "Locate the binary, source, and manual-page files for a command.\n"
+msgstr ""
+
+#: misc-utils/whereis.c:194
msgid " -b search only for binaries\n"
msgstr " -b 只搜索二进制文件\n"
-#: misc-utils/whereis.c:172
+#: misc-utils/whereis.c:195
msgid " -B <dirs> define binaries lookup path\n"
msgstr " -B <目录> 定义二进制文件查找路径\n"
-#: misc-utils/whereis.c:173
+#: misc-utils/whereis.c:196
msgid " -m search only for manuals\n"
msgstr " -m 只搜索 man 手册\n"
-#: misc-utils/whereis.c:174
+#: misc-utils/whereis.c:197
msgid " -M <dirs> define man lookup path\n"
msgstr " -M <目录> 定义 man 手册查找路径\n"
-#: misc-utils/whereis.c:175
+#: misc-utils/whereis.c:198
msgid " -s search only for sources\n"
msgstr " -s 只搜索源代码\n"
-#: misc-utils/whereis.c:176
+#: misc-utils/whereis.c:199
msgid " -S <dirs> define sources lookup path\n"
msgstr " -S <目录> 定义源代码查找路径\n"
-#: misc-utils/whereis.c:177
+#: misc-utils/whereis.c:200
msgid " -f terminate <dirs> argument list\n"
msgstr " -f 终止 <目录> 参数列表\n"
-#: misc-utils/whereis.c:178
+#: misc-utils/whereis.c:201
msgid " -u search for unusual entries\n"
msgstr " -u 搜索不常见记录\n"
-#: misc-utils/whereis.c:179
+#: misc-utils/whereis.c:202
msgid " -l output effective lookup paths\n"
msgstr " -l 输出有效查找路径\n"
@@ -9230,10 +9235,6 @@ msgstr "%s:创建签名备份失败"
msgid "%s: calling ioctl to re-read partition table: %m\n"
msgstr "%s:将调用 ioctl 来重新读分区表:%m\n"
-#: misc-utils/wipefs.c:383
-msgid "failed to create a signature backup, $HOME undefined"
-msgstr "创建签名备份失败,未定义 $HOME"
-
#: misc-utils/wipefs.c:411
#, c-format
msgid "%s: ignoring nested \"%s\" partition table on non-whole disk device"
@@ -9249,6 +9250,10 @@ msgid "Use the --force option to force erase."
msgstr "使用 --force 选项强制擦除。"
#: misc-utils/wipefs.c:456
+msgid "Wipe signatures from a device.\n"
+msgstr ""
+
+#: misc-utils/wipefs.c:459
msgid ""
" -a, --all wipe all magic strings (BE CAREFUL!)\n"
" -b, --backup create a signature backup in $HOME\n"
@@ -9271,28 +9276,24 @@ msgstr ""
" -t, --types <列表> 限制文件系统、RAID 或分区表的集合\n"
" -V, --version 输出版本信息并退出\n"
-#: misc-utils/wipefs.c:467
-#, c-format
-msgid ""
-"\n"
-"For more information see wipefs(8).\n"
-msgstr ""
-"\n"
-"更多信息请参阅 wipefs(8)。\n"
-
-#: misc-utils/wipefs.c:527
+#: misc-utils/wipefs.c:530
msgid "invalid offset argument"
msgstr "无效的 偏移 参数"
-#: misc-utils/wipefs.c:552
+#: misc-utils/wipefs.c:555
msgid "The --backup option is meaningless in this context"
msgstr "--backup 在此环境中无意义"
-#: schedutils/chrt.c:63
-#, c-format
-msgid ""
+#: schedutils/chrt.c:60
+#, fuzzy
+msgid "Show or change the real-time scheduling attributes of a process.\n"
+msgstr ""
"\n"
-"chrt - manipulate real-time attributes of a process\n"
+"设置或获取进程的 IO 调度类别和优先级。\n"
+
+#: schedutils/chrt.c:62
+#, fuzzy, c-format
+msgid ""
"\n"
"Set policy:\n"
" chrt [options] [<policy>] <priority> [-p <pid> | <command> [<arg>...]]\n"
@@ -9309,7 +9310,7 @@ msgstr ""
"获得策略:\n"
" chrt [选项] -p <pid>\n"
-#: schedutils/chrt.c:70
+#: schedutils/chrt.c:68
#, c-format
msgid ""
"\n"
@@ -9328,7 +9329,7 @@ msgstr ""
" -o | --other 设置为 SCHED_OTHER 策略\n"
" -r | --rr 设置为 SCHED_RR 策略(默认)\n"
-#: schedutils/chrt.c:79
+#: schedutils/chrt.c:77
#, c-format
msgid ""
"\n"
@@ -9339,7 +9340,7 @@ msgstr ""
"调度标志:\n"
" -R | --reset-on-fork 为 FIFO 或 RR 设置 SCHED_RESET_ON_FORK\n"
-#: schedutils/chrt.c:83
+#: schedutils/chrt.c:81
#, c-format
msgid ""
"\n"
@@ -9362,68 +9363,68 @@ msgstr ""
" -V | --version 输出版本信息\n"
"\n"
-#: schedutils/chrt.c:105
+#: schedutils/chrt.c:104
#, c-format
msgid "failed to get pid %d's policy"
msgstr "无法获得 pid %d 的策略"
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:107
#, c-format
msgid "pid %d's new scheduling policy: "
msgstr "pid %d 的新调度策略:"
-#: schedutils/chrt.c:110
+#: schedutils/chrt.c:109
#, c-format
msgid "pid %d's current scheduling policy: "
msgstr "pid %d 的当前调度策略:"
-#: schedutils/chrt.c:143
+#: schedutils/chrt.c:142
msgid "unknown scheduling policy"
msgstr "未知的调度策略"
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:146
#, c-format
msgid "failed to get pid %d's attributes"
msgstr "获取 pid %d 的属性失败"
-#: schedutils/chrt.c:150
+#: schedutils/chrt.c:149
#, c-format
msgid "pid %d's new scheduling priority: %d\n"
msgstr "pid %d 的新调度策略:%d\n"
-#: schedutils/chrt.c:153
+#: schedutils/chrt.c:152
#, c-format
msgid "pid %d's current scheduling priority: %d\n"
msgstr "pid %d 的当前调度优先级:%d\n"
-#: schedutils/chrt.c:188
+#: schedutils/chrt.c:187
#, c-format
msgid "SCHED_%s min/max priority\t: %d/%d\n"
msgstr "SCHED_%s 最小/最大优先级\t:%d/%d\n"
-#: schedutils/chrt.c:191
+#: schedutils/chrt.c:190
#, c-format
msgid "SCHED_%s not supported?\n"
msgstr "SCHED_%s 不支持?\n"
-#: schedutils/chrt.c:287 schedutils/chrt.c:320
+#: schedutils/chrt.c:285 schedutils/chrt.c:318
msgid "cannot obtain the list of tasks"
msgstr "无法获取任务列表"
-#: schedutils/chrt.c:299
+#: schedutils/chrt.c:297
msgid "invalid priority argument"
msgstr "无效的 优先级 参数"
-#: schedutils/chrt.c:305
+#: schedutils/chrt.c:303
msgid "SCHED_RESET_ON_FORK flag is supported for SCHED_FIFO and SCHED_RR policies only"
msgstr "SCHED_RESET_ON_FORK 标志只支持 SCHED_FIFO 和 SCHED_RR 策略"
-#: schedutils/chrt.c:323
+#: schedutils/chrt.c:321
#, c-format
msgid "failed to set tid %d's policy"
msgstr "设置 tid %d 策略失败"
-#: schedutils/chrt.c:326
+#: schedutils/chrt.c:324
#, c-format
msgid "failed to set pid %d's policy"
msgstr "设置 pid %d 的策略失败"
@@ -9463,6 +9464,13 @@ msgstr ""
" %1$s [选项] <命令>\n"
#: schedutils/ionice.c:112
+#, fuzzy
+msgid "Show or change the I/O-scheduling class and priority of a process.\n"
+msgstr ""
+"\n"
+"设置或获取进程的 IO 调度类别和优先级。\n"
+
+#: schedutils/ionice.c:115
msgid ""
" -c, --class <class> name or number of scheduling class,\n"
" 0: none, 1: realtime, 2: best-effort, 3: idle\n"
@@ -9470,7 +9478,7 @@ msgstr ""
" -c, --class <类别> 调度类别的名称或数值\n"
" 0: 无, 1: 实时, 2: 尽力, 3: 空闲\n"
-#: schedutils/ionice.c:114
+#: schedutils/ionice.c:117
msgid ""
" -n, --classdata <num> priority (0..7) in the specified scheduling class,\n"
" only for the realtime and best-effort classes\n"
@@ -9478,61 +9486,61 @@ msgstr ""
" -n, --classdata <数字> 指定调度类别的优先级(0..7),只针对\n"
" “实时”和“尽力”类别\n"
-#: schedutils/ionice.c:116
+#: schedutils/ionice.c:119
msgid " -p, --pid <pid>... act on these already running processes\n"
msgstr " -p, --pid <pid>... 对这些已运行的进程操作\n"
-#: schedutils/ionice.c:117
+#: schedutils/ionice.c:120
msgid " -P, --pgid <pgrp>... act on already running processes in these groups\n"
msgstr " -P, --pgid <pgrp>... 对这些组中已运行的进程操作\n"
-#: schedutils/ionice.c:118
+#: schedutils/ionice.c:121
msgid " -t, --ignore ignore failures\n"
msgstr " -t, --ignore 忽略失败\n"
-#: schedutils/ionice.c:119
+#: schedutils/ionice.c:122
msgid " -u, --uid <uid>... act on already running processes owned by these users\n"
msgstr " -u, --uid <uid>... 对属于这些用户的已运行进程操作\n"
-#: schedutils/ionice.c:156
+#: schedutils/ionice.c:159
msgid "invalid class data argument"
msgstr "无效的类别数据参数"
-#: schedutils/ionice.c:162
+#: schedutils/ionice.c:165
msgid "invalid class argument"
msgstr "无效的类别参数"
-#: schedutils/ionice.c:167
+#: schedutils/ionice.c:170
#, c-format
msgid "unknown scheduling class: '%s'"
msgstr "未知的调度类别:“%s”"
-#: schedutils/ionice.c:175 schedutils/ionice.c:183 schedutils/ionice.c:191
+#: schedutils/ionice.c:178 schedutils/ionice.c:186 schedutils/ionice.c:194
msgid "can handle only one of pid, pgid or uid at once"
msgstr "无法一次只处理一个 pid、pgid 或 uid"
-#: schedutils/ionice.c:184
+#: schedutils/ionice.c:187
msgid "invalid PGID argument"
msgstr "无效的 PGID 参数"
-#: schedutils/ionice.c:192
+#: schedutils/ionice.c:195
msgid "invalid UID argument"
msgstr "无效的 UID 参数"
-#: schedutils/ionice.c:211
+#: schedutils/ionice.c:214
msgid "ignoring given class data for none class"
msgstr "将忽略为“无”类别指定的类别数据"
-#: schedutils/ionice.c:219
+#: schedutils/ionice.c:222
msgid "ignoring given class data for idle class"
msgstr "将忽略为“空闲”类别指定的类别数据"
-#: schedutils/ionice.c:224
+#: schedutils/ionice.c:227
#, c-format
msgid "unknown prio class %d"
msgstr "未知的优先级类别 %d"
-#: schedutils/taskset.c:52
+#: schedutils/taskset.c:51
#, c-format
msgid ""
"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
@@ -9541,7 +9549,11 @@ msgstr ""
"用法:%s [选项] [掩码 | cpu列表] [pid|命令 [参数...]]\n"
"\n"
-#: schedutils/taskset.c:56
+#: schedutils/taskset.c:55
+msgid "Show or change the CPU affinity of a process.\n"
+msgstr ""
+
+#: schedutils/taskset.c:59
#, c-format
msgid ""
"Options:\n"
@@ -9560,7 +9572,7 @@ msgstr ""
" -V, --version 输出版本信息\n"
"\n"
-#: schedutils/taskset.c:64
+#: schedutils/taskset.c:67
#, c-format
msgid ""
"The default behavior is to run a new command:\n"
@@ -9585,71 +9597,73 @@ msgstr ""
"列表格式中的范围可以带一个跨度参数:\n"
" 例如 0-31:2 与掩码 0x55555555 等效\n"
-#: schedutils/taskset.c:76
-#, c-format
-msgid ""
-"\n"
-"For more information see taskset(1).\n"
-msgstr ""
-"\n"
-"更多信息请参阅 taskset(1)。\n"
-
-#: schedutils/taskset.c:87
+#: schedutils/taskset.c:90
#, c-format
msgid "pid %d's new affinity list: %s\n"
msgstr "pid %d 的新亲和列表:%s\n"
-#: schedutils/taskset.c:88
+#: schedutils/taskset.c:91
#, c-format
msgid "pid %d's current affinity list: %s\n"
msgstr "pid %d 的当前亲和列表:%s\n"
-#: schedutils/taskset.c:91
+#: schedutils/taskset.c:94
#, c-format
msgid "pid %d's new affinity mask: %s\n"
msgstr "pid %d 的新亲和掩码:%s\n"
-#: schedutils/taskset.c:92
+#: schedutils/taskset.c:95
#, c-format
msgid "pid %d's current affinity mask: %s\n"
msgstr "pid %d 的当前亲和掩码:%s\n"
-#: schedutils/taskset.c:96
+#: schedutils/taskset.c:99
msgid "internal error: conversion from cpuset to string failed"
msgstr "内部错误:从 cpuset 转换到字符串失败"
-#: schedutils/taskset.c:106 schedutils/taskset.c:122
+#: schedutils/taskset.c:109 schedutils/taskset.c:125
#, c-format
msgid "failed to get pid %d's affinity"
msgstr "获取 pid %d 的亲和力失败"
-#: schedutils/taskset.c:116
+#: schedutils/taskset.c:119
#, c-format
msgid "failed to set pid %d's affinity"
msgstr "设置 pid %d 的亲和力失败"
-#: schedutils/taskset.c:184 sys-utils/chcpu.c:286
+#: schedutils/taskset.c:186 sys-utils/chcpu.c:289
msgid "cannot determine NR_CPUS; aborting"
msgstr "无法确定 NR_CPUS;将中止"
-#: schedutils/taskset.c:193 schedutils/taskset.c:206 sys-utils/chcpu.c:292
+#: schedutils/taskset.c:195 schedutils/taskset.c:208 sys-utils/chcpu.c:295
msgid "cpuset_alloc failed"
msgstr "cpuset_alloc 失败"
-#: schedutils/taskset.c:213 sys-utils/chcpu.c:232
+#: schedutils/taskset.c:215 sys-utils/chcpu.c:232
#, c-format
msgid "failed to parse CPU list: %s"
msgstr "解析 CPU 列表失败:%s"
-#: schedutils/taskset.c:216
+#: schedutils/taskset.c:218
#, c-format
msgid "failed to parse CPU mask: %s"
msgstr "解析 CPU 掩码失败:%s"
-#: sys-utils/blkdiscard.c:58
+#: sys-utils/blkdiscard.c:56
+#, c-format
+msgid "%s: Discarded %<PRIu64> bytes from the offset %<PRIu64>\n"
+msgstr "%1$s:已忽略从偏移 %3$<PRIu64> 位置开始的 %2$<PRIu64> 个字节\n"
+
+#: sys-utils/blkdiscard.c:66
+msgid "Discard the content of sectors on a device.\n"
+msgstr ""
+
+#: sys-utils/blkdiscard.c:69
+#, fuzzy
msgid ""
" -o, --offset <num> offset in bytes to discard from\n"
" -l, --length <num> length of bytes to discard from the offset\n"
+" -p, --step <num> size of the discard iterations within the offset\n"
" -s, --secure perform secure discard\n"
" -v, --verbose print aligned length and offset\n"
msgstr ""
@@ -9658,46 +9672,60 @@ msgstr ""
" -s, --secure 执行安全忽略\n"
" -v, --verbose 打印对齐的长度和偏移\n"
-#: sys-utils/blkdiscard.c:109 sys-utils/fstrim.c:287 sys-utils/losetup.c:530
+#: sys-utils/blkdiscard.c:124 sys-utils/fstrim.c:291 sys-utils/losetup.c:533
#: text-utils/hexdump.c:124
msgid "failed to parse offset"
msgstr "解析偏移失败"
-#: sys-utils/blkdiscard.c:124
+#: sys-utils/blkdiscard.c:128
+#, fuzzy
+msgid "failed to parse step"
+msgstr "解析大小失败"
+
+#: sys-utils/blkdiscard.c:143 sys-utils/zramctl.c:537 sys-utils/zramctl.c:562
msgid "no device specified"
msgstr "未指定设备"
-#: sys-utils/blkdiscard.c:129 sys-utils/fallocate.c:348
-#: sys-utils/fsfreeze.c:118 sys-utils/fstrim.c:309
+#: sys-utils/blkdiscard.c:148 sys-utils/fallocate.c:351
+#: sys-utils/fsfreeze.c:122 sys-utils/fstrim.c:313
msgid "unexpected number of arguments"
msgstr "参数数量异常"
-#: sys-utils/blkdiscard.c:143
+#: sys-utils/blkdiscard.c:162
#, c-format
msgid "%s: BLKGETSIZE64 ioctl failed"
msgstr "%s:BLKGETSIZE64 ioctl 失败"
-#: sys-utils/blkdiscard.c:145
+#: sys-utils/blkdiscard.c:164
#, c-format
msgid "%s: BLKSSZGET ioctl failed"
msgstr "%s:BLKSSZGET ioctl 失败"
-#: sys-utils/blkdiscard.c:158
+#: sys-utils/blkdiscard.c:168
+#, c-format
+msgid "%s: offset %<PRIu64> is not aligned to sector size %i"
+msgstr ""
+
+#: sys-utils/blkdiscard.c:173
+#, c-format
+msgid "%s: offset is greater than device size"
+msgstr "%s:偏移量超过设备大小"
+
+#: sys-utils/blkdiscard.c:182
+#, c-format
+msgid "%s: length %<PRIu64> is not aligned to sector size %i"
+msgstr ""
+
+#: sys-utils/blkdiscard.c:194
#, c-format
msgid "%s: BLKSECDISCARD ioctl failed"
msgstr "%s:BLKSECDISCARD ioctl 失败"
-#: sys-utils/blkdiscard.c:161
+#: sys-utils/blkdiscard.c:197
#, c-format
msgid "%s: BLKDISCARD ioctl failed"
msgstr "%s:BLKDISCARD ioctl 失败"
-#. TRANSLATORS: The standard value here is a very large number.
-#: sys-utils/blkdiscard.c:166
-#, c-format
-msgid "%s: Discarded %<PRIu64> bytes from the offset %<PRIu64>\n"
-msgstr "%1$s:已忽略从偏移 %3$<PRIu64> 位置开始的 %2$<PRIu64> 个字节\n"
-
#: sys-utils/chcpu.c:87 sys-utils/chcpu.c:179
#, c-format
msgid "CPU %d does not exist"
@@ -9828,7 +9856,7 @@ msgstr "CPU %d 已解除配置\n"
msgid "invalid CPU number in CPU list: %s"
msgstr "CPU 列表中的 CPU 数量无效:%s"
-#: sys-utils/chcpu.c:238 text-utils/col.c:121
+#: sys-utils/chcpu.c:238 text-utils/col.c:130
#, c-format
msgid ""
"\n"
@@ -9839,7 +9867,11 @@ msgstr ""
"用法:\n"
" %s [选项]\n"
-#: sys-utils/chcpu.c:241
+#: sys-utils/chcpu.c:242
+msgid "Configure CPUs in a multi-processor system.\n"
+msgstr ""
+
+#: sys-utils/chcpu.c:244
msgid ""
"\n"
"Options:\n"
@@ -9863,189 +9895,193 @@ msgstr ""
" -r, --rescan 触发重新扫描 cpu\n"
" -V, --version 输出版本信息并退出\n"
-#: sys-utils/chcpu.c:323
+#: sys-utils/chcpu.c:326
#, c-format
msgid "unsupported argument: %s"
msgstr "不支持的参数:%s"
#: sys-utils/ctrlaltdel.c:21
-#, c-format
-msgid " %s <hard|soft>\n"
+#, fuzzy, c-format
+msgid " %s hard|soft\n"
msgstr " %s <hard|soft>\n"
-#: sys-utils/ctrlaltdel.c:56
+#: sys-utils/ctrlaltdel.c:60
msgid "You must be root to set the Ctrl-Alt-Del behavior"
msgstr "只有 root 用户才能设置 Ctrl-Alt-Del 行为"
-#: sys-utils/dmesg.c:108
+#: sys-utils/dmesg.c:110
msgid "system is unusable"
msgstr "系统无法使用"
-#: sys-utils/dmesg.c:109
+#: sys-utils/dmesg.c:111
msgid "action must be taken immediately"
msgstr "操作必须立即执行"
-#: sys-utils/dmesg.c:110
+#: sys-utils/dmesg.c:112
msgid "critical conditions"
msgstr "紧急条件"
-#: sys-utils/dmesg.c:111
+#: sys-utils/dmesg.c:113
msgid "error conditions"
msgstr "错误条件"
-#: sys-utils/dmesg.c:112
+#: sys-utils/dmesg.c:114
msgid "warning conditions"
msgstr "警告条件"
-#: sys-utils/dmesg.c:113
+#: sys-utils/dmesg.c:115
msgid "normal but significant condition"
msgstr "正常但重要的条件"
-#: sys-utils/dmesg.c:114
+#: sys-utils/dmesg.c:116
msgid "informational"
msgstr "信息"
-#: sys-utils/dmesg.c:115
+#: sys-utils/dmesg.c:117
msgid "debug-level messages"
msgstr "调试级别的消息"
-#: sys-utils/dmesg.c:129
+#: sys-utils/dmesg.c:131
msgid "kernel messages"
msgstr "内核消息"
-#: sys-utils/dmesg.c:130
+#: sys-utils/dmesg.c:132
msgid "random user-level messages"
msgstr "随机的用户级消息"
-#: sys-utils/dmesg.c:131
+#: sys-utils/dmesg.c:133
msgid "mail system"
msgstr "邮件系统"
-#: sys-utils/dmesg.c:132
+#: sys-utils/dmesg.c:134
msgid "system daemons"
msgstr "系统守护进程"
-#: sys-utils/dmesg.c:133
+#: sys-utils/dmesg.c:135
msgid "security/authorization messages"
msgstr "安全/认证消息"
-#: sys-utils/dmesg.c:134
+#: sys-utils/dmesg.c:136
msgid "messages generated internally by syslogd"
msgstr "syslogd 内部生成的消息"
-#: sys-utils/dmesg.c:135
+#: sys-utils/dmesg.c:137
msgid "line printer subsystem"
msgstr "行打印机子系统"
-#: sys-utils/dmesg.c:136
+#: sys-utils/dmesg.c:138
msgid "network news subsystem"
msgstr "网络新闻子系统"
-#: sys-utils/dmesg.c:137
+#: sys-utils/dmesg.c:139
msgid "UUCP subsystem"
msgstr "UUCP 子系统"
-#: sys-utils/dmesg.c:138
+#: sys-utils/dmesg.c:140
msgid "clock daemon"
msgstr "时钟守护进程"
-#: sys-utils/dmesg.c:139
+#: sys-utils/dmesg.c:141
msgid "security/authorization messages (private)"
msgstr "安全/认证消息(私有)"
-#: sys-utils/dmesg.c:140
+#: sys-utils/dmesg.c:142
msgid "FTP daemon"
msgstr "ftp 守护进程"
-#: sys-utils/dmesg.c:263
+#: sys-utils/dmesg.c:266
+msgid "Display or control the kernel ring buffer.\n"
+msgstr ""
+
+#: sys-utils/dmesg.c:269
msgid " -C, --clear clear the kernel ring buffer\n"
msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n"
-#: sys-utils/dmesg.c:264
+#: sys-utils/dmesg.c:270
msgid " -c, --read-clear read and clear all messages\n"
msgstr " -c, --read-clear 读取并清除所有消息\n"
-#: sys-utils/dmesg.c:265
+#: sys-utils/dmesg.c:271
msgid " -D, --console-off disable printing messages to console\n"
msgstr " -D, --console-off 禁止向终端打印消息\n"
-#: sys-utils/dmesg.c:266
+#: sys-utils/dmesg.c:272
msgid " -E, --console-on enable printing messages to console\n"
msgstr " -E, --console-on 启用向终端打印消息\n"
-#: sys-utils/dmesg.c:267
+#: sys-utils/dmesg.c:273
msgid " -F, --file <file> use the file instead of the kernel log buffer\n"
msgstr " -F, --file <文件> 用 文件 代替内核日志缓冲区\n"
-#: sys-utils/dmesg.c:268
+#: sys-utils/dmesg.c:274
msgid " -f, --facility <list> restrict output to defined facilities\n"
msgstr " -f, --facility <列表> 将输出限制为定义的设施\n"
-#: sys-utils/dmesg.c:269
+#: sys-utils/dmesg.c:275
msgid " -H, --human human readable output\n"
msgstr " -H, --human 易读格式输出\n"
-#: sys-utils/dmesg.c:270
+#: sys-utils/dmesg.c:276
msgid " -k, --kernel display kernel messages\n"
msgstr " -k, --kernel 显示内核消息\n"
-#: sys-utils/dmesg.c:271
+#: sys-utils/dmesg.c:277
msgid " -L, --color[=<when>] colorize messages (auto, always or never)\n"
msgstr " -L, --color[=<时机>] 彩色显示消息(auto, always 或 never)\n"
-#: sys-utils/dmesg.c:272
+#: sys-utils/dmesg.c:278
msgid " -l, --level <list> restrict output to defined levels\n"
msgstr " -l, --level <列表> 限制输出级别\n"
-#: sys-utils/dmesg.c:273
+#: sys-utils/dmesg.c:279
msgid " -n, --console-level <level> set level of messages printed to console\n"
msgstr " -n, --console-level <级别> 设置打印到终端的消息级别\n"
-#: sys-utils/dmesg.c:274
+#: sys-utils/dmesg.c:280
msgid " -P, --nopager do not pipe output into a pager\n"
msgstr " -P, --nopager 不将输出通过管道传递给分页程序\n"
-#: sys-utils/dmesg.c:275
+#: sys-utils/dmesg.c:281
msgid " -r, --raw print the raw message buffer\n"
msgstr " -r, --raw 打印原生消息缓冲区\n"
-#: sys-utils/dmesg.c:276
+#: sys-utils/dmesg.c:282
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:277
+#: sys-utils/dmesg.c:283
msgid " -s, --buffer-size <size> buffer size to query the kernel ring buffer\n"
msgstr " -s, --buffer-size <大小> 查询内核环形缓冲区所用的缓冲区大小\n"
-#: sys-utils/dmesg.c:278
+#: sys-utils/dmesg.c:284
msgid " -u, --userspace display userspace messages\n"
msgstr " -u, --userspace 显示用户空间消息\n"
-#: sys-utils/dmesg.c:279
+#: sys-utils/dmesg.c:285
msgid " -w, --follow wait for new messages\n"
msgstr " -w, --follow 等待新消息\n"
-#: sys-utils/dmesg.c:280
+#: sys-utils/dmesg.c:286
msgid " -x, --decode decode facility and level to readable string\n"
msgstr " -x, --decode 将设施和级别解码为可读的字符串\n"
-#: sys-utils/dmesg.c:281
+#: sys-utils/dmesg.c:287
msgid " -d, --show-delta show time delta between printed messages\n"
msgstr " -d, --show-delta 显示打印消息之间的时间差\n"
-#: sys-utils/dmesg.c:282
+#: sys-utils/dmesg.c:288
msgid " -e, --reltime show local time and time delta in readable format\n"
msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n"
-#: sys-utils/dmesg.c:283
+#: sys-utils/dmesg.c:289
msgid " -T, --ctime show human readable timestamp\n"
msgstr " -T, --ctime 显示易读的时间戳\n"
-#: sys-utils/dmesg.c:284
+#: sys-utils/dmesg.c:290
msgid " -t, --notime don't print messages timestamp\n"
msgstr " -t, --notime 不打印消息时间戳\n"
-#: sys-utils/dmesg.c:285
+#: sys-utils/dmesg.c:291
msgid ""
" --time-format <format> show time stamp using format:\n"
" [delta|reltime|ctime|notime|iso]\n"
@@ -10055,7 +10091,7 @@ msgstr ""
" [delta|reltime|ctime|notime|iso]\n"
"挂起/恢复会使 ctime 和 iso 时间戳不精确。\n"
-#: sys-utils/dmesg.c:291
+#: sys-utils/dmesg.c:297
msgid ""
"\n"
"Supported log facilities:\n"
@@ -10063,7 +10099,7 @@ msgstr ""
"\n"
"支持的日志设施:\n"
-#: sys-utils/dmesg.c:297
+#: sys-utils/dmesg.c:303
msgid ""
"\n"
"Supported log levels (priorities):\n"
@@ -10071,61 +10107,63 @@ msgstr ""
"\n"
"支持的日志级别(优先级):\n"
-#: sys-utils/dmesg.c:351
+#: sys-utils/dmesg.c:357
#, c-format
msgid "failed to parse level '%s'"
msgstr "解析级别“%s”失败"
-#: sys-utils/dmesg.c:353
+#: sys-utils/dmesg.c:359
#, c-format
msgid "unknown level '%s'"
msgstr "未知级别“%s”"
-#: sys-utils/dmesg.c:389
+#: sys-utils/dmesg.c:395
#, c-format
msgid "failed to parse facility '%s'"
msgstr "解析设施“%s”失败"
-#: sys-utils/dmesg.c:391
+#: sys-utils/dmesg.c:397
#, c-format
msgid "unknown facility '%s'"
msgstr "未知设施“%s”"
-#: sys-utils/dmesg.c:519
+#: sys-utils/dmesg.c:525
#, c-format
msgid "cannot mmap: %s"
msgstr "无法 mmap:%s"
-#: sys-utils/dmesg.c:1318
+#: sys-utils/dmesg.c:1325
msgid "invalid buffer size argument"
msgstr "无效的 缓冲区大小 参数"
-#: sys-utils/dmesg.c:1375
+#: sys-utils/dmesg.c:1381
msgid "--show-delta is ignored when used together with iso8601 time format"
msgstr "--show-delta 与 iso8601 时间格式共用时将忽略"
-#: sys-utils/dmesg.c:1398
-msgid "--raw could be used together with --level or --facility only when read messages from /dev/kmsg"
+#: sys-utils/dmesg.c:1404
+#, fuzzy
+msgid "--raw can be used together with --level or --facility only when reading messages from /dev/kmsg"
msgstr "--raw 只有在从 /dev/kmsg 读消息时才可以与 --level 或 --facility 共用"
-#: sys-utils/dmesg.c:1408
+#: sys-utils/dmesg.c:1414
msgid "read kernel buffer failed"
msgstr "读取内核缓冲区失败"
-#: sys-utils/dmesg.c:1421
-msgid "unsupported command"
-msgstr "不支持的命令"
-
-#: sys-utils/dmesg.c:1427
+#: sys-utils/dmesg.c:1433
msgid "klogctl failed"
msgstr "klogctl 失败"
-#: sys-utils/eject.c:142
+#: sys-utils/eject.c:134
#, c-format
msgid " %s [options] [<device>|<mountpoint>]\n"
msgstr " %s [选项] [<设备>|<挂臷点>]\n"
-#: sys-utils/eject.c:145
+#: sys-utils/eject.c:137
+#, fuzzy
+msgid "Eject removable media.\n"
+msgstr "可移动设备"
+
+#: sys-utils/eject.c:140
msgid ""
" -a, --auto <on|off> turn auto-eject feature on or off\n"
" -c, --changerslot <slot> switch discs on a CD-ROM changer\n"
@@ -10165,7 +10203,7 @@ msgstr ""
" -x, --cdspeed <速度> 设置 CD-ROM 最高速度\n"
" -X, --listspeed 列出 CD-ROM 可用速度\n"
-#: sys-utils/eject.c:169
+#: sys-utils/eject.c:164
msgid ""
"\n"
"By default tries -r, -s, -f, and -q in order until success.\n"
@@ -10173,291 +10211,290 @@ msgstr ""
"\n"
"默认将依次尝试 -r、-s、-f 和 -q 直到成功。\n"
-#: sys-utils/eject.c:215
+#: sys-utils/eject.c:210
msgid "invalid argument to --auto/-a option"
msgstr "--auto/-a 选项参数无效"
-#: sys-utils/eject.c:219
+#: sys-utils/eject.c:214
msgid "invalid argument to --changerslot/-c option"
msgstr "--changerslot/-c 选项的参数无效"
-#: sys-utils/eject.c:223
+#: sys-utils/eject.c:218
msgid "invalid argument to --cdspeed/-x option"
msgstr "--cdspeed/-x 选项的参数无效"
-#: sys-utils/eject.c:244
+#: sys-utils/eject.c:239
msgid "invalid argument to --manualeject/-i option"
msgstr "--manualeject/-i 选项的参数无效"
-#: sys-utils/eject.c:339
+#: sys-utils/eject.c:334
msgid "CD-ROM auto-eject command failed"
msgstr "CD-ROM 自动弹出命令失败"
-#: sys-utils/eject.c:356
+#: sys-utils/eject.c:348
+#, fuzzy
+msgid "CD-ROM door lock is not supported"
+msgstr "CD-ROM 驱动器未就绪"
+
+#: sys-utils/eject.c:350
+msgid "other users have the drive open and not CAP_SYS_ADMIN"
+msgstr ""
+
+#: sys-utils/eject.c:352
msgid "CD-ROM lock door command failed"
msgstr "CD-ROM 锁仓门命令失败"
-#: sys-utils/eject.c:359
+#: sys-utils/eject.c:357
msgid "CD-Drive may NOT be ejected with device button"
msgstr "CD 驱动器不能通过设备上的按钮弹出"
-#: sys-utils/eject.c:361
+#: sys-utils/eject.c:359
msgid "CD-Drive may be ejected with device button"
msgstr "CD 驱动器可以通过设备上的按钮弹出"
-#: sys-utils/eject.c:372
+#: sys-utils/eject.c:370
msgid "CD-ROM select disc command failed"
msgstr "CD-ROM 选择光盘命令失败"
-#: sys-utils/eject.c:376
+#: sys-utils/eject.c:374
msgid "CD-ROM load from slot command failed"
msgstr "CD-ROM 从槽加载命令失败"
-#: sys-utils/eject.c:378
+#: sys-utils/eject.c:376
msgid "IDE/ATAPI CD-ROM changer not supported by this kernel\n"
msgstr "此内核不支持 IDE/ATAPI CD-ROM\n"
-#: sys-utils/eject.c:396
+#: sys-utils/eject.c:394
msgid "CD-ROM tray close command failed"
msgstr "CD-ROM 关闭仓门命令失败"
-#: sys-utils/eject.c:398
+#: sys-utils/eject.c:396
msgid "CD-ROM tray close command not supported by this kernel\n"
msgstr "此内核不支持 CD-ROM 关闭仓门命令\n"
-#: sys-utils/eject.c:415
+#: sys-utils/eject.c:413
msgid "CD-ROM eject unsupported"
msgstr "不支持 CD-ROM 弹出"
-#: sys-utils/eject.c:446 sys-utils/eject.c:467 sys-utils/eject.c:1119
+#: sys-utils/eject.c:441 sys-utils/eject.c:464 sys-utils/eject.c:1019
msgid "CD-ROM eject command failed"
msgstr "CD-ROM 弹出命令失败"
-#: sys-utils/eject.c:449
+#: sys-utils/eject.c:444
msgid "no CD-ROM information available"
msgstr "没有可用的 CD-ROM 信息"
-#: sys-utils/eject.c:452
+#: sys-utils/eject.c:447
msgid "CD-ROM drive is not ready"
msgstr "CD-ROM 驱动器未就绪"
-#: sys-utils/eject.c:492
+#: sys-utils/eject.c:490
msgid "CD-ROM select speed command failed"
msgstr "CD-ROM 选择速度命令失败"
-#: sys-utils/eject.c:494 sys-utils/eject.c:580
+#: sys-utils/eject.c:492 sys-utils/eject.c:578
msgid "CD-ROM select speed command not supported by this kernel"
msgstr "此内核不支持 CD-ROM 选择速度命令"
-#: sys-utils/eject.c:531
+#: sys-utils/eject.c:529
#, c-format
msgid "%s: failed to finding CD-ROM name"
msgstr "%s:获取 CD-ROM 名称失败"
-#: sys-utils/eject.c:546
+#: sys-utils/eject.c:544
#, c-format
msgid "%s: failed to read speed"
msgstr "%s:读 速度 失败"
-#: sys-utils/eject.c:554
+#: sys-utils/eject.c:552
msgid "failed to read speed"
msgstr "读 速度 失败"
-#: sys-utils/eject.c:598
+#: sys-utils/eject.c:596
msgid "not an sg device, or old sg driver"
msgstr "不是 sg 设备,或为旧 sg 驱动"
-#: sys-utils/eject.c:670
+#: sys-utils/eject.c:668
#, c-format
msgid "%s: unmounting"
msgstr "%s:正在卸载"
-#: sys-utils/eject.c:685
+#: sys-utils/eject.c:683
#, c-format
msgid "unable to exec /bin/umount of `%s'"
msgstr "无法对“%s”执行 /bin/umount"
-#: sys-utils/eject.c:688
+#: sys-utils/eject.c:686
msgid "unable to fork"
msgstr "无法 fork"
-#: sys-utils/eject.c:695
+#: sys-utils/eject.c:693
#, c-format
msgid "unmount of `%s' did not exit normally"
msgstr "卸载“%s”未正常退出"
-#: sys-utils/eject.c:698
+#: sys-utils/eject.c:696
#, c-format
msgid "unmount of `%s' failed\n"
msgstr "挂臷“%s”失败\n"
-#: sys-utils/eject.c:742
+#: sys-utils/eject.c:738
msgid "failed to parse mount table"
msgstr "解析挂臷表失败"
-#: sys-utils/eject.c:803 sys-utils/eject.c:1000
+#: sys-utils/eject.c:799 sys-utils/eject.c:900
#, c-format
msgid "%s: mounted on %s"
msgstr "%s:已挂臷于 %s"
-#: sys-utils/eject.c:900
-#, c-format
-msgid "%s: is removable device"
-msgstr "%s 不是可移动设备"
-
-#: sys-utils/eject.c:919
-#, c-format
-msgid "%s: connected by hotplug subsystem: %s"
-msgstr "%s:已通过热插拔子系统连接:%s"
-
-#: sys-utils/eject.c:940
+#: sys-utils/eject.c:841
msgid "setting CD-ROM speed to auto"
msgstr "正在将 CD-ROM 速度设置为自动"
-#: sys-utils/eject.c:942
+#: sys-utils/eject.c:843
#, c-format
msgid "setting CD-ROM speed to %ldX"
msgstr "正在将 CD-ROM 速度设置为 %ldX"
-#: sys-utils/eject.c:969
+#: sys-utils/eject.c:869
#, c-format
msgid "default device: `%s'"
msgstr "默认设备:“%s”"
-#: sys-utils/eject.c:975
+#: sys-utils/eject.c:875
#, c-format
msgid "using default device `%s'"
msgstr "使用默认设备“%s”"
-#: sys-utils/eject.c:994
+#: sys-utils/eject.c:894
#, c-format
msgid "%s: unable to find device"
msgstr "%s:找不到设备"
-#: sys-utils/eject.c:996
+#: sys-utils/eject.c:896
#, c-format
msgid "device name is `%s'"
msgstr "设备名称为“%s”"
-#: sys-utils/eject.c:1002 sys-utils/umount.c:204 sys-utils/umount.c:233
-#: sys-utils/umount.c:407 sys-utils/umount.c:430
+#: sys-utils/eject.c:902 sys-utils/umount.c:207 sys-utils/umount.c:236
+#: sys-utils/umount.c:410 sys-utils/umount.c:433
#, c-format
msgid "%s: not mounted"
msgstr "%s:未挂载"
-#: sys-utils/eject.c:1006
+#: sys-utils/eject.c:906
#, c-format
msgid "%s: disc device: %s (disk device will be used for eject)"
msgstr "%s:盘设备:%s(盘设备将用于弹出)"
-#: sys-utils/eject.c:1014
+#: sys-utils/eject.c:914
#, c-format
msgid "%s: not found mountpoint or device with the given name"
msgstr "%s:未找到指定名称的挂载点或设备"
-#: sys-utils/eject.c:1017
+#: sys-utils/eject.c:917
#, c-format
msgid "%s: is whole-disk device"
msgstr "%s:是 整盘 设备"
-#: sys-utils/eject.c:1021
+#: sys-utils/eject.c:921
#, c-format
msgid "%s: is not hot-pluggable device"
msgstr "%s:不是热插拔设备"
-#: sys-utils/eject.c:1025
+#: sys-utils/eject.c:925
#, c-format
msgid "device is `%s'"
msgstr "设备是“%s”"
-#: sys-utils/eject.c:1026
+#: sys-utils/eject.c:926
msgid "exiting due to -n/--noop option"
msgstr "将因 -n/--noop 选项退出"
-#: sys-utils/eject.c:1040
+#: sys-utils/eject.c:940
#, c-format
msgid "%s: enabling auto-eject mode"
msgstr "%s:正在启用自动弹出模式"
-#: sys-utils/eject.c:1042
+#: sys-utils/eject.c:942
#, c-format
msgid "%s: disabling auto-eject mode"
msgstr "%s:正在禁用自动弹出模式"
-#: sys-utils/eject.c:1050
+#: sys-utils/eject.c:950
#, c-format
msgid "%s: closing tray"
msgstr "%s:正在关闭仓门"
-#: sys-utils/eject.c:1059
+#: sys-utils/eject.c:959
#, c-format
msgid "%s: toggling tray"
msgstr "%s:开关仓门"
-#: sys-utils/eject.c:1068
+#: sys-utils/eject.c:968
#, c-format
msgid "%s: listing CD-ROM speed"
msgstr "%s:正在列出 CD-ROM 速度"
-#: sys-utils/eject.c:1094
+#: sys-utils/eject.c:994
#, c-format
msgid "error: %s: device in use"
msgstr "错误:%s:设备正在使用"
-#: sys-utils/eject.c:1100
+#: sys-utils/eject.c:1000
#, c-format
msgid "%s: selecting CD-ROM disc #%ld"
msgstr "%s:正在选择 CD-ROM 盘 #%ld"
-#: sys-utils/eject.c:1116
+#: sys-utils/eject.c:1016
#, c-format
msgid "%s: trying to eject using CD-ROM eject command"
msgstr "%s:正在尝试使用 CD-ROM 弹出命令弹出"
-#: sys-utils/eject.c:1118
+#: sys-utils/eject.c:1018
msgid "CD-ROM eject command succeeded"
msgstr "CD-ROM 弹出命令成功"
-#: sys-utils/eject.c:1123
+#: sys-utils/eject.c:1023
#, c-format
msgid "%s: trying to eject using SCSI commands"
msgstr "%s:正在尝试使用 SCSI 命令弹出"
-#: sys-utils/eject.c:1125
+#: sys-utils/eject.c:1025
msgid "SCSI eject succeeded"
msgstr "SCSI 弹出成功"
-#: sys-utils/eject.c:1126
+#: sys-utils/eject.c:1026
msgid "SCSI eject failed"
msgstr "SCSI 弹出失败"
-#: sys-utils/eject.c:1130
+#: sys-utils/eject.c:1030
#, c-format
msgid "%s: trying to eject using floppy eject command"
msgstr "%s:正在尝试使用软盘弹出命令弹出"
-#: sys-utils/eject.c:1132
+#: sys-utils/eject.c:1032
msgid "floppy eject command succeeded"
msgstr "软盘弹出命令成功"
-#: sys-utils/eject.c:1133
+#: sys-utils/eject.c:1033
msgid "floppy eject command failed"
msgstr "软盘弹出命令失败"
-#: sys-utils/eject.c:1137
+#: sys-utils/eject.c:1037
#, c-format
msgid "%s: trying to eject using tape offline command"
msgstr "%s:正在尝试使用磁带离线命令弹出"
-#: sys-utils/eject.c:1139
+#: sys-utils/eject.c:1039
msgid "tape offline command succeeded"
msgstr "磁带离线命令成功"
-#: sys-utils/eject.c:1140
+#: sys-utils/eject.c:1040
msgid "tape offline command failed"
msgstr "磁带离线命令失败"
-#: sys-utils/eject.c:1144
+#: sys-utils/eject.c:1044
msgid "unable to eject"
msgstr "无法弹出"
@@ -10467,133 +10504,150 @@ msgid " %s [options] <filename>\n"
msgstr " %s [选项] <文件名>\n"
#: sys-utils/fallocate.c:81
+msgid "Preallocate space to, or deallocate space from a file.\n"
+msgstr ""
+
+#: sys-utils/fallocate.c:84
msgid " -c, --collapse-range remove a range from the file\n"
msgstr " -c, --collapse-range 移除文件中的某个范围\n"
-#: sys-utils/fallocate.c:82
+#: sys-utils/fallocate.c:85
msgid " -d, --dig-holes detect zeroes and replace with holes\n"
msgstr " -d, --dig-holes 检测零并替换为空洞\n"
-#: sys-utils/fallocate.c:83
+#: sys-utils/fallocate.c:86
msgid " -l, --length <num> length for range operations, in bytes\n"
msgstr " -l, --length <数字> 范围操作的长度(字节数)\n"
-#: sys-utils/fallocate.c:84
+#: sys-utils/fallocate.c:87
msgid " -n, --keep-size maintain the apparent size of the file\n"
msgstr " -n, --keep-size 保持文件的显示大小\n"
-#: sys-utils/fallocate.c:85
+#: sys-utils/fallocate.c:88
msgid " -o, --offset <num> offset for range operations, in bytes\n"
msgstr " -o, --offset <数字> 范围操作的偏移量(字节数)\n"
-#: sys-utils/fallocate.c:86
+#: sys-utils/fallocate.c:89
msgid " -p, --punch-hole replace a range with a hole (implies -n)\n"
msgstr " -p, --punch-hole 将某个范围替换为空洞(连带打开 -n)\n"
-#: sys-utils/fallocate.c:87
+#: sys-utils/fallocate.c:90
msgid " -z, --zero-range zero and ensure allocation of a range\n"
msgstr " -z, --zero-range 清零并保证分配某个范围\n"
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:126
msgid "keep size mode (-n option) unsupported"
msgstr "不支持保持大小模式(-n 选项)"
-#: sys-utils/fallocate.c:124
+#: sys-utils/fallocate.c:127
msgid "fallocate failed"
msgstr "fallocate 失败"
-#: sys-utils/fallocate.c:213
+#: sys-utils/fallocate.c:216
#, c-format
msgid "%s: read failed"
msgstr "%s:read 失败"
-#: sys-utils/fallocate.c:259
+#: sys-utils/fallocate.c:262
#, c-format
msgid "%s: %s (%ju bytes) converted to sparse holes.\n"
msgstr "%s:已将 %s(%ju 字节) 转换为稀疏空洞。\n"
-#: sys-utils/fallocate.c:343 sys-utils/fsfreeze.c:114
+#: sys-utils/fallocate.c:346 sys-utils/fsfreeze.c:118
msgid "no filename specified"
msgstr "未指定文件名"
-#: sys-utils/fallocate.c:355 sys-utils/fallocate.c:361
+#: sys-utils/fallocate.c:358 sys-utils/fallocate.c:364
msgid "invalid length value specified"
msgstr "指定的长度值无效"
-#: sys-utils/fallocate.c:359
+#: sys-utils/fallocate.c:362
msgid "no length argument specified"
msgstr "没有指定长度参数"
-#: sys-utils/fallocate.c:364
+#: sys-utils/fallocate.c:367
msgid "invalid offset value specified"
msgstr "指定的偏移值无效"
#: sys-utils/flock.c:52
-#, c-format
+#, fuzzy, c-format
msgid ""
-" %1$s [options] <file|directory> <command> [<arguments>...]\n"
-" %1$s [options] <file|directory> -c <command>\n"
+" %1$s [options] <file>|<directory> <command> [<argument>...]\n"
+" %1$s [options] <file>|<directory> -c <command>\n"
" %1$s [options] <file descriptor number>\n"
msgstr ""
" %1$s [选项] <文件|目录> <命令> [<参数>...]\n"
" %1$s [选项] <文件|目录> -c <命令>\n"
" %1$s [选项] <文件描述符号码>\n"
-#: sys-utils/flock.c:57
-msgid " -s --shared get a shared lock\n"
+#: sys-utils/flock.c:58
+msgid "Manage file locks from shell scripts.\n"
+msgstr ""
+
+#: sys-utils/flock.c:61
+#, fuzzy
+msgid " -s, --shared get a shared lock\n"
msgstr " -s --shared 获得共享锁\n"
-#: sys-utils/flock.c:58
-msgid " -x --exclusive get an exclusive lock (default)\n"
+#: sys-utils/flock.c:62
+#, fuzzy
+msgid " -x, --exclusive get an exclusive lock (default)\n"
msgstr " -x --exclusive 获得排他锁(默认)\n"
-#: sys-utils/flock.c:59
-msgid " -u --unlock remove a lock\n"
+#: sys-utils/flock.c:63
+#, fuzzy
+msgid " -u, --unlock remove a lock\n"
msgstr " -u --unlock 移除锁\n"
-#: sys-utils/flock.c:60
-msgid " -n --nonblock fail rather than wait\n"
+#: sys-utils/flock.c:64
+#, fuzzy
+msgid " -n, --nonblock fail rather than wait\n"
msgstr " -n --nonblock 失败而不等待\n"
-#: sys-utils/flock.c:61
-msgid " -w --timeout <secs> wait for a limited amount of time\n"
+#: sys-utils/flock.c:65
+#, fuzzy
+msgid " -w, --timeout <secs> wait for a limited amount of time\n"
msgstr " -w --timeout <秒数> 等待一段时间\n"
-#: sys-utils/flock.c:62
-msgid " -E --conflict-exit-code <number> exit code after conflict or timeout\n"
+#: sys-utils/flock.c:66
+#, fuzzy
+msgid " -E, --conflict-exit-code <number> exit code after conflict or timeout\n"
msgstr " -E --conflict-exit-code <数字> 冲突或超时后的退出代码\n"
-#: sys-utils/flock.c:63
-msgid " -o --close close file descriptor before running command\n"
+#: sys-utils/flock.c:67
+#, fuzzy
+msgid " -o, --close close file descriptor before running command\n"
msgstr " -o --close 在运行命令前关闭文件描述符\n"
-#: sys-utils/flock.c:64
-msgid " -c --command <command> run a single command string through the shell\n"
+#: sys-utils/flock.c:68
+#, fuzzy
+msgid " -c, --command <command> run a single command string through the shell\n"
msgstr " -c --command <命令> 通过 shell 运行一条命令\n"
-#: sys-utils/flock.c:97
+#: sys-utils/flock.c:101
#, c-format
msgid "cannot open lock file %s"
msgstr "不能打开锁文件 %s"
-#: sys-utils/flock.c:177
+#: sys-utils/flock.c:181
msgid "invalid timeout value"
msgstr "无效的 超时值"
-#: sys-utils/flock.c:179
-msgid "timeout cannot be zero"
-msgstr "超时不能为零"
-
-#: sys-utils/flock.c:183
+#: sys-utils/flock.c:185
msgid "invalid exit code"
msgstr "无效退出代码"
-#: sys-utils/flock.c:203
+#: sys-utils/flock.c:205
#, c-format
msgid "%s requires exactly one command argument"
msgstr "%s 需要惟一的命令行参数"
-#: sys-utils/flock.c:224
+#: sys-utils/flock.c:223
+#, fuzzy
+msgid "bad file descriptor"
+msgstr "标志描述"
+
+#: sys-utils/flock.c:226
msgid "requires file descriptor, file or directory"
msgstr "需要文件描述符、文件或目录"
@@ -10602,34 +10656,38 @@ msgstr "需要文件描述符、文件或目录"
msgid " %s [options] <mountpoint>\n"
msgstr " %s [选项] <挂臷点>\n"
-#: sys-utils/fsfreeze.c:52
+#: sys-utils/fsfreeze.c:53
+msgid "Suspend access to a filesystem (ext3/4, ReiserFS, JFS, XFS).\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:56
msgid " -f, --freeze freeze the filesystem\n"
msgstr " -f, --freeze 冻结文件系统\n"
-#: sys-utils/fsfreeze.c:53
+#: sys-utils/fsfreeze.c:57
msgid " -u, --unfreeze unfreeze the filesystem\n"
msgstr " -u, --unfreeze 解冻文件系统\n"
-#: sys-utils/fsfreeze.c:112
+#: sys-utils/fsfreeze.c:116
msgid "neither --freeze or --unfreeze specified"
msgstr "既未指定 --freeze 也未指定 --unfreeze"
-#: sys-utils/fsfreeze.c:132
+#: sys-utils/fsfreeze.c:136
#, c-format
msgid "%s: is not a directory"
msgstr "%s:不是目录"
-#: sys-utils/fsfreeze.c:139
+#: sys-utils/fsfreeze.c:143
#, c-format
msgid "%s: freeze failed"
msgstr "%s:冻结失败"
-#: sys-utils/fsfreeze.c:145
+#: sys-utils/fsfreeze.c:149
#, c-format
msgid "%s: unfreeze failed"
msgstr "%s:解冻失败"
-#: sys-utils/fstrim.c:80 sys-utils/mountpoint.c:197
+#: sys-utils/fstrim.c:80
#, c-format
msgid "%s: not a directory"
msgstr "%s:不是一个目录"
@@ -10645,7 +10703,7 @@ msgstr "%s:FITRIM ioctl 失败"
msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgstr "%s:%s (%<PRIu64> 字节) 已修剪\n"
-#: sys-utils/fstrim.c:173 sys-utils/swapon.c:627 sys-utils/umount.c:327
+#: sys-utils/fstrim.c:173 sys-utils/swapon.c:688 sys-utils/umount.c:330
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
@@ -10655,53 +10713,57 @@ msgstr "解析 %s 失败"
msgid " %s [options] <mount point>\n"
msgstr " %s [选项] <挂臷点>\n"
-#: sys-utils/fstrim.c:232
+#: sys-utils/fstrim.c:233
+msgid "Discard unused blocks on a mounted filesystem.\n"
+msgstr ""
+
+#: sys-utils/fstrim.c:236
msgid " -a, --all trim all mounted filesystems that are supported\n"
msgstr " -a, --all 修剪不支持的所有已挂载文件系统\n"
-#: sys-utils/fstrim.c:233
+#: sys-utils/fstrim.c:237
msgid " -o, --offset <num> the offset in bytes to start discarding from\n"
msgstr " -o, --offset <数字> 开始丢弃的偏移量(字节)\n"
-#: sys-utils/fstrim.c:234
+#: sys-utils/fstrim.c:238
msgid " -l, --length <num> the number of bytes to discard\n"
msgstr " -l, --length <数字> 要丢弃的字符数\n"
-#: sys-utils/fstrim.c:235
+#: sys-utils/fstrim.c:239
msgid " -m, --minimum <num> the minimum extent length to discard\n"
msgstr " -m, --minimum <数字> 要丢弃的最小限制长度\n"
-#: sys-utils/fstrim.c:236
+#: sys-utils/fstrim.c:240
msgid " -v, --verbose print number of discarded bytes\n"
msgstr " -v, --verbose 打印丢弃的字节数\n"
-#: sys-utils/fstrim.c:291
+#: sys-utils/fstrim.c:295
msgid "failed to parse minimum extent length"
msgstr "解析 最小范围长度 失败"
-#: sys-utils/fstrim.c:304
+#: sys-utils/fstrim.c:308
msgid "no mountpoint specified"
msgstr "未指定挂载点"
-#: sys-utils/fstrim.c:318
+#: sys-utils/fstrim.c:322
#, c-format
msgid "%s: the discard operation is not supported"
msgstr "%s:不支持丢弃操作"
-#: sys-utils/hwclock.c:231
+#: sys-utils/hwclock.c:244
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "将假设硬件时钟保持为 %s 时间。\n"
-#: sys-utils/hwclock.c:232 sys-utils/hwclock.c:322
+#: sys-utils/hwclock.c:245 sys-utils/hwclock.c:335
msgid "UTC"
msgstr "UTC"
-#: sys-utils/hwclock.c:232 sys-utils/hwclock.c:321
+#: sys-utils/hwclock.c:245 sys-utils/hwclock.c:334
msgid "local"
msgstr "当地"
-#: sys-utils/hwclock.c:306
+#: sys-utils/hwclock.c:319
msgid ""
"Warning: unrecognized third line in adjtime file\n"
"(Expected: `UTC' or `LOCAL' or nothing.)"
@@ -10709,82 +10771,82 @@ msgstr ""
"警告:adjtime 文件第三行无法识别\n"
"(应为:“UTC”或“LOCAL”或空)"
-#: sys-utils/hwclock.c:315
+#: sys-utils/hwclock.c:328
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "上次漂移调整完成于1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:317
+#: sys-utils/hwclock.c:330
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "上次校准完成于1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:319
+#: sys-utils/hwclock.c:332
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "硬件时钟为 %s 时间\n"
-#: sys-utils/hwclock.c:346
+#: sys-utils/hwclock.c:359
#, c-format
msgid "Waiting for clock tick...\n"
msgstr "正在等等时钟滴答...\n"
-#: sys-utils/hwclock.c:352
+#: sys-utils/hwclock.c:365
#, c-format
msgid "...synchronization failed\n"
msgstr "...同步失败\n"
-#: sys-utils/hwclock.c:354
+#: sys-utils/hwclock.c:367
#, c-format
msgid "...got clock tick\n"
msgstr "...已获取时钟滴答\n"
-#: sys-utils/hwclock.c:417
+#: sys-utils/hwclock.c:430
#, 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:426
+#: sys-utils/hwclock.c:439
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr "硬件时钟时间:%4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:460
+#: sys-utils/hwclock.c:473
#, 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:488
+#: sys-utils/hwclock.c:501
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr "正在将硬件时钟设置为 %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:494
+#: sys-utils/hwclock.c:507
#, c-format
msgid "Clock not changed - testing only.\n"
msgstr "时钟未更改 - 纯测试。\n"
-#: sys-utils/hwclock.c:598
+#: sys-utils/hwclock.c:611
#, c-format
msgid "sleeping ~%d usec\n"
msgstr "将睡眠 ~%d 微秒\n"
-#: sys-utils/hwclock.c:609
+#: sys-utils/hwclock.c:622
#, c-format
msgid "time jumped backward %.6f seconds to %ld.%06d - retargeting\n"
msgstr "时间回溯 %.6f 秒到了 %ld.%06d - 将重新定位\n"
-#: sys-utils/hwclock.c:617
+#: sys-utils/hwclock.c:630
#, c-format
msgid "%ld.%06d < %ld.%06d (%.6f)\n"
msgstr "%ld.%06d < %ld.%06d (%.6f)\n"
-#: sys-utils/hwclock.c:633
+#: sys-utils/hwclock.c:646
#, fuzzy, c-format
msgid "missed it - %ld.%06d is too far past %ld.%06d (%.6f > %.6f)\n"
msgstr "错过了 - %ld.%06d 落后 %ld.%06d 太久(%.6f > %.6f)\n"
-#: sys-utils/hwclock.c:661
+#: sys-utils/hwclock.c:674
#, c-format
msgid ""
"%ld.%06d is close enough to %ld.%06d (%.6f < %.6f)\n"
@@ -10793,24 +10855,24 @@ msgstr ""
"%ld.%06d 距 %ld.%06d 太近(%.6f < %.6f)\n"
"请将 RTC 设为 %ld (%ld + %d; refsystime = %ld.%06d)\n"
-#: sys-utils/hwclock.c:686
+#: sys-utils/hwclock.c:696
msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095)."
msgstr "硬件时钟寄存器包含的值无效(如一个月的第 50 天)或超出了程序能处理的范围(如2095年)。"
-#: sys-utils/hwclock.c:696
-#, c-format
-msgid "%s %.6f seconds\n"
+#: sys-utils/hwclock.c:706
+#, fuzzy, c-format
+msgid "%s .%06d seconds\n"
msgstr "%s %.6f 秒\n"
-#: sys-utils/hwclock.c:727
+#: sys-utils/hwclock.c:737
msgid "No --date option specified."
msgstr "未指定 --date 选项。"
-#: sys-utils/hwclock.c:733
+#: sys-utils/hwclock.c:743
msgid "--date argument too long"
msgstr "--date 的参数过长"
-#: sys-utils/hwclock.c:740
+#: sys-utils/hwclock.c:750
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks."
@@ -10818,21 +10880,21 @@ msgstr ""
"--date 选项的参数不是有效的日期。\n"
"具体说,它包含了引号。"
-#: sys-utils/hwclock.c:748
+#: sys-utils/hwclock.c:758
#, c-format
msgid "Issuing date command: %s\n"
msgstr "正在发出 date 命令:%s\n"
-#: sys-utils/hwclock.c:752
+#: sys-utils/hwclock.c:762
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr "无法在 /bin/sh shell 中运行“date”程序。popen() 失败"
-#: sys-utils/hwclock.c:760
+#: sys-utils/hwclock.c:770
#, c-format
msgid "response from date command = %s\n"
msgstr "date 命令的响应为 %s\n"
-#: sys-utils/hwclock.c:762
+#: sys-utils/hwclock.c:772
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -10847,7 +10909,7 @@ msgstr ""
"响应为:\n"
" %s"
-#: sys-utils/hwclock.c:773
+#: sys-utils/hwclock.c:783
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
@@ -10862,59 +10924,64 @@ msgstr ""
"响应为:\n"
" %s\n"
-#: sys-utils/hwclock.c:785
+#: sys-utils/hwclock.c:795
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "数据字符串 %s 等价于 1969年后 %ld 秒。\n"
-#: sys-utils/hwclock.c:817
+#: sys-utils/hwclock.c:833
msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it."
msgstr "硬件时钟不包含有效时间,因此无法从它来设置系统时间。"
-#: sys-utils/hwclock.c:839 sys-utils/hwclock.c:919
+#: sys-utils/hwclock.c:852 sys-utils/hwclock.c:939
#, c-format
msgid "Calling settimeofday:\n"
msgstr "正在调用 settimeofday:\n"
-#: sys-utils/hwclock.c:840 sys-utils/hwclock.c:921
+#: sys-utils/hwclock.c:853 sys-utils/hwclock.c:941
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: sys-utils/hwclock.c:842 sys-utils/hwclock.c:923
+#: sys-utils/hwclock.c:855 sys-utils/hwclock.c:943
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: sys-utils/hwclock.c:846 sys-utils/hwclock.c:927
+#: sys-utils/hwclock.c:859 sys-utils/hwclock.c:947
#, c-format
msgid "Not setting system clock because running in test mode.\n"
msgstr "将不设置系统时钟,因为正以测试方式运行。\n"
-#: sys-utils/hwclock.c:855 sys-utils/hwclock.c:951
+#: sys-utils/hwclock.c:875 sys-utils/hwclock.c:971
msgid "Must be superuser to set system clock."
msgstr "只能以超级用户身份来设置系统时钟。"
-#: sys-utils/hwclock.c:858 sys-utils/hwclock.c:954
+#: sys-utils/hwclock.c:878 sys-utils/hwclock.c:974
msgid "settimeofday() failed"
msgstr "settimeofday() 失败"
-#: sys-utils/hwclock.c:894
+#: sys-utils/hwclock.c:914
#, c-format
msgid "Current system time: %ld = %s\n"
msgstr "当前系统时间:%ld = %s\n"
-#: sys-utils/hwclock.c:920
+#: sys-utils/hwclock.c:940
#, c-format
msgid "\tUTC: %s\n"
msgstr "\tUTC:%s\n"
-#: sys-utils/hwclock.c:983
+#: sys-utils/hwclock.c:1005
+#, fuzzy, c-format
+msgid "Not adjusting drift factor because the --update-drift option was not used.\n"
+msgstr "将不调整漂移系数,因为之前硬件时钟包含垃圾内容。\n"
+
+#: sys-utils/hwclock.c:1009
#, c-format
msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
msgstr "将不调整漂移系数,因为之前硬件时钟包含垃圾内容。\n"
-#: sys-utils/hwclock.c:988
+#: sys-utils/hwclock.c:1014
#, c-format
msgid ""
"Not adjusting drift factor because last calibration time is zero,\n"
@@ -10923,12 +10990,12 @@ msgstr ""
"将不调整漂移系数,因为上次校准时间为零,\n"
"历史有问题;需要启动校准。\n"
-#: sys-utils/hwclock.c:994
-#, c-format
-msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
+#: sys-utils/hwclock.c:1020
+#, fuzzy, 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:1047
+#: sys-utils/hwclock.c:1058
#, c-format
msgid ""
"Clock drift factor was calculated as %f seconds/day.\n"
@@ -10937,31 +11004,31 @@ msgstr ""
"时钟漂移系数会按 %f 秒/天计算。\n"
"系数过大,将重置为 0。\n"
-#: sys-utils/hwclock.c:1054
-#, c-format
+#: sys-utils/hwclock.c:1065
+#, fuzzy, c-format
msgid ""
-"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
+"Clock drifted %.1f seconds in the past %.1f seconds\n"
+"in spite of a drift factor of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr "在过去的 %2$d 秒内,时钟漂移了 %1$.1f 秒,而漂移系数为 %3$f 秒/天。会将漂移系数调整 %4$f 秒/天\n"
-#: sys-utils/hwclock.c:1101
+#: sys-utils/hwclock.c:1108
#, c-format
msgid "Time since last adjustment is %d second\n"
msgid_plural "Time since last adjustment is %d seconds\n"
msgstr[0] "距上次调整的时间为 %d 秒\n"
-#: sys-utils/hwclock.c:1105
+#: sys-utils/hwclock.c:1112
#, c-format
-msgid "Need to insert %d second and refer time back %.6f seconds ago\n"
-msgid_plural "Need to insert %d seconds and refer time back %.6f seconds ago\n"
-msgstr[0] "需要插入 %d 秒并将时间往回指 %.6f 秒\n"
+msgid "Calculated Hardware Clock drift is %ld.%06d seconds\n"
+msgstr ""
-#: sys-utils/hwclock.c:1138
+#: sys-utils/hwclock.c:1142
#, c-format
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "将不更新 adjtime 文件,因为正以测试方式运行。\n"
-#: sys-utils/hwclock.c:1139
+#: sys-utils/hwclock.c:1143
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -10970,55 +11037,55 @@ msgstr ""
"若执行,将向 %s 写入以下内容:\n"
"%s"
-#: sys-utils/hwclock.c:1148
+#: sys-utils/hwclock.c:1152
#, c-format
msgid "Could not open file with the clock adjustment parameters in it (%s) for writing"
msgstr "无法打开包含时钟调整参数(%s)的文件来写入"
-#: sys-utils/hwclock.c:1154 sys-utils/hwclock.c:1161
+#: sys-utils/hwclock.c:1158 sys-utils/hwclock.c:1165
#, c-format
msgid "Could not update file with the clock adjustment parameters (%s) in it"
msgstr "无法更新包含时钟调整参数(%s)的文件"
-#: sys-utils/hwclock.c:1169
+#: sys-utils/hwclock.c:1173
msgid "Drift adjustment parameters not updated."
msgstr "漂移调整参数未更新。"
-#: sys-utils/hwclock.c:1208
+#: sys-utils/hwclock.c:1209
msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it."
msgstr "硬件时间不包含有效时间,程序无法调整它。"
-#: sys-utils/hwclock.c:1216
+#: sys-utils/hwclock.c:1217
#, c-format
msgid "Not setting clock because last adjustment time is zero, so history is bad.\n"
msgstr "将不设置时钟,因为上次调整时间为零,历史有误。\n"
-#: sys-utils/hwclock.c:1220
+#: sys-utils/hwclock.c:1221
#, c-format
msgid "Not setting clock because drift factor %f is far too high.\n"
msgstr "将不设置时钟,因为上次漂移系数 %f 过高。\n"
-#: sys-utils/hwclock.c:1242
-#, c-format
-msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr "需要的调整不到一秒,将不设置时钟。\n"
-
-#: sys-utils/hwclock.c:1269
+#: sys-utils/hwclock.c:1250
#, c-format
msgid "No usable clock interface found.\n"
msgstr "未找到可用的时钟接口。\n"
-#: sys-utils/hwclock.c:1398 sys-utils/hwclock.c:1404
+#: sys-utils/hwclock.c:1374
+#, c-format
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr "需要的调整不到一秒,将不设置时钟。\n"
+
+#: sys-utils/hwclock.c:1397 sys-utils/hwclock.c:1403
#, c-format
msgid "Unable to set system clock.\n"
msgstr "无法设置系统时钟。\n"
-#: sys-utils/hwclock.c:1417
+#: sys-utils/hwclock.c:1411
#, c-format
msgid "At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
msgstr "位于1969(年)后 %ld 秒,RTC 应读取到的是1969(年)后 %ld 秒。\n"
-#: sys-utils/hwclock.c:1446
+#: sys-utils/hwclock.c:1440
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n"
"This copy of hwclock was built for a machine other than Alpha\n"
@@ -11028,34 +11095,38 @@ msgstr ""
"这版 hwclock 程序不是为 Alpha 计算机编译的(因此目前也不打算在 Alpha\n"
" 计算机上运行)。未执行任何操作。"
-#: sys-utils/hwclock.c:1463
+#: sys-utils/hwclock.c:1457
msgid "Unable to get the epoch value from the kernel."
msgstr "无法从内核获取纪元(epoch)值。"
-#: sys-utils/hwclock.c:1465
+#: sys-utils/hwclock.c:1459
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "内核假设纪元(epoch)值为 %lu\n"
-#: sys-utils/hwclock.c:1470
+#: sys-utils/hwclock.c:1464
msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it."
msgstr "要设置纪元(epoch)值,您必须使用“epoch”选项来指定设置的值。"
-#: sys-utils/hwclock.c:1474
+#: sys-utils/hwclock.c:1468
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "不会将纪元(epoch)设置为 %d - 纯测试。\n"
-#: sys-utils/hwclock.c:1478
+#: sys-utils/hwclock.c:1472
#, c-format
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "无法设置内核中的纪元(epoch)值。\n"
-#: sys-utils/hwclock.c:1570
+#: sys-utils/hwclock.c:1564
msgid " hwclock [function] [option...]\n"
msgstr " hwclock [功能] [选项...]\n"
-#: sys-utils/hwclock.c:1572
+#: sys-utils/hwclock.c:1567
+msgid "Query or set the hardware clock.\n"
+msgstr ""
+
+#: sys-utils/hwclock.c:1569
msgid ""
"\n"
"Functions:\n"
@@ -11063,17 +11134,19 @@ msgstr ""
"\n"
"功能:\n"
-#: sys-utils/hwclock.c:1573
+#: sys-utils/hwclock.c:1570
+#, fuzzy
msgid ""
" -h, --help show this help text and exit\n"
" -r, --show read hardware clock and print result\n"
+" --get read hardware clock and print drift corrected result\n"
" --set set the RTC to the time given with --date\n"
msgstr ""
" -h, --help 显示此帮助并退出\n"
" -r, --show 读取硬件时钟并打印结果\n"
" --set 将 RTC 设置为 --date 指定的时间\n"
-#: sys-utils/hwclock.c:1576
+#: sys-utils/hwclock.c:1574
msgid ""
" -s, --hctosys set the system time from the hardware clock\n"
" -w, --systohc set the hardware clock from the current system time\n"
@@ -11087,11 +11160,11 @@ msgstr ""
" --adjust 根据自上次时钟设置或调整后的系统漂移\n"
" 来调整 RTC\n"
-#: sys-utils/hwclock.c:1581
+#: sys-utils/hwclock.c:1579
msgid " -c, --compare periodically compare the system clock with the CMOS clock\n"
msgstr " -c, --compare 定期将系统时钟与 CMOS 时钟相比较\n"
-#: sys-utils/hwclock.c:1583
+#: sys-utils/hwclock.c:1581
msgid ""
" --getepoch print out the kernel's hardware clock epoch value\n"
" --setepoch set the kernel's hardware clock epoch value to the \n"
@@ -11101,7 +11174,7 @@ msgstr ""
" --setepoch 将内核的硬件时钟纪元(epoch)值设置为\n"
" --epoch 选项指定的值\n"
-#: sys-utils/hwclock.c:1587
+#: sys-utils/hwclock.c:1585
msgid ""
" --predict predict RTC reading at time given with --date\n"
" -V, --version display version information and exit\n"
@@ -11109,7 +11182,7 @@ msgstr ""
" --predict 预测 --date 选项所指定时刻读取到的 RTC 值\n"
" -V, --version 显示版本信息并退出\n"
-#: sys-utils/hwclock.c:1591
+#: sys-utils/hwclock.c:1589
msgid ""
" -u, --utc the hardware clock is kept in UTC\n"
" --localtime the hardware clock is kept in local time\n"
@@ -11117,11 +11190,11 @@ msgstr ""
" -u, --utc 硬件时钟保持为 UTC 时间\n"
" --localtime 硬件时钟保持为本地时间\n"
-#: sys-utils/hwclock.c:1594
+#: sys-utils/hwclock.c:1592
msgid " -f, --rtc <file> special /dev/... file to use instead of default\n"
msgstr " -f, --rtc <文件> 代替默认文件的特殊 /dev/... 文件\n"
-#: sys-utils/hwclock.c:1597
+#: sys-utils/hwclock.c:1595
#, c-format
msgid ""
" --directisa access the ISA bus directly instead of %s\n"
@@ -11135,13 +11208,15 @@ msgstr ""
" --date <时间> 指定要设置的硬件时钟时间\n"
" --epoch <年> 指定作为硬件纪元(epoch)值起始的年份\n"
-#: sys-utils/hwclock.c:1603
-#, c-format
+#: sys-utils/hwclock.c:1601
+#, fuzzy, c-format
msgid ""
-" --noadjfile do not access %s; this requires the use of\n"
+" --update-drift update drift factor in %1$s (requires\n"
+" --set or --systohc)\n"
+" --noadjfile do not access %1$s; this requires the use of\n"
" either --utc or --localtime\n"
" --adjfile <file> specifies the path to the adjust file;\n"
-" the default is %s\n"
+" the default is %1$s\n"
msgstr ""
" --noadjfile 不访问 %s;需要使用 --utc 或 --localtime 选项\n"
" --adjfile <文件> 指定调整文件的路径;\n"
@@ -11167,146 +11242,108 @@ msgstr ""
" 告知 hwclock 您使用的 Alpha 类型(参阅 hwclock(8))\n"
"\n"
-#: sys-utils/hwclock.c:1733
+#: sys-utils/hwclock.c:1738
msgid "Unable to connect to audit system"
msgstr "无法连接到审计系统"
-#: sys-utils/hwclock.c:1831
+#: sys-utils/hwclock.c:1836
msgid "invalid epoch argument"
msgstr "无效的纪元(epoch)参数"
-#: sys-utils/hwclock.c:1870
+#: sys-utils/hwclock.c:1881
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr "%s 不接受无选项的参数。您提供了 %d。\n"
-#: sys-utils/hwclock.c:1879
+#: sys-utils/hwclock.c:1890
msgid "With --noadjfile, you must specify either --utc or --localtime"
msgstr "指定 --noadjfile 时,您必须指定 --utc 或 --localtime"
-#: sys-utils/hwclock.c:1892
+#: sys-utils/hwclock.c:1903
msgid "No usable set-to time. Cannot set clock."
msgstr "无可用的待设置时间。无法设置时钟。"
-#: sys-utils/hwclock.c:1907
+#: sys-utils/hwclock.c:1918
msgid "Sorry, only the superuser can change the Hardware Clock."
msgstr "抱歉,只有超级用户才能设置硬件时钟。"
-#: sys-utils/hwclock.c:1911
+#: sys-utils/hwclock.c:1922
msgid "Sorry, only the superuser can change the System Clock."
msgstr "抱歉,只有超级用户才能设置系统时钟。"
-#: sys-utils/hwclock.c:1915
+#: sys-utils/hwclock.c:1926
msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
msgstr "抱歉,只有超级用户才能更改内核中的硬件时钟纪元(epoch)。"
-#: sys-utils/hwclock.c:1938
+#: sys-utils/hwclock.c:1949
msgid "Cannot access the Hardware Clock via any known method."
msgstr "无法通过已知的任何方式访问硬件时钟。"
-#: sys-utils/hwclock.c:1941
+#: sys-utils/hwclock.c:1952
msgid "Use the --debug option to see the details of our search for an access method."
msgstr "请使用 --debug 选项来观察程序搜索访问方法的详情。"
-#: sys-utils/hwclock-cmos.c:217
+#: sys-utils/hwclock-cmos.c:218
#, c-format
msgid "booted from MILO\n"
msgstr "从 MILO 启动\n"
-#: sys-utils/hwclock-cmos.c:229
+#: sys-utils/hwclock-cmos.c:230
#, c-format
msgid "Ruffian BCD clock\n"
msgstr "Ruffian BCD 时钟\n"
-#: sys-utils/hwclock-cmos.c:248
+#: sys-utils/hwclock-cmos.c:249
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "时钟端口已调整为 0x%x\n"
-#: sys-utils/hwclock-cmos.c:264
+#: sys-utils/hwclock-cmos.c:265
#, c-format
msgid "funky TOY!\n"
msgstr "烦人的 TOY!\n"
-#: sys-utils/hwclock-cmos.c:292
+#: sys-utils/hwclock-cmos.c:293
#, c-format
msgid "atomic %s failed for 1000 iterations!"
msgstr "原子操作 %s 1000 次迭代都失败了!"
-#: sys-utils/hwclock-cmos.c:318
+#: sys-utils/hwclock-cmos.c:319
#, c-format
msgid "cmos_read(): write to control address %X failed"
msgstr "cmos_read():写控制地址 %X 失败"
-#: sys-utils/hwclock-cmos.c:322
-#, c-format
-msgid "cmos_read(): read data address %X failed"
+#: sys-utils/hwclock-cmos.c:323
+#, fuzzy, c-format
+msgid "cmos_read(): read from data address %X failed"
msgstr "cmos_read():读数据地址 %X 失败"
-#: sys-utils/hwclock-cmos.c:359
+#: sys-utils/hwclock-cmos.c:360
#, c-format
msgid "cmos_write(): write to control address %X failed"
msgstr "cmos_write():写控制地址 %X 失败"
-#: sys-utils/hwclock-cmos.c:364
+#: sys-utils/hwclock-cmos.c:365
#, c-format
msgid "cmos_write(): write to data address %X failed"
msgstr "cmos_write(): 读数据地址 %X 失败"
-#: sys-utils/hwclock-cmos.c:639
+#: sys-utils/hwclock-cmos.c:640
msgid "I failed to get permission because I didn't try."
msgstr "程序未获得权限,因为未尝试获取。"
-#: sys-utils/hwclock-cmos.c:642
+#: sys-utils/hwclock-cmos.c:643
msgid "unable to get I/O port access: the iopl(3) call failed."
msgstr "无法访问 I/O 端口:iopl(3) 调用失败。"
-#: sys-utils/hwclock-cmos.c:645
+#: sys-utils/hwclock-cmos.c:646
msgid "Probably you need root privileges.\n"
msgstr "您可能需要 root 用户权限。\n"
-#: sys-utils/hwclock-cmos.c:652
+#: sys-utils/hwclock-cmos.c:653
msgid "Using direct I/O instructions to ISA clock."
msgstr "将对 ISA 时钟使用直接 I/O 指令。"
-#: sys-utils/hwclock-kd.c:47
-#, c-format
-msgid "Waiting in loop for time from KDGHWCLK to change\n"
-msgstr "正在循环等待来自 KDGHWCLK 的时间更改\n"
-
-#: sys-utils/hwclock-kd.c:50
-msgid "KDGHWCLK ioctl to read time failed"
-msgstr "用来读取时间的 KDGHWCLK ioctl 失败"
-
-#: sys-utils/hwclock-kd.c:72
-msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr "在循环中用来读取时间的 KDGHWCLK ioctl 失败"
-
-#: sys-utils/hwclock-kd.c:79 sys-utils/hwclock-rtc.c:236
-msgid "Timed out waiting for time change."
-msgstr "等待时间更改超时。"
-
-#: sys-utils/hwclock-kd.c:98
-#, c-format
-msgid "ioctl() failed to read time from %s"
-msgstr "ioctl() 从 %s 读取时间失败"
-
-#: sys-utils/hwclock-kd.c:134
-msgid "ioctl KDSHWCLK failed"
-msgstr "ioctl KDSHWCLK 失败"
-
-#: sys-utils/hwclock-kd.c:146
-msgid "Using the KDGHWCLK interface to m68k clock."
-msgstr "将对 m68k 时钟使用 KDGHWCLK 接口。"
-
-#: sys-utils/hwclock-kd.c:170
-msgid "Can't open /dev/tty1 or /dev/vc/1"
-msgstr "打不开 /dev/tty1 或 /dev/vc/1"
-
-#: sys-utils/hwclock-kd.c:174
-msgid "KDGHWCLK ioctl failed"
-msgstr "KDGHWCLK ioctl 失败"
-
#: sys-utils/hwclock-rtc.c:195
#, c-format
msgid "ioctl(%s) to %s to read the time failed"
@@ -11317,6 +11354,10 @@ msgstr "对 %2$s 的读取时间 ioctl(%1$s) 失败"
msgid "Waiting in loop for time from %s to change\n"
msgstr "正在循环等待来自 %s 的时间更改\n"
+#: sys-utils/hwclock-rtc.c:236
+msgid "Timed out waiting for time change."
+msgstr "等待时间更改超时。"
+
#: sys-utils/hwclock-rtc.c:279
#, c-format
msgid "%s does not have interrupt functions. "
@@ -11397,260 +11438,288 @@ msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
#: sys-utils/ipcmk.c:69
+msgid "Create various IPC resources.\n"
+msgstr ""
+
+#: sys-utils/ipcmk.c:72
msgid " -M, --shmem <size> create shared memory segment of size <size>\n"
msgstr " -M, --shmem <尺寸> 创建大小为指定<尺寸>的共享内存段。\n"
-#: sys-utils/ipcmk.c:70
-msgid " -S, --semaphore <nsems> create semaphore array with <nsems> elements\n"
+#: sys-utils/ipcmk.c:73
+#, fuzzy
+msgid " -S, --semaphore <number> create semaphore array with <number> elements\n"
msgstr " -S, --semaphore <nsems> 创建包含 <nsems> 个元素的信号量数组\n"
-#: sys-utils/ipcmk.c:71
+#: sys-utils/ipcmk.c:74
msgid " -Q, --queue create message queue\n"
msgstr " -Q, --queue 创建消息队列\n"
-#: sys-utils/ipcmk.c:72
+#: sys-utils/ipcmk.c:75
msgid " -p, --mode <mode> permission for the resource (default is 0644)\n"
msgstr " -p, --mode <模式> 资源的权限模式掩码(默认为 0644)\n"
-#: sys-utils/ipcmk.c:106 sys-utils/losetup.c:549
+#: sys-utils/ipcmk.c:110 sys-utils/losetup.c:552 sys-utils/zramctl.c:477
msgid "failed to parse size"
msgstr "解析大小失败"
-#: sys-utils/ipcmk.c:113
+#: sys-utils/ipcmk.c:117
msgid "failed to parse elements"
msgstr "解析元素失败"
-#: sys-utils/ipcmk.c:137
+#: sys-utils/ipcmk.c:141
msgid "create share memory failed"
msgstr "创建共享内存失败"
-#: sys-utils/ipcmk.c:139
+#: sys-utils/ipcmk.c:143
#, c-format
msgid "Shared memory id: %d\n"
msgstr "共享内存 id:%d\n"
-#: sys-utils/ipcmk.c:145
+#: sys-utils/ipcmk.c:149
msgid "create message queue failed"
msgstr "创建消息队列失败"
-#: sys-utils/ipcmk.c:147
+#: sys-utils/ipcmk.c:151
#, c-format
msgid "Message queue id: %d\n"
msgstr "消息队列 id:%d\n"
-#: sys-utils/ipcmk.c:153
+#: sys-utils/ipcmk.c:157
msgid "create semaphore failed"
msgstr "创建信号量失败"
-#: sys-utils/ipcmk.c:155
+#: sys-utils/ipcmk.c:159
#, c-format
msgid "Semaphore id: %d\n"
msgstr "信号量 id:%d\n"
-#: sys-utils/ipcrm.c:53
+#: sys-utils/ipcrm.c:50
+#, fuzzy, c-format
+msgid ""
+" %1$s [options]\n"
+" %1$s shm|msg|sem <id>...\n"
+msgstr " %s [选项] <文件>...\n"
+
+#: sys-utils/ipcrm.c:54
+msgid "Remove certain IPC resources.\n"
+msgstr ""
+
+#: sys-utils/ipcrm.c:57
msgid " -m, --shmem-id <id> remove shared memory segment by id\n"
msgstr " -m, --shmem-id <id> 按 id 号移除共享内存段\n"
-#: sys-utils/ipcrm.c:54
+#: sys-utils/ipcrm.c:58
msgid " -M, --shmem-key <key> remove shared memory segment by key\n"
msgstr " -M, --shmem-key <键> 按键值移除共享内存段\n"
-#: sys-utils/ipcrm.c:55
+#: sys-utils/ipcrm.c:59
msgid " -q, --queue-id <id> remove message queue by id\n"
msgstr " -q, --queue-id <id> 按 id 号移除消息队列\n"
-#: sys-utils/ipcrm.c:56
+#: sys-utils/ipcrm.c:60
msgid " -Q, --queue-key <key> remove message queue by key\n"
msgstr " -Q, --queue-key <键> 按键值移除消息队列\n"
-#: sys-utils/ipcrm.c:57
+#: sys-utils/ipcrm.c:61
msgid " -s, --semaphore-id <id> remove semaphore by id\n"
msgstr " -s, --semaphore-id <id> 按 id 号移除信号量\n"
-#: sys-utils/ipcrm.c:58
+#: sys-utils/ipcrm.c:62
msgid " -S, --semaphore-key <key> remove semaphore by key\n"
msgstr " -S, --semaphore-key <键> 按键值移除信号量\n"
-#: sys-utils/ipcrm.c:59
+#: sys-utils/ipcrm.c:63
msgid " -a, --all[=shm|msg|sem] remove all (in the specified category)\n"
msgstr " -a, --all[=<shm|msg|sem>] (将指定类别中的)全部移除\n"
-#: sys-utils/ipcrm.c:60
+#: sys-utils/ipcrm.c:64
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: sys-utils/ipcrm.c:80
+#: sys-utils/ipcrm.c:86
#, c-format
msgid "removing shared memory segment id `%d'\n"
msgstr "正在移除共享内存段 id “%d”\n"
-#: sys-utils/ipcrm.c:85
+#: sys-utils/ipcrm.c:91
#, c-format
msgid "removing message queue id `%d'\n"
msgstr "正在移除消息队列 id “%d”\n"
-#: sys-utils/ipcrm.c:90
+#: sys-utils/ipcrm.c:96
#, c-format
msgid "removing semaphore id `%d'\n"
msgstr "正在移除信号量 id “%d”\n"
-#: sys-utils/ipcrm.c:102 sys-utils/ipcrm.c:216
+#: sys-utils/ipcrm.c:108 sys-utils/ipcrm.c:222
msgid "permission denied for key"
msgstr "对 键 的权限不足"
-#: sys-utils/ipcrm.c:102
+#: sys-utils/ipcrm.c:108
msgid "permission denied for id"
msgstr "对 id 的权限不足"
-#: sys-utils/ipcrm.c:105 sys-utils/ipcrm.c:222
+#: sys-utils/ipcrm.c:111 sys-utils/ipcrm.c:228
msgid "invalid key"
msgstr "无效键"
-#: sys-utils/ipcrm.c:105
+#: sys-utils/ipcrm.c:111
msgid "invalid id"
msgstr "无效 id"
-#: sys-utils/ipcrm.c:108 sys-utils/ipcrm.c:219
+#: sys-utils/ipcrm.c:114 sys-utils/ipcrm.c:225
msgid "already removed key"
msgstr "已移除的键"
-#: sys-utils/ipcrm.c:108
+#: sys-utils/ipcrm.c:114
msgid "already removed id"
msgstr "已移除的 id"
-#: sys-utils/ipcrm.c:111 sys-utils/ipcrm.c:225
+#: sys-utils/ipcrm.c:117 sys-utils/ipcrm.c:231
msgid "key failed"
msgstr "键失败"
-#: sys-utils/ipcrm.c:111
+#: sys-utils/ipcrm.c:117
msgid "id failed"
msgstr "ID 失败"
-#: sys-utils/ipcrm.c:128
+#: sys-utils/ipcrm.c:134
#, c-format
msgid "invalid id: %s"
msgstr "无效 ID:%s"
-#: sys-utils/ipcrm.c:161
+#: sys-utils/ipcrm.c:167
#, c-format
msgid "resource(s) deleted\n"
msgstr "资源已删除\n"
-#: sys-utils/ipcrm.c:194
+#: sys-utils/ipcrm.c:200
#, c-format
msgid "illegal key (%s)"
msgstr "非法的键(%s)"
-#: sys-utils/ipcrm.c:252
+#: sys-utils/ipcrm.c:256
msgid "kernel not configured for shared memory"
msgstr "内核未做共享内存的相关配置"
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:269
msgid "kernel not configured for semaphores"
msgstr "内核未做信号量的相关配置"
-#: sys-utils/ipcrm.c:279
+#: sys-utils/ipcrm.c:290
msgid "kernel not configured for message queues"
msgstr "内核未做消息的相关配置"
-#: sys-utils/ipcrm.c:381 sys-utils/ipcrm.c:405
+#: sys-utils/ipcrm.c:392 sys-utils/ipcrm.c:416
#, c-format
msgid "unknown argument: %s"
msgstr "未知参数:%s"
-#: sys-utils/ipcs.c:56
+#: sys-utils/ipcs.c:53
+#, c-format
+msgid ""
+" %1$s [resource-option...] [output-option]\n"
+" %1$s -m|-q|-s -i <id>\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:57
+msgid "Show information on IPC facilities.\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:60
msgid " -i, --id <id> print details on resource identified by <id>\n"
msgstr " -i, --id <id> 打印由<id>标识的资源的详细信息\n"
-#: sys-utils/ipcs.c:60
+#: sys-utils/ipcs.c:65
msgid "Resource options:\n"
msgstr "资源选项:\n"
-#: sys-utils/ipcs.c:61
+#: sys-utils/ipcs.c:66
msgid " -m, --shmems shared memory segments\n"
msgstr " -m, --shmems 共享内存段\n"
-#: sys-utils/ipcs.c:62
+#: sys-utils/ipcs.c:67
msgid " -q, --queues message queues\n"
msgstr " -q, --queues 消息队列\n"
-#: sys-utils/ipcs.c:63
+#: sys-utils/ipcs.c:68
msgid " -s, --semaphores semaphores\n"
msgstr " -s, --semaphores 信号量\n"
-#: sys-utils/ipcs.c:64
+#: sys-utils/ipcs.c:69
msgid " -a, --all all (default)\n"
msgstr " -a, --all 全部(默认)\n"
-#: sys-utils/ipcs.c:66
-msgid "Output format:\n"
+#: sys-utils/ipcs.c:72
+#, fuzzy
+msgid "Output options:\n"
msgstr "输出格式:\n"
-#: sys-utils/ipcs.c:67
+#: sys-utils/ipcs.c:73
msgid " -t, --time show attach, detach and change times\n"
msgstr " -t, --time 显示附加、脱离和更改时间\n"
-#: sys-utils/ipcs.c:68
+#: sys-utils/ipcs.c:74
msgid " -p, --pid show PIDs of creator and last operator\n"
msgstr " -p, --pid 显示创建者和最后操作者的 PID\n"
-#: sys-utils/ipcs.c:69
+#: sys-utils/ipcs.c:75
msgid " -c, --creator show creator and owner\n"
msgstr " -c, --creator 显示创建者和拥有者\n"
-#: sys-utils/ipcs.c:70
+#: sys-utils/ipcs.c:76
msgid " -l, --limits show resource limits\n"
msgstr " -l, --limits 显示资源限制\n"
-#: sys-utils/ipcs.c:71
+#: sys-utils/ipcs.c:77
msgid " -u, --summary show status summary\n"
msgstr " -u, --summary 显示状态摘要\n"
-#: sys-utils/ipcs.c:72
+#: sys-utils/ipcs.c:78
msgid " --human show sizes in human-readable format\n"
msgstr " --human 以易读格式显示大小\n"
-#: sys-utils/ipcs.c:73
+#: sys-utils/ipcs.c:79
msgid " -b, --bytes show sizes in bytes\n"
msgstr " -b, --bytes 以字节数显示大小\n"
-#: sys-utils/ipcs.c:158
+#: sys-utils/ipcs.c:165
msgid "when using an ID, a single resource must be specified"
msgstr "使用 ID 时,必须指定一个资源"
-#: sys-utils/ipcs.c:196
+#: sys-utils/ipcs.c:203
#, c-format
msgid "------ Shared Memory Limits --------\n"
msgstr "---------- 同享内存限制 ------------\n"
-#: sys-utils/ipcs.c:199
+#: sys-utils/ipcs.c:206
#, c-format
msgid "max number of segments = %ju\n"
msgstr "最大段数 = %ju\n"
-#: sys-utils/ipcs.c:201
+#: sys-utils/ipcs.c:208
msgid "max seg size"
msgstr "最大段大小"
-#: sys-utils/ipcs.c:203
+#: sys-utils/ipcs.c:210
msgid "max total shared memory"
msgstr "最大总共享内存"
-#: sys-utils/ipcs.c:206
+#: sys-utils/ipcs.c:213
msgid "min seg size"
msgstr "最小段大小"
-#: sys-utils/ipcs.c:216
+#: sys-utils/ipcs.c:225
#, c-format
msgid "kernel not configured for shared memory\n"
msgstr "内核未做共享内存的相关配置\n"
-#: sys-utils/ipcs.c:220
+#: sys-utils/ipcs.c:229
#, c-format
msgid "------ Shared Memory Status --------\n"
msgstr "---------- 共享内存状态 ------------\n"
-#: sys-utils/ipcs.c:232
+#: sys-utils/ipcs.c:241
#, c-format
msgid ""
"segments allocated %d\n"
@@ -11665,301 +11734,301 @@ msgstr ""
"页交换 %ld\n"
"交换性能:%ld 次尝试\t %ld 次成功\n"
-#: sys-utils/ipcs.c:249
+#: sys-utils/ipcs.c:258
#, c-format
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "------------- 共享内存段创建者/拥有者 ---------------\n"
-#: sys-utils/ipcs.c:251 sys-utils/ipcs.c:257 sys-utils/ipcs.c:264
-#: sys-utils/ipcs.c:270
+#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:266 sys-utils/ipcs.c:273
+#: sys-utils/ipcs.c:279
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:251 sys-utils/ipcs.c:270 sys-utils/ipcs.c:374
-#: sys-utils/ipcs.c:389 sys-utils/ipcs.c:473 sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:279 sys-utils/ipcs.c:383
+#: sys-utils/ipcs.c:398 sys-utils/ipcs.c:484 sys-utils/ipcs.c:502
msgid "perms"
msgstr "权限"
-#: sys-utils/ipcs.c:251 sys-utils/ipcs.c:374 sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:383 sys-utils/ipcs.c:484
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:251 sys-utils/ipcs.c:374 sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:383 sys-utils/ipcs.c:484
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:251 sys-utils/ipcs.c:374 sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:383 sys-utils/ipcs.c:484
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:251 sys-utils/ipcs.c:374 sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:383 sys-utils/ipcs.c:484
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:255
+#: sys-utils/ipcs.c:264
#, c-format
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "------------ 共享内存 添加/脱离/更改 时间 --------------\n"
-#: sys-utils/ipcs.c:257 sys-utils/ipcs.c:264 sys-utils/ipcs.c:270
-#: sys-utils/ipcs.c:380 sys-utils/ipcs.c:389 sys-utils/ipcs.c:479
-#: sys-utils/ipcs.c:485 sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:266 sys-utils/ipcs.c:273 sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:389 sys-utils/ipcs.c:398 sys-utils/ipcs.c:490
+#: sys-utils/ipcs.c:496 sys-utils/ipcs.c:502
msgid "owner"
msgstr "拥有者"
-#: sys-utils/ipcs.c:257
+#: sys-utils/ipcs.c:266
msgid "attached"
msgstr "已连上"
-#: sys-utils/ipcs.c:257
+#: sys-utils/ipcs.c:266
msgid "detached"
msgstr "已断开"
-#: sys-utils/ipcs.c:258
+#: sys-utils/ipcs.c:267
msgid "changed"
msgstr "已更改"
-#: sys-utils/ipcs.c:262
+#: sys-utils/ipcs.c:271
#, c-format
msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
msgstr "-------- 共享内存 创建者/上次修改者 PID ----------\n"
-#: sys-utils/ipcs.c:264
+#: sys-utils/ipcs.c:273
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:264
+#: sys-utils/ipcs.c:273
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:277
#, c-format
msgid "------ Shared Memory Segments --------\n"
msgstr "------------ 共享内存段 --------------\n"
-#: sys-utils/ipcs.c:270 sys-utils/ipcs.c:389 sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:279 sys-utils/ipcs.c:398 sys-utils/ipcs.c:502
msgid "key"
msgstr "键"
-#: sys-utils/ipcs.c:271 sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:280 sys-utils/ipcs.c:503
msgid "size"
msgstr "大小"
-#: sys-utils/ipcs.c:271 sys-utils/prlimit.c:75 sys-utils/prlimit.c:78
+#: sys-utils/ipcs.c:280 sys-utils/prlimit.c:75 sys-utils/prlimit.c:78
#: sys-utils/prlimit.c:81 sys-utils/prlimit.c:82 sys-utils/prlimit.c:90
msgid "bytes"
msgstr "字节"
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:281
msgid "nattch"
msgstr "连接数"
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:281
msgid "status"
msgstr "状态"
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:298 sys-utils/ipcs.c:300
-#: sys-utils/ipcs.c:412 sys-utils/ipcs.c:414 sys-utils/ipcs.c:516
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:520 sys-utils/ipcs.c:574
-#: sys-utils/ipcs.c:576 sys-utils/ipcs.c:605 sys-utils/ipcs.c:607
-#: sys-utils/ipcs.c:609 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:305 sys-utils/ipcs.c:307 sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:421 sys-utils/ipcs.c:423 sys-utils/ipcs.c:527
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:531 sys-utils/ipcs.c:585
+#: sys-utils/ipcs.c:587 sys-utils/ipcs.c:616 sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:620 sys-utils/ipcs.c:644
msgid "Not set"
msgstr "未设置"
-#: sys-utils/ipcs.c:326
+#: sys-utils/ipcs.c:335
msgid "dest"
msgstr "目标"
-#: sys-utils/ipcs.c:327
+#: sys-utils/ipcs.c:336
msgid "locked"
msgstr "已锁定"
-#: sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:355
#, c-format
msgid "------ Semaphore Limits --------\n"
msgstr "--------- 信号量限制 -----------\n"
-#: sys-utils/ipcs.c:349
+#: sys-utils/ipcs.c:358
#, c-format
msgid "max number of arrays = %d\n"
msgstr "最大数组数量 = %d\n"
-#: sys-utils/ipcs.c:350
+#: sys-utils/ipcs.c:359
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "每个数组的最大信号量数目 = %d\n"
-#: sys-utils/ipcs.c:351
+#: sys-utils/ipcs.c:360
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "系统最大信号量数 = %d\n"
-#: sys-utils/ipcs.c:352
+#: sys-utils/ipcs.c:361
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "每次信号量调用最大操作数 = %d\n"
-#: sys-utils/ipcs.c:353
+#: sys-utils/ipcs.c:362
#, c-format
msgid "semaphore max value = %d\n"
msgstr "信号量最大值 = %d\n"
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:371
#, c-format
msgid "kernel not configured for semaphores\n"
msgstr "内核未做信号量的相关配置\n"
-#: sys-utils/ipcs.c:365
+#: sys-utils/ipcs.c:374
#, c-format
msgid "------ Semaphore Status --------\n"
msgstr "--------- 信号量状态 -----------\n"
-#: sys-utils/ipcs.c:366
+#: sys-utils/ipcs.c:375
#, c-format
msgid "used arrays = %d\n"
msgstr "已使用数组 = %d\n"
-#: sys-utils/ipcs.c:367
+#: sys-utils/ipcs.c:376
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "已分配信号量数 = %d\n"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:381
#, c-format
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "----------- 信号量数组创建者/拥有者 ------------\n"
-#: sys-utils/ipcs.c:374 sys-utils/ipcs.c:380 sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:383 sys-utils/ipcs.c:389 sys-utils/ipcs.c:398
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:378
+#: sys-utils/ipcs.c:387
#, c-format
msgid "------ Semaphore Operation/Change Times --------\n"
msgstr "------------ 信号量 操作/更改 时间 -------------\n"
-#: sys-utils/ipcs.c:380
+#: sys-utils/ipcs.c:389
msgid "last-op"
msgstr "上一操作"
-#: sys-utils/ipcs.c:380
+#: sys-utils/ipcs.c:389
msgid "last-changed"
msgstr "上次更改"
-#: sys-utils/ipcs.c:387
+#: sys-utils/ipcs.c:396
#, c-format
msgid "------ Semaphore Arrays --------\n"
msgstr "--------- 信号量数组 -----------\n"
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:398
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:448
+#: sys-utils/ipcs.c:457
#, c-format
msgid "------ Messages Limits --------\n"
msgstr "---------- 消息限制 -----------\n"
-#: sys-utils/ipcs.c:449
+#: sys-utils/ipcs.c:458
#, c-format
msgid "max queues system wide = %d\n"
msgstr "系统最大队列数量 = %d\n"
-#: sys-utils/ipcs.c:451
+#: sys-utils/ipcs.c:460
msgid "max size of message"
msgstr "最大消息尺寸"
-#: sys-utils/ipcs.c:453
+#: sys-utils/ipcs.c:462
msgid "default max size of queue"
msgstr "默认的队列最大尺寸"
-#: sys-utils/ipcs.c:460
+#: sys-utils/ipcs.c:469
#, c-format
msgid "kernel not configured for message queues\n"
msgstr "内核未做消息的相关配置\n"
-#: sys-utils/ipcs.c:463
+#: sys-utils/ipcs.c:472
#, c-format
msgid "------ Messages Status --------\n"
msgstr "---------- 消息状态 -----------\n"
-#: sys-utils/ipcs.c:464
+#: sys-utils/ipcs.c:474
#, c-format
msgid "allocated queues = %d\n"
msgstr "已分配队列数 = %d\n"
-#: sys-utils/ipcs.c:465
+#: sys-utils/ipcs.c:475
#, c-format
msgid "used headers = %d\n"
msgstr "已用消息头(header)数 = %d\n"
-#: sys-utils/ipcs.c:466
+#: sys-utils/ipcs.c:477
msgid "used space"
msgstr "已用空间"
-#: sys-utils/ipcs.c:467
+#: sys-utils/ipcs.c:478
msgid " bytes\n"
msgstr " 字节\n"
-#: sys-utils/ipcs.c:471
+#: sys-utils/ipcs.c:482
#, c-format
msgid "------ Message Queues Creators/Owners --------\n"
msgstr "---------- 消息队列 创建者/拥有者 ------------\n"
-#: sys-utils/ipcs.c:473 sys-utils/ipcs.c:479 sys-utils/ipcs.c:485
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:484 sys-utils/ipcs.c:490 sys-utils/ipcs.c:496
+#: sys-utils/ipcs.c:502
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:477
+#: sys-utils/ipcs.c:488
#, c-format
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "----------- 消息队列 发送/接收/更改 时间 ------------\n"
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:490
msgid "send"
msgstr "发送"
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:490
msgid "recv"
msgstr "接收"
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:490
msgid "change"
msgstr "更改"
-#: sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:494
#, c-format
msgid "------ Message Queues PIDs --------\n"
msgstr "--------- 消息队列 PID -----------\n"
-#: sys-utils/ipcs.c:485
+#: sys-utils/ipcs.c:496
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:485
+#: sys-utils/ipcs.c:496
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:500
#, c-format
msgid "------ Message Queues --------\n"
msgstr "--------- 消息队列 -----------\n"
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:503
msgid "used-bytes"
msgstr "已用字节数"
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:504
msgid "messages"
msgstr "消息"
-#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:588 sys-utils/ipcs.c:621
+#: sys-utils/ipcs.c:569 sys-utils/ipcs.c:599 sys-utils/ipcs.c:632
#, c-format
msgid "id %d not found"
msgstr "找不到 id %d"
-#: sys-utils/ipcs.c:562
+#: sys-utils/ipcs.c:573
#, c-format
msgid ""
"\n"
@@ -11968,45 +12037,45 @@ msgstr ""
"\n"
"共享内存段 shmid=%d\n"
-#: sys-utils/ipcs.c:563
+#: sys-utils/ipcs.c:574
#, 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:566
+#: sys-utils/ipcs.c:577
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "模式=%#o\t访问权限=%#o\n"
-#: sys-utils/ipcs.c:568
+#: sys-utils/ipcs.c:579
msgid "size="
msgstr "大小="
-#: sys-utils/ipcs.c:568
+#: sys-utils/ipcs.c:579
msgid "bytes="
msgstr "字节数="
-#: sys-utils/ipcs.c:570
+#: sys-utils/ipcs.c:581
#, c-format
msgid "lpid=%u\tcpid=%u\tnattch=%jd\n"
msgstr "lpid=%u\tcpid=%u\tnattch=%jd\n"
-#: sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:584
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "附加时间=%-26.24s\n"
-#: sys-utils/ipcs.c:575
+#: sys-utils/ipcs.c:586
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "脱离时间=%-26.24s\n"
-#: sys-utils/ipcs.c:577 sys-utils/ipcs.c:608
+#: sys-utils/ipcs.c:588 sys-utils/ipcs.c:619
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "更改时间=%-26.24s\n"
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:603
#, c-format
msgid ""
"\n"
@@ -12015,38 +12084,38 @@ msgstr ""
"\n"
"消息队列 msqid=%d\n"
-#: sys-utils/ipcs.c:593
+#: sys-utils/ipcs.c:604
#, 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:597
+#: sys-utils/ipcs.c:608
msgid "csize="
msgstr "csize="
-#: sys-utils/ipcs.c:597
+#: sys-utils/ipcs.c:608
msgid "cbytes="
msgstr "cbytes="
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:610
msgid "qsize="
msgstr "qsize="
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:610
msgid "qbytes="
msgstr "qbytes="
-#: sys-utils/ipcs.c:604
+#: sys-utils/ipcs.c:615
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "发送时间=%-26.24s\n"
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:617
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "接收时间=%-26.24s\n"
-#: sys-utils/ipcs.c:625
+#: sys-utils/ipcs.c:636
#, c-format
msgid ""
"\n"
@@ -12055,117 +12124,129 @@ msgstr ""
"\n"
"信号量数组 semid=%d\n"
-#: sys-utils/ipcs.c:626
+#: sys-utils/ipcs.c:637
#, 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:629
+#: sys-utils/ipcs.c:640
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "模式=%#o,访问权限=%#o\n"
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:642
#, c-format
msgid "nsems = %ju\n"
msgstr "nsems = %ju\n"
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:643
#, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %-26.24s\n"
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:645
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %-26.24s\n"
-#: sys-utils/ipcs.c:637
+#: sys-utils/ipcs.c:648
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:637
+#: sys-utils/ipcs.c:648
msgid "value"
msgstr "值"
-#: sys-utils/ipcs.c:637
+#: sys-utils/ipcs.c:648
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:637
+#: sys-utils/ipcs.c:648
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:637
+#: sys-utils/ipcs.c:648
msgid "pid"
msgstr "pid"
-#: sys-utils/ipcutils.c:224 sys-utils/ipcutils.c:228 sys-utils/ipcutils.c:232
-#: sys-utils/ipcutils.c:236
+#: sys-utils/ipcutils.c:226 sys-utils/ipcutils.c:230 sys-utils/ipcutils.c:234
+#: sys-utils/ipcutils.c:238
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: sys-utils/ipcutils.c:501
+#: sys-utils/ipcutils.c:499
#, c-format
msgid "%s (bytes) = "
msgstr "%s (字节) = "
-#: sys-utils/ipcutils.c:503
+#: sys-utils/ipcutils.c:501
#, c-format
msgid "%s (kbytes) = "
msgstr "%s (千字节) = "
-#: sys-utils/ldattach.c:143
+#: sys-utils/ldattach.c:179
msgid "invalid iflag"
msgstr "无效的 iflag"
-#: sys-utils/ldattach.c:159
+#: sys-utils/ldattach.c:195
#, c-format
msgid " %s [options] <ldisc> <device>\n"
msgstr " %s [选项] <线路规则> <设备>\n"
-#: sys-utils/ldattach.c:162
+#: sys-utils/ldattach.c:198
+msgid "Attach a line discipline to a serial line.\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:201
msgid " -d, --debug print verbose messages to stderr\n"
msgstr " -d, --debug 向标准错误打印详尽消息\n"
-#: sys-utils/ldattach.c:163
+#: sys-utils/ldattach.c:202
msgid " -s, --speed <value> set serial line speed\n"
msgstr " -s, --speed <值> 设置串口线速度\n"
-#: sys-utils/ldattach.c:164
+#: sys-utils/ldattach.c:203
+msgid " -c, --intro-command <string> intro sent before ldattach\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:204
+msgid " -p, --pause <seconds> pause between intro and ldattach\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:205
msgid " -7, --sevenbits set character size to 7 bits\n"
msgstr " -7, --sevenbits 字节大小设为 7 位\n"
-#: sys-utils/ldattach.c:165
+#: sys-utils/ldattach.c:206
msgid " -8, --eightbits set character size to 8 bits\n"
msgstr " -8, --eightbits 字节大小设为 8 位\n"
-#: sys-utils/ldattach.c:166
+#: sys-utils/ldattach.c:207
msgid " -n, --noparity set parity to none\n"
msgstr " -n, --noparity 设为无校验位\n"
-#: sys-utils/ldattach.c:167
+#: sys-utils/ldattach.c:208
msgid " -e, --evenparity set parity to even\n"
msgstr " -e, --evenparity 设为奇检验\n"
-#: sys-utils/ldattach.c:168
+#: sys-utils/ldattach.c:209
msgid " -o, --oddparity set parity to odd\n"
msgstr " -o, --oddparity 设为偶检验\n"
-#: sys-utils/ldattach.c:169
+#: sys-utils/ldattach.c:210
msgid " -1, --onestopbit set stop bits to one\n"
msgstr " -1, --onestopbit 停止位设为 1\n"
-#: sys-utils/ldattach.c:170
+#: sys-utils/ldattach.c:211
msgid " -2, --twostopbits set stop bits to two\n"
msgstr " -2, --twostopbits 停止位设为 2\n"
-#: sys-utils/ldattach.c:171
+#: sys-utils/ldattach.c:212
msgid " -i, --iflag [-]<iflag> set input mode flag\n"
msgstr " -i, --iflag [-]<iflag> 设置输入模式标志\n"
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:217
msgid ""
"\n"
"Known <ldisc> names:\n"
@@ -12173,7 +12254,7 @@ msgstr ""
"\n"
"已知<线路规则>名称:\n"
-#: sys-utils/ldattach.c:178
+#: sys-utils/ldattach.c:219
msgid ""
"\n"
"Known <iflag> names:\n"
@@ -12181,43 +12262,53 @@ msgstr ""
"\n"
"已知<iflag>名称:\n"
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:336
msgid "invalid speed argument"
msgstr "无效的 速度 参数"
-#: sys-utils/ldattach.c:274
+#: sys-utils/ldattach.c:339
+#, fuzzy
+msgid "invalid pause argument"
+msgstr "无效的 磁头数 参数"
+
+#: sys-utils/ldattach.c:355
msgid "invalid option"
msgstr "无效选项"
-#: sys-utils/ldattach.c:285
+#: sys-utils/ldattach.c:366
msgid "invalid line discipline argument"
msgstr "无效的 线路规则 参数"
-#: sys-utils/ldattach.c:292
+#: sys-utils/ldattach.c:373
#, c-format
msgid "%s is not a serial line"
msgstr "%s 不是串行线"
-#: sys-utils/ldattach.c:299
+#: sys-utils/ldattach.c:380
#, c-format
msgid "cannot get terminal attributes for %s"
msgstr "无法获取 %s 的终端属性"
-#: sys-utils/ldattach.c:302
+#: sys-utils/ldattach.c:383
#, c-format
msgid "speed %d unsupported"
msgstr "不支持速度 %d"
-#: sys-utils/ldattach.c:351
+#: sys-utils/ldattach.c:432
#, c-format
msgid "cannot set terminal attributes for %s"
msgstr "无法设置 %s 的终端属性"
-#: sys-utils/ldattach.c:358
+#: sys-utils/ldattach.c:442
+#, fuzzy, c-format
+msgid "cannot write intro command to %s"
+msgstr "无法创建 %s 目录"
+
+#: sys-utils/ldattach.c:452
msgid "cannot set line discipline"
msgstr "无法设置行规则"
-#: sys-utils/ldattach.c:364
+#: sys-utils/ldattach.c:461
msgid "cannot daemonize"
msgstr "无法转为守护进程"
@@ -12277,8 +12368,8 @@ msgstr ",加密 %s(类型 %u)"
msgid "%s: detach failed"
msgstr "%s:断开失败"
-#: sys-utils/losetup.c:315 sys-utils/lscpu.c:1442 sys-utils/prlimit.c:226
-#: sys-utils/swapon.c:151 sys-utils/wdctl.c:213
+#: sys-utils/losetup.c:315 sys-utils/lscpu.c:1442 sys-utils/prlimit.c:229
+#: sys-utils/swapon.c:164 sys-utils/wdctl.c:215 sys-utils/zramctl.c:259
msgid "failed to initialize output line"
msgstr "初始化输出行失败"
@@ -12292,70 +12383,74 @@ msgstr ""
" %1$s [选项] -f | <回环设备> <文件>\n"
#: sys-utils/losetup.c:372
+msgid "Set up and control loop devices.\n"
+msgstr ""
+
+#: sys-utils/losetup.c:375
msgid " -a, --all list all used devices\n"
msgstr " -a, --all 列出所有使用的设备\n"
-#: sys-utils/losetup.c:373
+#: sys-utils/losetup.c:376
msgid " -d, --detach <loopdev>... detach one or more devices\n"
msgstr " -d, --detach <回环设备>... 断开一台或多台设备\n"
-#: sys-utils/losetup.c:374
+#: sys-utils/losetup.c:377
msgid " -D, --detach-all detach all used devices\n"
msgstr " -D, --detach-all 断开所有使用的设备\n"
-#: sys-utils/losetup.c:375
+#: sys-utils/losetup.c:378
msgid " -f, --find find first unused device\n"
msgstr " -f, --find 查找第一个未使用的设备\n"
-#: sys-utils/losetup.c:376
+#: sys-utils/losetup.c:379
msgid " -c, --set-capacity <loopdev> resize the device\n"
msgstr " -c, --set-capacity <回环设备> 改变设备容量\n"
-#: sys-utils/losetup.c:377
+#: sys-utils/losetup.c:380
msgid " -j, --associated <file> list all devices associated with <file>\n"
msgstr " -j, --associated <文件> 列出所有与 <文件> 相关的设备\n"
-#: sys-utils/losetup.c:381
+#: sys-utils/losetup.c:384
msgid " -o, --offset <num> start at offset <num> into file\n"
msgstr " -o, --offset <数字> 在文件偏移量 <数字> 处开始\n"
-#: sys-utils/losetup.c:382
+#: sys-utils/losetup.c:385
msgid " --sizelimit <num> device is limited to <num> bytes of the file\n"
msgstr " --sizelimit <数字> 设备限制为了文件的<数字>个字节\n"
-#: sys-utils/losetup.c:383
+#: sys-utils/losetup.c:386
msgid " -P, --partscan create a partitioned loop device\n"
msgstr " -P, --partscan 创建带分区的回环设备\n"
-#: sys-utils/losetup.c:384
+#: sys-utils/losetup.c:387
msgid " -r, --read-only set up a read-only loop device\n"
msgstr " -r, --read-only 创建只读的回环设备\n"
-#: sys-utils/losetup.c:385
+#: sys-utils/losetup.c:388
msgid " --show print device name after setup (with -f)\n"
msgstr " --show 设置后打印设备名(加 -f 选项)\n"
-#: sys-utils/losetup.c:386
+#: sys-utils/losetup.c:389
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: sys-utils/losetup.c:390
+#: sys-utils/losetup.c:393
msgid " -l, --list list info about all or specified (default)\n"
msgstr " -l, --list 列出所有或指定的信息(默认)\n"
-#: sys-utils/losetup.c:391
+#: sys-utils/losetup.c:394
msgid " -O, --output <cols> specify columns to output for --list\n"
msgstr " -O, --output <列> 指定 --list 选项要输出的列\n"
-#: sys-utils/losetup.c:392
+#: sys-utils/losetup.c:395
msgid " -n, --noheadings don't print headings for --list output\n"
msgstr " -n, --noheadings --list 输出时不打印标题\n"
-#: sys-utils/losetup.c:393
+#: sys-utils/losetup.c:396
msgid " --raw use raw --list output format\n"
msgstr " --raw 使用原生 --list 输出格式\n"
-#: sys-utils/losetup.c:399
+#: sys-utils/losetup.c:402
msgid ""
"\n"
"Available --list columns:\n"
@@ -12363,49 +12458,49 @@ msgstr ""
"\n"
"可用的 --list 列:\n"
-#: sys-utils/losetup.c:419
+#: sys-utils/losetup.c:422
#, c-format
msgid "%s: Warning: file is smaller than 512 bytes; the loop device may be useless or invisible for system tools."
msgstr "%s:警告,文件小于 512 个字节,回环设备可能无用或在系统工具中看不到。"
-#: sys-utils/losetup.c:423
+#: sys-utils/losetup.c:426
#, c-format
msgid "%s: Warning: file does not fit into a 512-byte sector; the end of the file will be ignored."
msgstr "%s:警告,文件未对齐 512 字节扇区,其末尾将被忽略。"
-#: sys-utils/losetup.c:494 sys-utils/losetup.c:504 sys-utils/losetup.c:594
-#: sys-utils/losetup.c:608 sys-utils/losetup.c:684
+#: sys-utils/losetup.c:497 sys-utils/losetup.c:507 sys-utils/losetup.c:597
+#: sys-utils/losetup.c:611 sys-utils/losetup.c:687
#, c-format
msgid "%s: failed to use device"
msgstr "%s:使用设备失败"
-#: sys-utils/losetup.c:605
+#: sys-utils/losetup.c:608
msgid "no loop device specified"
msgstr "未指定回环设备"
-#: sys-utils/losetup.c:613
+#: sys-utils/losetup.c:616
msgid "no file specified"
msgstr "未指定文件"
-#: sys-utils/losetup.c:620
+#: sys-utils/losetup.c:623
#, c-format
msgid "the options %s are allowed during loop device setup only"
msgstr "选项 %s 只允许在设置回环设备时使用"
-#: sys-utils/losetup.c:625
+#: sys-utils/losetup.c:628
msgid "the option --offset is not allowed in this context"
msgstr "此环境下不允许使用 --offset 选项"
-#: sys-utils/losetup.c:645 sys-utils/losetup.c:696
+#: sys-utils/losetup.c:648 sys-utils/losetup.c:699
msgid "cannot find an unused loop device"
msgstr "找不到未使用的回环设备"
-#: sys-utils/losetup.c:655
+#: sys-utils/losetup.c:658
#, c-format
msgid "%s: failed to use backing file"
msgstr "%s:使用后备文件失败"
-#: sys-utils/losetup.c:717
+#: sys-utils/losetup.c:720
#, c-format
msgid "%s: set capacity failed"
msgstr "%s:设置容量失败"
@@ -12646,63 +12741,58 @@ msgid "NUMA node%d CPU(s):"
msgstr "NUMA 节点%d CPU:"
#: sys-utils/lscpu.c:1633
+msgid "Display information about the CPU architecture.\n"
+msgstr ""
+
+#: sys-utils/lscpu.c:1636
msgid " -a, --all print both online and offline CPUs (default for -e)\n"
msgstr " -a, --all 同时打印在线和离线 CPU (-e 选项默认值)\n"
-#: sys-utils/lscpu.c:1634
+#: sys-utils/lscpu.c:1637
msgid " -b, --online print online CPUs only (default for -p)\n"
msgstr " -b, --online 只打印在线 CPU (-p 选项默认值)\n"
-#: sys-utils/lscpu.c:1635
+#: sys-utils/lscpu.c:1638
msgid " -c, --offline print offline CPUs only\n"
msgstr " -c, --offline 只打印离线 CPU\n"
-#: sys-utils/lscpu.c:1636
+#: sys-utils/lscpu.c:1639
msgid " -e, --extended[=<list>] print out an extended readable format\n"
msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
-#: sys-utils/lscpu.c:1637
+#: sys-utils/lscpu.c:1640
msgid " -p, --parse[=<list>] print out a parsable format\n"
msgstr " -p, --parse[=<列表>] 打印可解析格式\n"
-#: sys-utils/lscpu.c:1638
+#: sys-utils/lscpu.c:1641
msgid " -s, --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: sys-utils/lscpu.c:1639
+#: sys-utils/lscpu.c:1642
msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n"
msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n"
-#: sys-utils/lscpu.c:1649
-#, c-format
-msgid ""
-"\n"
-"For more details see lscpu(1).\n"
-msgstr ""
-"\n"
-"更多信息请参阅 lscpu(1)。\n"
-
-#: sys-utils/lscpu.c:1737
+#: sys-utils/lscpu.c:1739
#, 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/mount.c:66 sys-utils/umount.c:115
+#: sys-utils/mount.c:66 sys-utils/umount.c:118
#, c-format
msgid "only root can use \"--%s\" option (effective UID is %u)"
msgstr "只有 root 用户能使用“--%s”选项(有效 UID 是 %u)"
-#: sys-utils/mount.c:69 sys-utils/umount.c:118
+#: sys-utils/mount.c:69 sys-utils/umount.c:121
#, c-format
msgid "only root can do that (effective UID is %u)"
msgstr "只有 root 用户能执行该操作(有效 UID 为 %u)"
-#: sys-utils/mount.c:73 sys-utils/umount.c:122
+#: sys-utils/mount.c:73 sys-utils/umount.c:125
#, c-format
msgid "only root can use \"--%s\" option"
msgstr "只有 root 用户能使用“--%s”选项"
-#: sys-utils/mount.c:74 sys-utils/umount.c:123
+#: sys-utils/mount.c:74 sys-utils/umount.c:126
msgid "only root can do that"
msgstr "只有 root 能执行该操作"
@@ -12720,7 +12810,7 @@ msgstr "%s:解析出错:忽略第 %d 行的记录。"
msgid "failed to read mtab"
msgstr "读取 mtab 失败"
-#: sys-utils/mount.c:193 sys-utils/umount.c:282
+#: sys-utils/mount.c:193 sys-utils/umount.c:285
#, c-format
msgid "%-25s: ignored\n"
msgstr "%-25s:已忽略\n"
@@ -12942,17 +13032,22 @@ msgstr "挂载表满"
msgid "%s: can't read superblock"
msgstr "%s:不能读超级块"
-#: sys-utils/mount.c:575
+#: sys-utils/mount.c:576
#, c-format
msgid "unknown filesystem type '%s'"
msgstr "未知的文件系统类型“%s”"
-#: sys-utils/mount.c:583
+#: sys-utils/mount.c:578
+#, fuzzy
+msgid "unknown filesystem type"
+msgstr "未知的文件系统类型“%s”"
+
+#: sys-utils/mount.c:586
#, c-format
msgid "%s is not a block device, and stat(2) fails?"
msgstr "%s 不是块设备,而且 stat(2) 失败?"
-#: sys-utils/mount.c:585
+#: sys-utils/mount.c:588
#, c-format
msgid ""
"the kernel does not recognize %s as a block device\n"
@@ -12961,67 +13056,67 @@ msgstr ""
"内核无法将 %s 识别为块设备\n"
" (试试“modprobe driver”?)"
-#: sys-utils/mount.c:588
+#: sys-utils/mount.c:591
#, c-format
msgid "%s is not a block device (maybe try `-o loop'?)"
msgstr "%s 不是块设备(用 `-o loop' 试试?)"
-#: sys-utils/mount.c:590
+#: sys-utils/mount.c:593
#, c-format
msgid " %s is not a block device"
msgstr "%s 不是一个块设备"
-#: sys-utils/mount.c:597
+#: sys-utils/mount.c:600
#, c-format
msgid "%s is not a valid block device"
msgstr "%s 不是一个有效的块设备"
-#: sys-utils/mount.c:603
+#: sys-utils/mount.c:606
#, c-format
msgid "cannot mount %s read-only"
msgstr "无法以只读方式挂载 %s"
-#: sys-utils/mount.c:606
+#: sys-utils/mount.c:609
#, c-format
msgid "%s is write-protected but explicit `-w' flag given"
msgstr "%s 是写保护的,但指明了“-w”标志"
-#: sys-utils/mount.c:609
+#: sys-utils/mount.c:612
#, c-format
msgid "cannot remount %s read-write, is write-protected"
msgstr "无法以读写方式重新挂载 %s,它是写保护的"
-#: sys-utils/mount.c:612
+#: sys-utils/mount.c:615
#, c-format
msgid "%s is write-protected, mounting read-only"
msgstr "%s 写保护,将以只读方式挂载"
-#: sys-utils/mount.c:625
+#: sys-utils/mount.c:628
#, c-format
msgid "no medium found on %s"
msgstr "在 %s 上找不到媒体"
-#: sys-utils/mount.c:629
+#: sys-utils/mount.c:632
#, c-format
msgid "mount %s on %s failed"
msgstr "将 %s 挂载到 %s 失败"
-#: sys-utils/mount.c:653
+#: sys-utils/mount.c:656
#, c-format
msgid "%s: failed to parse"
msgstr "%s:解析失败"
-#: sys-utils/mount.c:692
+#: sys-utils/mount.c:695
#, c-format
msgid "unsupported option format: %s"
msgstr "不支持的参数格式:%s"
-#: sys-utils/mount.c:694
+#: sys-utils/mount.c:697
#, c-format
msgid "failed to append option '%s'"
msgstr "追加选项“%s”失败"
-#: sys-utils/mount.c:701
+#: sys-utils/mount.c:714
#, c-format
msgid ""
" %1$s [-lhV]\n"
@@ -13036,7 +13131,12 @@ msgstr ""
" %1$s [选项] <源> <目录>\n"
" %1$s <操作> <挂载点> [<目标>]\n"
-#: sys-utils/mount.c:710
+#: sys-utils/mount.c:722
+#, fuzzy
+msgid "Mount a filesystem.\n"
+msgstr "正在检查所有文件系统。\n"
+
+#: sys-utils/mount.c:726
#, c-format
msgid ""
" -a, --all mount all filesystems mentioned in fstab\n"
@@ -13051,7 +13151,7 @@ msgstr ""
" -F, --fork 对每个设备禁用 fork(和 -a 选项一起使用)\n"
" -T, --fstab <路径> /etc/fstab 的替代文件\n"
-#: sys-utils/mount.c:716
+#: sys-utils/mount.c:732
#, c-format
msgid ""
" -h, --help display this help text and exit\n"
@@ -13064,7 +13164,7 @@ msgstr ""
" -l, --show-labels 列出所有带有指定标签的挂载\n"
" -n, --no-mtab 不写 /etc/mtab\n"
-#: sys-utils/mount.c:721
+#: sys-utils/mount.c:737
#, c-format
msgid ""
" -o, --options <list> comma-separated list of mount options\n"
@@ -13077,7 +13177,7 @@ msgstr ""
" -r, --read-only 以只读方式挂载文件系统(同 -o ro)\n"
" -t, --types <列表> 限制文件系统类型集合\n"
-#: sys-utils/mount.c:726
+#: sys-utils/mount.c:742
#, c-format
msgid ""
" --source <src> explicitly specifies source (path, label, uuid)\n"
@@ -13086,7 +13186,7 @@ msgstr ""
" --source <源> 指明源(路径、标签、uuid)\n"
" --target <目标> 指明挂载点\n"
-#: sys-utils/mount.c:729
+#: sys-utils/mount.c:745
#, c-format
msgid ""
" -v, --verbose say what is being done\n"
@@ -13097,7 +13197,7 @@ msgstr ""
" -V, --version 显示版本信息并退出\n"
" -w, --rw, --read-write 以读写方式挂载文件系统(默认)\n"
-#: sys-utils/mount.c:738
+#: sys-utils/mount.c:754
#, c-format
msgid ""
"\n"
@@ -13118,7 +13218,7 @@ msgstr ""
" PARTLABEL=<标签> 按分区标签指定设备\n"
" PARTUUID=<uuid> 按分区 UUID 指定设备\n"
-#: sys-utils/mount.c:747
+#: sys-utils/mount.c:763
#, c-format
msgid ""
" <device> specifies device by path\n"
@@ -13129,7 +13229,7 @@ msgstr ""
" <目录> 绑定式挂载的挂载点(参阅 --bind/rbind)\n"
" <文件> 用于设置回环设备的常规文件\n"
-#: sys-utils/mount.c:752
+#: sys-utils/mount.c:768
#, c-format
msgid ""
"\n"
@@ -13144,7 +13244,7 @@ msgstr ""
" -M, --move 将子树移动到其他位置\n"
" -R, --rbind 挂载其他位置的子树及其包含的所有子挂载(submount)\n"
-#: sys-utils/mount.c:757
+#: sys-utils/mount.c:773
#, c-format
msgid ""
" --make-shared mark a subtree as shared\n"
@@ -13157,7 +13257,7 @@ msgstr ""
" --make-private 将子树标记为 私有\n"
" --make-unbindable 将子树标记为 不可绑定\n"
-#: sys-utils/mount.c:762
+#: sys-utils/mount.c:778
#, c-format
msgid ""
" --make-rshared recursively mark a whole subtree as shared\n"
@@ -13170,19 +13270,19 @@ msgstr ""
" --make-rprivate 递归地将整个子树标记为 私有\n"
" --make-runbindable 递归地将整个子树标记为 不可绑定\n"
-#: sys-utils/mount.c:848 sys-utils/umount.c:546
+#: sys-utils/mount.c:864 sys-utils/umount.c:549
msgid "libmount context allocation failed"
msgstr "libmount 环境(context)分配失败"
-#: sys-utils/mount.c:905 sys-utils/umount.c:599
+#: sys-utils/mount.c:921 sys-utils/umount.c:602
msgid "failed to set options pattern"
msgstr "设置选项模式失败"
-#: sys-utils/mount.c:1058
+#: sys-utils/mount.c:1074
msgid "source specified more than once"
msgstr "源指定了多次"
-#: sys-utils/mountpoint.c:119
+#: sys-utils/mountpoint.c:118
#, c-format
msgid ""
" %1$s [-qd] /path/to/directory\n"
@@ -13191,7 +13291,11 @@ msgstr ""
" %1$s [-qd] /目录/的/路径\n"
" %1$s -x /dev/设备\n"
-#: sys-utils/mountpoint.c:123
+#: sys-utils/mountpoint.c:122
+msgid "Check whether a directory or file is a mountpoint.\n"
+msgstr ""
+
+#: sys-utils/mountpoint.c:125
msgid ""
" -q, --quiet quiet mode - don't print anything\n"
" -d, --fs-devno print maj:min device number of the filesystem\n"
@@ -13201,104 +13305,122 @@ msgstr ""
" -d, --fs-devno 打印文件系统的 主:次 设备号\n"
" -x, --devno 打印块设备的主:次设备号\n"
-#: sys-utils/mountpoint.c:203
+#: sys-utils/mountpoint.c:195
#, c-format
msgid "%s is not a mountpoint\n"
msgstr "%s 不是一个挂载点\n"
-#: sys-utils/mountpoint.c:209
+#: sys-utils/mountpoint.c:201
#, c-format
msgid "%s is a mountpoint\n"
msgstr "%s 是一个挂载点\n"
-#: sys-utils/nsenter.c:65 sys-utils/setpriv.c:93 sys-utils/unshare.c:64
-#, c-format
-msgid " %s [options] <program> [args...]\n"
-msgstr " %s [选项] <程序> [参数...]\n"
+#: sys-utils/nsenter.c:65 sys-utils/setpriv.c:93 sys-utils/unshare.c:108
+#, fuzzy, c-format
+msgid " %s [options] <program> [<argument>...]\n"
+msgstr " %s [选项] <程序> [参数 ...]\n"
#: sys-utils/nsenter.c:69
+msgid "Run a program with namespaces of other processes.\n"
+msgstr ""
+
+#: sys-utils/nsenter.c:72
msgid " -t, --target <pid> target process to get namespaces from\n"
msgstr " -t, --target <pid> 要获取名字空间的目标进程\n"
-#: sys-utils/nsenter.c:70
-msgid " -m, --mount [=<file>] enter mount namespace\n"
+#: sys-utils/nsenter.c:73
+#, fuzzy
+msgid " -m, --mount[=<file>] enter mount namespace\n"
msgstr " -m, --mount [=<文件>] 进入挂臷名字空间\n"
-#: sys-utils/nsenter.c:71
-msgid " -u, --uts [=<file>] enter UTS namespace (hostname etc)\n"
+#: sys-utils/nsenter.c:74
+#, fuzzy
+msgid " -u, --uts[=<file>] enter UTS namespace (hostname etc)\n"
msgstr " -u, --uts [=<文件>] 进入 UTS 名字空间(主机名等)\n"
-#: sys-utils/nsenter.c:72
-msgid " -i, --ipc [=<file>] enter System V IPC namespace\n"
+#: sys-utils/nsenter.c:75
+#, fuzzy
+msgid " -i, --ipc[=<file>] enter System V IPC namespace\n"
msgstr " -i, --ipc [=<文件>] 进入系统 V IPC 名字空间\n"
-#: sys-utils/nsenter.c:73
-msgid " -n, --net [=<file>] enter network namespace\n"
+#: sys-utils/nsenter.c:76
+#, fuzzy
+msgid " -n, --net[=<file>] enter network namespace\n"
msgstr " -n, --net [=<文件>] 进入网络名字空间\n"
-#: sys-utils/nsenter.c:74
-msgid " -p, --pid [=<file>] enter pid namespace\n"
+#: sys-utils/nsenter.c:77
+#, fuzzy
+msgid " -p, --pid[=<file>] enter pid namespace\n"
msgstr " -p, --pid [=<文件>] 进入 pid 名字空间\n"
-#: sys-utils/nsenter.c:75
-msgid " -U, --user [=<file>] enter user namespace\n"
+#: sys-utils/nsenter.c:78
+#, fuzzy
+msgid " -U, --user[=<file>] enter user namespace\n"
msgstr " -U, --user [=<文件>] 进入用户名字空间\n"
-#: sys-utils/nsenter.c:76
-msgid " -S, --setuid <uid> set uid in user namespace\n"
+#: sys-utils/nsenter.c:79
+#, fuzzy
+msgid " -S, --setuid <uid> set uid in entered namespace\n"
msgstr " -S, --setuid <uid> 在用户名字空间中设置 uid\n"
-#: sys-utils/nsenter.c:77
-msgid " -G, --setgid <gid> set gid in user namespace\n"
+#: sys-utils/nsenter.c:80
+#, fuzzy
+msgid " -G, --setgid <gid> set gid in entered namespace\n"
msgstr " -G, --setgid <gid> 在用户名字空间中设置 gid\n"
-#: sys-utils/nsenter.c:78
-msgid " -r, --root [=<dir>] set the root directory\n"
+#: sys-utils/nsenter.c:81
+msgid " --preserve-credentials do not touch uids or gids\n"
+msgstr ""
+
+#: sys-utils/nsenter.c:82
+#, fuzzy
+msgid " -r, --root[=<dir>] set the root directory\n"
msgstr " -r, --root [=<目录>] 设置根目录\n"
-#: sys-utils/nsenter.c:79
-msgid " -w, --wd [=<dir>] set the working directory\n"
+#: sys-utils/nsenter.c:83
+#, fuzzy
+msgid " -w, --wd[=<dir>] set the working directory\n"
msgstr " -w, --wd [=<目录>] 设置工作目录\n"
-#: sys-utils/nsenter.c:80
+#: sys-utils/nsenter.c:84
msgid " -F, --no-fork do not fork before exec'ing <program>\n"
msgstr " -F, --no-fork 执行 <程序> 前不 fork\n"
-#: sys-utils/nsenter.c:105
+#: sys-utils/nsenter.c:109
#, c-format
msgid "neither filename nor target pid supplied for %s"
msgstr "没有为 %s 提供文件名或目标 pid"
-#: sys-utils/nsenter.c:245
+#: sys-utils/nsenter.c:253
msgid "failed to parse uid"
msgstr "解析 uid 失败"
-#: sys-utils/nsenter.c:248
+#: sys-utils/nsenter.c:257
msgid "failed to parse gid"
msgstr "解析 gid 失败"
-#: sys-utils/nsenter.c:291
+#: sys-utils/nsenter.c:324
#, c-format
msgid "reassociate to namespace '%s' failed"
msgstr "重新关联到名字空间“%s”失败"
-#: sys-utils/nsenter.c:302
+#: sys-utils/nsenter.c:335
msgid "cannot open current working directory"
msgstr "打不开当前工作目录"
-#: sys-utils/nsenter.c:309
+#: sys-utils/nsenter.c:342
msgid "change directory by root file descriptor failed"
msgstr "根据 root 文件描述符 更改目录失败"
-#: sys-utils/nsenter.c:312
+#: sys-utils/nsenter.c:345
msgid "chroot failed"
msgstr "chroot 失败"
-#: sys-utils/nsenter.c:322
+#: sys-utils/nsenter.c:355
msgid "change directory by working directory file descriptor failed"
msgstr "按工作目录文件描述符更改目录失败"
-#: sys-utils/nsenter.c:333 sys-utils/setpriv.c:810 sys-utils/setpriv.c:814
+#: sys-utils/nsenter.c:366 sys-utils/setpriv.c:816 sys-utils/setpriv.c:820
msgid "setgroups failed"
msgstr "setgroups 失败"
@@ -13307,7 +13429,12 @@ msgstr "setgroups 失败"
msgid " %s [options] new_root put_old\n"
msgstr " %s [选项] 新根目录 旧根目录更名\n"
-#: sys-utils/pivot_root.c:71
+#: sys-utils/pivot_root.c:37
+#, fuzzy
+msgid "Change the root filesystem.\n"
+msgstr "正在检查所有文件系统。\n"
+
+#: sys-utils/pivot_root.c:75
#, c-format
msgid "failed to change root from `%s' to `%s'"
msgstr "将根目录从“%s”更改为“%s”失败"
@@ -13422,7 +13549,11 @@ msgstr " %s [选项] [-p PID]\n"
msgid " %s [options] COMMAND\n"
msgstr " %s [选项] 命令\n"
-#: sys-utils/prlimit.c:165
+#: sys-utils/prlimit.c:166
+msgid "Show or change the resource limits of a process.\n"
+msgstr ""
+
+#: sys-utils/prlimit.c:168
msgid ""
"\n"
"General Options:\n"
@@ -13430,7 +13561,7 @@ msgstr ""
"\n"
"常规选项:\n"
-#: sys-utils/prlimit.c:166
+#: sys-utils/prlimit.c:169
msgid ""
" -p, --pid <pid> process id\n"
" -o, --output <list> define which output columns to use\n"
@@ -13448,7 +13579,7 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
" -V, --version 输出版本信息并退出\n"
-#: sys-utils/prlimit.c:174
+#: sys-utils/prlimit.c:177
msgid ""
"\n"
"Resources Options:\n"
@@ -13456,7 +13587,7 @@ msgstr ""
"\n"
"资源选项:\n"
-#: sys-utils/prlimit.c:175
+#: sys-utils/prlimit.c:178
msgid ""
" -c, --core maximum size of core files created\n"
" -d, --data maximum size of a process's data segment\n"
@@ -13494,129 +13625,141 @@ msgstr ""
" -y, --rttime 实时调度时进程调度的 CPU\n"
" (间隔)时间(毫秒)\n"
-#: sys-utils/prlimit.c:240 sys-utils/prlimit.c:246 sys-utils/prlimit.c:362
-#: sys-utils/prlimit.c:367
+#: sys-utils/prlimit.c:243 sys-utils/prlimit.c:249 sys-utils/prlimit.c:365
+#: sys-utils/prlimit.c:370
msgid "unlimited"
msgstr "无限制"
-#: sys-utils/prlimit.c:329
+#: sys-utils/prlimit.c:332
#, c-format
msgid "failed to get old %s limit"
msgstr "获取旧的 %s 限制失败"
-#: sys-utils/prlimit.c:353
+#: sys-utils/prlimit.c:356
#, c-format
msgid "the soft limit %s cannot exceed the hard limit"
msgstr "软限制 %s 不能超过硬限制"
-#: sys-utils/prlimit.c:360
+#: sys-utils/prlimit.c:363
#, c-format
msgid "New %s limit: "
msgstr "新的 %s 限制:"
-#: sys-utils/prlimit.c:374
+#: sys-utils/prlimit.c:377
#, c-format
msgid "failed to set the %s resource limit"
msgstr "设置 %s 资源限制失败"
-#: sys-utils/prlimit.c:375
+#: sys-utils/prlimit.c:378
#, c-format
msgid "failed to get the %s resource limit"
msgstr "获取 %s 资源限制失败"
-#: sys-utils/prlimit.c:452
+#: sys-utils/prlimit.c:455
#, c-format
msgid "failed to parse %s limit"
msgstr "解析 %s 限制失败"
-#: sys-utils/prlimit.c:581
+#: sys-utils/prlimit.c:584
msgid "option --pid may be specified only once"
msgstr "--pid 选项只能指定一次"
-#: sys-utils/prlimit.c:612
+#: sys-utils/prlimit.c:615
msgid "options --pid and COMMAND are mutually exclusive"
msgstr "--pid 和 命令 互相排斥"
-#: sys-utils/readprofile.c:108
+#: sys-utils/readprofile.c:107
+msgid "Display kernel profiling information.\n"
+msgstr ""
+
+#: sys-utils/readprofile.c:111
#, c-format
msgid " -m, --mapfile <mapfile> (defaults: \"%s\" and\n"
msgstr " -m, --mapfile <映射文件> (默认:“%s”和\n"
-#: sys-utils/readprofile.c:110
+#: sys-utils/readprofile.c:113
#, c-format
msgid " \"%s\")\n"
msgstr " “%s”)\n"
-#: sys-utils/readprofile.c:112
+#: sys-utils/readprofile.c:115
#, c-format
msgid " -p, --profile <pro-file> (default: \"%s\")\n"
msgstr " -p, --profile <pro-file> (默认:“%s”)\n"
-#: sys-utils/readprofile.c:113
+#: sys-utils/readprofile.c:116
msgid " -M, --multiplier <mult> set the profiling multiplier to <mult>\n"
msgstr " -M, --multiplier <乘数> 将性能测试乘数设置为<乘数>\n"
-#: sys-utils/readprofile.c:114
+#: sys-utils/readprofile.c:117
msgid " -i, --info print only info about the sampling step\n"
msgstr " -i, --info 只打印有关采样步骤(sampling step)的信息\n"
-#: sys-utils/readprofile.c:115
+#: sys-utils/readprofile.c:118
msgid " -v, --verbose print verbose data\n"
msgstr " -v, --verbose 打印详细信息\n"
-#: sys-utils/readprofile.c:116
+#: sys-utils/readprofile.c:119
msgid " -a, --all print all symbols, even if count is 0\n"
msgstr " -a, --all 打印所有符号,即使计数为 0\n"
-#: sys-utils/readprofile.c:117
+#: sys-utils/readprofile.c:120
msgid " -b, --histbin print individual histogram-bin counts\n"
msgstr " -b, --histbin 打印各个直方图区间的计数\n"
-#: sys-utils/readprofile.c:118
+#: sys-utils/readprofile.c:121
msgid " -s, --counters print individual counters within functions\n"
msgstr " -s, --counters 打印函数内的独立计数\n"
-#: sys-utils/readprofile.c:119
+#: sys-utils/readprofile.c:122
msgid " -r, --reset reset all the counters (root only)\n"
msgstr " -r, --reset 重置所有计数(限 root 用户)\n"
-#: sys-utils/readprofile.c:120
+#: sys-utils/readprofile.c:123
msgid " -n, --no-auto disable byte order auto-detection\n"
msgstr " -n, --no-auto 禁用字节顺序自动检测\n"
-#: sys-utils/readprofile.c:237
+#: sys-utils/readprofile.c:240
#, c-format
msgid "error writing %s"
msgstr "写 %s 出错"
-#: sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:271
msgid "Assuming reversed byte order. Use -n to force native byte order."
msgstr "将假设为反向字节顺序。可使用 -n 强制为原生字节顺序。"
-#: sys-utils/readprofile.c:283
+#: sys-utils/readprofile.c:286
#, c-format
msgid "Sampling_step: %i\n"
msgstr "采样步数(step):%i\n"
-#: sys-utils/readprofile.c:299 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:302 sys-utils/readprofile.c:323
#, c-format
msgid "%s(%i): wrong map line"
msgstr "%s(%i):错误的 map 行"
-#: sys-utils/readprofile.c:310
+#: sys-utils/readprofile.c:313
#, c-format
msgid "can't find \"_stext\" in %s"
msgstr "在 %s 中找不到“_stext”"
-#: sys-utils/readprofile.c:343
+#: sys-utils/readprofile.c:346
msgid "profile address out of range. Wrong map file?"
msgstr "配置(profile)地址超出范围。map 文件错误?"
-#: sys-utils/readprofile.c:401
+#: sys-utils/readprofile.c:404
msgid "total"
msgstr "总计"
-#: sys-utils/renice.c:57
+#: sys-utils/renice.c:52
+msgid "process ID"
+msgstr "进程 ID"
+
+#: sys-utils/renice.c:53
+msgid "process group ID"
+msgstr "进程组 ID"
+
+#: sys-utils/renice.c:61
#, c-format
msgid ""
" %1$s [-n] <priority> [-p|--pid] <pid>...\n"
@@ -13627,68 +13770,65 @@ msgstr ""
" %1$s [-n] <优先级> -g|--pgrp <pgid>...\n"
" %1$s [-n] <优先级> -u|--user <用户>...\n"
-#: sys-utils/renice.c:63
-msgid ""
-" -g, --pgrp <id> interpret argument as process group ID\n"
-" -n, --priority <num> specify the nice increment value\n"
-" -p, --pid <id> interpret argument as process ID (default)\n"
-" -u, --user <name|id> interpret argument as username or user ID\n"
-" -h, --help display help text and exit\n"
-" -V, --version display version information and exit\n"
-msgstr ""
-" -g, --pgrp <id> 将参数解释为进程组 ID\n"
-" -n, --priority <数字> 指定 nice 增加值\n"
-" -p, --pid <id> 将参数解释为进程 ID (默认)\n"
-" -u, --user <名字|id> 将参数解释为用户名或用户 ID\n"
-" -h, --help 显示帮助文本并退出\n"
-" -V, --version 显示版本信息并退出\n"
-
-#: sys-utils/renice.c:70
-msgid ""
-"\n"
-"For more information see renice(1).\n"
+#: sys-utils/renice.c:67
+msgid "Alter the priority of running processes.\n"
msgstr ""
-"\n"
-"更多信息请参阅 renice(1)。\n"
-#: sys-utils/renice.c:140
-#, c-format
-msgid "unknown user %s"
-msgstr "未知用户 %s"
+#: sys-utils/renice.c:70
+#, fuzzy
+msgid " -n, --priority <num> specify the nice increment value\n"
+msgstr " -C, --cylinders <数字> 指定柱面数\n"
-#: sys-utils/renice.c:148
-#, c-format
-msgid "bad value %s"
-msgstr "错误值 %s"
+#: sys-utils/renice.c:71
+#, fuzzy
+msgid " -p, --pid <id> interpret argument as process ID (default)\n"
+msgstr " -i, --id 也记录进程 ID\n"
-#: sys-utils/renice.c:161
-msgid "process ID"
-msgstr "进程 ID"
+#: sys-utils/renice.c:72
+#, fuzzy
+msgid " -g, --pgrp <id> interpret argument as process group ID\n"
+msgstr " -t, --target <pid> 要获取名字空间的目标进程\n"
-#: sys-utils/renice.c:166
-msgid "process group ID"
-msgstr "进程组 ID"
+#: sys-utils/renice.c:73
+msgid " -u, --user <name>|<id> interpret argument as username or user ID\n"
+msgstr ""
-#: sys-utils/renice.c:171 sys-utils/renice.c:181
+#: sys-utils/renice.c:86
#, c-format
msgid "failed to get priority for %d (%s)"
msgstr "获取 %d (%s) 的优先级失败"
-#: sys-utils/renice.c:175
+#: sys-utils/renice.c:99
#, c-format
msgid "failed to set priority for %d (%s)"
msgstr "设置 %d 的优先级失败(%s)"
-#: sys-utils/renice.c:185
+#: sys-utils/renice.c:104
#, c-format
msgid "%d (%s) old priority %d, new priority %d\n"
msgstr "%d (%s) 旧优先级为 %d,新优先级为 %d\n"
+#: sys-utils/renice.c:176
+#, c-format
+msgid "unknown user %s"
+msgstr "未知用户 %s"
+
+#. TRANSLATORS: The first %s is one of the above
+#. * three ID names. Read: "bad value for %s: %s"
+#: sys-utils/renice.c:185
+#, fuzzy, c-format
+msgid "bad %s value: %s"
+msgstr "错误值 %s"
+
#: sys-utils/rtcwake.c:75
+msgid "Enter a system sleep state until a specified wakeup time.\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:78
msgid " -a, --auto reads the clock mode from adjust file (default)\n"
msgstr " -a, --auto 从 adjust 文件读取时钟模式(默认)\n"
-#: sys-utils/rtcwake.c:77
+#: sys-utils/rtcwake.c:80
#, c-format
msgid ""
" -A, --adjfile <file> specifies the path to the adjust file\n"
@@ -13697,247 +13837,257 @@ msgstr ""
" -A, --adjfile <文件> 指定 adjust 文件的路径\n"
" 默认为 %s\n"
-#: sys-utils/rtcwake.c:79
+#: sys-utils/rtcwake.c:82
msgid " -d, --device <device> select rtc device (rtc0|rtc1|...)\n"
msgstr " -d, --device <设备> 选择 rtc 设备(rtc0|rtc1|...)\n"
-#: sys-utils/rtcwake.c:80
+#: sys-utils/rtcwake.c:83
msgid " -n, --dry-run does everything, but suspend\n"
msgstr " -n, --dry-run 演示操作但不执行(suspend)\n"
-#: sys-utils/rtcwake.c:81
+#: sys-utils/rtcwake.c:84
msgid " -l, --local RTC uses local timezone\n"
msgstr " -l, --local RTC 使用本地时区\n"
-#: sys-utils/rtcwake.c:82
+#: sys-utils/rtcwake.c:85
msgid " -m, --mode <mode> standby|mem|... sleep mode\n"
msgstr " -m, --mode <模式> 指定 standby|mem|... 等睡眠模式\n"
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:86
msgid " -s, --seconds <seconds> seconds to sleep\n"
msgstr " -s, --seconds <秒数> 指定睡眠的秒数\n"
-#: sys-utils/rtcwake.c:84
+#: sys-utils/rtcwake.c:87
msgid " -t, --time <time_t> time to wake\n"
msgstr " -t, --time <time_t> 指定唤醒时刻\n"
-#: sys-utils/rtcwake.c:85
+#: sys-utils/rtcwake.c:88
msgid " -u, --utc RTC uses UTC\n"
msgstr " -u, --utc RTC 使用 UTC\n"
-#: sys-utils/rtcwake.c:86
+#: sys-utils/rtcwake.c:89
msgid " -v, --verbose verbose messages\n"
msgstr " -v, --verbose 输出详尽消息\n"
-#: sys-utils/rtcwake.c:143
+#: sys-utils/rtcwake.c:146
msgid "read rtc time failed"
msgstr "读取 rtc 时间失败"
-#: sys-utils/rtcwake.c:148
+#: sys-utils/rtcwake.c:151
msgid "read system time failed"
msgstr "读取系统时间失败"
-#: sys-utils/rtcwake.c:166
+#: sys-utils/rtcwake.c:169
msgid "convert rtc time failed"
msgstr "转换 rtc 时间失败"
-#: sys-utils/rtcwake.c:226
+#: sys-utils/rtcwake.c:229
msgid "set rtc alarm failed"
msgstr "设置 rtc 闹钟失败"
-#: sys-utils/rtcwake.c:230
+#: sys-utils/rtcwake.c:233
msgid "enable rtc alarm failed"
msgstr "启用 rtc 闹钟失败"
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:237
msgid "set rtc wake alarm failed"
msgstr "设置 rtc 唤醒闹钟失败"
-#: sys-utils/rtcwake.c:337
+#: sys-utils/rtcwake.c:340
msgid "read rtc alarm failed"
msgstr "读取 rtc 闹钟失败"
-#: sys-utils/rtcwake.c:343
+#: sys-utils/rtcwake.c:346
#, c-format
msgid "alarm: off\n"
msgstr "闹钟:关\n"
-#: sys-utils/rtcwake.c:360
+#: sys-utils/rtcwake.c:363
msgid "convert time failed"
msgstr "转换时间失败"
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:370
#, c-format
msgid "alarm: on %s"
msgstr "闹钟:于 %s"
-#: sys-utils/rtcwake.c:445
+#: sys-utils/rtcwake.c:448
#, c-format
msgid "unrecognized suspend state '%s'"
msgstr "不支持的挂起状态“%s”"
-#: sys-utils/rtcwake.c:455
+#: sys-utils/rtcwake.c:458
msgid "invalid seconds argument"
msgstr "无效的 秒数 参数"
-#: sys-utils/rtcwake.c:462
+#: sys-utils/rtcwake.c:465
msgid "invalid time argument"
msgstr "无效的 时间 参数"
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:489
#, c-format
msgid "%s: assuming RTC uses UTC ...\n"
msgstr "%s:将假设 RTC 使用 UTC...\n"
-#: sys-utils/rtcwake.c:493
+#: sys-utils/rtcwake.c:495
#, c-format
msgid "Using UTC time.\n"
msgstr "使用 UTC 时间。\n"
-#: sys-utils/rtcwake.c:494
+#: sys-utils/rtcwake.c:496
#, c-format
msgid "Using local time.\n"
msgstr "使用当地时间。\n"
-#: sys-utils/rtcwake.c:499
+#: sys-utils/rtcwake.c:501
msgid "must provide wake time (see -t and -s options)"
msgstr "必须指定唤醒时间(参阅 -t 和 -s 选项)"
-#: sys-utils/rtcwake.c:516
+#: sys-utils/rtcwake.c:518
#, c-format
msgid "%s not enabled for wakeup events"
msgstr "%s 没有为唤醒事件启用"
-#: sys-utils/rtcwake.c:531
+#: sys-utils/rtcwake.c:533
#, c-format
msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
msgstr "闹钟 %ld,sys 时间 %ld,rtc 时间 %ld,秒数 %u\n"
-#: sys-utils/rtcwake.c:537
+#: sys-utils/rtcwake.c:539
#, c-format
msgid "suspend to \"%s\" unavailable"
msgstr "挂起到“%s”不可用"
-#: sys-utils/rtcwake.c:545
+#: sys-utils/rtcwake.c:547
#, c-format
msgid "time doesn't go backward to %s"
msgstr "时间不能返回到 %s"
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:557
#, c-format
msgid "%s: wakeup using %s at %s"
msgstr "%1$s:用 %3$s 的 %2$s 唤醒"
-#: sys-utils/rtcwake.c:559
+#: sys-utils/rtcwake.c:561
#, c-format
msgid "%s: wakeup from \"%s\" using %s at %s"
msgstr "%s:从“%s”唤醒,使用 %s,时间 %s"
-#: sys-utils/rtcwake.c:568
+#: sys-utils/rtcwake.c:570
#, c-format
msgid "suspend mode: no; leaving\n"
msgstr "挂起模式:无;将离开\n"
-#: sys-utils/rtcwake.c:576
+#: sys-utils/rtcwake.c:578
#, c-format
msgid "suspend mode: off; executing %s\n"
msgstr "挂起模式:关;正在执行 %s\n"
-#: sys-utils/rtcwake.c:595
+#: sys-utils/rtcwake.c:597
#, c-format
msgid "suspend mode: on; reading rtc\n"
msgstr "挂起模式:开;正在读 rtc\n"
-#: sys-utils/rtcwake.c:601
+#: sys-utils/rtcwake.c:603
msgid "rtc read failed"
msgstr "读 rtc 失败"
-#: sys-utils/rtcwake.c:612
+#: sys-utils/rtcwake.c:614
#, c-format
msgid "suspend mode: disable; disabling alarm\n"
msgstr "挂起模式:禁用;正在禁用闹钟\n"
-#: sys-utils/rtcwake.c:616
+#: sys-utils/rtcwake.c:618
#, c-format
msgid "suspend mode: show; printing alarm info\n"
msgstr "挂起模式:显示;正在打印闹钟信息\n"
-#: sys-utils/rtcwake.c:623
+#: sys-utils/rtcwake.c:625
#, c-format
msgid "suspend mode: %s; suspending system\n"
msgstr "挂起模式:%s;正在挂起系统\n"
-#: sys-utils/rtcwake.c:636 sys-utils/rtcwake.c:642
+#: sys-utils/rtcwake.c:638 sys-utils/rtcwake.c:644
msgid "disable rtc alarm interrupt failed"
msgstr "禁用 rtc 闹钟中断失败"
-#: sys-utils/setarch.c:52
+#: sys-utils/setarch.c:48
#, c-format
msgid "Switching on %s.\n"
msgstr "正在打开 %s。\n"
-#: sys-utils/setarch.c:94
-#, c-format
-msgid " %s%s [options] [program [program arguments]]\n"
-msgstr " %s%s [选项] [程序 [程序参数]]\n"
+#: sys-utils/setarch.c:91
+#, fuzzy, c-format
+msgid " %s <arch> [options] [<program> [<argument>...]]\n"
+msgstr " %s [选项] <程序> [参数 ...]\n"
+
+#: sys-utils/setarch.c:93
+#, fuzzy, c-format
+msgid " %s [options] [<program> [<argument>...]]\n"
+msgstr " %s [选项] <程序> [参数 ...]\n"
+
+#: sys-utils/setarch.c:96
+msgid "Change the reported architecture and set personality flags.\n"
+msgstr ""
#: sys-utils/setarch.c:99
-msgid " -v, --verbose says what options are being switched on\n"
-msgstr " -v, --verbose 打印开启了哪些选项\n"
+msgid " -B, --32bit turns on ADDR_LIMIT_32BIT\n"
+msgstr " -B, --32bit 开启 ADDR_LIMIT_32BIT\n"
#: sys-utils/setarch.c:100
-msgid " -R, --addr-no-randomize disables randomization of the virtual address space\n"
-msgstr " -R, --addr-no-randomize 禁止随机化虚拟地址空间\n"
-
-#: sys-utils/setarch.c:101
msgid " -F, --fdpic-funcptrs makes function pointers point to descriptors\n"
msgstr " -F, --fdpic-funcptrs 将程序指针指向描述符\n"
-#: sys-utils/setarch.c:102
-msgid " -Z, --mmap-page-zero turns on MMAP_PAGE_ZERO\n"
-msgstr " -Z, --mmap-page-zero 开启 MMAP_PAGE_ZERO\n"
+#: sys-utils/setarch.c:101
+msgid " -I, --short-inode turns on SHORT_INODE\n"
+msgstr " -I, --short-inode 开启 SHORT_INODE\n"
-#: sys-utils/setarch.c:103
+#: sys-utils/setarch.c:102
msgid " -L, --addr-compat-layout changes the way virtual memory is allocated\n"
msgstr " -L, --addr-compat-layout 更改虚拟内存分配的方式\n"
+#: sys-utils/setarch.c:103
+msgid " -R, --addr-no-randomize disables randomization of the virtual address space\n"
+msgstr " -R, --addr-no-randomize 禁止随机化虚拟地址空间\n"
+
#: sys-utils/setarch.c:104
-msgid " -X, --read-implies-exec turns on READ_IMPLIES_EXEC\n"
-msgstr " -X, --read-implies-exec 开启 READ_IMPLIES_EXEC\n"
+msgid " -S, --whole-seconds turns on WHOLE_SECONDS\n"
+msgstr " -S, --whole-seconds 开启 WHOLE_SECONDS\n"
#: sys-utils/setarch.c:105
-msgid " -B, --32bit turns on ADDR_LIMIT_32BIT\n"
-msgstr " -B, --32bit 开启 ADDR_LIMIT_32BIT\n"
+msgid " -T, --sticky-timeouts turns on STICKY_TIMEOUTS\n"
+msgstr " -T, --sticky-timeouts 开启 STICKY_TIMEOUTS\n"
#: sys-utils/setarch.c:106
-msgid " -I, --short-inode turns on SHORT_INODE\n"
-msgstr " -I, --short-inode 开启 SHORT_INODE\n"
+msgid " -X, --read-implies-exec turns on READ_IMPLIES_EXEC\n"
+msgstr " -X, --read-implies-exec 开启 READ_IMPLIES_EXEC\n"
#: sys-utils/setarch.c:107
-msgid " -S, --whole-seconds turns on WHOLE_SECONDS\n"
-msgstr " -S, --whole-seconds 开启 WHOLE_SECONDS\n"
+msgid " -Z, --mmap-page-zero turns on MMAP_PAGE_ZERO\n"
+msgstr " -Z, --mmap-page-zero 开启 MMAP_PAGE_ZERO\n"
#: sys-utils/setarch.c:108
-msgid " -T, --sticky-timeouts turns on STICKY_TIMEOUTS\n"
-msgstr " -T, --sticky-timeouts 开启 STICKY_TIMEOUTS\n"
-
-#: sys-utils/setarch.c:109
msgid " -3, --3gb limits the used address space to a maximum of 3 GB\n"
msgstr " -3, --3gb 将用户地址空间限制为最多 3 GB\n"
-#: sys-utils/setarch.c:110
+#: sys-utils/setarch.c:109
msgid " --4gb ignored (for backward compatibility only)\n"
msgstr " --4gb 忽略(纯为兼容)\n"
-#: sys-utils/setarch.c:111
+#: sys-utils/setarch.c:110
msgid " --uname-2.6 turns on UNAME26\n"
msgstr " --uname-2.6 开启 UNAME26\n"
-#: sys-utils/setarch.c:112
+#: sys-utils/setarch.c:111
+#, fuzzy
+msgid " -v, --verbose say what options are being switched on\n"
+msgstr " -v, --verbose 打印开启了哪些选项\n"
+
+#: sys-utils/setarch.c:114
msgid " --list list settable architectures, and exit\n"
msgstr " --list 列出可设置的架构并退出\n"
-#: sys-utils/setarch.c:126
+#: sys-utils/setarch.c:128
#, c-format
msgid ""
"%s\n"
@@ -13946,371 +14096,395 @@ msgstr ""
"%s\n"
"请使用“%s --help”了解更多信息。"
-#: sys-utils/setarch.c:128
+#: sys-utils/setarch.c:131
#, c-format
msgid "Try `%s --help' for more information."
msgstr "请使用“%s --help”了解更多信息。"
-#: sys-utils/setarch.c:235 sys-utils/setarch.c:250
+#: sys-utils/setarch.c:237
#, c-format
msgid "%s: Unrecognized architecture"
msgstr "%s:未识别的架构"
-#: sys-utils/setarch.c:291 sys-utils/setarch.c:297
+#: sys-utils/setarch.c:248
+#, fuzzy, c-format
+msgid "Kernel cannot set architecture to %s"
+msgstr "无法设置 %s 的超时"
+
+#: sys-utils/setarch.c:295
msgid "Not enough arguments"
msgstr "参数不够"
-#: sys-utils/setarch.c:313 sys-utils/setarch.c:374
+#: sys-utils/setarch.c:312
#, c-format
msgid "Failed to set personality to %s"
msgstr "无法将人格(personality)设置为 %s"
-#: sys-utils/setpriv.c:95
+#: sys-utils/setarch.c:369
+#, fuzzy
+msgid "unrecognized option '--list'"
+msgstr "不识别的选项“%c”"
+
+#: sys-utils/setarch.c:376
+#, fuzzy
+msgid "no architecture argument specified"
+msgstr "没有指定长度参数"
+
+#: sys-utils/setarch.c:382
+#, fuzzy, c-format
+msgid "failed to set personality to %s"
+msgstr "无法将人格(personality)设置为 %s"
+
+#: sys-utils/setpriv.c:97
+msgid "Run a program with different privilege settings.\n"
+msgstr ""
+
+#: sys-utils/setpriv.c:100
msgid " -d, --dump show current state (and do not exec anything)\n"
msgstr " -d, --dump 显示当前状态(不执行任何操作)\n"
-#: sys-utils/setpriv.c:96
+#: sys-utils/setpriv.c:101
msgid " --nnp, --no-new-privs disallow granting new privileges\n"
msgstr " --nnp, --no-new-privs 禁止赋予新权限\n"
-#: sys-utils/setpriv.c:97
+#: sys-utils/setpriv.c:102
msgid " --inh-caps <caps,...> set inheritable capabilities\n"
msgstr " --inh-caps <caps,...> 设置可继承的权能\n"
-#: sys-utils/setpriv.c:98
+#: sys-utils/setpriv.c:103
msgid " --bounding-set <caps> set capability bounding set\n"
msgstr " --bounding-set <caps> 设置权能绑定集\n"
-#: sys-utils/setpriv.c:99
+#: sys-utils/setpriv.c:104
msgid " --ruid <uid> set real uid\n"
msgstr " --ruid <uid> 设置实际 uid\n"
-#: sys-utils/setpriv.c:100
+#: sys-utils/setpriv.c:105
msgid " --euid <uid> set effective uid\n"
msgstr " --euid <uid> 设置有效 uid\n"
-#: sys-utils/setpriv.c:101
+#: sys-utils/setpriv.c:106
msgid " --rgid <gid> set real gid\n"
msgstr " --rgid <gid> 设置实际 gid\n"
-#: sys-utils/setpriv.c:102
+#: sys-utils/setpriv.c:107
msgid " --egid <gid> set effective gid\n"
msgstr " --egid <gid> 设置有效 gid\n"
-#: sys-utils/setpriv.c:103
+#: sys-utils/setpriv.c:108
msgid " --reuid <uid> set real and effective uid\n"
msgstr " --reuid <uid> 设置实际和有效 uid\n"
-#: sys-utils/setpriv.c:104
+#: sys-utils/setpriv.c:109
msgid " --regid <gid> set real and effective gid\n"
msgstr " --regid <gid> 设置实际和有效 gid\n"
-#: sys-utils/setpriv.c:105
+#: sys-utils/setpriv.c:110
msgid " --clear-groups clear supplementary groups\n"
msgstr " --clear-groups 清除附属组\n"
-#: sys-utils/setpriv.c:106
+#: sys-utils/setpriv.c:111
msgid " --keep-groups keep supplementary groups\n"
msgstr " --keep-groups 保留附属组\n"
-#: sys-utils/setpriv.c:107
+#: sys-utils/setpriv.c:112
msgid " --groups <group,...> set supplementary groups\n"
msgstr " --groups <组,...> 设置附属组\n"
-#: sys-utils/setpriv.c:108
+#: sys-utils/setpriv.c:113
msgid " --securebits <bits> set securebits\n"
msgstr " --securebits <位> 设置安全位\n"
-#: sys-utils/setpriv.c:109
+#: sys-utils/setpriv.c:114
msgid " --selinux-label <label> set SELinux label\n"
msgstr " --selinux-label <标签> 设置 SELinux 标签\n"
-#: sys-utils/setpriv.c:110
+#: sys-utils/setpriv.c:115
msgid " --apparmor-profile <pr> set AppArmor profile\n"
msgstr " --apparmor-profile <pr> 设置 AppArmor 配置文件\n"
-#: sys-utils/setpriv.c:115
+#: sys-utils/setpriv.c:121
msgid " This tool can be dangerous. Read the manpage, and be careful.\n"
msgstr "运行此工具有风险。请阅读 man 手册,谨慎操作。\n"
-#: sys-utils/setpriv.c:187 sys-utils/setpriv.c:461
+#: sys-utils/setpriv.c:193 sys-utils/setpriv.c:467
msgid "getting process secure bits failed"
msgstr "获取进程安全位失败"
-#: sys-utils/setpriv.c:191
+#: sys-utils/setpriv.c:197
#, c-format
msgid "Securebits: "
msgstr "安全位:"
-#: sys-utils/setpriv.c:211
+#: sys-utils/setpriv.c:217
#, c-format
msgid "[none]\n"
msgstr "[无]\n"
-#: sys-utils/setpriv.c:237
+#: sys-utils/setpriv.c:243
#, c-format
msgid "%s: too long"
msgstr "%s:过长"
-#: sys-utils/setpriv.c:265
+#: sys-utils/setpriv.c:271
#, c-format
msgid "Supplementary groups: "
msgstr "附属组:"
-#: sys-utils/setpriv.c:267 sys-utils/setpriv.c:315 sys-utils/setpriv.c:320
-#: sys-utils/setpriv.c:326 sys-utils/setpriv.c:331
+#: sys-utils/setpriv.c:273 sys-utils/setpriv.c:321 sys-utils/setpriv.c:326
+#: sys-utils/setpriv.c:332 sys-utils/setpriv.c:337
#, c-format
msgid "[none]"
msgstr "[无]"
-#: sys-utils/setpriv.c:287
+#: sys-utils/setpriv.c:293
#, c-format
msgid "uid: %u\n"
msgstr "uid:%u\n"
-#: sys-utils/setpriv.c:288
+#: sys-utils/setpriv.c:294
#, c-format
msgid "euid: %u\n"
msgstr "euid:%u\n"
-#: sys-utils/setpriv.c:291
+#: sys-utils/setpriv.c:297
#, c-format
msgid "suid: %u\n"
msgstr "suid:%u\n"
-#: sys-utils/setpriv.c:293 sys-utils/setpriv.c:385
+#: sys-utils/setpriv.c:299 sys-utils/setpriv.c:391
msgid "getresuid failed"
msgstr "getresuid 失败"
-#: sys-utils/setpriv.c:302 sys-utils/setpriv.c:400
+#: sys-utils/setpriv.c:308 sys-utils/setpriv.c:406
msgid "getresgid failed"
msgstr "getresgid 失败"
-#: sys-utils/setpriv.c:313
+#: sys-utils/setpriv.c:319
#, c-format
msgid "Effective capabilities: "
msgstr "有效权能:"
-#: sys-utils/setpriv.c:318
+#: sys-utils/setpriv.c:324
#, c-format
msgid "Permitted capabilities: "
msgstr "允许的权能:"
-#: sys-utils/setpriv.c:324
+#: sys-utils/setpriv.c:330
#, c-format
msgid "Inheritable capabilities: "
msgstr "可继承的权能:"
-#: sys-utils/setpriv.c:329
+#: sys-utils/setpriv.c:335
#, c-format
msgid "Capability bounding set: "
msgstr "权能绑定集:"
-#: sys-utils/setpriv.c:337
+#: sys-utils/setpriv.c:343
msgid "SELinux label"
msgstr "SELinux 标签"
-#: sys-utils/setpriv.c:340
+#: sys-utils/setpriv.c:346
msgid "AppArmor profile"
msgstr "AppArmor 配置文件"
-#: sys-utils/setpriv.c:353
+#: sys-utils/setpriv.c:359
#, c-format
msgid "cap %d: libcap-ng is broken"
msgstr "权能 %d:libcap-ng 损坏"
-#: sys-utils/setpriv.c:376
+#: sys-utils/setpriv.c:382
msgid "Invalid supplementary group id"
msgstr "无效的附属组 id"
-#: sys-utils/setpriv.c:393
+#: sys-utils/setpriv.c:399
msgid "setresuid failed"
msgstr "setresuid 失败"
-#: sys-utils/setpriv.c:408
+#: sys-utils/setpriv.c:414
msgid "setresgid failed"
msgstr "setresgid 失败"
-#: sys-utils/setpriv.c:429
+#: sys-utils/setpriv.c:435
msgid "bad capability string"
msgstr "错误的权能字符串"
-#: sys-utils/setpriv.c:437
+#: sys-utils/setpriv.c:443
msgid "libcap-ng is too old for \"all\" caps"
msgstr "对于“all”权能,libcap-ng 太旧"
-#: sys-utils/setpriv.c:446
+#: sys-utils/setpriv.c:452
#, c-format
msgid "unknown capability \"%s\""
msgstr "未知权能“%s”"
-#: sys-utils/setpriv.c:470
+#: sys-utils/setpriv.c:476
msgid "unrecognized securebit set -- refusing to adjust"
msgstr "无法识别的安全位集 -- 拒绝调整"
-#: sys-utils/setpriv.c:474
+#: sys-utils/setpriv.c:480
msgid "bad securebits string"
msgstr "安全位字符串有误"
-#: sys-utils/setpriv.c:481
+#: sys-utils/setpriv.c:487
msgid "+all securebits is not allowed"
msgstr "+all 安全位是不允许的"
-#: sys-utils/setpriv.c:494
+#: sys-utils/setpriv.c:500
msgid "adjusting keep_caps does not make sense"
msgstr "调整 keep_caps(保持权能) 没有意义"
-#: sys-utils/setpriv.c:498
+#: sys-utils/setpriv.c:504
msgid "unrecognized securebit"
msgstr "无法识别的安全位"
-#: sys-utils/setpriv.c:518
+#: sys-utils/setpriv.c:524
msgid "SELinux is not running"
msgstr "SELinux 没有运行"
-#: sys-utils/setpriv.c:533
+#: sys-utils/setpriv.c:539
#, c-format
msgid "close failed: %s"
msgstr "关闭失败:%s"
-#: sys-utils/setpriv.c:541
+#: sys-utils/setpriv.c:547
msgid "AppArmor is not running"
msgstr "AppArmor 没有运行"
-#: sys-utils/setpriv.c:652
+#: sys-utils/setpriv.c:658
msgid "duplicate --no-new-privs option"
msgstr "复制 --no-new-privs 选项"
-#: sys-utils/setpriv.c:657
+#: sys-utils/setpriv.c:663
msgid "duplicate ruid"
msgstr "复制 ruid"
-#: sys-utils/setpriv.c:659
+#: sys-utils/setpriv.c:665
msgid "failed to parse ruid"
msgstr "解析 ruid 失败"
-#: sys-utils/setpriv.c:663
+#: sys-utils/setpriv.c:669
msgid "duplicate euid"
msgstr "复制 euid"
-#: sys-utils/setpriv.c:665
+#: sys-utils/setpriv.c:671
msgid "failed to parse euid"
msgstr "解析 euid 失败"
-#: sys-utils/setpriv.c:669
+#: sys-utils/setpriv.c:675
msgid "duplicate ruid or euid"
msgstr "复制 ruid 或 euid"
-#: sys-utils/setpriv.c:671
+#: sys-utils/setpriv.c:677
msgid "failed to parse reuid"
msgstr "解析 reuid 失败"
-#: sys-utils/setpriv.c:675
+#: sys-utils/setpriv.c:681
msgid "duplicate rgid"
msgstr "复制 rgid"
-#: sys-utils/setpriv.c:677
+#: sys-utils/setpriv.c:683
msgid "failed to parse rgid"
msgstr "解析 rgid 失败"
-#: sys-utils/setpriv.c:681
+#: sys-utils/setpriv.c:687
msgid "duplicate egid"
msgstr "复制 egid"
-#: sys-utils/setpriv.c:683
+#: sys-utils/setpriv.c:689
msgid "failed to parse egid"
msgstr "解析 egid 失败"
-#: sys-utils/setpriv.c:687
+#: sys-utils/setpriv.c:693
msgid "duplicate rgid or egid"
msgstr "复制 rgid 或 egid"
-#: sys-utils/setpriv.c:689
+#: sys-utils/setpriv.c:695
msgid "failed to parse regid"
msgstr "解析 regid 失败"
-#: sys-utils/setpriv.c:694
+#: sys-utils/setpriv.c:700
msgid "duplicate --clear-groups option"
msgstr "复制 --clear-groups 选项"
-#: sys-utils/setpriv.c:700
+#: sys-utils/setpriv.c:706
msgid "duplicate --keep-groups option"
msgstr "复制 --keep-groups 选项"
-#: sys-utils/setpriv.c:706
+#: sys-utils/setpriv.c:712
msgid "duplicate --groups option"
msgstr "复制 --groups 选项"
-#: sys-utils/setpriv.c:715
+#: sys-utils/setpriv.c:721
msgid "duplicate --inh-caps option"
msgstr "复制 --inh-caps 选项"
-#: sys-utils/setpriv.c:721
+#: sys-utils/setpriv.c:727
msgid "duplicate --bounding-set option"
msgstr "复制 --bounding-set 选项"
-#: sys-utils/setpriv.c:727
+#: sys-utils/setpriv.c:733
msgid "duplicate --securebits option"
msgstr "复制 --securebits 选项"
-#: sys-utils/setpriv.c:733
+#: sys-utils/setpriv.c:739
msgid "duplicate --selinux-label option"
msgstr "复制 --selinux-label 选项"
-#: sys-utils/setpriv.c:739
+#: sys-utils/setpriv.c:745
msgid "duplicate --apparmor-profile option"
msgstr "复制 --apparmor-profile 选项"
-#: sys-utils/setpriv.c:750
+#: sys-utils/setpriv.c:756
#, c-format
msgid "unrecognized option '%c'"
msgstr "不识别的选项“%c”"
-#: sys-utils/setpriv.c:757
+#: sys-utils/setpriv.c:763
msgid "--dump is incompatible with all other options"
msgstr "--dump 与其他所有选项不兼容"
-#: sys-utils/setpriv.c:765
+#: sys-utils/setpriv.c:771
msgid "--list-caps must be specified alone"
msgstr "--list-caps 必须作为单独选项指定"
-#: sys-utils/setpriv.c:771
+#: sys-utils/setpriv.c:777
msgid "No program specified"
msgstr "未指定程序"
-#: sys-utils/setpriv.c:776
+#: sys-utils/setpriv.c:782
msgid "--[re]gid requires --keep-groups, --clear-groups, or --groups"
msgstr "--[re]gid 需要 --keep-groups、--clear-groups 或 --groups"
-#: sys-utils/setpriv.c:780
+#: sys-utils/setpriv.c:786
msgid "disallow granting new privileges failed"
msgstr "禁止赋予新权限失败"
-#: sys-utils/setpriv.c:788
+#: sys-utils/setpriv.c:794
msgid "keep process capabilities failed"
msgstr "保持进程权能失败"
-#: sys-utils/setpriv.c:796
+#: sys-utils/setpriv.c:802
msgid "activate capabilities"
msgstr "激活权能"
-#: sys-utils/setpriv.c:802
+#: sys-utils/setpriv.c:808
msgid "reactivate capabilities"
msgstr "重新激活权能"
-#: sys-utils/setpriv.c:819
+#: sys-utils/setpriv.c:825
msgid "set process securebits failed"
msgstr "设置进程安全位失败"
-#: sys-utils/setpriv.c:825
+#: sys-utils/setpriv.c:831
msgid "apply bounding set"
msgstr "应用绑定集"
-#: sys-utils/setpriv.c:831
+#: sys-utils/setpriv.c:837
msgid "apply capabilities"
msgstr "应用权能"
-#: sys-utils/setpriv.c:836
+#: sys-utils/setpriv.c:842
#, c-format
msgid "cannot execute: %s"
msgstr "无法执行:%s"
@@ -14321,50 +14495,58 @@ msgid " %s [options] <program> [arguments ...]\n"
msgstr " %s [选项] <程序> [参数 ...]\n"
#: sys-utils/setsid.c:36
+msgid "Run a program in a new session.\n"
+msgstr ""
+
+#: sys-utils/setsid.c:39
msgid " -c, --ctty set the controlling terminal to the current one\n"
msgstr " -c, --ctty 将控制终端设置为当前终端\n"
-#: sys-utils/setsid.c:37
+#: sys-utils/setsid.c:40
msgid " -w, --wait wait program to exit, and use the same return\n"
msgstr " -w, --wait 等待程序退出,并使用它的返回值\n"
-#: sys-utils/setsid.c:90
+#: sys-utils/setsid.c:93
msgid "fork"
msgstr "fork"
-#: sys-utils/setsid.c:102
+#: sys-utils/setsid.c:105
#, c-format
msgid "child %d did not exit normally"
msgstr "子 %d 未正常退出"
-#: sys-utils/setsid.c:107
+#: sys-utils/setsid.c:110
msgid "setsid failed"
msgstr "setsid 失败"
-#: sys-utils/setsid.c:111
+#: sys-utils/setsid.c:114
msgid "failed to set the controlling terminal"
msgstr "设置控制终端失败"
-#: sys-utils/swapoff.c:32
+#: sys-utils/swapoff.c:86
#, c-format
msgid "swapoff %s\n"
msgstr "swapoff %s\n"
-#: sys-utils/swapoff.c:44
+#: sys-utils/swapoff.c:102
msgid "Not superuser."
msgstr "非超级用户。"
-#: sys-utils/swapoff.c:47
+#: sys-utils/swapoff.c:105
#, c-format
msgid "%s: swapoff failed"
msgstr "%s:swapoff 失败"
-#: sys-utils/swapoff.c:68 sys-utils/swapon.c:678
+#: sys-utils/swapoff.c:119 sys-utils/swapon.c:727
#, c-format
msgid " %s [options] [<spec>]\n"
msgstr " %s [选项] [<指定>]\n"
-#: sys-utils/swapoff.c:71
+#: sys-utils/swapoff.c:122
+msgid "Disable devices and files for paging and swapping.\n"
+msgstr ""
+
+#: sys-utils/swapoff.c:125
msgid ""
" -a, --all disable all swaps from /proc/swaps\n"
" -v, --verbose verbose mode\n"
@@ -14372,7 +14554,7 @@ msgstr ""
" -a, --all 禁用 /proc/swaps 中的所有交换区\n"
" -v, --verbose verbose mode\n"
-#: sys-utils/swapoff.c:78
+#: sys-utils/swapoff.c:132
msgid ""
"\n"
"The <spec> parameter:\n"
@@ -14392,150 +14574,193 @@ msgstr ""
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:102
+#: sys-utils/swapon.c:111
msgid "device file or partition path"
msgstr "设备文件或分区路径"
-#: sys-utils/swapon.c:103
+#: sys-utils/swapon.c:112
msgid "type of the device"
msgstr "设备的类型"
-#: sys-utils/swapon.c:104
+#: sys-utils/swapon.c:113
msgid "size of the swap area"
msgstr "交换区大小"
-#: sys-utils/swapon.c:105
+#: sys-utils/swapon.c:114
msgid "bytes in use"
msgstr "已使用字节数"
-#: sys-utils/swapon.c:106
+#: sys-utils/swapon.c:115
msgid "swap priority"
msgstr "交换优先级"
-#: sys-utils/swapon.c:209
+#: sys-utils/swapon.c:116
+msgid "swap uuid"
+msgstr ""
+
+#: sys-utils/swapon.c:117
+#, fuzzy
+msgid "swap label"
+msgstr "Apple 标签"
+
+#: sys-utils/swapon.c:234
#, c-format
msgid "%s\t\t\t\tType\t\tSize\tUsed\tPriority\n"
msgstr "%s\t\t\t\t类型\t\t大小\t已用\t权限\n"
-#: sys-utils/swapon.c:209
+#: sys-utils/swapon.c:234
msgid "Filename"
msgstr "文件名"
-#: sys-utils/swapon.c:273
+#: sys-utils/swapon.c:298
#, c-format
msgid "%s: reinitializing the swap."
msgstr "%s:正在重新初始化交换区。"
-#: sys-utils/swapon.c:325
+#: sys-utils/swapon.c:350
#, c-format
msgid "%s: lseek failed"
msgstr "%s:lseek 失败"
-#: sys-utils/swapon.c:331
+#: sys-utils/swapon.c:356
#, c-format
msgid "%s: write signature failed"
msgstr "%s:写签名失败"
-#: sys-utils/swapon.c:415
+#: sys-utils/swapon.c:440
#, c-format
msgid "%s: found swap signature: version %ud, page-size %d, %s byte order"
msgstr "%s:找到交换区签名:版本为 %ud,页面大小为 %d,%s 字节顺序"
-#: sys-utils/swapon.c:420
+#: sys-utils/swapon.c:445
msgid "different"
msgstr "不同"
-#: sys-utils/swapon.c:420
+#: sys-utils/swapon.c:445
msgid "same"
msgstr "相同"
-#: sys-utils/swapon.c:463
+#: sys-utils/swapon.c:488
#, c-format
msgid "%s: insecure permissions %04o, %04o suggested."
msgstr "%s:不安全的权限 %04o,建议使用 %04o。"
-#: sys-utils/swapon.c:468
+#: sys-utils/swapon.c:493
#, c-format
msgid "%s: insecure file owner %d, 0 (root) suggested."
msgstr "%s:不安全的文件拥有者 %d,建议使用 0(root)。"
-#: sys-utils/swapon.c:474
+#: sys-utils/swapon.c:499
#, c-format
msgid "%s: skipping - it appears to have holes."
msgstr "%s:将跳过 - 它似乎有空洞。"
-#: sys-utils/swapon.c:488
+#: sys-utils/swapon.c:513
#, c-format
msgid "%s: get size failed"
msgstr "%s:获取大小失败"
-#: sys-utils/swapon.c:494
+#: sys-utils/swapon.c:519
#, c-format
msgid "%s: read swap header failed"
msgstr "%s:读交换区头失败"
-#: sys-utils/swapon.c:504
+#: sys-utils/swapon.c:529
#, c-format
msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
msgstr "%s:页大小=%d,交换区大小=%llu,设备大小=%llu"
-#: sys-utils/swapon.c:509
+#: sys-utils/swapon.c:534
#, c-format
msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
msgstr "%s:末页 0x%08llx 大于交换空间的实际大小"
-#: sys-utils/swapon.c:519
+#: sys-utils/swapon.c:544
#, c-format
msgid "%s: swap format pagesize does not match."
msgstr "%s:交换格式页大小不匹配。"
-#: sys-utils/swapon.c:527
+#: sys-utils/swapon.c:552
#, c-format
msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
msgstr "%s:交换格式页大小不匹配。(使用 --fixpgsz 来重新对它初始化。)"
-#: sys-utils/swapon.c:536
+#: sys-utils/swapon.c:561
#, c-format
msgid "%s: software suspend data detected. Rewriting the swap signature."
msgstr "%s:检测到软件挂起数据。将重新写交换区签名。"
-#: sys-utils/swapon.c:561
+#: sys-utils/swapon.c:586
#, c-format
msgid "swapon %s\n"
msgstr "swapon %s\n"
-#: sys-utils/swapon.c:600
+#: sys-utils/swapon.c:625
#, c-format
msgid "%s: swapon failed"
msgstr "%s:swapon 失败"
-#: sys-utils/swapon.c:681
-msgid ""
-" -a, --all enable all swaps from /etc/fstab\n"
-" -d, --discard[=<policy>] enable swap discards, if supported by device\n"
-" -e, --ifexists silently skip devices that do not exist\n"
-" -f, --fixpgsz reinitialize the swap space if necessary\n"
-" -p, --priority <prio> specify the priority of the swap device\n"
-" -s, --summary display summary about used swap devices (DEPRECATED)\n"
-" --show[=<columns>] display summary in definable table\n"
-" --noheadings don't print headings, use with --show\n"
-" --raw use the raw output format, use with --show\n"
-" --bytes display swap size in bytes in --show output\n"
-" -v, --verbose verbose mode\n"
-msgstr ""
-" -a, --all 启用 /etc/fstab 中的所有交换区\n"
-" -b, --discard[=<策略>] 启用交换丢弃,如果设备支持\n"
-" -e, --ifexists 直接跳过不存在的设备\n"
-" -f, --fixpgsz 需要时重新初始化交换空间\n"
-" -p, --priority <prio> 指定交换设备的优先级为 <prio>\n"
-" -s, --summary 显示已使用交换设备的摘要(已废弃)\n"
-" --show[=<列>] 显示可交换表格的摘要\n"
-" --noheadings 不打印标题,与 --show 一起使用\n"
-" --raw 使用原生输出格式,与 --show 一起使用\n"
-" --bytes 在 --show 选项输出中以字节显示交换区大小\n"
-" -v, --verbose 详尽模式\n"
-
-#: sys-utils/swapon.c:697
+#: sys-utils/swapon.c:730
+msgid "Enable devices and files for paging and swapping.\n"
+msgstr ""
+
+#: sys-utils/swapon.c:733
+#, fuzzy
+msgid " -a, --all enable all swaps from /etc/fstab\n"
+msgstr " -a, --all 列出所有使用的设备\n"
+
+#: sys-utils/swapon.c:734
+msgid " -d, --discard[=<policy>] enable swap discards, if supported by device\n"
+msgstr ""
+
+#: sys-utils/swapon.c:735
+msgid " -e, --ifexists silently skip devices that do not exist\n"
+msgstr ""
+
+#: sys-utils/swapon.c:736
+msgid " -f, --fixpgsz reinitialize the swap space if necessary\n"
+msgstr ""
+
+#: sys-utils/swapon.c:737
+#, fuzzy
+msgid " -o, --options <list> comma-separated list of swap options\n"
+msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n"
+
+#: sys-utils/swapon.c:738
+#, fuzzy
+msgid " -p, --priority <prio> specify the priority of the swap device\n"
+msgstr " -p, --priority <级别> 将指定消息标记为此优先级\n"
+
+#: sys-utils/swapon.c:739
+#, fuzzy
+msgid " -s, --summary display summary about used swap devices (DEPRECATED)\n"
+msgstr " -s, --getsz 以 512-字节扇区显示设备大小[已废弃]\n"
+
+#: sys-utils/swapon.c:740
+msgid " --show[=<columns>] display summary in definable table\n"
+msgstr ""
+
+#: sys-utils/swapon.c:741
+#, fuzzy
+msgid " --noheadings don't print table heading (with --show)\n"
+msgstr " --noheadings 不打印标题\n"
+
+#: sys-utils/swapon.c:742
+#, fuzzy
+msgid " --raw use the raw output format (with --show)\n"
+msgstr " -r, --raw 使用原生输出格式\n"
+
+#: sys-utils/swapon.c:743
+#, fuzzy
+msgid " --bytes display swap size in bytes in --show output\n"
+msgstr " --help 显示此帮助并退出\n"
+
+#: sys-utils/swapon.c:744
+#, fuzzy
+msgid " -v, --verbose verbose mode\n"
+msgstr " -v, --verbose 详尽模式\n"
+
+#: sys-utils/swapon.c:750
msgid ""
"\n"
"The <spec> parameter:\n"
@@ -14559,13 +14784,14 @@ msgstr ""
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:707
+#: sys-utils/swapon.c:760
+#, fuzzy
msgid ""
"\n"
"Available discard policy types (for --discard):\n"
-" once\t : only single-time area discards are issued. (swapon)\n"
-" pages\t : discard freed pages before they are reused.\n"
-" * if no policy is selected both discard types are enabled. (default)\n"
+" once\t : only single-time area discards are issued\n"
+" pages\t : freed pages are discarded before they are reused\n"
+" If no policy is selected, both discard types are enabled (default).\n"
msgstr ""
"\n"
"可用的丢弃策略类型(针对 --discard):\n"
@@ -14573,7 +14799,7 @@ msgstr ""
" pages\t :对释放的页在重新使用前丢弃\n"
" * 如果未选择策略,则两者都将启用。(默认)\n"
-#: sys-utils/swapon.c:712
+#: sys-utils/swapon.c:765
msgid ""
"\n"
"Available columns (for --show):\n"
@@ -14581,16 +14807,16 @@ msgstr ""
"\n"
"可用列(用于 --show):\n"
-#: sys-utils/swapon.c:770
+#: sys-utils/swapon.c:840
msgid "failed to parse priority"
msgstr "解析优先级失败"
-#: sys-utils/swapon.c:789
+#: sys-utils/swapon.c:859
#, c-format
msgid "unsupported discard policy: %s"
msgstr "不支持的丢弃策略:%s"
-#: sys-utils/swapon-common.c:62
+#: sys-utils/swapon-common.c:63
#, c-format
msgid "cannot find the device for %s"
msgstr "找不到对应 %s 的设备"
@@ -14599,7 +14825,7 @@ msgstr "找不到对应 %s 的设备"
msgid "failed to open directory"
msgstr "打开目录失败"
-#: sys-utils/switch_root.c:67 term-utils/wall.c:301
+#: sys-utils/switch_root.c:67 term-utils/wall.c:305
msgid "stat failed"
msgstr "stat 失败"
@@ -14645,119 +14871,127 @@ msgstr "旧根文件系统不是 initramfs 格式"
msgid " %s [options] <newrootdir> <init> <args to init>\n"
msgstr " %s [选项] <新根目录> <init 程序> <init 程序参数>\n"
-#: sys-utils/switch_root.c:233
+#: sys-utils/switch_root.c:205
+msgid "Switch to another filesystem as the root of the mount tree.\n"
+msgstr ""
+
+#: sys-utils/switch_root.c:237
msgid "failed. Sorry."
msgstr "失败了。抱歉。"
-#: sys-utils/switch_root.c:236
+#: sys-utils/switch_root.c:240
#, c-format
msgid "cannot access %s"
msgstr "无法访问 %s"
-#: sys-utils/tunelp.c:83
+#: sys-utils/tunelp.c:92
+msgid "Set various parameters for the line printer.\n"
+msgstr ""
+
+#: sys-utils/tunelp.c:95
msgid " -i, --irq <num> specify parallel port irq\n"
msgstr " -i, --irq <数字> 指定并口中断号\n"
-#: sys-utils/tunelp.c:84
+#: sys-utils/tunelp.c:96
msgid " -t, --time <ms> driver wait time in milliseconds\n"
msgstr " -t, --time <毫秒数> 驱动等待时间(毫秒)\n"
-#: sys-utils/tunelp.c:85
+#: sys-utils/tunelp.c:97
msgid " -c, --chars <num> number of output characters before sleep\n"
msgstr " -c, --chars <数字> 睡眠前输出的字符数\n"
-#: sys-utils/tunelp.c:86
+#: sys-utils/tunelp.c:98
msgid " -w, --wait <us> strobe wait in micro seconds\n"
msgstr " -w, --wait <微秒数> 选通(strobe)信号等待时间(微秒)\n"
#. TRANSLATORS: do not translate <on|off> arguments. The
#. argument reader does not recognize locale, unless `on' is
#. exactly that very same string.
-#: sys-utils/tunelp.c:90
+#: sys-utils/tunelp.c:102
msgid " -a, --abort <on|off> abort on error\n"
msgstr " -a, --abort <on|off> 出错时中止\n"
-#: sys-utils/tunelp.c:91
+#: sys-utils/tunelp.c:103
msgid " -o, --check-status <on|off> check printer status before printing\n"
msgstr " -o, --check-status <on|off> 打印前检查打印机状态\n"
-#: sys-utils/tunelp.c:92
+#: sys-utils/tunelp.c:104
msgid " -C, --careful <on|off> extra checking to status check\n"
msgstr " -C, --careful <on|off> 进行状态检查外的其他检查\n"
-#: sys-utils/tunelp.c:93
+#: sys-utils/tunelp.c:105
msgid " -s, --status query printer status\n"
msgstr " -s, --status 查询打印机状态\n"
-#: sys-utils/tunelp.c:94
+#: sys-utils/tunelp.c:106
msgid " -T, --trust-irq <on|off> make driver to trust irq\n"
msgstr " -T, --trust-irq <on|off> 将驱动设置为信任的中断\n"
-#: sys-utils/tunelp.c:95
+#: sys-utils/tunelp.c:107
msgid " -r, --reset reset the port\n"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/tunelp.c:96
+#: sys-utils/tunelp.c:108
msgid " -q, --print-irq <on|off> display current irq setting\n"
msgstr " -q, --print-irq <on|off> 显示当前的中断设置\n"
-#: sys-utils/tunelp.c:109
+#: sys-utils/tunelp.c:121
msgid "bad value"
msgstr "错误值"
-#: sys-utils/tunelp.c:273
+#: sys-utils/tunelp.c:284
#, c-format
msgid "%s not an lp device"
msgstr "%s 不是循环设备"
-#: sys-utils/tunelp.c:293
+#: sys-utils/tunelp.c:304
msgid "LPGETSTATUS error"
msgstr "LPGETSTATUS 出错"
-#: sys-utils/tunelp.c:298
+#: sys-utils/tunelp.c:309
#, c-format
msgid "%s status is %d"
msgstr "%s 状态为 %d"
-#: sys-utils/tunelp.c:300
+#: sys-utils/tunelp.c:311
#, c-format
msgid ", busy"
msgstr ",忙碌"
-#: sys-utils/tunelp.c:302
+#: sys-utils/tunelp.c:313
#, c-format
msgid ", ready"
msgstr ",就绪"
-#: sys-utils/tunelp.c:304
+#: sys-utils/tunelp.c:315
#, c-format
msgid ", out of paper"
msgstr ",缺页"
-#: sys-utils/tunelp.c:306
+#: sys-utils/tunelp.c:317
#, c-format
msgid ", on-line"
msgstr ",在线"
-#: sys-utils/tunelp.c:308
+#: sys-utils/tunelp.c:319
#, c-format
msgid ", error"
msgstr ",错误"
-#: sys-utils/tunelp.c:314
+#: sys-utils/tunelp.c:325
msgid "ioctl failed"
msgstr "ioctl 失败"
-#: sys-utils/tunelp.c:324
+#: sys-utils/tunelp.c:335
msgid "LPGETIRQ error"
msgstr "LPGETIRQ 出错"
-#: sys-utils/tunelp.c:329
+#: sys-utils/tunelp.c:340
#, c-format
msgid "%s using IRQ %d\n"
msgstr "%s 使用中断请求 %d\n"
-#: sys-utils/tunelp.c:331
+#: sys-utils/tunelp.c:342
#, c-format
msgid "%s using polling\n"
msgstr "%s 使用轮询\n"
@@ -14774,10 +15008,15 @@ msgstr ""
" %1$s [选项] <源> | <目录>\n"
#: sys-utils/umount.c:82
+#, fuzzy
+msgid "Unmount filesystems.\n"
+msgstr "Linux 文件系统"
+
+#: sys-utils/umount.c:85
msgid " -a, --all unmount all filesystems\n"
msgstr " -a, --all 卸载所有文件系统\n"
-#: sys-utils/umount.c:83
+#: sys-utils/umount.c:86
msgid ""
" -A, --all-targets unmount all mountpoints for the given device in the\n"
" current namespace\n"
@@ -14785,85 +15024,85 @@ msgstr ""
" -A, --all-targets 卸载当前名字空间内指定设备\n"
" 对应的所有挂臷点\n"
-#: sys-utils/umount.c:85
+#: sys-utils/umount.c:88
msgid " -c, --no-canonicalize don't canonicalize paths\n"
msgstr " -c, --no-canonicalize 不对路径规范化\n"
-#: sys-utils/umount.c:86
+#: sys-utils/umount.c:89
msgid " -d, --detach-loop if mounted loop device, also free this loop device\n"
msgstr " -d, --detach-loop 若挂臷了回环设备,也释放该回环设备\n"
-#: sys-utils/umount.c:87
+#: sys-utils/umount.c:90
msgid " --fake dry run; skip the umount(2) syscall\n"
msgstr " --fake 空运行;跳过 umount(2) 系统调用\n"
-#: sys-utils/umount.c:88
+#: sys-utils/umount.c:91
msgid " -f, --force force unmount (in case of an unreachable NFS system)\n"
msgstr " -f, --force 强制卸载(遇到不响应的 NFS 系统时)\n"
-#: sys-utils/umount.c:89
+#: sys-utils/umount.c:92
msgid " -i, --internal-only don't call the umount.<type> helpers\n"
msgstr " -i, --internal-only 不调用 umount.<类型> 辅助程序\n"
-#: sys-utils/umount.c:90
+#: sys-utils/umount.c:93
msgid " -n, --no-mtab don't write to /etc/mtab\n"
msgstr " -n, --no-mtab 不写 /etc/mtab\n"
-#: sys-utils/umount.c:91
+#: sys-utils/umount.c:94
msgid " -l, --lazy detach the filesystem now, clean up things later\n"
msgstr " -l, --lazy 立即断开文件系统,清理以后执行\n"
-#: sys-utils/umount.c:92
+#: sys-utils/umount.c:95
msgid " -O, --test-opts <list> limit the set of filesystems (use with -a)\n"
msgstr " -O, --test-opts <列表> 限制文件系统集合(和 -a 选项一起使用)\n"
-#: sys-utils/umount.c:93
+#: sys-utils/umount.c:96
msgid " -R, --recursive recursively unmount a target with all its children\n"
msgstr " -R, --recursive 递归卸载目录及其子对象\n"
-#: sys-utils/umount.c:94
+#: sys-utils/umount.c:97
msgid " -r, --read-only in case unmounting fails, try to remount read-only\n"
msgstr " -r, --read-only 若卸载失败,尝试以只读方式重新挂臷\n"
-#: sys-utils/umount.c:95
+#: sys-utils/umount.c:98
msgid " -t, --types <list> limit the set of filesystem types\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: sys-utils/umount.c:96
+#: sys-utils/umount.c:99
msgid " -v, --verbose say what is being done\n"
msgstr " -v, --verbose 打印当前进行的操作\n"
-#: sys-utils/umount.c:140
+#: sys-utils/umount.c:143
#, c-format
msgid "%s (%s) unmounted"
msgstr "%s (%s) 已卸载"
-#: sys-utils/umount.c:142
+#: sys-utils/umount.c:145
#, c-format
msgid "%s unmounted"
msgstr "%s 未挂载"
-#: sys-utils/umount.c:207
+#: sys-utils/umount.c:210
#, c-format
msgid "%s: umount failed"
msgstr "%s:umount 失败"
-#: sys-utils/umount.c:216
+#: sys-utils/umount.c:219
#, c-format
msgid "%s: filesystem was unmounted, but mount(8) failed"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: sys-utils/umount.c:230
+#: sys-utils/umount.c:233
#, c-format
msgid "%s: invalid block device"
msgstr "%s:无效的块设备"
-#: sys-utils/umount.c:236
+#: sys-utils/umount.c:239
#, c-format
msgid "%s: can't write superblock"
msgstr "%s:无法写超级块"
-#: sys-utils/umount.c:239
+#: sys-utils/umount.c:242
#, c-format
msgid ""
"%s: target is busy\n"
@@ -14874,102 +15113,121 @@ msgstr ""
" (有些情况下通过 lsof(8) 或 fuser(1) 可以\n"
" 找到有关使用该设备的进程的有用信息。)"
-#: sys-utils/umount.c:246
+#: sys-utils/umount.c:249
#, c-format
msgid "%s: mountpoint not found"
msgstr "%s:找不到挂臷点"
-#: sys-utils/umount.c:248
+#: sys-utils/umount.c:251
msgid "undefined mountpoint"
msgstr "未定义的挂载点"
-#: sys-utils/umount.c:251
+#: sys-utils/umount.c:254
#, c-format
msgid "%s: must be superuser to unmount"
msgstr "%s:必须以超级用户身份卸载"
-#: sys-utils/umount.c:254
+#: sys-utils/umount.c:257
#, c-format
msgid "%s: block devices are not permitted on filesystem"
msgstr "%s:文件系统不允许块设备"
-#: sys-utils/umount.c:305
+#: sys-utils/umount.c:308
msgid "failed to set umount target"
msgstr "设置卸载目标失败"
-#: sys-utils/umount.c:321
+#: sys-utils/umount.c:324
msgid "libmount table allocation failed"
msgstr "libmount 表分配失败"
-#: sys-utils/umount.c:364 sys-utils/umount.c:444
+#: sys-utils/umount.c:367 sys-utils/umount.c:447
msgid "libmount iterator allocation failed"
msgstr "分配 libmount 迭代器失败!"
-#: sys-utils/umount.c:370
+#: sys-utils/umount.c:373
#, c-format
msgid "failed to get child fs of %s"
msgstr "获取 %s 的子文件系统失败"
-#: sys-utils/umount.c:408 sys-utils/umount.c:431
+#: sys-utils/umount.c:411 sys-utils/umount.c:434
#, c-format
msgid "%s: not found"
msgstr "%s:找不到"
-#: sys-utils/umount.c:438
+#: sys-utils/umount.c:441
#, c-format
msgid "%s: failed to determine source (--all-targets is unsupported on systems with regular mtab file)."
msgstr "%s:确定源失败(有常规 mtab 文件的系统不支持 --all-targets)"
-#: sys-utils/unshare.c:53
+#: sys-utils/unshare.c:62
+#, fuzzy, c-format
+msgid "unsupported --setgroups argument '%s'"
+msgstr "不支持的参数:%s"
+
+#: sys-utils/unshare.c:83 sys-utils/unshare.c:98
#, c-format
msgid "write failed %s"
msgstr "写失败:%s"
-#: sys-utils/unshare.c:67
+#: sys-utils/unshare.c:112
+msgid "Run a program with some namespaces unshared from the parent.\n"
+msgstr ""
+
+#: sys-utils/unshare.c:115
msgid " -m, --mount unshare mounts namespace\n"
msgstr " -m, --mount 取消共享挂载名字空间\n"
-#: sys-utils/unshare.c:68
+#: sys-utils/unshare.c:116
msgid " -u, --uts unshare UTS namespace (hostname etc)\n"
msgstr " -u, --uts 取消共享 UTS 名字空间(主机名等)\n"
-#: sys-utils/unshare.c:69
+#: sys-utils/unshare.c:117
msgid " -i, --ipc unshare System V IPC namespace\n"
msgstr " -i, --ipc 取消共享 System V IPC 名字空间\n"
-#: sys-utils/unshare.c:70
+#: sys-utils/unshare.c:118
msgid " -n, --net unshare network namespace\n"
msgstr " -n, --net 取消共享网络名字空间\n"
-#: sys-utils/unshare.c:71
+#: sys-utils/unshare.c:119
msgid " -p, --pid unshare pid namespace\n"
msgstr " -p, --pid 取消共享 pid 名字空间\n"
-#: sys-utils/unshare.c:72
+#: sys-utils/unshare.c:120
msgid " -U, --user unshare user namespace\n"
msgstr " -U, --user 取消共享用户名字空间\n"
-#: sys-utils/unshare.c:73
+#: sys-utils/unshare.c:121
msgid " -f, --fork fork before launching <program>\n"
msgstr " -f, --fork 在启动<程序>前 fork\n"
-#: sys-utils/unshare.c:74
+#: sys-utils/unshare.c:122
msgid " --mount-proc[=<dir>] mount proc filesystem first (implies --mount)\n"
msgstr " --mount-proc[=<目录>] 先挂载 proc 文件系统(连带打开 --mount)\n"
-#: sys-utils/unshare.c:75
+#: sys-utils/unshare.c:123
msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:158
+#: sys-utils/unshare.c:124
+#, fuzzy
+msgid " -s, --setgroups <allow|deny> control setgroups syscall in user namespaces\n"
+msgstr " -G, --setgid <gid> 在用户名字空间中设置 gid\n"
+
+#: sys-utils/unshare.c:213
msgid "unshare failed"
msgstr "unshare 失败"
-#: sys-utils/unshare.c:176
+#: sys-utils/unshare.c:231
msgid "child exit failed"
msgstr "子进程退出失败"
-#: sys-utils/unshare.c:188
+#: sys-utils/unshare.c:237
+#, fuzzy
+msgid "options --setgroups=allow and --map-root-user are mutually exclusive."
+msgstr "选项 --{shell,fast,command,session-command,login} 和 --user 互斥"
+
+#: sys-utils/unshare.c:254
#, c-format
msgid "mount %s failed"
msgstr "挂载 %s 失败"
@@ -15047,7 +15305,11 @@ msgstr "看门狗设备名称"
msgid "unknown flag: %s"
msgstr "未知标志:%s"
-#: sys-utils/wdctl.c:178
+#: sys-utils/wdctl.c:177
+msgid "Show the status of the hardware watchdog.\n"
+msgstr ""
+
+#: sys-utils/wdctl.c:180
msgid ""
" -f, --flags <list> print selected flags only\n"
" -F, --noflags don't print information about flags\n"
@@ -15071,203 +15333,343 @@ msgstr ""
" -s, --settimeout <秒> 设置看门狗超时\n"
" -x, --flags-only 只打印标志表格(同 -I -T)\n"
-#: sys-utils/wdctl.c:194
+#: sys-utils/wdctl.c:196
#, c-format
msgid "The default device is %s.\n"
msgstr "默认设备为 %s。\n"
-#: sys-utils/wdctl.c:197
+#: sys-utils/wdctl.c:199
msgid "Available columns:\n"
msgstr "可用的列:\n"
-#: sys-utils/wdctl.c:287
+#: sys-utils/wdctl.c:289
#, c-format
msgid "%s: unknown flags 0x%x\n"
msgstr "%s:未知标志 0x%x\n"
-#: sys-utils/wdctl.c:317 sys-utils/wdctl.c:373
+#: sys-utils/wdctl.c:319 sys-utils/wdctl.c:375
#, c-format
msgid "%s: watchdog already in use, terminating."
msgstr "%s:看门狗正在使用,将终止。"
-#: sys-utils/wdctl.c:331 sys-utils/wdctl.c:401
+#: sys-utils/wdctl.c:333 sys-utils/wdctl.c:403
#, c-format
msgid "%s: failed to disarm watchdog"
msgstr "%s:喂看门狗失败"
-#: sys-utils/wdctl.c:340
+#: sys-utils/wdctl.c:342
#, c-format
msgid "cannot set timeout for %s"
msgstr "无法设置 %s 的超时"
-#: sys-utils/wdctl.c:346
+#: sys-utils/wdctl.c:348
#, c-format
msgid "Timeout has been set to %d second.\n"
msgid_plural "Timeout has been set to %d seconds.\n"
msgstr[0] "超时已调整为 %d 秒\n"
-#: sys-utils/wdctl.c:380
+#: sys-utils/wdctl.c:382
#, c-format
msgid "%s: failed to get information about watchdog"
msgstr "%s:获取看门狗信息失败"
-#: sys-utils/wdctl.c:462 sys-utils/wdctl.c:465 sys-utils/wdctl.c:468
+#: sys-utils/wdctl.c:464 sys-utils/wdctl.c:467 sys-utils/wdctl.c:470
#, c-format
msgid "%-14s %2i second\n"
msgid_plural "%-14s %2i seconds\n"
msgstr[0] "%-14s %2i 秒\n"
-#: sys-utils/wdctl.c:463
+#: sys-utils/wdctl.c:465
msgid "Timeout:"
msgstr "超时:"
-#: sys-utils/wdctl.c:466
+#: sys-utils/wdctl.c:468
msgid "Pre-timeout:"
msgstr "预超时:"
-#: sys-utils/wdctl.c:469
+#: sys-utils/wdctl.c:471
msgid "Timeleft:"
msgstr "剩余时间:"
-#: sys-utils/wdctl.c:603
+#: sys-utils/wdctl.c:605
msgid "Device:"
msgstr "设备:"
-#: sys-utils/wdctl.c:605
+#: sys-utils/wdctl.c:607
msgid "Identity:"
msgstr "标识:"
-#: sys-utils/wdctl.c:607
+#: sys-utils/wdctl.c:609
msgid "version"
msgstr "版本:"
-#: term-utils/agetty.c:416
+#: sys-utils/zramctl.c:67
+#, fuzzy
+msgid "zram device name"
+msgstr "设备名"
+
+#: sys-utils/zramctl.c:68
+msgid "limit on the uncompressed amount of data"
+msgstr ""
+
+#: sys-utils/zramctl.c:69
+msgid "uncompressed size of stored data"
+msgstr ""
+
+#: sys-utils/zramctl.c:70
+msgid "compressed size of stored data"
+msgstr ""
+
+#: sys-utils/zramctl.c:71
+msgid "the selected compression algorithm"
+msgstr ""
+
+#: sys-utils/zramctl.c:72
+msgid "number of concurrent compress operations"
+msgstr ""
+
+#: sys-utils/zramctl.c:73
+#, fuzzy
+msgid "empty pages with no allocated memory"
+msgstr "分配内存失败:%m"
+
+#: sys-utils/zramctl.c:74
+msgid "all memory including allocator fragmentation and metadata overhead"
+msgstr ""
+
+#: sys-utils/zramctl.c:376
+#, fuzzy, c-format
+msgid ""
+" %1$s [options] <device>\n"
+" %1$s -r <device> [...]\n"
+" %1$s [options] -f | <device> -s <size>\n"
+msgstr ""
+" %1$s [选项] [<回环设备>]\n"
+" %1$s [选项] -f | <回环设备> <文件>\n"
+
+#: sys-utils/zramctl.c:382
+msgid "Set up and control zram devices.\n"
+msgstr ""
+
+#: sys-utils/zramctl.c:385
+msgid " -a, --algorithm lzo|lz4 compression algorithm to use\n"
+msgstr ""
+
+#: sys-utils/zramctl.c:386
+#, fuzzy
+msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
+msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
+
+#: sys-utils/zramctl.c:387
+#, fuzzy
+msgid " -f, --find find a free device\n"
+msgstr " -f, --find 查找第一个未使用的设备\n"
+
+#: sys-utils/zramctl.c:388
+#, fuzzy
+msgid " -n, --noheadings don't print headings\n"
+msgstr " -n, --noheadings 不打印标题\n"
+
+#: sys-utils/zramctl.c:389
+#, fuzzy
+msgid " -o, --output <list> columns to use for status output\n"
+msgstr " -o, --output[=<列表>] 定义要输出的列\n"
+
+#: sys-utils/zramctl.c:390
+#, fuzzy
+msgid " --raw use raw status output format\n"
+msgstr " --raw 使用原生 --list 输出格式\n"
+
+#: sys-utils/zramctl.c:391
+#, fuzzy
+msgid " -r, --reset reset all specified devices\n"
+msgstr " -D, --detach-all 断开所有使用的设备\n"
+
+#: sys-utils/zramctl.c:392
+#, fuzzy
+msgid " -s, --size <size> device size\n"
+msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n"
+
+#: sys-utils/zramctl.c:393
+#, fuzzy
+msgid " -t, --streams <number> number of compression streams\n"
+msgstr " -s, --sectors <数字> 设置要使用的扇区数\n"
+
+#: sys-utils/zramctl.c:459
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr "不支持的参数:%s"
+
+#: sys-utils/zramctl.c:481
+#, fuzzy
+msgid "failed to parse streams"
+msgstr "解析 起点 失败"
+
+#: sys-utils/zramctl.c:503
+#, fuzzy
+msgid "option --find is mutually exclusive with <device>"
+msgstr "--pid 和 命令 互相排斥"
+
+#: sys-utils/zramctl.c:509
+#, fuzzy
+msgid "only one <device> at a time is allowed"
+msgstr "当前只支持一个设备参数"
+
+#: sys-utils/zramctl.c:512
+msgid "options --algorithm and --streams must be combined with --size"
+msgstr ""
+
+#: sys-utils/zramctl.c:542 sys-utils/zramctl.c:570
+#, fuzzy, c-format
+msgid "%s: failed to reset"
+msgstr "%s:解析失败"
+
+#: sys-utils/zramctl.c:552 sys-utils/zramctl.c:560
+msgid "no free zram device found"
+msgstr ""
+
+#: sys-utils/zramctl.c:574
+#, fuzzy, c-format
+msgid "%s: failed to set number of streams"
+msgstr "解析行数失败"
+
+#: sys-utils/zramctl.c:578
+#, fuzzy, c-format
+msgid "%s: failed to set algorithm"
+msgstr "%s:设置后备文件失败"
+
+#: sys-utils/zramctl.c:581
+#, fuzzy, c-format
+msgid "%s: failed to set disksize (%ju bytes)"
+msgstr "%s:获取 整盘 设备号失败"
+
+#: term-utils/agetty.c:446
#, c-format
msgid "%s%s (automatic login)\n"
msgstr "%s%s (自动登录)\n"
-#: term-utils/agetty.c:470
+#: term-utils/agetty.c:500
#, c-format
msgid "%s: can't change root directory %s: %m"
msgstr "%s:无法更改根目录 %s:%m"
-#: term-utils/agetty.c:475
+#: term-utils/agetty.c:505
#, c-format
msgid "%s: can't change working directory %s: %m"
msgstr "%s:无法更改工作目录 %s:%m"
-#: term-utils/agetty.c:480
+#: term-utils/agetty.c:510
#, c-format
msgid "%s: can't change process priority: %m"
msgstr "%s:无法更改进程优先级:%m"
-#: term-utils/agetty.c:491
+#: term-utils/agetty.c:521
#, c-format
msgid "%s: can't exec %s: %m"
msgstr "%s:无法执行 %s:%m"
-#: term-utils/agetty.c:522 term-utils/agetty.c:805 term-utils/agetty.c:817
-#: term-utils/agetty.c:1360 term-utils/agetty.c:1378 term-utils/agetty.c:1410
-#: term-utils/agetty.c:1420 term-utils/agetty.c:1457 term-utils/agetty.c:1733
-#: term-utils/agetty.c:2246
+#: term-utils/agetty.c:552 term-utils/agetty.c:839 term-utils/agetty.c:851
+#: term-utils/agetty.c:1408 term-utils/agetty.c:1426 term-utils/agetty.c:1458
+#: term-utils/agetty.c:1468 term-utils/agetty.c:1505 term-utils/agetty.c:1853
+#: term-utils/agetty.c:2371
#, c-format
msgid "failed to allocate memory: %m"
msgstr "分配内存失败:%m"
-#: term-utils/agetty.c:684
+#: term-utils/agetty.c:716
msgid "invalid argument of --local-line"
msgstr "--local-line 选项参数无效"
-#: term-utils/agetty.c:716
+#: term-utils/agetty.c:748
#, c-format
msgid "bad timeout value: %s"
msgstr "超时值有误:%s"
-#: term-utils/agetty.c:835
+#: term-utils/agetty.c:869
#, c-format
msgid "bad speed: %s"
msgstr "速度有误:%s"
-#: term-utils/agetty.c:837
+#: term-utils/agetty.c:871
msgid "too many alternate speeds"
msgstr "备选速度过多"
-#: term-utils/agetty.c:965 term-utils/agetty.c:982 term-utils/agetty.c:1022
+#: term-utils/agetty.c:999 term-utils/agetty.c:1016 term-utils/agetty.c:1056
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr "/dev/%s:无法以标准输入打开:%m"
-#: term-utils/agetty.c:988
+#: term-utils/agetty.c:1022
#, c-format
msgid "/dev/%s: not a character device"
msgstr "/dev/%s:不是字符设备"
-#: term-utils/agetty.c:990
+#: term-utils/agetty.c:1024
#, c-format
msgid "/dev/%s: not a tty"
msgstr "/dev/%s:不是终端"
-#: term-utils/agetty.c:994 term-utils/agetty.c:1026
+#: term-utils/agetty.c:1028 term-utils/agetty.c:1060
#, c-format
msgid "/dev/%s: cannot get controlling tty: %m"
msgstr "/dev/%s:无法获取控制 tty:%m"
-#: term-utils/agetty.c:1016
+#: term-utils/agetty.c:1050
#, c-format
msgid "/dev/%s: vhangup() failed: %m"
msgstr "/dev/%s:vhangup() 失败:%m"
-#: term-utils/agetty.c:1037
+#: term-utils/agetty.c:1071
#, c-format
msgid "%s: not open for read/write"
msgstr "%s:未打开(就)读/写"
-#: term-utils/agetty.c:1042
+#: term-utils/agetty.c:1076
#, c-format
msgid "/dev/%s: cannot set process group: %m"
msgstr "/dev/%s:无法设置进程组:%m"
-#: term-utils/agetty.c:1056
+#: term-utils/agetty.c:1090
#, c-format
msgid "%s: dup problem: %m"
msgstr "%s:dup 问题:%m"
-#: term-utils/agetty.c:1073
+#: term-utils/agetty.c:1107
#, c-format
msgid "%s: failed to get terminal attributes: %m"
msgstr "%s:获取终端属性失败:%m"
-#: term-utils/agetty.c:1266 term-utils/agetty.c:1286
+#: term-utils/agetty.c:1314 term-utils/agetty.c:1334
#, c-format
msgid "setting terminal attributes failed: %m"
msgstr "设置终端属性失败:%m"
-#: term-utils/agetty.c:1401
+#: term-utils/agetty.c:1449
#, c-format
msgid "cannot open: %s: %m"
msgstr "无法打开 %s:%m"
-#: term-utils/agetty.c:1507
+#: term-utils/agetty.c:1555
msgid "[press ENTER to login]"
msgstr "[按 ENTER 键登录]"
-#: term-utils/agetty.c:1523
+#: term-utils/agetty.c:1571
msgid "Num Lock off"
msgstr "Num Lock 关"
-#: term-utils/agetty.c:1526
+#: term-utils/agetty.c:1574
msgid "Num Lock on"
msgstr "Num Lock 开"
-#: term-utils/agetty.c:1529
+#: term-utils/agetty.c:1577
msgid "Caps Lock on"
msgstr "Caps Lock 开"
-#: term-utils/agetty.c:1532
+#: term-utils/agetty.c:1580
msgid "Scroll Lock on"
msgstr "Scroll Lock 开"
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1583
#, c-format
msgid ""
"Hint: %s\n"
@@ -15276,32 +15678,32 @@ msgstr ""
"提示:%s\n"
"\n"
-#: term-utils/agetty.c:1654
+#: term-utils/agetty.c:1774
#, c-format
msgid "%s: read: %m"
msgstr "%s:read:%m"
-#: term-utils/agetty.c:1713
+#: term-utils/agetty.c:1833
#, c-format
msgid "%s: input overrun"
msgstr "%s:输入过载"
-#: term-utils/agetty.c:1729 term-utils/agetty.c:1737
+#: term-utils/agetty.c:1849 term-utils/agetty.c:1857
#, c-format
msgid "%s: invalid character conversion for login name"
msgstr "%s:登录名字符转换无效"
-#: term-utils/agetty.c:1743
+#: term-utils/agetty.c:1863
#, c-format
msgid "%s: invalid character 0x%x in login name"
msgstr "%s:登录名中的字符 0x%x 无效"
-#: term-utils/agetty.c:1828
+#: term-utils/agetty.c:1948
#, c-format
msgid "%s: failed to set terminal attributes: %m"
msgstr "%s:设置终端属性失败:%m"
-#: term-utils/agetty.c:1864
+#: term-utils/agetty.c:1984
#, c-format
msgid ""
" %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n"
@@ -15310,189 +15712,212 @@ msgstr ""
" %1$s [选项] <线路> [<波特率>,...] [<终端类型>]\n"
" %1$s [选项] <波特率>,... <线路> [<终端类型>]\n"
-#: term-utils/agetty.c:1867
+#: term-utils/agetty.c:1988
+msgid "Open a terminal and set its mode.\n"
+msgstr ""
+
+#: term-utils/agetty.c:1991
msgid " -8, --8bits assume 8-bit tty\n"
msgstr " -8, --8bits 采用 8 位 tty\n"
-#: term-utils/agetty.c:1868
+#: term-utils/agetty.c:1992
msgid " -a, --autologin <user> login the specified user automatically\n"
msgstr " -a, --autologin <用户> 以指定用户自动登录\n"
-#: term-utils/agetty.c:1869
+#: term-utils/agetty.c:1993
msgid " -c, --noreset do not reset control mode\n"
msgstr " -c, --noreset 不重置控制模式\n"
-#: term-utils/agetty.c:1870
+#: term-utils/agetty.c:1994
msgid " -E, --remote use -r <hostname> for login(1)\n"
msgstr " -E, --remote 使用 -r <主机名> 选项调用 login(1)\n"
-#: term-utils/agetty.c:1871
+#: term-utils/agetty.c:1995
msgid " -f, --issue-file <file> display issue file\n"
msgstr " -f, --issue-file <文件> 指定要显示的预登录消息(issue)文件\n"
-#: term-utils/agetty.c:1872
+#: term-utils/agetty.c:1996
msgid " -h, --flow-control enable hardware flow control\n"
msgstr " -h, --flow-control 启用硬件流控制\n"
-#: term-utils/agetty.c:1873
+#: term-utils/agetty.c:1997
msgid " -H, --host <hostname> specify login host\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: term-utils/agetty.c:1874
+#: term-utils/agetty.c:1998
msgid " -i, --noissue do not display issue file\n"
msgstr " -i, --noissue 不显示预登录消息(issue)文件\n"
-#: term-utils/agetty.c:1875
+#: term-utils/agetty.c:1999
msgid " -I, --init-string <string> set init string\n"
msgstr " -I, --init-string <字符串> 设置初始字符串\n"
-#: term-utils/agetty.c:1876
+#: term-utils/agetty.c:2000
msgid " -J --noclear do not clear the screen before prompt\n"
msgstr " -J --noclear 提示之前不清屏\n"
-#: term-utils/agetty.c:1877
+#: term-utils/agetty.c:2001
msgid " -l, --login-program <file> specify login program\n"
msgstr " -l, --login-program <文件> 指定登录程序\n"
-#: term-utils/agetty.c:1878
+#: term-utils/agetty.c:2002
msgid " -L, --local-line[=<mode>] control the local line flag\n"
msgstr " -L, --local-line[=<模式>] 控制本地线路标志\n"
-#: term-utils/agetty.c:1879
+#: term-utils/agetty.c:2003
msgid " -m, --extract-baud extract baud rate during connect\n"
msgstr " -m, --extract-baud 连接过程中提取波特率\n"
-#: term-utils/agetty.c:1880
+#: term-utils/agetty.c:2004
msgid " -n, --skip-login do not prompt for login\n"
msgstr " -n, --skip-login 不提示登录\n"
-#: term-utils/agetty.c:1881
+#: term-utils/agetty.c:2005
msgid " -N --nonewline do not print a newline before issue\n"
msgstr " -N --nonewline 预登录消息(issue)前不打印换行(newline)\n"
-#: term-utils/agetty.c:1882
+#: term-utils/agetty.c:2006
msgid " -o, --login-options <opts> options that are passed to login\n"
msgstr " -o, --login-options <选项> 传递给登录程序的选项\n"
-#: term-utils/agetty.c:1883
+#: term-utils/agetty.c:2007
msgid " -p, --login-pause wait for any key before the login\n"
msgstr " -p, --login-pause 登录前等待按下任意键来继续\n"
-#: term-utils/agetty.c:1884
+#: term-utils/agetty.c:2008
msgid " -r, --chroot <dir> change root to the directory\n"
msgstr " -r, --chroot <目录> 将根目录更改为指定目录\n"
-#: term-utils/agetty.c:1885
+#: term-utils/agetty.c:2009
msgid " -R, --hangup do virtually hangup on the tty\n"
msgstr " -R, --hangup 对 tty 执行虚拟挂起(virtual hangup)\n"
-#: term-utils/agetty.c:1886
+#: term-utils/agetty.c:2010
msgid " -s, --keep-baud try to keep baud rate after break\n"
msgstr " -s, --keep-baud 中断(break)后尝试保持波特率\n"
-#: term-utils/agetty.c:1887
+#: term-utils/agetty.c:2011
msgid " -t, --timeout <number> login process timeout\n"
msgstr " -t, --timeout <数字> 登录进程超时(秒)\n"
-#: term-utils/agetty.c:1888
+#: term-utils/agetty.c:2012
msgid " -U, --detect-case detect uppercase terminal\n"
msgstr " -U, --detect-case 检测纯大写终端\n"
-#: term-utils/agetty.c:1889
+#: term-utils/agetty.c:2013
msgid " -w, --wait-cr wait carriage-return\n"
msgstr " -w, --wait-cr 等待回车\n"
-#: term-utils/agetty.c:1890
+#: term-utils/agetty.c:2014
msgid " --nohints do not print hints\n"
msgstr " --nohints 不打印提示信息\n"
-#: term-utils/agetty.c:1891
+#: term-utils/agetty.c:2015
msgid " --nohostname no hostname at all will be shown\n"
msgstr " --nohostname 将完全不显示主机名\n"
-#: term-utils/agetty.c:1892
+#: term-utils/agetty.c:2016
msgid " --long-hostname show full qualified hostname\n"
msgstr " --long-hostname 显示完全限定主机名\n"
-#: term-utils/agetty.c:1893
+#: term-utils/agetty.c:2017
msgid " --erase-chars <string> additional backspace chars\n"
msgstr " --erase-chars <字符串> 附加的退格字符\n"
-#: term-utils/agetty.c:1894
+#: term-utils/agetty.c:2018
msgid " --kill-chars <string> additional kill chars\n"
msgstr " --kill-chars <字符串> 附加的杀死(kill)字符\n"
-#: term-utils/agetty.c:1895
+#: term-utils/agetty.c:2019
msgid " --chdir <directory> chdir before the login\n"
msgstr " --chdir <目录> 登录前切换目录(chdir)\n"
-#: term-utils/agetty.c:1896
+#: term-utils/agetty.c:2020
msgid " --delay <number> sleep seconds before prompt\n"
msgstr " --delay <数字> 提示前睡眠的秒数\n"
-#: term-utils/agetty.c:1897
+#: term-utils/agetty.c:2021
msgid " --nice <number> run login with this priority\n"
msgstr " --nice <数字> 以指定优先级运行 login\n"
-#: term-utils/agetty.c:1898
+#: term-utils/agetty.c:2022
+#, fuzzy
+msgid " --reload reload prompts on running agetty instances\n"
+msgstr " --nohints 不打印提示信息\n"
+
+#: term-utils/agetty.c:2023
msgid " --help display this help and exit\n"
msgstr " --help 显示此帮助并退出\n"
-#: term-utils/agetty.c:1899
+#: term-utils/agetty.c:2024
msgid " --version output version information and exit\n"
msgstr " --version 输出版本信息并退出\n"
-#: term-utils/agetty.c:2210
+#: term-utils/agetty.c:2335
#, c-format
msgid "%d user"
msgid_plural "%d users"
msgstr[0] "%d 位用户"
-#: term-utils/agetty.c:2334
+#: term-utils/agetty.c:2459
#, c-format
msgid "checkname failed: %m"
msgstr "checkname 失败:%m"
+#: term-utils/agetty.c:2502
+#, fuzzy, c-format
+msgid "cannot touch file: %s"
+msgstr "无法关闭文件 %s"
+
+#: term-utils/agetty.c:2506
+msgid "--reload is unsupported on your system"
+msgstr ""
+
#: term-utils/mesg.c:75
#, c-format
msgid " %s [options] [y | n]\n"
msgstr " %s [选项] [y | n]\n"
-#: term-utils/mesg.c:77
+#: term-utils/mesg.c:78
+#, fuzzy
+msgid "Control write access of other users to your terminal.\n"
+msgstr "拒绝了写您的终端"
+
+#: term-utils/mesg.c:81
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: term-utils/mesg.c:121
+#: term-utils/mesg.c:125
msgid "ttyname failed"
msgstr "ttyname 失败"
-#: term-utils/mesg.c:128
+#: term-utils/mesg.c:132
msgid "is y"
msgstr "是 y"
-#: term-utils/mesg.c:131
+#: term-utils/mesg.c:135
msgid "is n"
msgstr "是 n"
-#: term-utils/mesg.c:142 term-utils/mesg.c:148
+#: term-utils/mesg.c:146 term-utils/mesg.c:152
#, c-format
msgid "change %s mode failed"
msgstr "更改 %s 模式失败"
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:148
msgid "write access to your terminal is allowed"
msgstr "允许了写您的终端"
-#: term-utils/mesg.c:150
+#: term-utils/mesg.c:154
msgid "write access to your terminal is denied"
msgstr "拒绝了写您的终端"
-#: term-utils/mesg.c:153
+#: term-utils/mesg.c:157
#, c-format
msgid "invalid argument: %s"
msgstr "无效参数:%s"
-#: term-utils/script.c:133
+#: term-utils/script.c:134
#, c-format
msgid ""
"output file `%s' is a link\n"
@@ -15503,12 +15928,16 @@ msgstr ""
"如果真想用它,使用 --force 选项。\n"
"程序没有启动。"
-#: term-utils/script.c:143
+#: term-utils/script.c:144
#, c-format
msgid " %s [options] [file]\n"
msgstr " %s [选项] [文件]\n"
-#: term-utils/script.c:146
+#: term-utils/script.c:147
+msgid "Make a typescript of a terminal session.\n"
+msgstr ""
+
+#: term-utils/script.c:150
msgid ""
" -a, --append append the output\n"
" -c, --command <command> run command rather than interactive shell\n"
@@ -15532,21 +15961,21 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: term-utils/script.c:252
+#: term-utils/script.c:256
#, c-format
msgid "Script started, file is %s\n"
msgstr "脚本已启动,文件为 %s\n"
-#: term-utils/script.c:440
+#: term-utils/script.c:450
#, c-format
msgid "Script started on %s"
msgstr "脚本启动于 %s"
-#: term-utils/script.c:482
+#: term-utils/script.c:492
msgid "cannot write script file"
msgstr "无法写脚本文件"
-#: term-utils/script.c:582
+#: term-utils/script.c:592
#, c-format
msgid ""
"\n"
@@ -15555,20 +15984,20 @@ msgstr ""
"\n"
"脚本完成,于 %s"
-#: term-utils/script.c:599
+#: term-utils/script.c:609
#, c-format
msgid "Script done, file is %s\n"
msgstr "脚本完成,文件为 %s\n"
-#: term-utils/script.c:625
+#: term-utils/script.c:635
msgid "failed to get terminal attributes"
msgstr "取终端属性失败"
-#: term-utils/script.c:632
+#: term-utils/script.c:642
msgid "openpty failed"
msgstr "openpty 失败"
-#: term-utils/script.c:672
+#: term-utils/script.c:682
msgid "out of pty's"
msgstr "pty 的输出"
@@ -15578,6 +16007,10 @@ msgid " %s [-t] timingfile [typescript] [divisor]\n"
msgstr " %s [-t] timingfile [typescript] [divisor]\n"
#: term-utils/scriptreplay.c:46
+msgid "Play back terminal typescripts, using timing information.\n"
+msgstr ""
+
+#: term-utils/scriptreplay.c:49
msgid ""
" -t, --timing <file> script timing output file\n"
" -s, --typescript <file> script terminal session output file\n"
@@ -15595,256 +16028,260 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: term-utils/scriptreplay.c:66
+#: term-utils/scriptreplay.c:70
#, c-format
msgid "expected a number, but got '%s'"
msgstr "应为数字,但收到了“%s”"
-#: term-utils/scriptreplay.c:69 term-utils/scriptreplay.c:73
+#: term-utils/scriptreplay.c:73 term-utils/scriptreplay.c:77
#, c-format
msgid "divisor '%s'"
msgstr "除数“%s”"
-#: term-utils/scriptreplay.c:117
+#: term-utils/scriptreplay.c:121
msgid "write to stdout failed"
msgstr "写 stdout 失败"
-#: term-utils/scriptreplay.c:123
+#: term-utils/scriptreplay.c:127
#, c-format
msgid "unexpected end of file on %s"
msgstr "%s 上的文件结尾异常"
-#: term-utils/scriptreplay.c:125
+#: term-utils/scriptreplay.c:129
#, c-format
msgid "failed to read typescript file %s"
msgstr "读 typescript 文件 %s 失败"
-#: term-utils/scriptreplay.c:190
+#: term-utils/scriptreplay.c:193
msgid "wrong number of arguments"
msgstr "参数个数不正确"
-#: term-utils/scriptreplay.c:221
+#: term-utils/scriptreplay.c:224
#, c-format
msgid "failed to read timing file %s"
msgstr "读时序文件 %s 失败"
-#: term-utils/scriptreplay.c:223
+#: term-utils/scriptreplay.c:226
#, c-format
msgid "timings file %s: %lu: unexpected format"
msgstr "时序文件 %s:%lu:格式异常"
-#: term-utils/setterm.c:191 term-utils/setterm.c:219 term-utils/setterm.c:257
-#: term-utils/setterm.c:295 term-utils/setterm.c:314 term-utils/setterm.c:323
-#: term-utils/setterm.c:337 term-utils/setterm.c:371 term-utils/setterm.c:385
+#: term-utils/setterm.c:192 term-utils/setterm.c:220 term-utils/setterm.c:258
+#: term-utils/setterm.c:296 term-utils/setterm.c:315 term-utils/setterm.c:324
+#: term-utils/setterm.c:338 term-utils/setterm.c:372 term-utils/setterm.c:386
#, c-format
msgid "argument error: %s"
msgstr "参数出错:%s"
-#: term-utils/setterm.c:260
+#: term-utils/setterm.c:261
#, c-format
msgid "argument error: bright %s is not supported"
msgstr "参数错误:不支持亮度 %s"
-#: term-utils/setterm.c:351
+#: term-utils/setterm.c:352
msgid "too many tabs"
msgstr "标签过多"
-#: term-utils/setterm.c:405
+#: term-utils/setterm.c:407
+msgid "Set the attributes of a terminal.\n"
+msgstr ""
+
+#: term-utils/setterm.c:410
msgid " --term <terminal_name> override TERM environment variable\n"
msgstr " --term <终端名> 替换 TERM 环境变量\n"
-#: term-utils/setterm.c:406
+#: term-utils/setterm.c:411
msgid " --reset reset terminal to power-on state\n"
msgstr " --reset 重置端口到上电时的状态\n"
-#: term-utils/setterm.c:407
+#: term-utils/setterm.c:412
msgid " --initialize display init string, and use default settings\n"
msgstr " --initialize 显示初始化字符串,并使用默认设置\n"
-#: term-utils/setterm.c:408
+#: term-utils/setterm.c:413
msgid " --default use default terminal settings\n"
msgstr " --default 使用默认终端设置\n"
-#: term-utils/setterm.c:409
+#: term-utils/setterm.c:414
msgid " --store save current terminal settings as default\n"
msgstr " --store 将当前终端设置保存为默认值\n"
-#: term-utils/setterm.c:410
+#: term-utils/setterm.c:415
msgid " --cursor [on|off] display cursor\n"
msgstr " --cursor [on|off] 显示光标\n"
-#: term-utils/setterm.c:411
+#: term-utils/setterm.c:416
msgid " --repeat [on|off] keyboard repeat\n"
msgstr " --repeat [on|off] 键盘重复\n"
-#: term-utils/setterm.c:412
+#: term-utils/setterm.c:417
msgid " --appcursorkeys [on|off] cursor key application mode\n"
msgstr " --appcursorkeys [on|off] 光标键应用程序模式\n"
-#: term-utils/setterm.c:413
+#: term-utils/setterm.c:418
msgid " --linewrap [on|off] continue on a new line when a line is full\n"
msgstr " --linewrap [on|off] 一行满时在新行中继续\n"
-#: term-utils/setterm.c:414
+#: term-utils/setterm.c:419
msgid " --inversescreen [on|off] swap colors for the whole screen\n"
msgstr " --inversescreen [on|off] 交换整个屏幕的颜色\n"
-#: term-utils/setterm.c:415
+#: term-utils/setterm.c:420
msgid " --foreground default|<color> set foreground color\n"
msgstr " --foreground default|<颜色> 设置前景色\n"
-#: term-utils/setterm.c:416
+#: term-utils/setterm.c:421
msgid " --background default|<color> set background color\n"
msgstr " --background default|<颜色> 设置背景色\n"
-#: term-utils/setterm.c:417
+#: term-utils/setterm.c:422
msgid " --ulcolor [bright] <color> set underlined text color\n"
msgstr " --ulcolor [bright] <颜色> 设置下划线颜色\n"
-#: term-utils/setterm.c:418
+#: term-utils/setterm.c:423
msgid " --hbcolor [bright] <color> set bold text color\n"
msgstr " --hbcolor [bright] <颜色> 设置粗体字颜色\n"
-#: term-utils/setterm.c:419
+#: term-utils/setterm.c:424
msgid " <color>: black blue cyan green grey magenta red white yellow\n"
msgstr " <颜色>:black blue cyan green grey magenta red white yellow\n"
-#: term-utils/setterm.c:420
+#: term-utils/setterm.c:425
msgid " --bold [on|off] bold\n"
msgstr " --bold [on|off] 粗体\n"
-#: term-utils/setterm.c:421
+#: term-utils/setterm.c:426
msgid " --half-bright [on|off] dim\n"
msgstr " -half-bright [on|off] 变暗\n"
-#: term-utils/setterm.c:422
+#: term-utils/setterm.c:427
msgid " --blink [on|off] blink\n"
msgstr " --blink [on|off] 闪烁\n"
-#: term-utils/setterm.c:423
+#: term-utils/setterm.c:428
msgid " --underline [on|off] underline\n"
msgstr " --underline [on|off] 下划线\n"
-#: term-utils/setterm.c:424
+#: term-utils/setterm.c:429
msgid " --reverse [on|off] swap foreground and background colors\n"
msgstr " --reverse [on|off] 交换前景色和背景色\n"
-#: term-utils/setterm.c:425
+#: term-utils/setterm.c:430
msgid " --clear [all|rest] clear screen and set cursor position\n"
msgstr " --clear [all|rest] 清屏并设置光标位置\n"
-#: term-utils/setterm.c:426
+#: term-utils/setterm.c:431
msgid " --tabs [<number>...] set these tab stop positions, or show them\n"
msgstr " --tabs [<数字>...] 设置这些制表位置,或显示制表位\n"
-#: term-utils/setterm.c:427
+#: term-utils/setterm.c:432
msgid " --clrtabs [<number>...] clear these tab stop positions, or all\n"
msgstr " --clrtabs [<数字>...] 清除这些或所有制表位\n"
-#: term-utils/setterm.c:428
+#: term-utils/setterm.c:433
msgid " --regtabs [1-160] set a regular tab stop interval\n"
msgstr " --regtabs [1-160] 设置常规的制表位间隔\n"
-#: term-utils/setterm.c:429
+#: term-utils/setterm.c:434
msgid " --blank [0-60|force|poke] set time of inactivity before screen blanks\n"
msgstr " --blank [0-60|force|poke] 设置多久不活动后屏幕变空白\n"
-#: term-utils/setterm.c:430
+#: term-utils/setterm.c:435
msgid " --dump [<number>] write vcsa<number> console dump to file\n"
msgstr " --dump [<数字>] 将 vcsa<数字> 终端转储到文件\n"
-#: term-utils/setterm.c:431
+#: term-utils/setterm.c:436
msgid " --append [<number>] append vcsa<number> console dump to file\n"
msgstr " --append [<数字>] 将 vcsa<数字> 终端转储追加到文件\n"
-#: term-utils/setterm.c:432
+#: term-utils/setterm.c:437
msgid " --file <filename> name of the dump file\n"
msgstr " -f, --file <文件名> 转储文件的名字\n"
-#: term-utils/setterm.c:433
+#: term-utils/setterm.c:438
msgid " --msg [on|off] send kernel messages to console\n"
msgstr " --msg [on|off] 将内核消息发送到终端\n"
-#: term-utils/setterm.c:434
+#: term-utils/setterm.c:439
msgid " --msglevel 0-8 kernel console log level\n"
msgstr " --msglevel 0-8 内核终端日志记录级别\n"
-#: term-utils/setterm.c:435
+#: term-utils/setterm.c:440
msgid " --powersave [on|vsync|hsync|powerdown|off]\n"
msgstr " -powersave [on|vsync|hsync|powerdown|off]\n"
-#: term-utils/setterm.c:436
+#: term-utils/setterm.c:441
msgid " set vesa powersaving features\n"
msgstr " 设置 vesa 节能功能\n"
-#: term-utils/setterm.c:437
+#: term-utils/setterm.c:442
msgid " --powerdown [0-60] set vesa powerdown interval in minutes\n"
msgstr " --powerdown [0-60] 设置 vesa 关闭电源间隔(分钟)\n"
-#: term-utils/setterm.c:438
+#: term-utils/setterm.c:443
msgid " --blength [0-2000] duration of the bell in milliseconds\n"
msgstr " --blength [0-2000] 响铃持续时间(毫秒)\n"
-#: term-utils/setterm.c:439
+#: term-utils/setterm.c:444
msgid " --bfreq <number> bell frequency in Hertz\n"
msgstr " --bfreq <数字> 响铃频率,单位为 Hz\n"
-#: term-utils/setterm.c:440
+#: term-utils/setterm.c:445
msgid " --version show version information and exit\n"
msgstr " --version 输出版本信息并退出\n"
-#: term-utils/setterm.c:441
+#: term-utils/setterm.c:446
msgid " --help display this help and exit\n"
msgstr " --help 显示此帮助并退出\n"
-#: term-utils/setterm.c:449
+#: term-utils/setterm.c:454
msgid "duplicate use of an option"
msgstr "重复使用某选项"
-#: term-utils/setterm.c:743
+#: term-utils/setterm.c:748
msgid "cannot force blank"
msgstr "无法强制清空(blank)"
-#: term-utils/setterm.c:748
+#: term-utils/setterm.c:753
msgid "cannot force unblank"
msgstr "无法强制反清空(unblank)"
-#: term-utils/setterm.c:754
+#: term-utils/setterm.c:759
msgid "cannot get blank status"
msgstr "无法获取空白状态"
-#: term-utils/setterm.c:780
+#: term-utils/setterm.c:785
#, c-format
msgid "can not open dump file %s for output"
msgstr "无法打开转储文件 %s 进行输出"
-#: term-utils/setterm.c:823
+#: term-utils/setterm.c:828
#, c-format
msgid "terminal %s does not support %s"
msgstr "终端 %s 不支持 %s"
-#: term-utils/setterm.c:999
+#: term-utils/setterm.c:1004
msgid "cannot (un)set powersave mode"
msgstr "无法设置(取消)节能模式"
-#: term-utils/setterm.c:1018 term-utils/setterm.c:1027
+#: term-utils/setterm.c:1023 term-utils/setterm.c:1032
msgid "klogctl error"
msgstr "klogctl 出错"
-#: term-utils/setterm.c:1048
+#: term-utils/setterm.c:1053
msgid "$TERM is not defined."
msgstr "$TERM 未定义。"
-#: term-utils/setterm.c:1055
+#: term-utils/setterm.c:1060
msgid "terminfo database cannot be found"
msgstr "找不到 terminfo 数据库"
-#: term-utils/setterm.c:1057
+#: term-utils/setterm.c:1062
#, c-format
msgid "%s: unknown terminal type"
msgstr "%s:未知终端类型"
-#: term-utils/setterm.c:1059
+#: term-utils/setterm.c:1064
msgid "terminal is hardcopy"
msgstr "终端为硬拷贝(hardcopy)"
@@ -15883,42 +16320,46 @@ msgstr "%s:严重错误,消息太长太长了"
msgid " %s [options] [<file> | <message>]\n"
msgstr " %s [选项] [<文件> | <消息>]\n"
-#: term-utils/wall.c:85
+#: term-utils/wall.c:86
+msgid "Write a message to all users.\n"
+msgstr ""
+
+#: term-utils/wall.c:89
msgid " -n, --nobanner do not print banner, works only for root\n"
msgstr " -n, --nobanner 不打印欢迎消息,只对 root 用户生效\n"
-#: term-utils/wall.c:86
+#: term-utils/wall.c:90
msgid " -t, --timeout <timeout> write timeout in seconds\n"
msgstr " -t, --timeout <超时> 写超时(秒)\n"
-#: term-utils/wall.c:128
+#: term-utils/wall.c:132
msgid "--nobanner is available only for root"
msgstr "--nobanner 只有 root 能用"
-#: term-utils/wall.c:133
+#: term-utils/wall.c:137
#, c-format
msgid "invalid timeout argument: %s"
msgstr "无效的超时参数:%s"
-#: term-utils/wall.c:210
+#: term-utils/wall.c:214
msgid "cannot get passwd uid"
msgstr "无法获取 passwd uid"
-#: term-utils/wall.c:215
+#: term-utils/wall.c:219
msgid "cannot get tty name"
msgstr "无法获得 tty 名称"
-#: term-utils/wall.c:233
+#: term-utils/wall.c:237
#, c-format
msgid "Broadcast message from %s@%s (%s) (%s):"
msgstr "来自 %s@%s (%s) (%s) 的广播消息:"
-#: term-utils/wall.c:268
+#: term-utils/wall.c:272
#, c-format
msgid "will not read %s - use stdin."
msgstr "将不读 %s - 使用 stdin。"
-#: term-utils/wall.c:307
+#: term-utils/wall.c:311
msgid "fread failed"
msgstr "fread 失败"
@@ -15928,68 +16369,66 @@ msgid " %s [options] <user> [<ttyname>]\n"
msgstr " %s [选项] <用户> [<tty名称>]\n"
#: term-utils/write.c:86
-msgid ""
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
+msgid "Send a message to another user.\n"
msgstr ""
-" -V, --version 输出版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
-"\n"
-#: term-utils/write.c:138
+#: term-utils/write.c:140
msgid "can't find your tty's name"
msgstr "找不到您的 tty 名称"
-#: term-utils/write.c:151
+#: term-utils/write.c:153
msgid "you have write permission turned off"
msgstr "您关闭了写权限"
-#: term-utils/write.c:169
+#: term-utils/write.c:171
#, c-format
msgid "%s is not logged in on %s"
msgstr "%s 未在 %s 上登录"
-#: term-utils/write.c:175
+#: term-utils/write.c:177
#, c-format
msgid "%s has messages disabled on %s"
msgstr "%s 在 %s 上禁用了消息"
-#: term-utils/write.c:270
+#: term-utils/write.c:272
#, c-format
msgid "%s is not logged in"
msgstr "%s 未登录"
-#: term-utils/write.c:277
+#: term-utils/write.c:279
#, c-format
msgid "%s has messages disabled"
msgstr "%s 禁用了消息"
-#: term-utils/write.c:279
+#: term-utils/write.c:281
#, c-format
msgid "%s is logged in more than once; writing to %s"
msgstr "%s 登录了多次;将记入 %s"
-#: term-utils/write.c:328
+#: term-utils/write.c:330
#, c-format
msgid "tty path %s too long"
msgstr "tty 路径 %s 过长"
-#: term-utils/write.c:346
+#: term-utils/write.c:348
#, c-format
msgid "Message from %s@%s (as %s) on %s at %s ..."
msgstr "%s@%s (作为 %s) 从 %s 上在 %s 发来消息..."
-#: term-utils/write.c:349
+#: term-utils/write.c:351
#, c-format
msgid "Message from %s@%s on %s at %s ..."
msgstr "%s@%s 从 %s 上在 %s 发来消息..."
-#: term-utils/write.c:377
+#: term-utils/write.c:379
msgid "carefulputc failed"
msgstr "carefulputc 失败"
-#: text-utils/col.c:125
+#: text-utils/col.c:134
+msgid "Filter out reverse line feeds.\n"
+msgstr ""
+
+#: text-utils/col.c:137
#, c-format
msgid ""
"\n"
@@ -16016,7 +16455,7 @@ msgstr ""
" -H, --help 显示此帮助并退出\n"
"\n"
-#: text-utils/col.c:136 text-utils/colrm.c:67
+#: text-utils/col.c:148 text-utils/colrm.c:69
#, c-format
msgid ""
"%s reads from standard input and writes to standard output\n"
@@ -16025,48 +16464,41 @@ msgstr ""
"%s 读取标准输入并写入标准输出\n"
"\n"
-#: text-utils/col.c:199
+#: text-utils/col.c:212
msgid "bad -l argument"
msgstr "-l 参数有误"
-#: text-utils/col.c:324
+#: text-utils/col.c:336
#, c-format
msgid "warning: can't back up %s."
msgstr "警告:无法备份 %s。"
-#: text-utils/col.c:325
+#: text-utils/col.c:337
msgid "past first line"
msgstr "越过第一行"
-#: text-utils/col.c:325
+#: text-utils/col.c:337
msgid "-- line already flushed"
msgstr "-- 行已经被冲洗(flushed)"
-#: text-utils/colcrt.c:315
+#: text-utils/colcrt.c:313 text-utils/column.c:92
#, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file ...]\n"
+msgid " %s [options] [<file>...]\n"
+msgstr " %s [选项] [<文件>...]\n"
+
+#: text-utils/colcrt.c:316
+msgid "Filter nroff output for CRT previewing.\n"
msgstr ""
-"\n"
-"用法:\n"
-" %s [选项] [文件 ...]\n"
#: text-utils/colcrt.c:319
-#, c-format
-msgid ""
-" -, --no-underlining suppress all underlining\n"
-" -2, --half-lines print all half-lines\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
-msgstr ""
-" -, --no-underlining 抑制所有下划线\n"
-" -2, --half-lines 打印所有半线(half-line)\n"
-" -V, --version 输出版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
-"\n"
+#, fuzzy
+msgid " -, --no-underlining suppress all underlining\n"
+msgstr " -u 屏蔽下划线\n"
+
+#: text-utils/colcrt.c:320
+#, fuzzy
+msgid " -2, --half-lines print all half-lines\n"
+msgstr " -a, --all 打印所有设备\n"
#: text-utils/colrm.c:59
#, c-format
@@ -16079,20 +16511,9 @@ msgstr ""
"用法:\n"
" %s [起始列 [终止列]]\n"
-#: text-utils/colrm.c:63
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
+#: text-utils/colrm.c:64
+msgid "Filter out the specified columns.\n"
msgstr ""
-"\n"
-"选项:\n"
-" -V, --version 输出版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
-"\n"
#: text-utils/colrm.c:185
msgid "first argument"
@@ -16102,24 +16523,23 @@ msgstr "第一个参数"
msgid "second argument"
msgstr "第二个参数"
-#: text-utils/column.c:92
-#, c-format
-msgid " %s [options] [<file>...]\n"
-msgstr " %s [选项] [<文件>...]\n"
+#: text-utils/column.c:95
+msgid "Columnate lists.\n"
+msgstr ""
-#: text-utils/column.c:94
+#: text-utils/column.c:98
msgid " -c, --columns <width> width of output in number of characters\n"
msgstr " -c, --columns <宽度> 输出宽度(字符数)\n"
-#: text-utils/column.c:95
+#: text-utils/column.c:99
msgid " -t, --table create a table\n"
msgstr " -t, --table 创建表格\n"
-#: text-utils/column.c:96
+#: text-utils/column.c:100
msgid " -s, --separator <string> possible table delimiters\n"
msgstr " -s, --separator <字符串> 可用的表格分隔符\n"
-#: text-utils/column.c:97
+#: text-utils/column.c:101
msgid ""
" -o, --output-separator <string>\n"
" columns separator for table output; default is two spaces\n"
@@ -16127,15 +16547,15 @@ msgstr ""
" -o, --output-separator <字符串>\n"
" 表格输出列分隔符,默认为两个空格\n"
-#: text-utils/column.c:99
+#: text-utils/column.c:103
msgid " -x, --fillrows fill rows before columns\n"
msgstr " -x, --fillrows 先填充行,再填充列\n"
-#: text-utils/column.c:156
+#: text-utils/column.c:159
msgid "invalid columns argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:392
+#: text-utils/column.c:395
#, c-format
msgid "line %d is too long, output will be truncated"
msgstr "第 %d 行过长,输出将截短"
@@ -16145,58 +16565,58 @@ msgstr "第 %d 行过长,输出将截短"
msgid " %s [options] <file>...\n"
msgstr " %s [选项] <文件>...\n"
-#: text-utils/hexdump.c:157
+#: text-utils/hexdump.c:158
+msgid "Display file contents in hexadecimal, decimal, octal, or ascii.\n"
+msgstr ""
+
+#: text-utils/hexdump.c:161
msgid " -b, --one-byte-octal one-byte octal display\n"
msgstr " -b, --one-byte-octal 单字节八进制显示\n"
-#: text-utils/hexdump.c:158
+#: text-utils/hexdump.c:162
msgid " -c, --one-byte-char one-byte character display\n"
msgstr " -c, --one-byte-char 单字节字符显示\n"
-#: text-utils/hexdump.c:159
+#: text-utils/hexdump.c:163
msgid " -C, --canonical canonical hex+ASCII display\n"
msgstr " -C, --canonical 规范化 hex+ASCII 显示\n"
-#: text-utils/hexdump.c:160
+#: text-utils/hexdump.c:164
msgid " -d, --two-bytes-decimal two-byte decimal display\n"
msgstr " -d, --two-bytes-decimal 双字节十进制显示\n"
-#: text-utils/hexdump.c:161
+#: text-utils/hexdump.c:165
msgid " -o, --two-bytes-octal two-byte octal display\n"
msgstr " -o, --two-bytes-octal 双字节八进制显示\n"
-#: text-utils/hexdump.c:162
+#: text-utils/hexdump.c:166
msgid " -x, --two-bytes-hex two-byte hexadecimal display\n"
msgstr " -x, --two-bytes-hex 双字节十六进制显示\n"
-#: text-utils/hexdump.c:163
+#: text-utils/hexdump.c:167
msgid " -L, --color[=<mode>] interpret color formatting specifiers\n"
msgstr " -L, --color[=<模式>] 解释颜色格式化限定符\n"
-#: text-utils/hexdump.c:164
+#: text-utils/hexdump.c:168
msgid " -e, --format <format> format string to be used for displaying data\n"
msgstr " -e, --format <格式> 用于显示数据的格式化字符串\n"
-#: text-utils/hexdump.c:165
+#: text-utils/hexdump.c:169
msgid " -f, --format-file <file> file that contains format strings\n"
msgstr " -f, --format-file <文件> 包含格式字符串的文件\n"
-#: text-utils/hexdump.c:166
+#: text-utils/hexdump.c:170
msgid " -n, --length <length> interpret only length bytes of input\n"
msgstr " -n, --length <长度> 只解释规定字节长度的输入\n"
-#: text-utils/hexdump.c:167
+#: text-utils/hexdump.c:171
msgid " -s, --skip <offset> skip offset bytes from the beginning\n"
msgstr " -s, --skip <偏移> 跳过开头的指定字节偏移\n"
-#: text-utils/hexdump.c:168
+#: text-utils/hexdump.c:172
msgid " -v, --no-squeezing output identical lines\n"
msgstr " -v, --no-squeezing 输出相同的行\n"
-#: text-utils/hexdump.c:196
-msgid "calling hexdump as od has been deprecated in favor of GNU coreutils od"
-msgstr "将 hexdump 作为 od 调用的方式已废弃,请转用 GNU coreutils 的 od"
-
#: text-utils/hexdump-display.c:365
msgid "all input file arguments failed"
msgstr "所有输入文件参数失败"
@@ -16221,60 +16641,68 @@ msgstr "格式损坏 {%s}"
msgid "bad conversion character %%%s"
msgstr "转换字符 %%%s 有误"
-#: text-utils/hexdump-parse.c:434
+#: text-utils/hexdump-parse.c:436
msgid "byte count with multiple conversion characters"
msgstr "对字符计数使用了多个转换字符"
-#: text-utils/more.c:321
+#: text-utils/line.c:33
+msgid "Read one line.\n"
+msgstr ""
+
+#: text-utils/more.c:322
+msgid "A file perusal filter for CRT viewing.\n"
+msgstr ""
+
+#: text-utils/more.c:325
msgid " -d display help instead of ringing bell\n"
msgstr " -d 显示帮助而非响铃\n"
-#: text-utils/more.c:322
+#: text-utils/more.c:326
msgid " -f count logical rather than screen lines\n"
msgstr " -f 计算逻辑行数,而非屏幕行数\n"
-#: text-utils/more.c:323
+#: text-utils/more.c:327
msgid " -l suppress pause after form feed\n"
msgstr " -l 屏蔽换页(form feed)后的暂停\n"
-#: text-utils/more.c:324
+#: text-utils/more.c:328
msgid " -c do not scroll, display text and clean line ends\n"
msgstr " -c 不滚动,显示文本并清理行末\n"
-#: text-utils/more.c:325
+#: text-utils/more.c:329
msgid " -p do not scroll, clean screen and display text\n"
msgstr " -p 不滚动,清除屏幕并显示文本\n"
-#: text-utils/more.c:326
+#: text-utils/more.c:330
msgid " -s squeeze multiple blank lines into one\n"
msgstr " -s 将多行空行压缩为一行\n"
-#: text-utils/more.c:327
+#: text-utils/more.c:331
msgid " -u suppress underlining\n"
msgstr " -u 屏蔽下划线\n"
-#: text-utils/more.c:328
+#: text-utils/more.c:332
msgid " -<number> the number of lines per screenful\n"
msgstr " -<数字> 每屏的行数\n"
-#: text-utils/more.c:329
+#: text-utils/more.c:333
msgid " +<number> display file beginning from line number\n"
msgstr " +<数字> 从指定行开始显示文件\n"
-#: text-utils/more.c:330
+#: text-utils/more.c:334
msgid " +/<string> display file beginning from search string match\n"
msgstr " +/<字符串> 从匹配搜索字符串的位置开始显示文件\n"
-#: text-utils/more.c:331
+#: text-utils/more.c:335
msgid " -V display version information and exit\n"
msgstr " -V 显示版本信息并退出\n"
-#: text-utils/more.c:574
+#: text-utils/more.c:578
#, c-format
msgid "unknown option -%s"
msgstr "未知选项 -%s"
-#: text-utils/more.c:598
+#: text-utils/more.c:602
#, c-format
msgid ""
"\n"
@@ -16285,7 +16713,7 @@ msgstr ""
"*** %s:目录 ***\n"
"\n"
-#: text-utils/more.c:640
+#: text-utils/more.c:644
#, c-format
msgid ""
"\n"
@@ -16296,39 +16724,39 @@ msgstr ""
"******** %s:不是文件文件 ********\n"
"\n"
-#: text-utils/more.c:735
+#: text-utils/more.c:739
#, c-format
msgid "[Use q or Q to quit]"
msgstr "[使用 q 或 Q 退出]"
-#: text-utils/more.c:806
+#: text-utils/more.c:810
#, c-format
msgid "--More--"
msgstr "--更多--"
-#: text-utils/more.c:808
+#: text-utils/more.c:812
#, c-format
msgid "(Next file: %s)"
msgstr "(下个文件:%s)"
-#: text-utils/more.c:816
+#: text-utils/more.c:820
#, c-format
msgid "[Press space to continue, 'q' to quit.]"
msgstr "[按空格键继续,“q”键退出。]"
-#: text-utils/more.c:1235
+#: text-utils/more.c:1246
#, c-format
msgid "...back %d page"
msgid_plural "...back %d pages"
msgstr[0] "...后退 %d 页"
-#: text-utils/more.c:1283
+#: text-utils/more.c:1294
#, c-format
msgid "...skipping %d line"
msgid_plural "...skipping %d lines"
msgstr[0] "...跳过 %d 行"
-#: text-utils/more.c:1321
+#: text-utils/more.c:1332
msgid ""
"\n"
"***Back***\n"
@@ -16338,11 +16766,11 @@ msgstr ""
"***后退***\n"
"\n"
-#: text-utils/more.c:1336
+#: text-utils/more.c:1347
msgid "No previous regular expression"
msgstr "无上一个正则表达式"
-#: text-utils/more.c:1366
+#: text-utils/more.c:1377
msgid ""
"\n"
"Most commands optionally preceded by integer argument k. Defaults in brackets.\n"
@@ -16352,7 +16780,7 @@ msgstr ""
"多数命令可在前面加整数参数 k。方括号中为参数的默认值\n"
"星号(*)表示参数将成为新的默认值。\n"
-#: text-utils/more.c:1373
+#: text-utils/more.c:1384
msgid ""
"<space> Display next k lines of text [current screen size]\n"
"z Display next k lines of text [current screen size]*\n"
@@ -16394,30 +16822,30 @@ msgstr ""
":f 显示当前文件名和行号\n"
". 重复前一命令\n"
-#: text-utils/more.c:1446 text-utils/more.c:1452
+#: text-utils/more.c:1457 text-utils/more.c:1463
#, c-format
msgid "[Press 'h' for instructions.]"
msgstr "[按“h”键获取说明。]"
-#: text-utils/more.c:1483
+#: text-utils/more.c:1494
#, c-format
msgid "\"%s\" line %d"
msgstr "“%s”第 %d 行"
-#: text-utils/more.c:1485
+#: text-utils/more.c:1496
#, c-format
msgid "[Not a file] line %d"
msgstr "[不是文件] 第 %d 行"
-#: text-utils/more.c:1567
+#: text-utils/more.c:1578
msgid " Overflow\n"
msgstr " 上溢\n"
-#: text-utils/more.c:1614
+#: text-utils/more.c:1625
msgid "...skipping\n"
msgstr "...跳过\n"
-#: text-utils/more.c:1648
+#: text-utils/more.c:1659
msgid ""
"\n"
"Pattern not found\n"
@@ -16425,19 +16853,19 @@ msgstr ""
"\n"
"未找到模式\n"
-#: text-utils/more.c:1653 text-utils/pg.c:1015 text-utils/pg.c:1161
+#: text-utils/more.c:1664 text-utils/pg.c:1028 text-utils/pg.c:1174
msgid "Pattern not found"
msgstr "找不到模式"
-#: text-utils/more.c:1699
+#: text-utils/more.c:1710
msgid "exec failed\n"
msgstr "exec 失败\n"
-#: text-utils/more.c:1713
+#: text-utils/more.c:1724
msgid "can't fork\n"
msgstr "无法 fork\n"
-#: text-utils/more.c:1747
+#: text-utils/more.c:1758
msgid ""
"\n"
"...Skipping "
@@ -16445,23 +16873,23 @@ msgstr ""
"\n"
"...跳过 "
-#: text-utils/more.c:1751
+#: text-utils/more.c:1762
msgid "...Skipping to file "
msgstr "...跳到文件 "
-#: text-utils/more.c:1753
+#: text-utils/more.c:1764
msgid "...Skipping back to file "
msgstr "...将跳回文件 "
-#: text-utils/more.c:2038
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "行过长"
-#: text-utils/more.c:2075
+#: text-utils/more.c:2084
msgid "No previous command to substitute for"
msgstr "没有要替换的前一命令"
-#: text-utils/pg.c:136
+#: text-utils/pg.c:145
msgid ""
"-------------------------------------------------------\n"
" h this screen\n"
@@ -16509,134 +16937,138 @@ msgstr ""
"更多信息请参阅 pg(1)。\n"
"-------------------------------------------------------\n"
-#: text-utils/pg.c:214
+#: text-utils/pg.c:223
#, c-format
msgid " %s [options] [+line] [+/pattern/] [files]\n"
msgstr " %s [选项] [+行] [+/模式/] [文件]\n"
-#: text-utils/pg.c:217
+#: text-utils/pg.c:227
+msgid "Browse pagewise through text files.\n"
+msgstr ""
+
+#: text-utils/pg.c:230
msgid " -number lines per page\n"
msgstr " -number 每页的行数\n"
-#: text-utils/pg.c:218
+#: text-utils/pg.c:231
msgid " -c clear screen before displaying\n"
msgstr " -c 显示前清屏\n"
-#: text-utils/pg.c:219
+#: text-utils/pg.c:232
msgid " -e do not pause at end of a file\n"
msgstr " -e 不在文件末尾暂停\n"
-#: text-utils/pg.c:220
+#: text-utils/pg.c:233
msgid " -f do not split long lines\n"
msgstr " -f 不分割长行\n"
-#: text-utils/pg.c:221
+#: text-utils/pg.c:234
msgid " -n terminate command with new line\n"
msgstr " -n 用换行符(new line)终止命令\n"
-#: text-utils/pg.c:222
+#: text-utils/pg.c:235
msgid " -p <prompt> specify prompt\n"
msgstr " -p <提示> 指定提示语\n"
-#: text-utils/pg.c:223
+#: text-utils/pg.c:236
msgid " -r disallow shell escape\n"
msgstr " -r 禁止 shell 转义\n"
-#: text-utils/pg.c:224
+#: text-utils/pg.c:237
msgid " -s print messages to stdout\n"
msgstr " -s 向标准输出打印消息\n"
-#: text-utils/pg.c:225
+#: text-utils/pg.c:238
msgid " +number start at the given line\n"
msgstr " +数字 从指定行开始\n"
-#: text-utils/pg.c:226
+#: text-utils/pg.c:239
msgid " +/pattern/ start at the line containing pattern\n"
msgstr " +/模式/ 从包含 模式 的行开始\n"
-#: text-utils/pg.c:238
+#: text-utils/pg.c:251
#, c-format
msgid "option requires an argument -- %s"
msgstr "选项需要一个参数 -- %s"
-#: text-utils/pg.c:244
+#: text-utils/pg.c:257
#, c-format
msgid "illegal option -- %s"
msgstr "非法的参数 -- %s"
-#: text-utils/pg.c:347
+#: text-utils/pg.c:360
msgid "...skipping forward\n"
msgstr "...前进\n"
-#: text-utils/pg.c:349
+#: text-utils/pg.c:362
msgid "...skipping backward\n"
msgstr "...后退\n"
-#: text-utils/pg.c:365
+#: text-utils/pg.c:378
msgid "No next file"
msgstr "无下一个文件"
-#: text-utils/pg.c:369
+#: text-utils/pg.c:382
msgid "No previous file"
msgstr "无上一个文件"
-#: text-utils/pg.c:871
+#: text-utils/pg.c:884
#, c-format
msgid "Read error from %s file"
msgstr "从 %s 文件读出错"
-#: text-utils/pg.c:874
+#: text-utils/pg.c:887
#, c-format
msgid "Unexpected EOF in %s file"
msgstr "在 %s 文件中遇到异常 EOF"
-#: text-utils/pg.c:876
+#: text-utils/pg.c:889
#, c-format
msgid "Unknown error in %s file"
msgstr "在 %s 文件中遇到未知错误"
-#: text-utils/pg.c:929
+#: text-utils/pg.c:942
msgid "Cannot create tempfile"
msgstr "无法创建临时文件"
-#: text-utils/pg.c:938 text-utils/pg.c:1102 text-utils/pg.c:1128
+#: text-utils/pg.c:951 text-utils/pg.c:1115 text-utils/pg.c:1141
msgid "RE error: "
msgstr "表达式错误:"
-#: text-utils/pg.c:1085
+#: text-utils/pg.c:1098
msgid "(EOF)"
msgstr "(文件末尾)"
-#: text-utils/pg.c:1110 text-utils/pg.c:1136
+#: text-utils/pg.c:1123 text-utils/pg.c:1149
msgid "No remembered search string"
msgstr "没有记忆的搜索字符串"
-#: text-utils/pg.c:1191
+#: text-utils/pg.c:1204
msgid "cannot open "
msgstr "打不开 "
-#: text-utils/pg.c:1243
+#: text-utils/pg.c:1256
msgid "saved"
msgstr "已保存"
-#: text-utils/pg.c:1333
+#: text-utils/pg.c:1346
msgid ": !command not allowed in rflag mode.\n"
msgstr ": !命令 在 rflag 模式下不许使用。\n"
-#: text-utils/pg.c:1368
+#: text-utils/pg.c:1381
msgid "fork() failed, try again later\n"
msgstr "fork() 失败,请稍后重试\n"
-#: text-utils/pg.c:1456
+#: text-utils/pg.c:1469
msgid "(Next file: "
msgstr "(下个文件:"
-#: text-utils/pg.c:1522
+#: text-utils/pg.c:1535
#, c-format
msgid "%s %s Copyright (c) 2000-2001 Gunnar Ritter. All rights reserved.\n"
msgstr "%s %s Copyright (c) 2000-2001 Gunnar Ritter. All rights reserved.\n"
-#: text-utils/pg.c:1575 text-utils/pg.c:1648
+#: text-utils/pg.c:1588 text-utils/pg.c:1661
msgid "failed to parse number of lines per page"
msgstr "解析每页的行数失败"
@@ -16645,27 +17077,9 @@ msgstr "解析每页的行数失败"
msgid "Usage: %s [options] [file ...]\n"
msgstr "用法:%s [选项] [文件 ...]\n"
-#: text-utils/rev.c:80
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-msgstr ""
-"\n"
-"选项:\n"
-" -V, --version 输出版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
-
-#: text-utils/rev.c:84
-#, c-format
-msgid ""
-"\n"
-"For more information see rev(1).\n"
+#: text-utils/rev.c:81
+msgid "Reverse lines characterwise.\n"
msgstr ""
-"\n"
-"更多信息请参阅 rev(1)。\n"
#: text-utils/tailf.c:114
#, c-format
@@ -16678,40 +17092,29 @@ msgid "%s: cannot add inotify watch (limit of inotify watches was reached)."
msgstr "%s:无法添加 inotify 观察(达到了 inotify 观察数限制)。"
#: text-utils/tailf.c:197
-#, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [option] file\n"
-msgstr ""
-"\n"
-"用法:\n"
-" %s [选项] 文件\n"
+#, fuzzy, c-format
+msgid " %s [option] <file>\n"
+msgstr " %s [选项] <文件>\n"
-#: text-utils/tailf.c:202
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-" -n, --lines NUMBER output the last NUMBER lines\n"
-" -NUMBER same as `-n NUMBER'\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
+#: text-utils/tailf.c:200
+msgid "Follow the growth of a log file.\n"
msgstr ""
-"\n"
-"选项:\n"
-" -n, --lines NUMBER 输出最后 NUMBER 行\n"
-" -NUMBER 同“-n NUMBER”\n"
-" -V, --version 输出版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
-"\n"
-#: text-utils/tailf.c:220 text-utils/tailf.c:261
+#: text-utils/tailf.c:203
+#, fuzzy
+msgid " -n, --lines <number> output the last <number> lines\n"
+msgstr " -C, --cylinders <数字> 指定柱面数\n"
+
+#: text-utils/tailf.c:204
+#, fuzzy
+msgid " -<number> same as '-n <number>'\n"
+msgstr " -<数字> 显示行数\n"
+
+#: text-utils/tailf.c:223 text-utils/tailf.c:264
msgid "failed to parse number of lines"
msgstr "解析行数失败"
-#: text-utils/tailf.c:274
+#: text-utils/tailf.c:276
msgid "no input file specified"
msgstr "未指定输入文件"
@@ -16721,31 +17124,947 @@ msgid " %s [options] [<file> ...]\n"
msgstr " %s [选项] [<文件> ...]\n"
#: text-utils/ul.c:139
+msgid "Do underlining.\n"
+msgstr ""
+
+#: text-utils/ul.c:142
msgid " -t, -T, --terminal TERMINAL override the TERM environment variable\n"
msgstr " -t, -T, --terminal TERMINAL 用 TERMINAL 覆盖 TERM 环境变量的值\n"
-#: text-utils/ul.c:140
+#: text-utils/ul.c:143
msgid " -i, --indicated underlining is indicated via a separate line\n"
msgstr " -i, --indicated 通过单独一行表示下划线\n"
-#: text-utils/ul.c:211
+#: text-utils/ul.c:204
msgid "trouble reading terminfo"
msgstr "读取终端信息出错"
-#: text-utils/ul.c:216
+#: text-utils/ul.c:209
#, c-format
msgid "terminal `%s' is not known, defaulting to `dumb'"
msgstr "终端“%s”未知,将使用默认值“dumb”"
-#: text-utils/ul.c:312
+#: text-utils/ul.c:299
#, c-format
msgid "unknown escape sequence in input: %o, %o"
msgstr "输入中有未知转义序列:%o,%o"
-#: text-utils/ul.c:647
+#: text-utils/ul.c:630
msgid "Input line too long."
msgstr "输入行过长。"
+#~ msgid "Please, select a type to create a new disk label."
+#~ msgstr "请选择创建新磁盘标签的类型。"
+
+#~ msgid "Usage: %s [options] device\n"
+#~ msgstr "用法:%s [选项] 设备\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -n, --no-verify disable the verification after the format\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -h, --help display this help and exit\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "选项:\n"
+#~ " -n, --no-verify 禁止格式化后的校验\n"
+#~ " -V, --version 输出版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+#~ "\n"
+
+#~ msgid "Usage:\n"
+#~ msgstr "用法:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information see mkfs(8).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "更多信息请参阅 mkfs(8)。\n"
+
+#~ msgid "%s (%s)\n"
+#~ msgstr "%s (%s)\n"
+
+#~ msgid "Bad swap header size, no label written."
+#~ msgstr "交换头(header)大小有误,未写入标签。"
+
+#~ msgid "seek error on %s - cannot seek to %lu"
+#~ msgstr "在 %s 上定位出错 - 无法定位到 %lu"
+
+#~ msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x"
+#~ msgstr "定位出错:想要 0x%08x%08x,得到了 0x%08x%08x"
+
+#~ msgid "read error on %s - cannot read sector %llu"
+#~ msgstr "在 %s 上定位出错 - 无法定位到 %llu"
+
+#~ msgid "write error on %s - cannot write sector %llu"
+#~ msgstr "在 %s 上定位出错 - 无法定位到 %llu"
+
+#~ msgid "cannot open partition sector save file (%s)"
+#~ msgstr "打不开分区扇区保存文件(%s)"
+
+#~ msgid "write error on %s"
+#~ msgstr "%s 写出错"
+
+#~ msgid "cannot stat partition restore file (%s)"
+#~ msgstr "无法 stat 分区恢复文件(%s)"
+
+#~ msgid "partition restore file has wrong size - not restoring"
+#~ msgstr "分区恢复文件大小有误 - 将不恢复"
+
+#~ msgid "cannot open partition restore file (%s)"
+#~ msgstr "无法打开分区恢复文件(%s)"
+
+#~ msgid "error reading %s"
+#~ msgstr "读 %s 出错"
+
+#~ msgid "cannot open device %s for writing"
+#~ msgstr "不能打开 %s 以写入"
+
+#~ msgid "error writing sector %lu on %s"
+#~ msgstr "写 %2$s 上的 %1$lu 扇区出错"
+
+#~ msgid "Disk %s: cannot get geometry"
+#~ msgstr "磁盘 %s:无法获取几何属性"
+
+#~ msgid "Disk %s: cannot get size"
+#~ msgstr "磁盘 %s:无法获取尺寸"
+
+#~ msgid ""
+#~ "Warning: start=%lu - this looks like a partition rather than\n"
+#~ "the entire disk. Using fdisk on it is probably meaningless.\n"
+#~ "[Use the --force option if you really want this]"
+#~ msgstr ""
+#~ "警告:起点为%lu - 这似乎是一个分区,而不是整个盘。对它执行\n"
+#~ "fdisk 可能没有意义。[如果您真想这么做,请使用 --force 选项]"
+
+#~ msgid "Warning: HDIO_GETGEO says that there are %lu heads"
+#~ msgstr "警告:HDIO_GETGEO 表明有 %lu 个磁头"
+
+#~ msgid "Warning: HDIO_GETGEO says that there are %lu sectors"
+#~ msgstr "警告:HDIO_GETGEO 表明有 %lu 个扇区"
+
+#~ msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders"
+#~ msgstr "警告:BLKGETSIZE/HDIO_GETGEO 表明有 %lu 个柱面"
+
+#~ msgid ""
+#~ "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
+#~ "This will give problems with all software that uses C/H/S addressing."
+#~ msgstr ""
+#~ "警告:扇区数异常(%lu) - 通常最多是 63\n"
+#~ "这会给所有使用 C/H/S 地址的软件带来问题。"
+
+#~ msgid ""
+#~ "\n"
+#~ "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
+#~ msgstr ""
+#~ "\n"
+#~ "磁盘 %s:%lu 个柱面,%lu 个磁头,%lu 个扇区/磁道\n"
+
+#~ msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)"
+#~ msgstr "分区 %2$s 的 %1$s 的磁头数有误:%3$lu (应在 0-%4$lu 范围)"
+
+#~ msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)"
+#~ msgstr "分区 %2$s 的 %1$s 的扇区数有误:%3$lu (应在 1-%4$lu 范围)"
+
+#~ msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)"
+#~ msgstr "分区 %2$s 的 %1$s 的柱面数有误:%3$lu (应在 0-%4$lu 范围)"
+
+#~ msgid "Re-reading the partition table ...\n"
+#~ msgstr "正在重新读取分区表...;\n"
+
+#~ msgid ""
+#~ "The command to re-read the partition table failed.\n"
+#~ "Run partprobe(8), kpartx(8) or reboot your system now,\n"
+#~ "before using mkfs"
+#~ msgstr ""
+#~ "重新读取分区表的命令失败。\n"
+#~ "在使用 mkfs 前,请先运行 partprobe(8)、kpartx(8) 或\n"
+#~ "重启系统。"
+
+#~ msgid "Error closing %s"
+#~ msgstr "关闭 %s 出错"
+
+#~ msgid "%s: no such partition\n"
+#~ msgstr "%s:没有此分区\n"
+
+#~ msgid "unrecognized format - using sectors"
+#~ msgstr "无法识别的格式 - 将使用扇区"
+
+#~ msgid "unimplemented format - using %s"
+#~ msgstr "未实现的格式 - 将使用 %s"
+
+#~ msgid "sectors"
+#~ msgstr "扇区"
+
+#~ msgid ""
+#~ "Units: cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
+#~ "\n"
+#~ msgstr ""
+#~ "单位:%lu 的柱面,1024字节的块,从 %d 开始计算\n"
+#~ "\n"
+
+#~ msgid " Device Boot Start End #cyls #blocks Id System\n"
+#~ msgstr " 设备 启动 开头 结束 #柱面 #块 Id 系统\n"
+
+#~ msgid ""
+#~ "Units: sectors of 512 bytes, counting from %d\n"
+#~ "\n"
+#~ msgstr ""
+#~ "单位:512字节的扇区,从 %d 开始计算\n"
+#~ "\n"
+
+#~ msgid " Device Boot Start End #sectors Id System\n"
+#~ msgstr " 设备 启动 开头 结束 #扇区 Id 系统\n"
+
+#~ msgid ""
+#~ "Units: blocks of 1024 bytes, counting from %d\n"
+#~ "\n"
+#~ msgstr ""
+#~ "单位:1024字节的块,从 %d 开始计算\n"
+#~ "\n"
+
+#~ msgid " Device Boot Start End #blocks Id System\n"
+#~ msgstr " 设备 启动 开头 结束 #块 Id 系统\n"
+
+#~ msgid ""
+#~ "Units: 1MiB = 1024*1024 bytes, blocks of 1024 bytes, counting from %d\n"
+#~ "\n"
+#~ msgstr ""
+#~ "单位:1MiB = 1024*1024 字节,1024字节的块,从 %d 开始计算\n"
+#~ "\n"
+
+#~ msgid " Device Boot Start End MiB #blocks Id System\n"
+#~ msgstr " 设备 启动 开头 结束 MiB #块 Id 系统\n"
+
+#~ msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+#~ msgstr "\t\t开头:(c,h,s) 应为 (%ld,%ld,%ld) 找到的为 (%ld,%ld,%ld)\n"
+
+#~ msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+#~ msgstr "\t\t结束:(c,h,s) 应为 (%ld,%ld,%ld) 找到的为 (%ld,%ld,%ld)\n"
+
+#~ msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
+#~ msgstr "分区结束在柱面 %ld,超过了磁盘的末尾\n"
+
+#~ msgid ""
+#~ "Warning: The partition table looks like it was made\n"
+#~ " for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
+#~ "For this listing I'll assume that geometry."
+#~ msgstr ""
+#~ "警告:分区表似乎是为 C/H/S=*/%ld/%ld 制作的\n"
+#~ "(而非 %ld/%ld/%ld)。\n"
+#~ "对这次列表程序将使用该几何属性。"
+
+#~ msgid "no partition table present"
+#~ msgstr "不存在分区表"
+
+#~ msgid "strange, only %d partition defined"
+#~ msgid_plural "strange, only %d partitions defined"
+#~ msgstr[0] "异常,只定义了 %d 个分区"
+
+#~ msgid "Warning: partition %s has size 0 but is not marked Empty"
+#~ msgstr "警告:分区 %s 大小为 0 但未标记为 空"
+
+#~ msgid "Warning: partition %s has size 0 and is bootable"
+#~ msgstr "警告:分区 %s 大小为 0 并且标记了 可启动"
+
+#~ msgid "Warning: partition %s has size 0 and nonzero start"
+#~ msgstr "警告:分区 %s 大小为 0 且起始位置不为 0"
+
+#~ msgid "Warning: partition %s is not contained in partition %s"
+#~ msgstr "警告:分区 %s 未包含在分区 %s 中"
+
+#~ msgid "Warning: partitions %s and %s overlap"
+#~ msgstr "警告:分区 %s 和 %s 有重叠"
+
+#~ msgid ""
+#~ "Warning: partition %s contains part of the partition table (sector %llu),\n"
+#~ "and will destroy it when filled"
+#~ msgstr "警告:分区 %s 包含部分分区表(%llu),填充会破坏它。"
+
+#~ msgid "Warning: partition %s starts at sector 0"
+#~ msgstr "警告:分区 %s 起始于扇区 0"
+
+#~ msgid "Warning: partition %s extends past end of disk"
+#~ msgstr "警告:分区 %s 超出了磁盘终点"
+
+#~ msgid ""
+#~ "Warning: partition %s has size %d.%d TB (%llu bytes),\n"
+#~ "which is larger than the %llu bytes limit imposed\n"
+#~ "by the DOS partition table for %d-byte sectors"
+#~ msgstr ""
+#~ "警告:分区 %s 大小为 %d.%d TB (%llu 字节),大于\n"
+#~ "%llu 字节(DOS 分区表对 %d-字节扇区的强制限定值)"
+
+#~ msgid ""
+#~ "Warning: partition %s starts at sector %llu (%d.%d TB for %d-byte sectors),\n"
+#~ "which exceeds the DOS partition table limit of %llu sectors"
+#~ msgstr ""
+#~ "警告:分区 %s 起点为第 %llu 扇区 (%d.%d TB,对于 %d-字节扇区),\n"
+#~ "这超过了 DOS 分区表 %llu 个扇区的限制"
+
+#~ msgid ""
+#~ "Among the primary partitions, at most one can be extended\n"
+#~ " (although this is not a problem under Linux)"
+#~ msgstr ""
+#~ "主分区中只有一个可设为扩展分区\n"
+#~ "(尽管 Linux 下不存在这个问题)"
+
+#~ msgid "Warning: partition %s does not start at a cylinder boundary"
+#~ msgstr "警告:分区 %s 未起始于柱面边界。"
+
+#~ msgid "Warning: partition %s does not end at a cylinder boundary"
+#~ msgstr "警告:分区 %s 未结束于柱面边界。"
+
+#~ msgid ""
+#~ "Warning: more than one primary partition is marked bootable (active)\n"
+#~ "This does not matter for LILO, but the DOS MBR will not boot this disk."
+#~ msgstr ""
+#~ "超过一个主分区被标记为 可启动(活动)。这对 LILO 没有影响,但 \n"
+#~ "DOS MBR 将无法启动该磁盘。"
+
+#~ msgid ""
+#~ "Warning: usually one can boot from primary partitions only\n"
+#~ "LILO disregards the `bootable' flag."
+#~ msgstr ""
+#~ "警告:通常只能从主分区启动\n"
+#~ "LILO 会忽略“可启动”标志。"
+
+#~ msgid ""
+#~ "Warning: no primary partition is marked bootable (active)\n"
+#~ "This does not matter for LILO, but the DOS MBR will not boot this disk."
+#~ msgstr ""
+#~ "警告:没有一个主分区被标记为 可启动(活动)。这对 LILO 没有影响,但 \n"
+#~ "DOS MBR 将无法启动该磁盘。"
+
+#~ msgid "start"
+#~ msgstr "起点"
+
+#~ msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)"
+#~ msgstr "分区 %s:起点:(c,h,s) 应为 (%ld,%ld,%ld) 找到的为 (%ld,%ld,%ld)"
+
+#~ msgid "end"
+#~ msgstr "末尾"
+
+#~ msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)"
+#~ msgstr "分区 %s:终点:(c,h,s) 应为 (%ld,%ld,%ld) 找到的为 (%ld,%ld,%ld)"
+
+#~ msgid "partition %s ends on cylinder %ld, beyond the end of the disk"
+#~ msgstr "分区 %s 结束于 %ld,超出了磁盘的末尾"
+
+#~ msgid ""
+#~ "Warning: shifted start of the extd partition from %lld to %lld\n"
+#~ "(For listing purposes only. Do not change its contents.)"
+#~ msgstr ""
+#~ "警告:扩展分区的起点从 %lld 移到了 %lld\n"
+#~ "(仅用于列表。不改变其内容。)"
+
+#~ msgid ""
+#~ "Warning: extended partition does not start at a cylinder boundary.\n"
+#~ "DOS and Linux will interpret the contents differently."
+#~ msgstr ""
+#~ "警告:扩展分区未开始于柱面边界处。\n"
+#~ "DOS 和 Linux 对其内容的解释会有分歧。"
+
+#~ msgid "ERROR: sector %llu does not have an msdos signature"
+#~ msgstr "错误:扇区 %llu 没有 msdos 签名"
+
+#~ msgid "too many partitions - ignoring those past nr (%zu)"
+#~ msgstr "分区过多 - 将忽略超过 nr (%zu) 的那些分区"
+
+#~ msgid "tree of partitions?"
+#~ msgstr "分区树?"
+
+#~ msgid "detected Disk Manager - unable to handle that"
+#~ msgstr "检测到磁盘管理器 - 无法处理它"
+
+#~ msgid "DM6 signature found - giving up"
+#~ msgstr "找到 DM6 签名 - 将放弃"
+
+#~ msgid "strange..., an extended partition of size 0?"
+#~ msgstr "不对呀...,一个大小为 0 的扩展分区?"
+
+#~ msgid "strange..., a BSD partition of size 0?"
+#~ msgstr "不对呀...,一个大小为 0 的 BSD 分区?"
+
+#~ msgid "-n flag was given: Nothing changed"
+#~ msgstr "指定了 -n 标志:未做更改"
+
+#~ msgid "Failed saving the old sectors - aborting\n"
+#~ msgstr "保存旧扇区失败 - 将中止\n"
+
+#~ msgid "Failed writing the partition on %s"
+#~ msgstr "写 %s 上的分区失败"
+
+#~ msgid "long or incomplete input line - quitting"
+#~ msgstr "输入行太长或不完整 - 将退出"
+
+#~ msgid "input error: `=' expected after %s field"
+#~ msgstr "输入错误:%s 字段后应为“=”"
+
+#~ msgid "input error: unexpected character %c after %s field"
+#~ msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
+
+#~ msgid "unrecognized input: %s"
+#~ msgstr "无法识别的输入:%s"
+
+#~ msgid "number too big"
+#~ msgstr "数字过大"
+
+#~ msgid "trailing junk after number"
+#~ msgstr "数字后有垃圾内容"
+
+#~ msgid "no room for partition descriptor"
+#~ msgstr "没有空间放置分区描述符"
+
+#~ msgid "cannot build surrounding extended partition"
+#~ msgstr "无法创建环绕扩展分区"
+
+#~ msgid "too many input fields"
+#~ msgstr "输入字段过多"
+
+#~ msgid "No room for more"
+#~ msgstr "空间不足"
+
+#~ msgid "Illegal type"
+#~ msgstr "非法类型"
+
+#~ msgid "Warning: given size (%llu) exceeds max allowable size (%llu)"
+#~ msgstr "警告:指定大小(%llu)超过了最大允许大小(%llu)"
+
+#~ msgid "Warning: empty partition"
+#~ msgstr "警告:空分区"
+
+#~ msgid "Warning: bad partition start (earliest %llu)"
+#~ msgstr "警告:分区起点有误(最早 %llu)"
+
+#~ msgid "unrecognized bootable flag - choose - or *"
+#~ msgstr "无法识别的可启动标志 - 选择 - 或 *"
+
+#~ msgid "partial c,h,s specification?"
+#~ msgstr "不完整的 c,h,s 说明?"
+
+#~ msgid "bad input"
+#~ msgstr "输入错误"
+
+#~ msgid "too many partitions"
+#~ msgstr "分区过多"
+
+#~ msgid ""
+#~ "Input in the following format; absent fields get a default value.\n"
+#~ "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
+#~ "Usually you only need to specify <start> and <size> (and perhaps <type>)."
+#~ msgstr ""
+#~ "按以下格式输入,未指定的字段将以默认值填充。\n"
+#~ "<起始> <大小> <类型 [E,S,L,X,hex]> <可启动 [-,*]> <c,h,s> <c,h,s>\n"
+#~ "通常您只须指定 <起始> 和 <大小> (可能还要指定 <类型>)。"
+
+#~ msgid " %s [options] <device>...\n"
+#~ msgstr " %s [选项] <设备>...\n"
+
+#~ msgid ""
+#~ " -s, --show-size list size of a partition\n"
+#~ " -c, --id change or print partition Id\n"
+#~ " --change-id change Id\n"
+#~ " --print-id print Id\n"
+#~ msgstr ""
+#~ " -s, --show-size 列出每个分区的大小\n"
+#~ " -c, --id 更改或打印分区 Id\n"
+#~ " --change-id 更改 Id\n"
+#~ " --print-id 打印 Id\n"
+
+#~ msgid ""
+#~ " -l, --list list partitions of each device\n"
+#~ " -d, --dump idem, but in a format suitable for later input\n"
+#~ " -i, --increment number cylinders etc. from 1 instead of from 0\n"
+#~ " -u, --unit <letter> units to be used; <letter> can be one of\n"
+#~ " S (sectors), C (cylinders), B (blocks), or M (MB)\n"
+#~ msgstr ""
+#~ " -l, --list 列出每个设备的分区\n"
+#~ " -d, --dump 同上,但以适合稍后输入的格式列出\n"
+#~ " -i, --increment 给柱面等计数时从 1 而非从 0 开始\n"
+#~ " -u, --unit <字母> 要使用的单位;<字母> 可以是以下之一\n"
+#~ " S(扇区),C(柱面),B(块)或 M(MB)\n"
+
+#~ msgid ""
+#~ " -1, --one-only reserved option that does nothing currently\n"
+#~ " -T, --list-types list the known partition types\n"
+#~ " -D, --DOS for DOS-compatibility: waste a little space\n"
+#~ " -E, --DOS-extended DOS extended partition compatibility\n"
+#~ " -R, --re-read make the kernel reread the partition table\n"
+#~ msgstr ""
+#~ " -1, --one-only 预留选项,目前没有作用\n"
+#~ " -T, --list-types 列出已知的分区类型\n"
+#~ " -D, --DOS 与 DOS 兼容;会浪费一点空间\n"
+#~ " -E, --DOS-extended 与 DOS 扩展分区兼容\n"
+#~ " -R, --re-read 让内核重新读取分区表\n"
+
+#~ msgid ""
+#~ " -N <number> change only the partition with this <number>\n"
+#~ " -n do not actually write to disk\n"
+#~ " -O <file> save the sectors that will be overwritten to <file>\n"
+#~ " -I <file> restore sectors from <file>\n"
+#~ msgstr ""
+#~ " -N <数字> 只更改分区号为 <数字> 的分区\n"
+#~ " -n 并不真的写入磁盘\n"
+#~ " -O <文件> 将要覆盖的分区保存到 <文件> 中\n"
+#~ " -I <文件> 从 <文件> 恢复扇区\n"
+
+#~ msgid ""
+#~ " -V, --verify check that the listed partitions are reasonable\n"
+#~ " -v, --version display version information and exit\n"
+#~ " -h, --help display this help text and exit\n"
+#~ msgstr ""
+#~ " -V, --verify 检查列出扇区的有效性\n"
+#~ " -v, --version 显示版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dangerous options:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "危险选项:\n"
+
+#~ msgid ""
+#~ " -f, --force disable all consistency checking\n"
+#~ " --no-reread do not check whether the partition is in use\n"
+#~ " -q, --quiet suppress warning messages\n"
+#~ " -L, --Linux do not complain about things irrelevant for Linux\n"
+#~ msgstr ""
+#~ " -f, --force 禁止所有一致性检查\n"
+#~ " --no-reread 不检查分区是否正在使用\n"
+#~ " -q, --quiet 抑制警告消息输出\n"
+#~ " -L, --Linux 不报告与 Linux 无关的事情\n"
+
+#~ msgid ""
+#~ " -g, --show-geometry print the kernel's idea of the geometry\n"
+#~ " -G, --show-pt-geometry print geometry guessed from the partition table\n"
+#~ msgstr ""
+#~ " -g, --show-geometry 打印内核检测到的几何属性\n"
+#~ " -G, --show-pt-geometry 打印从分区表推测出的几何属性\n"
+
+#~ msgid ""
+#~ " -A, --activate[=<device>] activate the bootable flag\n"
+#~ " -U, --unhide[=<device>] set partition as unhidden\n"
+#~ " -x, --show-extended also list extended partitions in the output,\n"
+#~ " or expect descriptors for them in the input\n"
+#~ msgstr ""
+#~ " -A, --activate[=<设备>] 激活 可启动 标志\n"
+#~ " -U, --unhide[=<设备>] 取消分区隐藏\n"
+#~ " -x, --show-extended 输出时也列出扩展分区,\n"
+#~ " 或输入时请求提供它们的描述符\n"
+
+#~ msgid ""
+#~ " --leave-last do not allocate the last cylinder\n"
+#~ " --IBM same as --leave-last\n"
+#~ msgstr ""
+#~ " --leave-last 不分配最后一个柱面\n"
+#~ " --IBM 同 --leave-last\n"
+
+#~ msgid ""
+#~ " --in-order partitions are in order\n"
+#~ " --not-in-order partitions are not in order\n"
+#~ " --inside-outer all logicals inside outermost extended\n"
+#~ " --not-inside-outer not all logicals inside outermost extended\n"
+#~ msgstr ""
+#~ " --in-order 分区按顺序\n"
+#~ " --not-in-order 分区不按顺序\n"
+#~ " --inside-outer 所有逻辑分区位于最外的扩展分区内\n"
+#~ " --not-inside-outer 不要求所有逻辑分区位于最外的扩展分区内\n"
+
+#~ msgid ""
+#~ " --nested every partition is disjoint from all others\n"
+#~ " --chained like nested, but extended partitions may lie outside\n"
+#~ " --onesector partitions are mutually disjoint\n"
+#~ msgstr ""
+#~ " --nested 每个分区与所有其他分区不相交\n"
+#~ " --chained 与 nested 相似,但扩展分区可以超界\n"
+#~ " --onesector 各分区互不相交\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Override the detected geometry using:\n"
+#~ " -C, --cylinders <number> set the number of cylinders to use\n"
+#~ " -H, --heads <number> set the number of heads to use\n"
+#~ " -S, --sectors <number> set the number of sectors to use\n"
+#~ msgstr ""
+#~ "\n"
+#~ "用以下选项覆盖检测到的几何属性:\n"
+#~ " -C, --cylinders <数字> 设置要使用的柱面数\n"
+#~ " -H, --heads <数字> 设置要使用的磁头数\n"
+#~ " -S, --sectors <数字> 设置要使用的扇区数n\n"
+
+#~ msgid " %s%sdevice list active partitions on device\n"
+#~ msgstr " %s%sdevice 列出设备上的活动分区\n"
+
+#~ msgid " %s%sdevice n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
+#~ msgstr " %s%s设备 n1 n2 ... 激活分区 n1 ..., 取消激活其他分区\n"
+
+#~ msgid "invalid number of partitions argument"
+#~ msgstr "无效的 分区数 参数"
+
+#~ msgid "cannot open %s\n"
+#~ msgstr "打不开 %s\n"
+
+#~ msgid "usage: sfdisk --print-id device partition-number"
+#~ msgstr "用法:sfdisk --print-id 设备 分区号"
+
+#~ msgid "usage: sfdisk --change-id device partition-number Id"
+#~ msgstr "用法:sfdisk --change-id 设备 分区号 Id"
+
+#~ msgid "usage: sfdisk --id device partition-number [Id]"
+#~ msgstr "用法:sfdisk --id 设备 分区号 [Id]"
+
+#~ msgid "can specify only one device (except with -l or -s)"
+#~ msgstr "只能指定一台设备(除非指定 -l 或 -s)"
+
+#~ msgid "cannot open %s read-write"
+#~ msgstr "不能以读写方式打开 %s"
+
+#~ msgid "cannot open %s for reading"
+#~ msgstr "不能以读方式打开 %s"
+
+#~ msgid "%s: OK"
+#~ msgstr "%s:OK"
+
+#~ msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
+#~ msgstr "%s:%ld 个柱面,%ld 个磁头,%ld 个扇区/磁道\n"
+
+#~ msgid "bad active byte: 0x%x instead of 0x80"
+#~ msgstr "错误的 活动 字节:0x%x 而非 0x80"
+
+#~ msgid "Done"
+#~ msgstr "完成"
+
+#~ msgid ""
+#~ "You have %d active primary partitions. This does not matter for LILO,\n"
+#~ "but the DOS MBR will only boot a disk with 1 active partition."
+#~ msgstr ""
+#~ "您有 %d 个活动的主分区。这对 LILO 没有影响,但 DOS MBR 只能启动带一个活动分区\n"
+#~ "的磁盘。"
+
+#~ msgid "partition %s has id %x and is not hidden"
+#~ msgstr "分区 %s 标识为 %x,不是隐藏的"
+
+#~ msgid "Bad Id %lx"
+#~ msgstr "错误的 Id %lx"
+
+#~ msgid "This disk is currently in use."
+#~ msgstr "此分区正在使用中。"
+
+#~ msgid "Fatal error: cannot find %s"
+#~ msgstr "致命错误:找不到 %s"
+
+#~ msgid "Warning: %s is not a block device"
+#~ msgstr "警告:%s 不是一个块设备"
+
+#~ msgid "OK"
+#~ msgstr "正常"
+
+#~ msgid "Partition %d does not exist, cannot change it"
+#~ msgstr "分区 %d 不存在,无法更改它"
+
+#~ msgid ""
+#~ "I don't like these partitions - nothing changed.\n"
+#~ "(If you really want this, use the --force option.)"
+#~ msgstr ""
+#~ "我不愿这样分区 - 未做更改。\n"
+#~ "(如果您真的想这样做,可使用 --force 选项。)"
+
+#~ msgid "I don't like this - probably you should answer No"
+#~ msgstr "我不愿这样做 - 建议您取消"
+
+#~ msgid "Are you satisfied with this? [ynq] "
+#~ msgstr "这样您满意吗?[ynq] "
+
+#~ msgid "Quitting - nothing changed"
+#~ msgstr "将退出 - 未做更改"
+
+#~ msgid "Please answer one of y,n,q\n"
+#~ msgstr "请回答 y, n 或 q\n"
+
+#~ msgid ""
+#~ "Successfully wrote the new partition table\n"
+#~ "\n"
+#~ msgstr ""
+#~ "成功写入了新分区表\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
+#~ "to zero the first 512 bytes: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+#~ "(See fdisk(8).)"
+#~ msgstr ""
+#~ "如果您创建或更改了 DOS 分区,如 /dev/foo7,请使用 dd(1)\n"
+#~ "将前 512 个字节清零:dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+#~ "(参阅 fdisk(8)。)"
+
+#~ msgid "If you have created or modified any DOS 6.x partitions, please see the fdisk documentation for additional information."
+#~ msgstr "如果您创建或修改了 DOS 6.x 分区,请查阅 cfdisk 手册页面了解其他信息。"
+
+#~ msgid "field is too long"
+#~ msgstr "字段过长"
+
+#~ msgid "%s: '%c' is not allowed"
+#~ msgstr "%s:不允许“%c”"
+
+#~ msgid "'%c' is not allowed"
+#~ msgstr "'%c' 不允许使用"
+
+#~ msgid "%s: control characters are not allowed"
+#~ msgstr "%s:不允许使用控制字符"
+
+#~ msgid "control characters are not allowed"
+#~ msgstr "不允许使用控制字符"
+
+#~ msgid " -m, --supp-groups display supplementary groups as well\n"
+#~ msgstr " -m, --supp-groups 也显示附属组\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more details see lslogins(1).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "更多细节参见 lslogins(1)。\n"
+
+#~ msgid "crypt() failed"
+#~ msgstr "crypt() 失败"
+
+#~ msgid " -h, --help This small usage guide\n"
+#~ msgstr " -h, --help 这个简短的用法指南\n"
+
+#~ msgid " -V, --version Output version information\n"
+#~ msgstr " -V, --version 输出版本信息\n"
+
+#~ msgid ""
+#~ " -a, --alternative use alternative dictionary\n"
+#~ " -d, --alphanum compare only alphanumeric characters\n"
+#~ " -f, --ignore-case ignore case differences when comparing\n"
+#~ " -t, --terminate <char> define string termination character\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -h, --help display this help and exit\n"
+#~ "\n"
+#~ msgstr ""
+#~ " -a, --alternative 使用替代词典\n"
+#~ " -d, --alphanum 只比较字母和数字\n"
+#~ " -f, --ignore-case 比较时忽略大小写\n"
+#~ " -t, --terminate <字符> 定义字符串终止字符\n"
+#~ " -V, --version 输出版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information see namei(1).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "更多信息参见 namei(1)。\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information see wipefs(8).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "更多信息请参阅 wipefs(8)。\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information see taskset(1).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "更多信息请参阅 taskset(1)。\n"
+
+#~ msgid "%s: is removable device"
+#~ msgstr "%s 不是可移动设备"
+
+#~ msgid "%s: connected by hotplug subsystem: %s"
+#~ msgstr "%s:已通过热插拔子系统连接:%s"
+
+#~ msgid "timeout cannot be zero"
+#~ msgstr "超时不能为零"
+
+#~ msgid "Need to insert %d second and refer time back %.6f seconds ago\n"
+#~ msgid_plural "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+#~ msgstr[0] "需要插入 %d 秒并将时间往回指 %.6f 秒\n"
+
+#~ msgid "Waiting in loop for time from KDGHWCLK to change\n"
+#~ msgstr "正在循环等待来自 KDGHWCLK 的时间更改\n"
+
+#~ msgid "KDGHWCLK ioctl to read time failed"
+#~ msgstr "用来读取时间的 KDGHWCLK ioctl 失败"
+
+#~ msgid "KDGHWCLK ioctl to read time failed in loop"
+#~ msgstr "在循环中用来读取时间的 KDGHWCLK ioctl 失败"
+
+#~ msgid "ioctl() failed to read time from %s"
+#~ msgstr "ioctl() 从 %s 读取时间失败"
+
+#~ msgid "ioctl KDSHWCLK failed"
+#~ msgstr "ioctl KDSHWCLK 失败"
+
+#~ msgid "Using the KDGHWCLK interface to m68k clock."
+#~ msgstr "将对 m68k 时钟使用 KDGHWCLK 接口。"
+
+#~ msgid "Can't open /dev/tty1 or /dev/vc/1"
+#~ msgstr "打不开 /dev/tty1 或 /dev/vc/1"
+
+#~ msgid "KDGHWCLK ioctl failed"
+#~ msgstr "KDGHWCLK ioctl 失败"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more details see lscpu(1).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "更多信息请参阅 lscpu(1)。\n"
+
+#~ msgid " %s [options] <program> [args...]\n"
+#~ msgstr " %s [选项] <程序> [参数...]\n"
+
+#~ msgid ""
+#~ " -g, --pgrp <id> interpret argument as process group ID\n"
+#~ " -n, --priority <num> specify the nice increment value\n"
+#~ " -p, --pid <id> interpret argument as process ID (default)\n"
+#~ " -u, --user <name|id> interpret argument as username or user ID\n"
+#~ " -h, --help display help text and exit\n"
+#~ " -V, --version display version information and exit\n"
+#~ msgstr ""
+#~ " -g, --pgrp <id> 将参数解释为进程组 ID\n"
+#~ " -n, --priority <数字> 指定 nice 增加值\n"
+#~ " -p, --pid <id> 将参数解释为进程 ID (默认)\n"
+#~ " -u, --user <名字|id> 将参数解释为用户名或用户 ID\n"
+#~ " -h, --help 显示帮助文本并退出\n"
+#~ " -V, --version 显示版本信息并退出\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information see renice(1).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "更多信息请参阅 renice(1)。\n"
+
+#~ msgid " %s%s [options] [program [program arguments]]\n"
+#~ msgstr " %s%s [选项] [程序 [程序参数]]\n"
+
+#~ msgid ""
+#~ " -a, --all enable all swaps from /etc/fstab\n"
+#~ " -d, --discard[=<policy>] enable swap discards, if supported by device\n"
+#~ " -e, --ifexists silently skip devices that do not exist\n"
+#~ " -f, --fixpgsz reinitialize the swap space if necessary\n"
+#~ " -p, --priority <prio> specify the priority of the swap device\n"
+#~ " -s, --summary display summary about used swap devices (DEPRECATED)\n"
+#~ " --show[=<columns>] display summary in definable table\n"
+#~ " --noheadings don't print headings, use with --show\n"
+#~ " --raw use the raw output format, use with --show\n"
+#~ " --bytes display swap size in bytes in --show output\n"
+#~ " -v, --verbose verbose mode\n"
+#~ msgstr ""
+#~ " -a, --all 启用 /etc/fstab 中的所有交换区\n"
+#~ " -b, --discard[=<策略>] 启用交换丢弃,如果设备支持\n"
+#~ " -e, --ifexists 直接跳过不存在的设备\n"
+#~ " -f, --fixpgsz 需要时重新初始化交换空间\n"
+#~ " -p, --priority <prio> 指定交换设备的优先级为 <prio>\n"
+#~ " -s, --summary 显示已使用交换设备的摘要(已废弃)\n"
+#~ " --show[=<列>] 显示可交换表格的摘要\n"
+#~ " --noheadings 不打印标题,与 --show 一起使用\n"
+#~ " --raw 使用原生输出格式,与 --show 一起使用\n"
+#~ " --bytes 在 --show 选项输出中以字节显示交换区大小\n"
+#~ " -v, --verbose 详尽模式\n"
+
+#~ msgid ""
+#~ " -V, --version output version information and exit\n"
+#~ " -h, --help display this help and exit\n"
+#~ "\n"
+#~ msgstr ""
+#~ " -V, --version 输出版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file ...]\n"
+#~ msgstr ""
+#~ "\n"
+#~ "用法:\n"
+#~ " %s [选项] [文件 ...]\n"
+
+#~ msgid ""
+#~ " -, --no-underlining suppress all underlining\n"
+#~ " -2, --half-lines print all half-lines\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -h, --help display this help and exit\n"
+#~ "\n"
+#~ msgstr ""
+#~ " -, --no-underlining 抑制所有下划线\n"
+#~ " -2, --half-lines 打印所有半线(half-line)\n"
+#~ " -V, --version 输出版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -h, --help display this help and exit\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "选项:\n"
+#~ " -V, --version 输出版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+#~ "\n"
+
+#~ msgid "calling hexdump as od has been deprecated in favor of GNU coreutils od"
+#~ msgstr "将 hexdump 作为 od 调用的方式已废弃,请转用 GNU coreutils 的 od"
+
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -h, --help display this help and exit\n"
+#~ msgstr ""
+#~ "\n"
+#~ "选项:\n"
+#~ " -V, --version 输出版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information see rev(1).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "更多信息请参阅 rev(1)。\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [option] file\n"
+#~ msgstr ""
+#~ "\n"
+#~ "用法:\n"
+#~ " %s [选项] 文件\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -n, --lines NUMBER output the last NUMBER lines\n"
+#~ " -NUMBER same as `-n NUMBER'\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -h, --help display this help and exit\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "选项:\n"
+#~ " -n, --lines NUMBER 输出最后 NUMBER 行\n"
+#~ " -NUMBER 同“-n NUMBER”\n"
+#~ " -V, --version 输出版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+#~ "\n"
+
#~ msgid "Type of the partition %zu is unchanged."
#~ msgstr "分区 %zu 的类型未更改。"
@@ -16897,9 +18216,6 @@ msgstr "输入行过长。"
#~ msgid "No room to create the extended partition"
#~ msgstr "没有空间来创建扩展分区"
-#~ msgid "No partition table.\n"
-#~ msgstr "无分区表。\n"
-
#~ msgid "No partition table. Starting with zero table."
#~ msgstr "无分区表。将以空表启动。"
@@ -17169,9 +18485,6 @@ msgstr "输入行过长。"
#~ msgid "Print"
#~ msgstr "打印"
-#~ msgid "Print partition table to the screen or to a file"
-#~ msgstr "向屏幕或文件打印分区表"
-
#~ msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
#~ msgstr "更改文件系统类型(DOS, Linux, OS/2 等)"
@@ -17208,9 +18521,6 @@ msgstr "输入行过长。"
#~ msgid " -h, --heads <number> set the number of heads to use\n"
#~ msgstr " -h, --heads <数字> 设置要使用的磁头数\n"
-#~ msgid " -s, --sectors <number> set the number of sectors to use\n"
-#~ msgstr " -s, --sectors <数字> 设置要使用的扇区数\n"
-
#~ msgid " -g, --guess guess a geometry from partition table\n"
#~ msgstr " -g, --guess 根据分区表推算几何属性\n"
@@ -17220,9 +18530,6 @@ msgstr "输入行过长。"
#~ msgid " -a, --arrow use arrow for highlighting the current partition\n"
#~ msgstr " -a, --arrow 用箭头突出显示当前分区\n"
-#~ msgid " --help display this help and exit\n"
-#~ msgstr " --help 显示此帮助并退出\n"
-
#~ msgid "cannot parse number of cylinders"
#~ msgstr "无法解析柱面数"
@@ -18546,9 +19853,6 @@ msgstr "输入行过长。"
#~ "\n"
#~ "警告:以柱面作为显示单位已废弃。请使用“u”命令来将单位改为扇区。\n"
-#~ msgid "Building a new DOS disklabel with disk identifier 0x%08x.\n"
-#~ msgstr "使用磁盘标识符 0x%08x 创建新的 DOS 磁盘标签。\n"
-
#~ msgid "New disk identifier (current 0x%08x): "
#~ msgstr "新磁盘标识符(当前为 0x%08x):"
@@ -18794,6 +20098,3 @@ msgstr "输入行过长。"
#~ msgid "bug in xstrndup call"
#~ msgstr "xstrndup 调用中有问题"
-
-#~ msgid "%s: offset is greater than device size"
-#~ msgstr "%s:偏移量超过设备大小"