summaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorKarel Zak2014-06-18 13:11:17 +0200
committerKarel Zak2014-06-18 13:11:17 +0200
commit0ed2f80bd043d55a6e81787a64694a073b395c69 (patch)
tree8299871e449359e8fcd523493874f71135ce3f53 /po/zh_CN.po
parentpo: update zh_CN.po (from translationproject.org) (diff)
downloadkernel-qcow2-util-linux-0ed2f80bd043d55a6e81787a64694a073b395c69.tar.gz
kernel-qcow2-util-linux-0ed2f80bd043d55a6e81787a64694a073b395c69.tar.xz
kernel-qcow2-util-linux-0ed2f80bd043d55a6e81787a64694a073b395c69.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.po11024
1 files changed, 5990 insertions, 5034 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3d3fea58b..b7ec5b887 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: util-linux-2.24-rc2\n"
"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2013-10-11 12:54+0200\n"
+"POT-Creation-Date: 2014-06-18 13:06+0200\n"
"PO-Revision-Date: 2014-05-01 10:47+0800\n"
"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -29,38 +29,37 @@ msgstr ""
msgid " %s <disk device> <partition number> <start> <length>\n"
msgstr " %s <磁盘设备> <分区号> <起点> <长度>\n"
-#: disk-utils/addpart.c:52 disk-utils/blockdev.c:275 disk-utils/blockdev.c:419
-#: disk-utils/blockdev.c:444 disk-utils/delpart.c:53 disk-utils/fdformat.c:62
-#: disk-utils/fdformat.c:154 disk-utils/fsck.c:1375
-#: disk-utils/fsck.cramfs.c:150 disk-utils/fsck.cramfs.c:511
-#: disk-utils/isosize.c:134 disk-utils/mkfs.bfs.c:187
-#: disk-utils/mkfs.cramfs.c:164 disk-utils/mkfs.cramfs.c:666
-#: disk-utils/mkfs.cramfs.c:791 disk-utils/mkfs.minix.c:753
-#: disk-utils/partx.c:933 disk-utils/resizepart.c:97
-#: disk-utils/swaplabel.c:105 fdisks/cfdisk.c:1831 fdisks/cfdisk.c:1953
-#: fdisks/cfdisk.c:2041 fdisks/fdisk.c:331 fdisks/fdisk.c:347
-#: fdisks/fdisk.c:381 fdisks/fdisk.c:534 libfdisk/src/bsd.c:521 lib/path.c:60
-#: lib/path.c:72 login-utils/islocal.c:87 login-utils/last.c:613
-#: login-utils/last-deprecated.c:245 login-utils/sulogin.c:399
-#: login-utils/sulogin.c:437 login-utils/utmpdump.c:125
-#: login-utils/utmpdump.c:344 login-utils/utmpdump.c:366
-#: login-utils/vipw.c:265 login-utils/vipw.c:283 misc-utils/findmnt.c:1019
-#: misc-utils/mcookie.c:145 misc-utils/mcookie.c:181 misc-utils/uuidd.c:221
-#: sys-utils/blkdiscard.c:135 sys-utils/cytune.c:178 sys-utils/cytune.c:404
-#: sys-utils/cytune.c:418 sys-utils/cytune.c:434 sys-utils/dmesg.c:515
-#: sys-utils/eject.c:510 sys-utils/eject.c:711 sys-utils/fallocate.c:153
-#: sys-utils/fsfreeze.c:124 sys-utils/fstrim.c:142 sys-utils/hwclock.c:265
+#: disk-utils/addpart.c:52 disk-utils/blockdev.c:276 disk-utils/blockdev.c:420
+#: disk-utils/blockdev.c:447 disk-utils/cfdisk.c:1999 disk-utils/delpart.c:53
+#: disk-utils/fdformat.c:62 disk-utils/fdformat.c:154 disk-utils/fdisk.c:702
+#: disk-utils/fdisk.c:718 disk-utils/fdisk.c:758 disk-utils/fdisk.c:924
+#: disk-utils/fsck.c:1424 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/mkfs.cramfs.c:666 disk-utils/mkfs.cramfs.c:793
+#: 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:644 login-utils/last-deprecated.c:245
+#: login-utils/sulogin.c:461 login-utils/sulogin.c:499
+#: 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:1043 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:359
+#: sys-utils/fsfreeze.c:124 sys-utils/fstrim.c:81 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:112 sys-utils/rtcwake.c:106
+#: 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:521 sys-utils/setpriv.c:544 sys-utils/swapon.c:322
-#: sys-utils/swapon.c:488 sys-utils/switch_root.c:158 sys-utils/wdctl.c:310
-#: sys-utils/wdctl.c:366 term-utils/script.c:208 term-utils/script.c:233
-#: term-utils/script.c:568 term-utils/scriptreplay.c:197
-#: term-utils/scriptreplay.c:200 term-utils/wall.c:268 text-utils/rev.c:141
-#: text-utils/tailf.c:61 text-utils/tailf.c:98 text-utils/ul.c:232
+#: sys-utils/setpriv.c:521 sys-utils/setpriv.c:544 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:320 sys-utils/wdctl.c:376 term-utils/script.c:216
+#: term-utils/script.c:242 term-utils/script.c:681
+#: term-utils/scriptreplay.c:203 term-utils/scriptreplay.c:206
+#: term-utils/wall.c:269 text-utils/rev.c:141 text-utils/tailf.c:61
+#: text-utils/tailf.c:98 text-utils/ul.c:232
#, c-format
msgid "cannot open %s"
msgstr "打不开 %s"
@@ -81,91 +80,91 @@ msgstr "无效的长度参数"
msgid "failed to add partition"
msgstr "添加分区失败"
-#: disk-utils/blockdev.c:62
+#: disk-utils/blockdev.c:63
msgid "set read-only"
msgstr "设置只读"
-#: disk-utils/blockdev.c:69
+#: disk-utils/blockdev.c:70
msgid "set read-write"
msgstr "设置读写"
-#: disk-utils/blockdev.c:75
+#: disk-utils/blockdev.c:76
msgid "get read-only"
msgstr "获得只读"
-#: disk-utils/blockdev.c:81
+#: disk-utils/blockdev.c:82
msgid "get discard zeroes support status"
msgstr "获取 忽略零数据 支持状态"
-#: disk-utils/blockdev.c:87
+#: disk-utils/blockdev.c:88
msgid "get logical block (sector) size"
msgstr "获得逻辑块(扇区)大小"
-#: disk-utils/blockdev.c:93
+#: disk-utils/blockdev.c:94
msgid "get physical block (sector) size"
msgstr "获得物理块(扇区)大小"
-#: disk-utils/blockdev.c:99
+#: disk-utils/blockdev.c:100
msgid "get minimum I/O size"
msgstr "获得最小 I/O 大小"
-#: disk-utils/blockdev.c:105
+#: disk-utils/blockdev.c:106
msgid "get optimal I/O size"
msgstr "获得最优 I/O 大小"
-#: disk-utils/blockdev.c:111
+#: disk-utils/blockdev.c:112
msgid "get alignment offset in bytes"
msgstr "获得对齐偏移字节数"
-#: disk-utils/blockdev.c:117
+#: disk-utils/blockdev.c:118
msgid "get max sectors per request"
msgstr "获得每次请求的最大扇区数"
-#: disk-utils/blockdev.c:123
+#: disk-utils/blockdev.c:124
msgid "get blocksize"
msgstr "获得块大小"
-#: disk-utils/blockdev.c:130
+#: disk-utils/blockdev.c:131
msgid "set blocksize on file descriptor opening the block device"
msgstr "设置打开该块设备的文件描述符的块大小"
-#: disk-utils/blockdev.c:136
+#: disk-utils/blockdev.c:137
msgid "get 32-bit sector count (deprecated, use --getsz)"
msgstr "获得 32-bit 扇区数量(已废弃,请使用 --getsz)"
-#: disk-utils/blockdev.c:142
+#: disk-utils/blockdev.c:143
msgid "get size in bytes"
msgstr "获得字节大小"
# fuzzy
-#: disk-utils/blockdev.c:149
+#: disk-utils/blockdev.c:150
msgid "set readahead"
msgstr "设置 readahead"
# fuzzy
-#: disk-utils/blockdev.c:155
+#: disk-utils/blockdev.c:156
msgid "get readahead"
msgstr "获取 readahead"
# fuzzy
-#: disk-utils/blockdev.c:162
+#: disk-utils/blockdev.c:163
msgid "set filesystem readahead"
msgstr "设置文件系统 readahead"
# fuzzy
-#: disk-utils/blockdev.c:168
+#: disk-utils/blockdev.c:169
msgid "get filesystem readahead"
msgstr "获取文件系统 readahead"
-#: disk-utils/blockdev.c:172
+#: disk-utils/blockdev.c:173
msgid "flush buffers"
msgstr "刷新缓存"
-#: disk-utils/blockdev.c:176
+#: disk-utils/blockdev.c:177
msgid "reread partition table"
msgstr "重新读取分区表"
-#: disk-utils/blockdev.c:183
+#: disk-utils/blockdev.c:184
#, c-format
msgid ""
"\n"
@@ -184,45 +183,413 @@ msgstr ""
"\n"
"可用命令有:\n"
-#: disk-utils/blockdev.c:189
+#: disk-utils/blockdev.c:190
#, c-format
msgid " %-25s get size in 512-byte sectors\n"
msgstr " %-25s 获得 512-字节扇区的大小\n"
-#: disk-utils/blockdev.c:310
+#: disk-utils/blockdev.c:311
msgid "could not get device size"
msgstr "无法多得设备大小"
-#: disk-utils/blockdev.c:316
+#: disk-utils/blockdev.c:317
#, c-format
msgid "Unknown command: %s"
msgstr "未知命令: %s"
-#: disk-utils/blockdev.c:332
+#: disk-utils/blockdev.c:333
#, c-format
msgid "%s requires an argument"
msgstr "%s 需要一个参数"
-#: disk-utils/blockdev.c:369
+#: disk-utils/blockdev.c:370
#, c-format
msgid "%s failed.\n"
msgstr "%s 失败.\n"
-#: disk-utils/blockdev.c:376
+#: disk-utils/blockdev.c:377
#, c-format
msgid "%s succeeded.\n"
msgstr "%s 成功.\n"
-#: disk-utils/blockdev.c:460
+#: disk-utils/blockdev.c:456 misc-utils/lsblk.c:1075 misc-utils/lsblk.c:1082
+#, 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:468
+#: 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:123
+msgid "Bootable"
+msgstr "可启动"
+
+#: disk-utils/cfdisk.c:123
+msgid "Toggle bootable flag of the current partition"
+msgstr "开关当前分区的 可启动 标志"
+
+#: disk-utils/cfdisk.c:124
+msgid "Delete"
+msgstr "删除"
+
+#: disk-utils/cfdisk.c:124
+msgid "Delete the current partition"
+msgstr "删除当前分区"
+
+#: disk-utils/cfdisk.c:125
+msgid "New"
+msgstr "新建"
+
+#: disk-utils/cfdisk.c:125
+msgid "Create new partition from free space"
+msgstr "在剩余空间上创建新分区"
+
+#: disk-utils/cfdisk.c:126
+msgid "Quit"
+msgstr "退出"
+
+#: disk-utils/cfdisk.c:126
+msgid "Quit program without writing partition table"
+msgstr "退出程序而不写入分区表"
+
+#: disk-utils/cfdisk.c:127 libfdisk/src/bsd.c:890 libfdisk/src/dos.c:1987
+#: libfdisk/src/gpt.c:2404 libfdisk/src/sgi.c:1089 libfdisk/src/sun.c:1003
+msgid "Type"
+msgstr "类型"
+
+#: disk-utils/cfdisk.c:127
+#, fuzzy
+msgid "Change the partition type"
+msgstr "更改分区类型"
+
+#: disk-utils/cfdisk.c:128
+msgid "Help"
+msgstr "帮助"
+
+#: disk-utils/cfdisk.c:128
+msgid "Print help screen"
+msgstr "打印帮助界面"
+
+#: disk-utils/cfdisk.c:129
+msgid "Sort"
+msgstr ""
+
+#: disk-utils/cfdisk.c:129
+#, fuzzy
+msgid "Fix partitions order"
+msgstr "修复分区顺序"
+
+#: disk-utils/cfdisk.c:130
+msgid "Write"
+msgstr "写入"
+
+#: disk-utils/cfdisk.c:130
+msgid "Write partition table to disk (this might destroy data)"
+msgstr "将分区表写入磁盘(可能损坏数据)"
+
+#: disk-utils/cfdisk.c:481 disk-utils/fdisk.c:373
+#, fuzzy, c-format
+msgid "internal error: unsupported dialog type %d"
+msgstr "内部错误:不支持的对话类型 %d"
+
+#: disk-utils/cfdisk.c:1235
+#, fuzzy, c-format
+msgid "Disk: %s"
+msgstr "磁盘:%.*s"
+
+#: disk-utils/cfdisk.c:1237
+#, fuzzy, c-format
+msgid "Size: %s, %ju bytes, %ju sectors"
+msgstr "Disk %s:%s,%llu 字节,%llu 个扇区"
+
+#: disk-utils/cfdisk.c:1240
+#, fuzzy, c-format
+msgid "Label: %s, identifier: %s"
+msgstr "磁盘标识符:%s"
+
+#: disk-utils/cfdisk.c:1243
+#, fuzzy, c-format
+msgid "Label: %s"
+msgstr "标签 ID:%s"
+
+#: disk-utils/cfdisk.c:1384
+msgid "May be followed by {M,B,G,T}iB (the \"iB\" is optional) or S for sectors."
+msgstr ""
+
+#: disk-utils/cfdisk.c:1388
+#, fuzzy
+msgid "Please, specify size."
+msgstr "未指定文件名。"
+
+#: disk-utils/cfdisk.c:1410
+#, c-format
+msgid "Minimal size is %ju"
+msgstr ""
+
+#: disk-utils/cfdisk.c:1419
+#, fuzzy, c-format
+msgid "Maximal size is %ju bytes."
+msgstr "获得字节大小"
+
+#: disk-utils/cfdisk.c:1423
+#, fuzzy
+msgid "Failed to parse size."
+msgstr "解析大小失败"
+
+#: disk-utils/cfdisk.c:1478
+#, fuzzy
+msgid "Select partition type"
+msgstr "已选择分区 %d"
+
+#: disk-utils/cfdisk.c:1540 disk-utils/fdisk.c:929
+msgid "Device does not contain a recognized partition table."
+msgstr "设备不包含可识别的分区表。"
+
+#: disk-utils/cfdisk.c:1542
+#, fuzzy
+msgid "Please, select a type to create a new disk label."
+msgstr "您想创建一个 BSD 磁盘标签吗?"
+
+#: disk-utils/cfdisk.c:1547
+#, fuzzy
+msgid "Select label type"
+msgstr "非法类型"
+
+#: disk-utils/cfdisk.c:1583
+msgid "Help Screen for cfdisk"
+msgstr "cfdisk 帮助页面"
+
+# 以下三句连贯,一起翻译
+#: disk-utils/cfdisk.c:1585
+msgid "This is cfdisk, a curses based disk partitioning program, which"
+msgstr "这是 cfdisk,一款基于 curses 的磁盘分区程序,"
+
+#: disk-utils/cfdisk.c:1586
+msgid "allows you to create, delete and modify partitions on your hard"
+msgstr "您可以通过它创建、删除和修改您硬盘驱动器上的"
+
+#: disk-utils/cfdisk.c:1587
+msgid "disk drive."
+msgstr "分区。"
+
+#: disk-utils/cfdisk.c:1589
+msgid "Copyright (C) 2014 Karel Zak <kzak@redhat.com> "
+msgstr ""
+
+#: disk-utils/cfdisk.c:1590
+msgid "Based on the original cfdisk from Kevin E. Martin & aeb."
+msgstr ""
+
+# 以下两条注意对齐
+#: disk-utils/cfdisk.c:1592
+msgid "Command Meaning"
+msgstr "命令 意义"
+
+#: disk-utils/cfdisk.c:1593
+msgid "------- -------"
+msgstr "------- -------"
+
+#: disk-utils/cfdisk.c:1594
+msgid " b Toggle bootable flag of the current partition"
+msgstr " b 切换当前分区的 可启动 标志"
+
+#: disk-utils/cfdisk.c:1595
+msgid " d Delete the current partition"
+msgstr " d 删除当前分区"
+
+#: disk-utils/cfdisk.c:1596
+msgid " h Print this screen"
+msgstr " h 打印此屏幕"
+
+#: disk-utils/cfdisk.c:1597
+msgid " n Create new partition from free space"
+msgstr " n 从空闲空间创建新分区"
+
+#: disk-utils/cfdisk.c:1598
+msgid " q Quit program without writing partition table"
+msgstr " q 退出程序但不写入分区表"
+
+#: disk-utils/cfdisk.c:1599
+#, fuzzy
+msgid " t Change the partition type"
+msgstr " t 更改文件系统类型"
+
+#: disk-utils/cfdisk.c:1600
+#, fuzzy
+msgid " s Fix partitions order"
+msgstr ""
+" -s, --show 列出分区\n"
+"\n"
+
+#: disk-utils/cfdisk.c:1601
+msgid " W Write partition table to disk (must enter upper case W)"
+msgstr " W 将分区表写入磁盘(必须输入大写 W)"
+
+#: disk-utils/cfdisk.c:1602
+msgid " Since this might destroy data on the disk, you must"
+msgstr " 由于这可能破坏磁盘上的数据,您必须"
+
+#: disk-utils/cfdisk.c:1603
+msgid " either confirm or deny the write by entering `yes' or"
+msgstr " 通过输入“yes”或“no”来确实或拒绝"
+
+#: disk-utils/cfdisk.c:1604
+msgid " `no'"
+msgstr " 写入"
+
+#: disk-utils/cfdisk.c:1605
+msgid "Up Arrow Move cursor to the previous partition"
+msgstr "上箭头 光标移到上一分区"
+
+#: disk-utils/cfdisk.c:1606
+msgid "Down Arrow Move cursor to the next partition"
+msgstr "下箭头 光标移到下一分区"
+
+#: disk-utils/cfdisk.c:1607
+#, fuzzy
+msgid "Left Arrow Move cursor to the previous menu item"
+msgstr "上箭头 光标移到上一分区"
+
+#: disk-utils/cfdisk.c:1608
+#, fuzzy
+msgid "Right Arrow Move cursor to the next menu item"
+msgstr "下箭头 光标移到下一分区"
+
+#: disk-utils/cfdisk.c:1611
+msgid "Note: All of the commands can be entered with either upper or lower"
+msgstr "注:所有命令均可以大写或小写"
+
+#: disk-utils/cfdisk.c:1612
+msgid "case letters (except for Writes)."
+msgstr "字母输入(写入命令除外)。"
+
+#: disk-utils/cfdisk.c:1614
+msgid "Use lsblk(8) or partx(8) to see more details about the device."
+msgstr ""
+
+#: disk-utils/cfdisk.c:1621
+#, fuzzy
+msgid "Press a key to continue."
+msgstr "按下一个键继续"
+
+#: disk-utils/cfdisk.c:1697
+msgid "Could not toggle the flag."
+msgstr ""
+
+#: disk-utils/cfdisk.c:1707
+#, fuzzy, c-format
+msgid "Could not delete partition %zu."
+msgstr "无法删除分区 %d"
+
+#: disk-utils/cfdisk.c:1709 disk-utils/fdisk-menu.c:504
+#, fuzzy, c-format
+msgid "Partition %zu has been deleted."
+msgstr "分区 %d 已删除。"
+
+#: disk-utils/cfdisk.c:1730
+#, fuzzy
+msgid "Partition size: "
+msgstr "分区数:%d"
+
+#: disk-utils/cfdisk.c:1761
+#, fuzzy, c-format
+msgid "Changed type of the partition %zu."
+msgstr "已将分区“%s”的类型更改为“%s”。"
+
+#: disk-utils/cfdisk.c:1763
+#, fuzzy, c-format
+msgid "Type of the partition %zu is unchanged."
+msgstr "分区 %zu 的类型未更改:%s。"
+
+#: disk-utils/cfdisk.c:1778
+msgid "Device open in read-only mode"
+msgstr ""
+
+#: disk-utils/cfdisk.c:1783
+#, fuzzy
+msgid "Are you sure you want to write the partition table to disk? "
+msgstr "您确定想将分区表写入磁盘吗?(是 或 否):"
+
+#: disk-utils/cfdisk.c:1785
+msgid "Type \"yes\" or \"no\" or press ESC to left dialog."
+msgstr ""
+
+#: disk-utils/cfdisk.c:1790 login-utils/lslogins.c:209 sys-utils/lscpu.c:1233
+#: sys-utils/lscpu.c:1243
+#, c-format
+msgid "yes"
+msgstr "是"
+
+#: disk-utils/cfdisk.c:1791
+msgid "Did not write partition table to disk"
+msgstr "不将分区表写入磁盘"
+
+#: disk-utils/cfdisk.c:1796
+#, fuzzy
+msgid "Failed to write disklabel"
+msgstr "写磁盘标签失败"
+
+#: disk-utils/cfdisk.c:1799 disk-utils/fdisk-menu.c:459
+msgid "The partition table has been altered."
+msgstr "分区表已调整。"
+
+#: disk-utils/cfdisk.c:1818
+#, fuzzy
+msgid "Note that partition table entries are not in disk order now."
+msgstr "分区表记录没有按磁盘顺序。"
+
+#: disk-utils/cfdisk.c:1841
+#, fuzzy
+msgid "failed to create a new disklabel"
+msgstr "写磁盘标签失败"
+
+#: disk-utils/cfdisk.c:1849
+#, fuzzy
+msgid "failed to read partitions"
+msgstr "添加分区失败"
+
+#: disk-utils/cfdisk.c:1859 disk-utils/fdisk.c:921 disk-utils/fdisk-menu.c:451
+msgid "Device open in read-only mode."
+msgstr ""
+
+#: disk-utils/cfdisk.c:1930
+#, fuzzy, c-format
+msgid " %1$s [options] <disk>\n"
+msgstr " %s [选项] <设备>\n"
+
+#: disk-utils/cfdisk.c:1933
+#, fuzzy
+msgid " -L --color[=<when>] colorize output (auto, always or never)\n"
+msgstr " -L[=<何时>] 彩色显示输出(auto自动,always总是或never从不)\n"
+
+#: disk-utils/cfdisk.c:1970 disk-utils/fdisk.c:841 misc-utils/cal.c:378
+#: sys-utils/dmesg.c:1294 text-utils/hexdump.c:114
+msgid "unsupported color mode"
+msgstr "不支持的颜色模式"
+
+#: disk-utils/cfdisk.c:1973 include/c.h:286 schedutils/chrt.c:266
+#: schedutils/taskset.c:166 sys-utils/chcpu.c:330 sys-utils/dmesg.c:1334
+#: sys-utils/hwclock.c:1541 sys-utils/lscpu.c:1711 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:1988 disk-utils/fdisk.c:787
+msgid "failed to allocate libfdisk context"
+msgstr "分配 libfdisk 上下文失败"
+
#: disk-utils/delpart.c:14
#, c-format
msgid " %s <disk device> <partition number>\n"
@@ -287,19 +654,19 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: disk-utils/fdformat.c:145 disk-utils/fsck.cramfs.c:146
-#: disk-utils/mkfs.bfs.c:180 disk-utils/mkfs.cramfs.c:754
-#: disk-utils/mkfs.cramfs.c:788 disk-utils/mkfs.minix.c:746
-#: disk-utils/partx.c:872 login-utils/last.c:627 misc-utils/namei.c:231
-#: sys-utils/blkdiscard.c:138 sys-utils/dmesg.c:517 sys-utils/fsfreeze.c:127
-#: sys-utils/fstrim.c:136 sys-utils/swapon.c:462 sys-utils/switch_root.c:88
-#: sys-utils/switch_root.c:128 term-utils/mesg.c:124 text-utils/tailf.c:101
-#: text-utils/tailf.c:279
+#: disk-utils/fdformat.c:145 disk-utils/fsck.cramfs.c:141
+#: disk-utils/mkfs.bfs.c:180 disk-utils/mkfs.cramfs.c:753
+#: disk-utils/mkfs.cramfs.c:790 disk-utils/mkfs.minix.c:746
+#: disk-utils/partx.c:888 login-utils/last.c:658 misc-utils/namei.c:231
+#: sys-utils/blkdiscard.c:138 sys-utils/dmesg.c:515 sys-utils/fallocate.c:180
+#: sys-utils/fsfreeze.c:127 sys-utils/fstrim.c:71 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
#, c-format
msgid "stat failed %s"
msgstr "stat 失败:%s"
-#: disk-utils/fdformat.c:148 disk-utils/partx.c:930 misc-utils/lsblk.c:1255
+#: disk-utils/fdformat.c:148 disk-utils/partx.c:946 misc-utils/lsblk.c:1338
#: sys-utils/blkdiscard.c:140 sys-utils/mountpoint.c:108
#, c-format
msgid "%s: not a block device"
@@ -328,209 +695,815 @@ msgid "Single"
msgstr "单面"
#: disk-utils/fdformat.c:163 disk-utils/fsck.minix.c:1389
-#: disk-utils/mkfs.minix.c:804 disk-utils/mkswap.c:664 disk-utils/partx.c:985
-#: disk-utils/resizepart.c:108 fdisks/sfdisk.c:2983 fdisks/sfdisk.c:3035
-#: fdisks/sfdisk.c:3072 login-utils/utmpdump.c:384 sys-utils/dmesg.c:643
-#: sys-utils/wdctl.c:335 sys-utils/wdctl.c:400 term-utils/script.c:306
-#: term-utils/script.c:398 text-utils/pg.c:1236
+#: 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:2996
+#: disk-utils/sfdisk.c:3048 disk-utils/sfdisk.c:3085
+#: login-utils/utmpdump.c:385 sys-utils/dmesg.c:642 sys-utils/wdctl.c:345
+#: sys-utils/wdctl.c:410 term-utils/script.c:337 term-utils/script.c:378
+#: term-utils/script.c:490 text-utils/pg.c:1236
msgid "write failed"
msgstr "写失败"
-#: disk-utils/fsck.c:191
+#: disk-utils/fdisk.c:53
+#, fuzzy, c-format
+msgid ""
+" %1$s [options] <disk> change partition table\n"
+" %1$s [options] -l [<disk>] list partition table(s)\n"
+msgstr ""
+" %1$s [选项] <磁盘> 更改分区表\n"
+" %1$s [选项] -l <磁盘> 列出分区表\n"
+
+#: disk-utils/fdisk.c:58
+msgid " -b <size> sector size (512, 1024, 2048 or 4096)\n"
+msgstr " -b <size> 扇区大小(512, 1024, 2048 或 4096)\n"
+
+#: disk-utils/fdisk.c:59 disk-utils/fdisk.c:61
+msgid " -c[=<mode>] compatible mode: 'dos' or 'nondos' (default)\n"
+msgstr " -c[=<模式>] 兼容模式:“dos”或“nondos”(默认)\n"
+
+#: disk-utils/fdisk.c:60
+msgid " -h print this help text\n"
+msgstr " -h 显示此帮助并退出\n"
+
+#: disk-utils/fdisk.c:62
+msgid " -L[=<when>] colorize output (auto, always or never)\n"
+msgstr " -L[=<何时>] 彩色显示输出(auto自动,always总是或never从不)\n"
+
+#: disk-utils/fdisk.c:63
+msgid " -t <type> force fdisk to recognize specified partition table type only\n"
+msgstr " -t <类型> 强制 disk 只重新识别特定的分区表类型\n"
+
+#: disk-utils/fdisk.c:64
+msgid " -u[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"
+msgstr " -u[=<单位>] 显示单位:“cylinders”柱面 或“sectors”扇区(默认)\n"
+
+#: disk-utils/fdisk.c:65
+msgid " -v print program version\n"
+msgstr " -v 打印程序版本\n"
+
+#: disk-utils/fdisk.c:66
+msgid " -C <number> specify the number of cylinders\n"
+msgstr " -C <数字> 指定柱面数\n"
+
+#: disk-utils/fdisk.c:67
+msgid " -H <number> specify the number of heads\n"
+msgstr " -H <数字> 指定磁头数\n"
+
+#: disk-utils/fdisk.c:68
+msgid " -S <number> specify the number of sectors per track\n"
+msgstr " -S <数字> 指定每条磁道的扇区数\n"
+
+#: disk-utils/fdisk.c:88
+#, c-format
+msgid ""
+"\n"
+"Do you really want to quit? "
+msgstr ""
+"\n"
+"您确实要退出吗?"
+
+#: disk-utils/fdisk.c:134
+#, fuzzy, c-format
+msgid "Select (default %c): "
+msgstr "%s (%s,默认 %c):"
+
+#: disk-utils/fdisk.c:137
+#, c-format
+msgid "Using default response %c."
+msgstr "将使用默认回应 %c。"
+
+#: disk-utils/fdisk.c:150 disk-utils/fdisk.c:223 disk-utils/fdisk.c:294
+msgid "Value out of range."
+msgstr "值超出范围。"
+
+#: disk-utils/fdisk.c:179
+#, c-format
+msgid "%s (%s, default %c): "
+msgstr "%s (%s,默认 %c):"
+
+#: disk-utils/fdisk.c:182 disk-utils/fdisk.c:248
+#, fuzzy, c-format
+msgid "%s (%s, default %ju): "
+msgstr "%s (%s,默认 %jd):"
+
+#: disk-utils/fdisk.c:187
+#, c-format
+msgid "%s (%c-%c, default %c): "
+msgstr "%s (%c-%c,默认为 %c):"
+
+#: disk-utils/fdisk.c:190 disk-utils/fdisk.c:250
+#, fuzzy, c-format
+msgid "%s (%ju-%ju, default %ju): "
+msgstr "%s (%jd-%jd,默认 %jd):"
+
+#: disk-utils/fdisk.c:193
+#, c-format
+msgid "%s (%c-%c): "
+msgstr "%s (%c-%c):"
+
+#: disk-utils/fdisk.c:196 disk-utils/fdisk.c:252
+#, fuzzy, c-format
+msgid "%s (%ju-%ju): "
+msgstr "%s (%jd-%jd): "
+
+#: disk-utils/fdisk.c:356
+msgid " [Y]es/[N]o: "
+msgstr "是[Y]/否[N]:"
+
+#: disk-utils/fdisk.c:387
+msgid "Partition type (type L to list all types): "
+msgstr "分区类型(输入 L 列出所有类型):"
+
+#: disk-utils/fdisk.c:388
+msgid "Hex code (type L to list all codes): "
+msgstr "Hex 代码(输入 L 列出所有代码):"
+
+#: disk-utils/fdisk.c:482
+msgid "DOS Compatibility flag is set (DEPRECATED!)"
+msgstr "已设置 DOS 兼容性标志(已废弃!)"
+
+#: disk-utils/fdisk.c:483
+msgid "DOS Compatibility flag is not set"
+msgstr "DOS 兼容性标志未设置"
+
+#: disk-utils/fdisk.c:505
+#, c-format
+msgid "Partition %zu does not exist yet!"
+msgstr "分区 %zu 还不存在!"
+
+#: disk-utils/fdisk.c:510 disk-utils/fdisk.c:519 disk-utils/sfdisk.c:586
+#: libfdisk/src/ask.c:751
+msgid "Unknown"
+msgstr "未知"
+
+#: disk-utils/fdisk.c:518
+#, c-format
+msgid "Changed type of partition '%s' to '%s'."
+msgstr "已将分区“%s”的类型更改为“%s”。"
+
+#: disk-utils/fdisk.c:522
+#, c-format
+msgid "Type of partition %zu is unchanged: %s."
+msgstr "分区 %zu 的类型未更改:%s。"
+
+#: disk-utils/fdisk.c:535
+#, fuzzy, c-format
+msgid "Disk %s: %s, %ju bytes, %ju sectors"
+msgstr "Disk %s:%s,%llu 字节,%llu 个扇区"
+
+#: disk-utils/fdisk.c:541
+#, c-format
+msgid "Geometry: %d heads, %llu sectors/track, %llu cylinders"
+msgstr "几何属性:%d 个磁头, %llu 个扇区/磁道, %llu 个柱面"
+
+#: disk-utils/fdisk.c:544
+#, c-format
+msgid "Units: %s of %d * %ld = %ld bytes"
+msgstr "单元:%s / %d * %ld = %ld 字节"
+
+#: disk-utils/fdisk.c:550
+#, c-format
+msgid "Sector size (logical/physical): %lu bytes / %lu bytes"
+msgstr "扇区大小(逻辑/物理):%lu 字节 / %lu 字节"
+
+#: disk-utils/fdisk.c:552
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes"
+msgstr "I/O 大小(最小/最佳):%lu 字节 / %lu 字节"
+
+#: disk-utils/fdisk.c:555
+#, c-format
+msgid "Alignment offset: %lu bytes"
+msgstr "对齐偏移量:%lu 字节"
+
+#: disk-utils/fdisk.c:558
+#, c-format
+msgid "Disklabel type: %s"
+msgstr "磁盘标签类型:%s"
+
+#: disk-utils/fdisk.c:561
+#, c-format
+msgid "Disk identifier: %s"
+msgstr "磁盘标识符:%s"
+
+#: disk-utils/fdisk.c:595
+msgid "Partition table entries are not in disk order."
+msgstr "分区表记录没有按磁盘顺序。"
+
+#: disk-utils/fdisk.c:646
+#, c-format
+msgid ""
+"\n"
+"%s: offset = %ju, size = %zu bytes."
+msgstr ""
+"\n"
+"%s: 偏移 = %ju, 大小 = %zu 字节。"
+
+#: disk-utils/fdisk.c:650
+msgid "cannot seek"
+msgstr "无法 seek"
+
+#: disk-utils/fdisk.c:655
+msgid "cannot read"
+msgstr "不能读"
+
+#: disk-utils/fdisk.c:669 libfdisk/src/bsd.c:233 libfdisk/src/dos.c:894
+#: libfdisk/src/gpt.c:1841
+msgid "First sector"
+msgstr "第一个扇区"
+
+#: disk-utils/fdisk.c:761
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s"
+msgstr "对 %s 进行 BLKGETSIZE ioctl 失败"
+
+#: disk-utils/fdisk.c:796
+msgid "invalid sector size argument"
+msgstr "无效的 扇区大小 参数"
+
+#: disk-utils/fdisk.c:805 disk-utils/sfdisk.c:2610
+msgid "invalid cylinders argument"
+msgstr "无效的 柱面数 参数"
+
+#: disk-utils/fdisk.c:814
+msgid "not found DOS label driver"
+msgstr "未找到 DOS 标签驱动"
+
+#: disk-utils/fdisk.c:827 disk-utils/sfdisk.c:2619
+msgid "invalid heads argument"
+msgstr "无效的 磁头数 参数"
+
+#: disk-utils/fdisk.c:833 disk-utils/sfdisk.c:2637
+msgid "invalid sectors argument"
+msgstr "无效的 扇区数 参数"
+
+#: disk-utils/fdisk.c:855
+#, c-format
+msgid "unsupported disklabel: %s"
+msgstr "不支持的磁盘标签:%s"
+
+#: disk-utils/fdisk.c:876
+msgid "The device properties (sector size and geometry) should be used with one specified device only."
+msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。"
+
+#: disk-utils/fdisk.c:912
+#, c-format
+msgid "Welcome to fdisk (%s)."
+msgstr "欢迎使用 fdisk (%s)。"
+
+#: disk-utils/fdisk.c:914
+msgid ""
+"Changes will remain in memory only, until you decide to write them.\n"
+"Be careful before using the write command.\n"
+msgstr ""
+"更改将停留在内存中,直到您决定将更改写入磁盘。\n"
+"使用写入命令前请三思。\n"
+
+#: disk-utils/fdisk.c:934
+msgid "The hybrid GPT detected. You have to sync the hybrid MBR manually (expert command 'M')."
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:95
+msgid "Generic"
+msgstr "常规"
+
+#: disk-utils/fdisk-menu.c:96
+msgid "delete a partition"
+msgstr "删除分区"
+
+#: disk-utils/fdisk-menu.c:97
+msgid "list known partition types"
+msgstr "列出已知分区类型"
+
+#: disk-utils/fdisk-menu.c:98
+msgid "add a new partition"
+msgstr "添加新分区"
+
+#: disk-utils/fdisk-menu.c:99
+msgid "print the partition table"
+msgstr "打印分区表"
+
+#: disk-utils/fdisk-menu.c:100
+msgid "change a partition type"
+msgstr "更改分区类型"
+
+#: disk-utils/fdisk-menu.c:101
+msgid "verify the partition table"
+msgstr "检查分区表"
+
+#: disk-utils/fdisk-menu.c:103
+msgid "print the raw data of the first sector from the device"
+msgstr "打印设备第1个扇区的原始数据"
+
+#: disk-utils/fdisk-menu.c:104
+msgid "print the raw data of the disklabel from the device"
+msgstr "打印设备磁盘标签的原始数据"
+
+#: disk-utils/fdisk-menu.c:105
+#, fuzzy
+msgid "fix partitions order"
+msgstr "修复分区顺序"
+
+#: disk-utils/fdisk-menu.c:107
+msgid "Misc"
+msgstr "杂项"
+
+#: disk-utils/fdisk-menu.c:108
+msgid "print this menu"
+msgstr "打印此菜单"
+
+#: disk-utils/fdisk-menu.c:109
+msgid "change display/entry units"
+msgstr "更改 显示/记录 单位"
+
+#: disk-utils/fdisk-menu.c:110
+msgid "extra functionality (experts only)"
+msgstr "更多功能(仅限专业人员)"
+
+#: disk-utils/fdisk-menu.c:112
+msgid "Save & Exit"
+msgstr "保存并退出"
+
+#: disk-utils/fdisk-menu.c:113
+msgid "write table to disk and exit"
+msgstr "将分区表写入磁盘并退出"
+
+#: disk-utils/fdisk-menu.c:114
+msgid "write table to disk"
+msgstr "将分区表写入磁盘"
+
+#: disk-utils/fdisk-menu.c:115
+msgid "quit without saving changes"
+msgstr "退出而不保存更改"
+
+#: disk-utils/fdisk-menu.c:116
+msgid "return to main menu"
+msgstr "返回主菜单"
+
+#: disk-utils/fdisk-menu.c:118
+msgid "return from BSD to DOS"
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:129
+msgid "Create a new label"
+msgstr "新建空磁盘标签"
+
+#: disk-utils/fdisk-menu.c:130
+msgid "create a new empty GPT partition table"
+msgstr "新建一份 GPT 分区表"
+
+#: disk-utils/fdisk-menu.c:131
+msgid "create a new empty SGI (IRIX) partition table"
+msgstr "新建一份空 GPT (IRIX) 分区表"
+
+#: disk-utils/fdisk-menu.c:132
+msgid "create a new empty DOS partition table"
+msgstr "新建一份的空 DOS 分区表"
+
+#: disk-utils/fdisk-menu.c:133
+msgid "create a new empty Sun partition table"
+msgstr "新建一份空 Sun 分区表"
+
+#: disk-utils/fdisk-menu.c:137
+msgid "create an IRIX (SGI) partition table"
+msgstr "创建一份 IRIX(SGI) 分区表"
+
+#: disk-utils/fdisk-menu.c:146
+msgid "Geometry"
+msgstr "几何属性"
+
+#: disk-utils/fdisk-menu.c:147
+msgid "change number of cylinders"
+msgstr "更改柱面数"
+
+#: disk-utils/fdisk-menu.c:148
+msgid "change number of heads"
+msgstr "更改磁头数"
+
+#: disk-utils/fdisk-menu.c:149
+msgid "change number of sectors/track"
+msgstr "更改扇区/磁道数"
+
+#: disk-utils/fdisk-menu.c:158 include/pt-mbr-partnames.h:91
+msgid "GPT"
+msgstr "GPT"
+
+#: disk-utils/fdisk-menu.c:159
+msgid "change disk GUID"
+msgstr "更改磁盘 GUID"
+
+#: disk-utils/fdisk-menu.c:160
+msgid "change partition name"
+msgstr "更改分区名"
+
+#: disk-utils/fdisk-menu.c:161
+msgid "change partition UUID"
+msgstr "更改分区 UUID"
+
+#: disk-utils/fdisk-menu.c:162
+msgid "enter protective/hybrid MBR"
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:165
+#, fuzzy
+msgid "toggle the legacy BIOS bootable flag"
+msgstr "开关 可启动 标志"
+
+#: disk-utils/fdisk-menu.c:166
+#, fuzzy
+msgid "toggle the no block IO protocol flag"
+msgstr "开关 dos 兼容性标志"
+
+#: disk-utils/fdisk-menu.c:167
+#, fuzzy
+msgid "toggle the required partition flag"
+msgstr "开关 只读 标志"
+
+#: disk-utils/fdisk-menu.c:168
+msgid "toggle the GUID specific bits"
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:178
+msgid "Sun"
+msgstr "Sun"
+
+#: disk-utils/fdisk-menu.c:179
+msgid "toggle the read-only flag"
+msgstr "开关 只读 标志"
+
+#: disk-utils/fdisk-menu.c:180
+msgid "toggle the mountable flag"
+msgstr "开关 可挂臷 标志"
+
+#: disk-utils/fdisk-menu.c:182
+msgid "change number of alternate cylinders"
+msgstr "更改备选柱面数"
+
+#: disk-utils/fdisk-menu.c:183
+msgid "change number of extra sectors per cylinder"
+msgstr "更改每柱面的额外扇区数"
+
+#: disk-utils/fdisk-menu.c:184
+msgid "change interleave factor"
+msgstr "更改交错系数"
+
+#: disk-utils/fdisk-menu.c:185
+msgid "change rotation speed (rpm)"
+msgstr "更改转速(转/分)"
+
+#: disk-utils/fdisk-menu.c:186
+msgid "change number of physical cylinders"
+msgstr "更改物理柱面数"
+
+#: disk-utils/fdisk-menu.c:195
+msgid "SGI"
+msgstr "SGI"
+
+#: disk-utils/fdisk-menu.c:196
+msgid "select bootable partition"
+msgstr "选择可启动分区"
+
+#: disk-utils/fdisk-menu.c:197
+msgid "edit bootfile entry"
+msgstr "编辑启动文件记录"
+
+#: disk-utils/fdisk-menu.c:198
+msgid "select sgi swap partition"
+msgstr "选择 sgi 交换分区"
+
+#: disk-utils/fdisk-menu.c:199
+msgid "create SGI info"
+msgstr "创建 SGI 信息"
+
+#: disk-utils/fdisk-menu.c:208
+msgid "DOS (MBR)"
+msgstr "DOS (MBR)"
+
+#: disk-utils/fdisk-menu.c:209
+msgid "toggle a bootable flag"
+msgstr "开关 可启动 标志"
+
+#: disk-utils/fdisk-menu.c:210
+msgid "edit nested BSD disklabel"
+msgstr "编辑嵌套的 BSD 磁盘标签"
+
+#: disk-utils/fdisk-menu.c:211
+msgid "toggle the dos compatibility flag"
+msgstr "开关 dos 兼容性标志"
+
+#: disk-utils/fdisk-menu.c:213
+msgid "move beginning of data in a partition"
+msgstr "移动分区数据的起始点"
+
+#: disk-utils/fdisk-menu.c:214
+msgid "change the disk identifier"
+msgstr "更改磁盘标识符"
+
+#: disk-utils/fdisk-menu.c:216
+msgid "return from protective/hybrid MBR to GPT"
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:226
+msgid "BSD"
+msgstr "BSD"
+
+#: disk-utils/fdisk-menu.c:227
+msgid "edit drive data"
+msgstr "编辑驱动数据"
+
+#: disk-utils/fdisk-menu.c:228
+msgid "install bootstrap"
+msgstr "安装引导程序"
+
+#: disk-utils/fdisk-menu.c:229
+msgid "show complete disklabel"
+msgstr "显示完整磁盘标签"
+
+#: disk-utils/fdisk-menu.c:230
+msgid "link BSD partition to non-BSD partition"
+msgstr "将 BSD 分区链接到非 BSD 分区"
+
+#: disk-utils/fdisk-menu.c:352
+#, c-format
+msgid ""
+"\n"
+"Help (expert commands):\n"
+msgstr ""
+"\n"
+"帮助 (专业命令):\n"
+
+#: disk-utils/fdisk-menu.c:354
+#, c-format
+msgid ""
+"\n"
+"Help:\n"
+msgstr ""
+"\n"
+"帮助:\n"
+
+#: disk-utils/fdisk-menu.c:371
+#, c-format
+msgid "You're editing nested '%s' partition table, primary partition table is '%s'."
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:400
+msgid "Expert command (m for help): "
+msgstr "专家命令(输入 m 显示帮助):"
+
+#: disk-utils/fdisk-menu.c:402
+msgid "Command (m for help): "
+msgstr "命令(输入 m 获取帮助):"
+
+#: disk-utils/fdisk-menu.c:412
+#, c-format
+msgid "%c: unknown command"
+msgstr "%c:未知命令"
+
+#: disk-utils/fdisk-menu.c:456
+msgid "failed to write disklabel"
+msgstr "写磁盘标签失败"
+
+#: disk-utils/fdisk-menu.c:502
+#, fuzzy, c-format
+msgid "Could not delete partition %zu"
+msgstr "无法删除分区 %d"
+
+#: disk-utils/fdisk-menu.c:520
+msgid "Changing display/entry units to cylinders (DEPRECATED!)."
+msgstr "将显示/记录单位更改为柱面(已废弃!)。"
+
+#: disk-utils/fdisk-menu.c:522
+msgid "Changing display/entry units to sectors."
+msgstr "将显示/记录单位更改为盲区。"
+
+#: disk-utils/fdisk-menu.c:532 disk-utils/fdisk-menu.c:672
+msgid "Leaving nested disklabel."
+msgstr "离开嵌套的磁盘标签。"
+
+#: disk-utils/fdisk-menu.c:573
+#, fuzzy
+msgid "Entering protective/hybrid MBR disklabel."
+msgstr "进入嵌套的 BSD 磁盘标签。"
+
+#: disk-utils/fdisk-menu.c:643
+msgid "Entering nested BSD disklabel."
+msgstr "进入嵌套的 BSD 磁盘标签。"
+
+#: disk-utils/fdisk-menu.c:829
+msgid "Number of cylinders"
+msgstr "柱面数"
+
+#: disk-utils/fdisk-menu.c:833
+msgid "Number of heads"
+msgstr "磁头数"
+
+#: disk-utils/fdisk-menu.c:837
+msgid "Number of sectors"
+msgstr "扇区数"
+
+#: disk-utils/fsck.c:208
#, c-format
msgid "%s is mounted\n"
msgstr "%s 已经挂载\n"
-#: disk-utils/fsck.c:193
+#: disk-utils/fsck.c:210
#, c-format
msgid "%s is not mounted\n"
msgstr "%s 未挂载\n"
-#: disk-utils/fsck.c:307 disk-utils/fsck.cramfs.c:169
-#: disk-utils/fsck.cramfs.c:176 disk-utils/fsck.cramfs.c:233
-#: disk-utils/fsck.cramfs.c:251 libfdisk/src/bsd.c:526 lib/path.c:100
-#: lib/path.c:121 lib/path.c:142 lib/path.c:190 login-utils/last.c:194
-#: login-utils/last.c:231 login-utils/sulogin.c:605 sys-utils/setpriv.c:233
+#: disk-utils/fsck.c:324 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:667 sys-utils/setpriv.c:233
+#: term-utils/setterm.c:726 term-utils/setterm.c:784 term-utils/setterm.c:788
+#: term-utils/setterm.c:795
#, c-format
msgid "cannot read %s"
msgstr "不能读 %s"
-#: disk-utils/fsck.c:309 lib/path.c:123 lib/path.c:144
+#: disk-utils/fsck.c:326 lib/path.c:136 lib/path.c:157
#, c-format
msgid "parse error: %s"
msgstr "解析错误:%s"
-#: disk-utils/fsck.c:329
-#, c-format
-msgid "Locking disk %s ... "
+#: disk-utils/fsck.c:353
+#, fuzzy, c-format
+msgid "cannot create directory %s"
+msgstr "无法更改到 %s 目录"
+
+#: disk-utils/fsck.c:366
+#, fuzzy, c-format
+msgid "Locking disk by %s ... "
msgstr "正在锁定磁盘 %s..."
-#: disk-utils/fsck.c:339
+#: disk-utils/fsck.c:377
#, c-format
msgid "(waiting) "
msgstr "(等待中) "
#. TRANSLATORS: These are followups to "Locking disk...".
-#: disk-utils/fsck.c:349
+#: disk-utils/fsck.c:387
msgid "succeeded"
msgstr "成功"
-#: disk-utils/fsck.c:349
+#: disk-utils/fsck.c:387
msgid "failed"
msgstr "失败"
-#: disk-utils/fsck.c:389
+#: disk-utils/fsck.c:405
+#, fuzzy, c-format
+msgid "Unlocking %s.\n"
+msgstr "将使用 %s。\n"
+
+#: disk-utils/fsck.c:438
#, c-format
msgid "failed to setup description for %s"
msgstr "设置 %s 描述 失败"
-#: disk-utils/fsck.c:415
+#: disk-utils/fsck.c:464
#, c-format
msgid "%s: parse error at line %d -- ignore"
msgstr "%s:第 %d 行解析出错 -- 忽略"
-#: disk-utils/fsck.c:447 disk-utils/fsck.c:449
+#: disk-utils/fsck.c:496 disk-utils/fsck.c:498
#, c-format
msgid "%s: failed to parse fstab"
msgstr "%s:解析 fstab 失败"
-#: disk-utils/fsck.c:591 sys-utils/umount.c:406 sys-utils/umount.c:429
-#, c-format
-msgid "%s: not found"
-msgstr "%s:找不到"
-
-#: disk-utils/fsck.c:618 login-utils/login.c:1082 login-utils/sulogin.c:968
-#: login-utils/vipw.c:213 sys-utils/flock.c:292 sys-utils/nsenter.c:137
-#: sys-utils/swapon.c:279 sys-utils/unshare.c:136 term-utils/script.c:264
-#: term-utils/script.c:274
+#: disk-utils/fsck.c:660 login-utils/login.c:964 login-utils/sulogin.c:1030
+#: 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
msgid "fork failed"
msgstr "fork 失败"
-#: disk-utils/fsck.c:625
+#: disk-utils/fsck.c:667
#, c-format
msgid "%s: execute failed"
msgstr "%s:执行失败"
-#: disk-utils/fsck.c:713
+#: disk-utils/fsck.c:755
msgid "wait: no more child process?!?"
msgstr "等待:没有剩余子进程了?!?"
-#: disk-utils/fsck.c:716
-msgid "waidpid failed"
-msgstr "waidpid 失败"
+#: disk-utils/fsck.c:758 sys-utils/flock.c:310 sys-utils/swapon.c:301
+#: sys-utils/unshare.c:171
+msgid "waitpid failed"
+msgstr "waitpid 失败"
-#: disk-utils/fsck.c:734
+#: disk-utils/fsck.c:776
#, c-format
msgid "Warning... %s for device %s exited with signal %d."
msgstr "警告... 对设备 %2$s 的 %1$s 以信号 %3$d 退出。"
-#: disk-utils/fsck.c:740
+#: disk-utils/fsck.c:782
#, c-format
msgid "%s %s: status is %x, should never happen."
msgstr "%s %s:状态为 %x,这不应该发生。"
-#: disk-utils/fsck.c:786
+#: disk-utils/fsck.c:828
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "以 %s 结束(退出状态为 %d)\n"
-#: disk-utils/fsck.c:848
-#, c-format
-msgid "error %d while executing fsck.%s for %s"
+#: disk-utils/fsck.c:906
+#, fuzzy, c-format
+msgid "error %d (%m) while executing fsck.%s for %s"
msgstr "对 %3$s 执行 fsck.%2$s 时出现错误 %1$d"
-#: disk-utils/fsck.c:917
+#: disk-utils/fsck.c:972
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'."
msgstr "传递给 -t 选项的文件系统类型必须全部/全不以“no”或“!”为前缀。"
-#: disk-utils/fsck.c:1034
+#: disk-utils/fsck.c:1088
#, c-format
msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
msgstr "%s:将跳过 /etc/fstab 中的错误行:将 mount 与非零的 fsck 通过次数绑定"
-#: disk-utils/fsck.c:1046
+#: disk-utils/fsck.c:1100
#, c-format
msgid "%s: skipping nonexistent device\n"
msgstr "%s:将跳过不存在的设备\n"
-#: disk-utils/fsck.c:1051
+#: disk-utils/fsck.c:1105
#, c-format
msgid "%s: nonexistent device (\"nofail\" fstab option may be used to skip this device)\n"
msgstr "%s:设备不存在(可以使用fstab 选项“nofail”来跳过此设备)\n"
# fuzzy
-#: disk-utils/fsck.c:1068
+#: disk-utils/fsck.c:1122
#, c-format
msgid "%s: skipping unknown filesystem type\n"
msgstr "%s:跳过未知的文件系统类型\n"
-#: disk-utils/fsck.c:1087
+#: disk-utils/fsck.c:1136
#, c-format
msgid "cannot check %s: fsck.%s not found"
msgstr "无法检查 %s:找不到 fsck.%s"
-#: disk-utils/fsck.c:1176
+#: disk-utils/fsck.c:1225
msgid "failed to allocate iterator"
msgstr "分配迭代器失败"
-#: disk-utils/fsck.c:1191
+#: disk-utils/fsck.c:1240
msgid "Checking all file systems.\n"
msgstr "正在检查所有文件系统。\n"
# pass number 是fstab中定义的,不为0则每次检测
-#: disk-utils/fsck.c:1282
+#: disk-utils/fsck.c:1331
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--正在等待-- (pass %d)\n"
-#: disk-utils/fsck.c:1307
+#: disk-utils/fsck.c:1356
#, c-format
msgid " %s [options] -- [fs-options] [<filesystem> ...]\n"
msgstr " %s [选项] -- [文件系统选项] [<文件系统> ...]\n"
-#: disk-utils/fsck.c:1311
+#: disk-utils/fsck.c:1360
msgid " -A check all filesystems\n"
msgstr " -A 检查所有文件系统\n"
-#: disk-utils/fsck.c:1312
+#: disk-utils/fsck.c:1361
msgid " -C [<fd>] display progress bar; file descriptor is for GUIs\n"
msgstr " -C [<fd>] 显示进度条;文件描述符 fd 用于图形用户界面\n"
-#: disk-utils/fsck.c:1313
+#: disk-utils/fsck.c:1362
msgid " -l lock the device to guarantee exclusive access\n"
msgstr " -l 锁定设备以确保独占访问\n"
-#: disk-utils/fsck.c:1314
+#: disk-utils/fsck.c:1363
msgid " -M do not check mounted filesystems\n"
msgstr " -M 不检查已挂臷的文件系统\n"
-#: disk-utils/fsck.c:1315
+#: disk-utils/fsck.c:1364
msgid " -N do not execute, just show what would be done\n"
msgstr " -N 不执行,只显示将执行的操作\n"
-#: disk-utils/fsck.c:1316
+#: disk-utils/fsck.c:1365
msgid " -P check filesystems in parallel, including root\n"
msgstr " -P 并行检查文件系统,包括 root\n"
-#: disk-utils/fsck.c:1317
+#: disk-utils/fsck.c:1366
msgid " -R skip root filesystem; useful only with '-A'\n"
msgstr " -R 跳过根文件系统;只在指定 '-A' 时有用\n"
-#: disk-utils/fsck.c:1318
+#: disk-utils/fsck.c:1367
msgid " -r report statistics for each device checked\n"
msgstr " -r 报告对每个已检查设备的统计\n"
-#: disk-utils/fsck.c:1319
+#: disk-utils/fsck.c:1368
msgid " -s serialize the checking operations\n"
msgstr " -s 串行化检查操作\n"
-#: disk-utils/fsck.c:1320
+#: disk-utils/fsck.c:1369
msgid " -T do not show the title on startup\n"
msgstr " -T 启动时不显示标题\n"
-#: disk-utils/fsck.c:1321
+#: disk-utils/fsck.c:1370
msgid ""
" -t <type> specify filesystem types to be checked;\n"
" <type> is allowed to be a comma-separated list\n"
@@ -538,304 +1511,308 @@ msgstr ""
" -t <类型> 指定要检查的文件系统类型;\n"
" <类型> 可以是以英文逗号分隔的列表\n"
-#: disk-utils/fsck.c:1323
+#: disk-utils/fsck.c:1372
msgid " -V explain what is being done\n"
msgstr " -V 解释正在进行的操作\n"
-#: disk-utils/fsck.c:1324
+#: disk-utils/fsck.c:1373
msgid " -? display this help and exit\n"
msgstr " -? 显示此帮助并退出\n"
-#: disk-utils/fsck.c:1327
+#: disk-utils/fsck.c:1376
msgid "See the specific fsck.* commands for available fs-options."
msgstr "参见特定的 fsck.* 命令了解可用的文件系统选项。"
-#: disk-utils/fsck.c:1365
+#: disk-utils/fsck.c:1414
msgid "too many devices"
msgstr "设备过多"
-#: disk-utils/fsck.c:1377
+#: disk-utils/fsck.c:1426
msgid "Is /proc mounted?"
msgstr "/proc 挂载了吗?"
-#: disk-utils/fsck.c:1385
+#: disk-utils/fsck.c:1434
#, c-format
msgid "must be root to scan for matching filesystems: %s"
msgstr "必须以 root 用户进行匹配文件系统扫描:%s"
-#: disk-utils/fsck.c:1389
+#: disk-utils/fsck.c:1438
#, c-format
msgid "couldn't find matching filesystem: %s"
msgstr "找不到匹配的文件系统:%s"
-#: disk-utils/fsck.c:1397 disk-utils/fsck.c:1485 sys-utils/eject.c:292
+#: disk-utils/fsck.c:1446 disk-utils/fsck.c:1534 misc-utils/kill.c:364
+#: sys-utils/eject.c:292
msgid "too many arguments"
msgstr "参数过多"
-#: disk-utils/fsck.c:1537
+#: disk-utils/fsck.c:1586
msgid "the -l option can be used with one device only -- ignore"
msgstr "-l 选项只能用于一个设备 -- 忽略"
-#: disk-utils/fsck.cramfs.c:114 misc-utils/whereis.c:168
+#: disk-utils/fsck.cramfs.c:108 misc-utils/whereis.c:168
#, c-format
msgid " %s [options] file\n"
msgstr " %s [选项] 文件\n"
-#: disk-utils/fsck.cramfs.c:116
+#: disk-utils/fsck.cramfs.c:110
msgid " -a for compatibility only, ignored\n"
msgstr " -a 纯兼容性选项,忽略\n"
-#: disk-utils/fsck.cramfs.c:117
+#: disk-utils/fsck.cramfs.c:111
msgid " -v, --verbose be more verbose\n"
msgstr " -v, --verbose 更详尽\n"
-#: disk-utils/fsck.cramfs.c:118
-msgid " -x, --destination <dir> extract into directory\n"
-msgstr " -x, --destination <目录> 提取到目录\n"
-
-#: disk-utils/fsck.cramfs.c:119
+#: disk-utils/fsck.cramfs.c:112
msgid " -y for compatibility only, ignored\n"
msgstr " -y 纯兼容性选项,忽略\n"
-#: disk-utils/fsck.cramfs.c:156
+#: disk-utils/fsck.cramfs.c:113
+msgid " -b, --blocksize <size> use this blocksize, defaults to page size\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:114
+msgid " --extract[=<dir>] test uncompression, optionally extract into <dir>\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:151
#, c-format
msgid "ioctl failed: unable to determine device size: %s"
msgstr "ioctl 失败:无法确定设备大小:%s"
-#: disk-utils/fsck.cramfs.c:162
+#: disk-utils/fsck.cramfs.c:157
#, c-format
msgid "not a block device or file: %s"
msgstr "不是一个块设备或文件:%s"
-#: disk-utils/fsck.cramfs.c:165 disk-utils/fsck.cramfs.c:200
+#: disk-utils/fsck.cramfs.c:160 disk-utils/fsck.cramfs.c:196
msgid "file length too short"
msgstr "文件长度过短"
-#: disk-utils/fsck.cramfs.c:174 disk-utils/fsck.cramfs.c:231
-#: disk-utils/fsck.cramfs.c:247 libfdisk/src/bsd.c:593 libfdisk/src/bsd.c:761
-#: login-utils/last.c:189 login-utils/last.c:223
+#: 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:195
#, c-format
msgid "seek on %s failed"
msgstr "在 %s 上定位失败"
-#: disk-utils/fsck.cramfs.c:180 disk-utils/fsck.cramfs.c:182
+#: disk-utils/fsck.cramfs.c:175 disk-utils/fsck.cramfs.c:177
msgid "superblock magic not found"
msgstr "超级块魔数(magic)未找到"
-#: disk-utils/fsck.cramfs.c:185
+#: disk-utils/fsck.cramfs.c:180
#, c-format
msgid "cramfs endianness is %s\n"
msgstr "cramfs 大小端为 %s\n"
-#: disk-utils/fsck.cramfs.c:186
+#: disk-utils/fsck.cramfs.c:181
msgid "big"
msgstr "大端"
-#: disk-utils/fsck.cramfs.c:186
+#: disk-utils/fsck.cramfs.c:181
msgid "little"
msgstr "小端"
# fuzzy
-#: disk-utils/fsck.cramfs.c:190
+#: disk-utils/fsck.cramfs.c:185
msgid "unsupported filesystem features"
msgstr "不支持的文件系统特性"
-#: disk-utils/fsck.cramfs.c:193
+#: disk-utils/fsck.cramfs.c:189
#, c-format
msgid "superblock size (%d) too small"
msgstr "超级块尺寸(%d)过小"
-#: disk-utils/fsck.cramfs.c:198
+#: disk-utils/fsck.cramfs.c:194
msgid "zero file count"
msgstr "零文件计数"
-#: disk-utils/fsck.cramfs.c:203
-#, c-format
-msgid "warning: file extends past end of filesystem\n"
+#: disk-utils/fsck.cramfs.c:198
+#, fuzzy
+msgid "file extends past end of filesystem"
msgstr "警告:文件超过了文件系统终点\n"
-#: disk-utils/fsck.cramfs.c:205
-#, c-format
-msgid "warning: old cramfs format\n"
+#: disk-utils/fsck.cramfs.c:200
+#, fuzzy
+msgid "old cramfs format"
msgstr "警告:旧的 cramfs 格式\n"
-#: disk-utils/fsck.cramfs.c:217
+#: disk-utils/fsck.cramfs.c:209
msgid "unable to test CRC: old cramfs format"
msgstr "无法检测 CRC:旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:270
+#: disk-utils/fsck.cramfs.c:262
msgid "crc error"
msgstr "crc 错误"
-#: disk-utils/fsck.cramfs.c:301 disk-utils/fsck.minix.c:551
+#: disk-utils/fsck.cramfs.c:292 disk-utils/fsck.minix.c:551
msgid "seek failed"
msgstr "定位失败"
-#: disk-utils/fsck.cramfs.c:305
+#: disk-utils/fsck.cramfs.c:296
msgid "read romfs failed"
msgstr "读取 romfs 失败"
-#: disk-utils/fsck.cramfs.c:337
+#: disk-utils/fsck.cramfs.c:328
msgid "root inode is not directory"
msgstr "根 inode 不是一个目录"
-#: disk-utils/fsck.cramfs.c:341
+#: disk-utils/fsck.cramfs.c:332
#, c-format
msgid "bad root offset (%lu)"
msgstr "错误的根偏移(%lu)"
-#: disk-utils/fsck.cramfs.c:359
+#: disk-utils/fsck.cramfs.c:350
msgid "data block too large"
msgstr "数据块过大"
-#: disk-utils/fsck.cramfs.c:363
+#: disk-utils/fsck.cramfs.c:354
#, c-format
msgid "decompression error: %s"
msgstr "解压出错:%s"
-#: disk-utils/fsck.cramfs.c:389
+#: disk-utils/fsck.cramfs.c:380
#, c-format
msgid " hole at %ld (%zd)\n"
msgstr " 位于 %ld 的空洞(%zd)\n"
-#: disk-utils/fsck.cramfs.c:396 disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:387 disk-utils/fsck.cramfs.c:542
#, c-format
msgid " uncompressing block at %ld to %ld (%ld)\n"
msgstr " 正在将 %ld 处的块解压到 %ld (%ld)\n"
-#: disk-utils/fsck.cramfs.c:403
+#: disk-utils/fsck.cramfs.c:394
#, c-format
msgid "non-block (%ld) bytes"
msgstr "非块(%ld)字节 "
-#: disk-utils/fsck.cramfs.c:407
+#: disk-utils/fsck.cramfs.c:398
#, c-format
msgid "non-size (%ld vs %ld) bytes"
msgstr "无大小(%ld : %ld)字节"
-#: disk-utils/fsck.cramfs.c:413 disk-utils/fsck.cramfs.c:517
-#: disk-utils/swaplabel.c:149 fdisks/cfdisk.c:1861 fdisks/cfdisk.c:1982
-#: fdisks/cfdisk.c:2080 fdisks/sfdisk.c:254 fdisks/sfdisk.c:262
-#: fdisks/sfdisk.c:324 sys-utils/fallocate.c:172 sys-utils/setpriv.c:527
-#: sys-utils/setpriv.c:531 sys-utils/setpriv.c:550 sys-utils/swapon.c:340
-#: term-utils/ttymsg.c:174
+#: 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:367
+#: sys-utils/setpriv.c:527 sys-utils/setpriv.c:550 sys-utils/swapon.c:338
+#: term-utils/ttymsg.c:175
#, c-format
msgid "write failed: %s"
msgstr "写失败:%s"
-#: disk-utils/fsck.cramfs.c:425
+#: disk-utils/fsck.cramfs.c:416
#, c-format
msgid "lchown failed: %s"
msgstr "lchown 失败:%s"
-#: disk-utils/fsck.cramfs.c:429
+#: disk-utils/fsck.cramfs.c:420
#, c-format
msgid "chown failed: %s"
msgstr "chown 失败:%s"
-#: disk-utils/fsck.cramfs.c:434
+#: disk-utils/fsck.cramfs.c:425
#, c-format
msgid "utime failed: %s"
msgstr "utime 失败:%s"
-#: disk-utils/fsck.cramfs.c:446
+#: disk-utils/fsck.cramfs.c:437
#, c-format
msgid "directory inode has zero offset and non-zero size: %s"
msgstr "目录 inode 偏移为 0,大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:461
+#: disk-utils/fsck.cramfs.c:452
#, c-format
msgid "mkdir failed: %s"
msgstr "mkdir 失败:%s"
-#: disk-utils/fsck.cramfs.c:477
+#: disk-utils/fsck.cramfs.c:468
msgid "filename length is zero"
msgstr "文件名长度为 0"
-#: disk-utils/fsck.cramfs.c:479
+#: disk-utils/fsck.cramfs.c:470
msgid "bad filename length"
msgstr "文件名长度有误"
-#: disk-utils/fsck.cramfs.c:485
+#: disk-utils/fsck.cramfs.c:476
msgid "bad inode offset"
msgstr "inode 偏移有误"
-#: disk-utils/fsck.cramfs.c:500
+#: disk-utils/fsck.cramfs.c:491
msgid "file inode has zero offset and non-zero size"
msgstr "文件 inode 偏移为 0,大小不为 0"
-#: disk-utils/fsck.cramfs.c:503
+#: disk-utils/fsck.cramfs.c:494
msgid "file inode has zero size and non-zero offset"
msgstr "文件 inode 大小为 0,偏移不为 0"
-#: disk-utils/fsck.cramfs.c:532
+#: disk-utils/fsck.cramfs.c:523
msgid "symbolic link has zero offset"
msgstr "符号链接偏移为 0"
-#: disk-utils/fsck.cramfs.c:534
+#: disk-utils/fsck.cramfs.c:525
msgid "symbolic link has zero size"
msgstr "符号链接大小为 0"
-#: disk-utils/fsck.cramfs.c:543
+#: disk-utils/fsck.cramfs.c:534
#, c-format
msgid "size error in symlink: %s"
msgstr "符号链接大小出错:%s"
-#: disk-utils/fsck.cramfs.c:557
+#: disk-utils/fsck.cramfs.c:548
#, c-format
msgid "symlink failed: %s"
msgstr "symlink 失败:%s"
-#: disk-utils/fsck.cramfs.c:570
+#: disk-utils/fsck.cramfs.c:561
#, c-format
msgid "special file has non-zero offset: %s"
msgstr "特殊文件的偏移不为 0:%s"
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:571
#, c-format
msgid "fifo has non-zero size: %s"
msgstr "FIFO 的大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:586
+#: disk-utils/fsck.cramfs.c:577
#, c-format
msgid "socket has non-zero size: %s"
msgstr "套接字的大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:589
+#: disk-utils/fsck.cramfs.c:580
#, fuzzy, c-format
msgid "bogus mode: %s (%o)"
msgstr "伪(bogus)模式:%s (%o)"
-#: disk-utils/fsck.cramfs.c:598
+#: disk-utils/fsck.cramfs.c:589
#, c-format
msgid "mknod failed: %s"
msgstr "mknod 失败:%s"
-#: disk-utils/fsck.cramfs.c:630
-#, c-format
-msgid "directory data start (%ld) < sizeof(struct cramfs_super) + start (%ld)"
+#: disk-utils/fsck.cramfs.c:621
+#, fuzzy, c-format
+msgid "directory data start (%lu) < sizeof(struct cramfs_super) + start (%zu)"
msgstr "目录数据起点(%ld) < sizeof(struct cramfs_super) + 起点 (%ld)"
-#: disk-utils/fsck.cramfs.c:634
-#, c-format
-msgid "directory data end (%ld) != file data start (%ld)"
+#: disk-utils/fsck.cramfs.c:625
+#, fuzzy, c-format
+msgid "directory data end (%lu) != file data start (%lu)"
msgstr "目录数据终点 (%ld) != 文件数据起点 (%ld)"
-#: disk-utils/fsck.cramfs.c:639
+#: disk-utils/fsck.cramfs.c:630
msgid "invalid file data offset"
msgstr "无效的文件数据偏移"
-#: disk-utils/fsck.cramfs.c:686
-msgid "compiled without -x support"
-msgstr "编译时未带有 -x 支持"
+#: disk-utils/fsck.cramfs.c:677 disk-utils/mkfs.cramfs.c:731
+msgid "invalid blocksize argument"
+msgstr "无效的 块大小 参数"
-#: disk-utils/fsck.cramfs.c:706
+#: disk-utils/fsck.cramfs.c:698
#, c-format
msgid "%s: OK\n"
msgstr "%s:OK\n"
-#: disk-utils/fsck.minix.c:195 disk-utils/swaplabel.c:162 fdisks/cfdisk.c:2763
-#: misc-utils/wipefs.c:413 sys-utils/blkdiscard.c:56 sys-utils/tunelp.c:80
+#: 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"
@@ -1283,25 +2260,25 @@ msgstr "%s 定位出错"
msgid "read error on %s"
msgstr "%s 读出错"
-#: disk-utils/isosize.c:149
+#: disk-utils/isosize.c:151
#, c-format
msgid "sector count: %d, sector size: %d\n"
msgstr "扇区计数:%d,扇区大小:%d\n"
-#: disk-utils/isosize.c:168
+#: disk-utils/isosize.c:170
#, c-format
msgid " %s [options] <iso9660_image_file>\n"
msgstr " %s [选项] <iso9660_image_file>\n"
-#: disk-utils/isosize.c:171
+#: disk-utils/isosize.c:173
msgid " -d, --divisor=<number> divide the amount of bytes by <number>\n"
msgstr " -d, --divisor=<数字> 将字节数除以 <数字>\n"
-#: disk-utils/isosize.c:172
+#: disk-utils/isosize.c:174
msgid " -x, --sectors show sector count and size\n"
msgstr " -x, --sectors 显示扇区计数和大小\n"
-#: disk-utils/isosize.c:204
+#: disk-utils/isosize.c:206
msgid "invalid divisor argument"
msgstr "无效的 divisor(除数) 参数"
@@ -1458,11 +2435,11 @@ msgstr "用法:\n"
msgid " %s [options] [-t <type>] [fs-options] <device> [<size>]\n"
msgstr " %s [选项] [-t <类型>] [文件系统选项] <设备> [<大小>]\n"
-#: disk-utils/mkfs.c:42 include/c.h:276 misc-utils/getopt.c:322
-#: misc-utils/look.c:370 misc-utils/mcookie.c:72 misc-utils/namei.c:422
-#: misc-utils/uuidd.c:74 misc-utils/uuidgen.c:38 misc-utils/wipefs.c:415
-#: sys-utils/hwclock.c:1463 sys-utils/renice.c:62 term-utils/script.c:134
-#: term-utils/scriptreplay.c:45 term-utils/setterm.c:681 term-utils/write.c:85
+#: 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:1582
+#: sys-utils/renice.c:62 term-utils/script.c:145 term-utils/scriptreplay.c:45
+#: term-utils/write.c:85
#, c-format
msgid ""
"\n"
@@ -1594,90 +2571,86 @@ msgstr "%6.2f%% (%+ld 字节)\t%s\n"
msgid "cannot close file %s"
msgstr "无法关闭文件 %s"
-#: disk-utils/mkfs.cramfs.c:732
-msgid "invalid blocksize argument"
-msgstr "无效的 块大小 参数"
-
-#: disk-utils/mkfs.cramfs.c:738
+#: disk-utils/mkfs.cramfs.c:737
msgid "invalid edition number argument"
msgstr "无效的修订版本号参数"
-#: disk-utils/mkfs.cramfs.c:748
+#: disk-utils/mkfs.cramfs.c:747
msgid "invalid endianness given; must be 'big', 'little', or 'host'"
msgstr "给定的大小端无效。必须为“big”、“little”或“host”"
-#: disk-utils/mkfs.cramfs.c:809
+#: disk-utils/mkfs.cramfs.c:811
#, c-format
msgid "warning: guestimate of required size (upper bound) is %lldMB, but maximum image size is %uMB. We might die prematurely."
msgstr "警告:估计需要的大小(上限)为 %lldMB,但最大镜像大小为 %uMB。程序可能提前终止(die)。"
-#: disk-utils/mkfs.cramfs.c:833
+#: disk-utils/mkfs.cramfs.c:835
msgid "ROM image map"
msgstr "ROM 镜像映射"
-#: disk-utils/mkfs.cramfs.c:845
+#: disk-utils/mkfs.cramfs.c:847
#, c-format
msgid "Including: %s\n"
msgstr "包含:%s\n"
-#: disk-utils/mkfs.cramfs.c:851
+#: disk-utils/mkfs.cramfs.c:853
#, c-format
msgid "Directory data: %zd bytes\n"
msgstr "目录数据:%zd 字节\n"
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:861
#, c-format
msgid "Everything: %zd kilobytes\n"
msgstr "全部:%zd KB\n"
-#: disk-utils/mkfs.cramfs.c:864
+#: disk-utils/mkfs.cramfs.c:866
#, c-format
msgid "Super block: %zd bytes\n"
msgstr "超级块:%zd 字节\n"
-#: disk-utils/mkfs.cramfs.c:871
+#: disk-utils/mkfs.cramfs.c:873
#, c-format
msgid "CRC: %x\n"
msgstr "CRC:%x\n"
-#: disk-utils/mkfs.cramfs.c:876
+#: disk-utils/mkfs.cramfs.c:878
#, c-format
msgid "not enough space allocated for ROM image (%lld allocated, %zu used)"
msgstr "为 ROM 镜像分配的空间不足(已分配 %lld,已使用 %zu)"
-#: disk-utils/mkfs.cramfs.c:882
+#: disk-utils/mkfs.cramfs.c:884
#, c-format
msgid "ROM image write failed (%zd %zd)"
msgstr "写 ROM 镜像失败(%zd %zd)"
-#: disk-utils/mkfs.cramfs.c:885
+#: disk-utils/mkfs.cramfs.c:887
msgid "ROM image"
msgstr "ROM 镜像"
-#: disk-utils/mkfs.cramfs.c:894
+#: disk-utils/mkfs.cramfs.c:896
msgid "warning: filenames truncated to 255 bytes."
msgstr "警告:文件名被截短为 255 个字节。"
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:898
msgid "warning: files were skipped due to errors."
msgstr "警告:由于错误,文件被跳过。"
-#: disk-utils/mkfs.cramfs.c:898
+#: disk-utils/mkfs.cramfs.c:900
#, c-format
msgid "warning: file sizes truncated to %luMB (minus 1 byte)."
msgstr "警告:文件大小被截短为 %luMB(减 1 字节)。"
-#: disk-utils/mkfs.cramfs.c:902
+#: disk-utils/mkfs.cramfs.c:904
#, c-format
msgid "warning: uids truncated to %u bits. (This may be a security concern.)"
msgstr "警告:uid 被截短为 %u 位。(可能有安全隐患。)"
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:907
#, c-format
msgid "warning: gids truncated to %u bits. (This may be a security concern.)"
msgstr "警告:gid 被截短为 %u 位。(可能有安全隐患。)"
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:910
#, c-format
msgid ""
"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
@@ -1879,35 +2852,35 @@ msgstr "将不会尝试在“%s”上创建文件系统"
msgid "%s: number of blocks too small"
msgstr "%s:块数太小"
-#: disk-utils/mkswap.c:162
+#: disk-utils/mkswap.c:161
#, c-format
msgid "Bad user-specified page size %u"
msgstr "用户指定的页大小 %u 有误"
-#: disk-utils/mkswap.c:168
+#: disk-utils/mkswap.c:167
#, c-format
msgid "Using user-specified page size %d, instead of the system value %d"
msgstr "将使用用户指定的页大小 %d 来取代系统值 %d"
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:189
msgid "Bad swap header size, no label written."
msgstr "交换头(header)大小有误,未写入标签。"
-#: disk-utils/mkswap.c:201
+#: disk-utils/mkswap.c:199
msgid "Label was truncated."
msgstr "标签已截短。"
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:205
#, c-format
msgid "no label, "
msgstr "无标签,"
-#: disk-utils/mkswap.c:215
+#: disk-utils/mkswap.c:213
#, c-format
msgid "no uuid\n"
msgstr "无 uuid\n"
-#: disk-utils/mkswap.c:280
+#: disk-utils/mkswap.c:278
#, c-format
msgid ""
"\n"
@@ -1918,7 +2891,7 @@ msgstr ""
"用法\n"
" %s [选项] 设备 [大小]\n"
-#: disk-utils/mkswap.c:285
+#: disk-utils/mkswap.c:283
#, c-format
msgid ""
"\n"
@@ -1945,365 +2918,376 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: disk-utils/mkswap.c:304
+#: disk-utils/mkswap.c:302
msgid "too many bad pages"
msgstr "坏页过多"
-#: disk-utils/mkswap.c:324
+#: disk-utils/mkswap.c:322
msgid "seek failed in check_blocks"
msgstr "check_blocks (检查块)时定位失败"
-#: disk-utils/mkswap.c:332
+#: disk-utils/mkswap.c:330
#, c-format
msgid "%lu bad page\n"
msgid_plural "%lu bad pages\n"
msgstr[0] "%lu 个坏页\n"
-#: disk-utils/mkswap.c:361
+#: disk-utils/mkswap.c:359
msgid "unable to alloc new libblkid probe"
msgstr "无法分配新的 libblkid 探针"
-#: disk-utils/mkswap.c:363
+#: disk-utils/mkswap.c:361
#, fuzzy
msgid "unable to assign device to libblkid probe"
msgstr "无法将设备分配给 libblkid 探针"
-#: disk-utils/mkswap.c:378 disk-utils/mkswap.c:405 disk-utils/mkswap.c:621
+#: disk-utils/mkswap.c:376 disk-utils/mkswap.c:402 disk-utils/mkswap.c:618
msgid "unable to rewind swap-device"
msgstr "无法倒回(rewind)交换设备"
-#: disk-utils/mkswap.c:409
+#: disk-utils/mkswap.c:406
msgid "unable to erase bootbits sectors"
msgstr "不能擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:423
+#: disk-utils/mkswap.c:422
#, c-format
msgid "%s: warning: wiping old %s signature."
msgstr "%s:警告,将擦除旧的 %s 签名。"
-#: disk-utils/mkswap.c:428
+#: disk-utils/mkswap.c:427
#, c-format
msgid "%s: warning: don't erase bootbits sectors"
msgstr "%s:警告,不要擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:431
+#: disk-utils/mkswap.c:430
#, c-format
msgid " (%s partition table detected). "
msgstr " (检测到 %s 分区表)。"
-#: disk-utils/mkswap.c:433
+#: disk-utils/mkswap.c:432
#, c-format
msgid " (compiled without libblkid). "
msgstr " (编译时未链接 libblkid)。"
-#: disk-utils/mkswap.c:434
+#: disk-utils/mkswap.c:433
#, c-format
msgid "Use -f to force.\n"
msgstr "使用 -f 选项强制执行。\n"
-#: disk-utils/mkswap.c:485
+#: disk-utils/mkswap.c:484
msgid "parsing page size failed"
msgstr "解析页大小失败"
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:490
msgid "parsing version number failed"
msgstr "解析版本号失败"
-#: disk-utils/mkswap.c:497
+#: disk-utils/mkswap.c:496
#, c-format
msgid "warning: ignoring -U (UUIDs are unsupported by %s)"
msgstr "警告:将忽略 -U 选项(%s 不支持 UUID)"
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:514
msgid "only one device argument is currently supported"
msgstr "当前只支持一个设备参数"
-#: disk-utils/mkswap.c:521
+#: disk-utils/mkswap.c:520
#, c-format
msgid "swapspace version %d is not supported"
msgstr "不支持交换空间版本 %d"
-#: disk-utils/mkswap.c:526
+#: disk-utils/mkswap.c:525
msgid "error: parsing UUID failed"
msgstr "错误:解析 UUID 失败"
-#: disk-utils/mkswap.c:535
+#: disk-utils/mkswap.c:534
msgid "error: Nowhere to set up swap on?"
msgstr "错误:没有设置交换空间的地方?"
-#: disk-utils/mkswap.c:541
+#: disk-utils/mkswap.c:540
msgid "invalid block count argument"
msgstr "无效的 块计数 参数"
-#: disk-utils/mkswap.c:549
+#: disk-utils/mkswap.c:548
#, c-format
msgid "error: size %llu KiB is larger than device size %llu KiB"
msgstr "错误:尺寸 %llu KiB 大于设备尺寸 %llu KiB"
-#: disk-utils/mkswap.c:555
+#: disk-utils/mkswap.c:554
#, c-format
msgid "error: swap area needs to be at least %ld KiB"
msgstr "错误:交换区至少需要 %ld KiB"
-#: disk-utils/mkswap.c:571
+#: disk-utils/mkswap.c:568
#, c-format
msgid "warning: truncating swap area to %llu KiB"
msgstr "警告:将把交换区截短为 %llu KiB"
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:573
#, c-format
msgid "error: %s is mounted; will not make swapspace"
msgstr "错误:%s 已挂载;将不会创建交换空间"
-#: disk-utils/mkswap.c:597
+#: disk-utils/mkswap.c:594
#, c-format
msgid "warning: %s is misaligned"
msgstr "警告:%s 未正确对齐"
-#: disk-utils/mkswap.c:610
+#: disk-utils/mkswap.c:607
msgid "Unable to set up swap-space: unreadable"
msgstr "无法设置交换空间:不可读"
-#: disk-utils/mkswap.c:613
-#, c-format
-msgid "Setting up swapspace version 1, size = %llu KiB\n"
+#: disk-utils/mkswap.c:610
+#, fuzzy, c-format
+msgid "Setting up swapspace version %d, size = %llu KiB\n"
msgstr "正在设置交换空间版本 1,大小 = %llu KiB\n"
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:622
#, c-format
msgid "%s: unable to write signature page"
msgstr "%s:无法写签名页"
-#: disk-utils/mkswap.c:637
+#: disk-utils/mkswap.c:634
#, c-format
msgid "%s: unable to obtain selinux file label"
msgstr "%s:无法获得 selinux 文件标签"
-#: disk-utils/mkswap.c:640
+#: disk-utils/mkswap.c:637
msgid "unable to matchpathcon()"
msgstr "无法执行 matchpathcon()"
-#: disk-utils/mkswap.c:643
+#: disk-utils/mkswap.c:640
msgid "unable to create new selinux context"
msgstr "无法创建新的 selinux 上下文"
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:642
msgid "couldn't compute selinux context"
msgstr "无法计算 selinux 上下文"
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:648
#, c-format
msgid "unable to relabel %s to %s"
msgstr "无法将 %s 标签改为 %s"
-#: disk-utils/partx.c:80
+#: disk-utils/partx.c:87
msgid "partition number"
msgstr "分区号"
-#: disk-utils/partx.c:81
+#: disk-utils/partx.c:88
msgid "start of the partition in sectors"
msgstr "分区起点(扇区数)"
-#: disk-utils/partx.c:82
+#: disk-utils/partx.c:89
msgid "end of the partition in sectors"
msgstr "分区终点(扇区数)"
-#: disk-utils/partx.c:83
+#: disk-utils/partx.c:90
msgid "number of sectors"
msgstr "扇区数"
-#: disk-utils/partx.c:84
+#: disk-utils/partx.c:91
msgid "human readable size"
msgstr "易读形式的大小"
-#: disk-utils/partx.c:85
+#: disk-utils/partx.c:92
msgid "partition name"
msgstr "分区名"
-#: disk-utils/partx.c:86 misc-utils/findmnt.c:122 misc-utils/lsblk.c:129
+#: disk-utils/partx.c:93 misc-utils/findmnt.c:132 misc-utils/lsblk.c:148
msgid "partition UUID"
msgstr "分区 UUID"
-#: disk-utils/partx.c:87
+#: disk-utils/partx.c:94
msgid "partition table type (dos, gpt, ...)"
msgstr "分区表类型(dos、gpt、...)"
-#: disk-utils/partx.c:88
+#: disk-utils/partx.c:95 misc-utils/lsblk.c:149
msgid "partition flags"
msgstr "分区标志"
-#: disk-utils/partx.c:89
+#: disk-utils/partx.c:96
msgid "partition type (a string, a UUID, or hex)"
msgstr "分区类型(字符串,UUID 或十六进制数)"
-#: disk-utils/partx.c:107 sys-utils/losetup.c:480
+#: disk-utils/partx.c:114 sys-utils/losetup.c:482
msgid "failed to initialize loopcxt"
msgstr "初始化 loopcxt 失败"
-#: disk-utils/partx.c:111
+#: disk-utils/partx.c:118
#, c-format
msgid "%s: failed to find unused loop device"
msgstr "%s:查找未使用的回环设备失败"
-#: disk-utils/partx.c:115
+#: disk-utils/partx.c:122
#, fuzzy, c-format
msgid "Trying to use '%s' for the loop device\n"
msgstr "将尝试用“%s”作为回环设备\n"
-#: disk-utils/partx.c:119
+#: disk-utils/partx.c:126
#, fuzzy, c-format
msgid "%s: failed to set backing file"
msgstr "%s:设置后备文件失败"
-#: disk-utils/partx.c:124 sys-utils/losetup.c:677
+#: 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:154 misc-utils/findmnt.c:361 misc-utils/lsblk.c:280
-#: misc-utils/lslocks.c:333 sys-utils/losetup.c:102 sys-utils/lscpu.c:275
-#: sys-utils/prlimit.c:270 sys-utils/swapon.c:121 sys-utils/wdctl.c:145
+#: disk-utils/partx.c:161 login-utils/lslogins.c:302 misc-utils/findmnt.c:374
+#: misc-utils/lsblk.c:305 misc-utils/lslocks.c:338 sys-utils/losetup.c:104
+#: sys-utils/lscpu.c:327 sys-utils/prlimit.c:273 sys-utils/swapon.c:123
+#: sys-utils/wdctl.c:151
#, c-format
msgid "unknown column: %s"
msgstr "未知列: %s"
-#: disk-utils/partx.c:201
+#: disk-utils/partx.c:208
#, c-format
msgid "%s: failed to get partition number"
msgstr "%s:获取分区号失败"
-#: disk-utils/partx.c:266
+#: disk-utils/partx.c:273
#, c-format
msgid "%s: error deleting partition %d"
msgstr "%s:删除分区 %d 出错"
-#: disk-utils/partx.c:268
+#: disk-utils/partx.c:275
#, c-format
msgid "%s: error deleting partitions %d-%d"
msgstr "%s:删除分区 %d-%d 出错"
-#: disk-utils/partx.c:292 disk-utils/partx.c:439 disk-utils/partx.c:955
+#: disk-utils/partx.c:299 disk-utils/partx.c:446 disk-utils/partx.c:971
#, c-format
msgid "specified range <%d:%d> does not make sense"
msgstr "指定的范围 <%d:%d> 无效"
-#: disk-utils/partx.c:301
+#: disk-utils/partx.c:308
#, c-format
msgid "%s: partition #%d removed\n"
msgstr "%s:分区 #%d 已移除\n"
-#: disk-utils/partx.c:305
+#: disk-utils/partx.c:312
#, c-format
msgid "%s: partition #%d already doesn't exist\n"
msgstr "%s:分区 #%d 已不存在\n"
-#: disk-utils/partx.c:310
+#: disk-utils/partx.c:317
#, c-format
msgid "%s: deleting partition #%d failed"
msgstr "%s:删除分区 #%d 失败"
-#: disk-utils/partx.c:330
+#: disk-utils/partx.c:337
#, c-format
msgid "%s: error adding partition %d"
msgstr "%s:添加分区 %d 出错"
-#: disk-utils/partx.c:332
+#: disk-utils/partx.c:339
#, c-format
msgid "%s: error adding partitions %d-%d"
msgstr "%s:添加分区 %d-%d 出错"
-#: disk-utils/partx.c:369 disk-utils/partx.c:481
+#: disk-utils/partx.c:376 disk-utils/partx.c:482
#, c-format
msgid "%s: partition #%d added\n"
msgstr "%s:分区 #%d 已添加\n"
-#: disk-utils/partx.c:374
+#: disk-utils/partx.c:381
#, c-format
msgid "%s: adding partition #%d failed"
msgstr "%s:添加分区 #%d 失败"
-#: disk-utils/partx.c:409
+#: disk-utils/partx.c:416
#, c-format
msgid "%s: error updating partition %d"
msgstr "%s:更新分区 %d 出错"
-#: disk-utils/partx.c:411
+#: disk-utils/partx.c:418
#, c-format
msgid "%s: error updating partitions %d-%d"
msgstr "%s:更新分区 %d-%d 出错"
-#: disk-utils/partx.c:475
+#: disk-utils/partx.c:455
+#, fuzzy, c-format
+msgid "%s: no partition #%d"
+msgstr "%s:分区 #%d 已添加\n"
+
+#: disk-utils/partx.c:476
#, c-format
msgid "%s: partition #%d resized\n"
msgstr "%s:已调整分区 #%d 的大小\n"
-#: disk-utils/partx.c:489
+#: disk-utils/partx.c:490
#, c-format
msgid "%s: updating partition #%d failed"
msgstr "%s:更新分区 #%d 失败"
-#: disk-utils/partx.c:526
+#: disk-utils/partx.c:527
#, c-format
msgid "#%2d: %9ju-%9ju (%9ju sector, %6ju MB)\n"
msgid_plural "#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n"
msgstr[0] "#%2d:%9ju-%9ju (%9ju 扇区%6ju MB)\n"
-#: disk-utils/partx.c:545 misc-utils/findmnt.c:664 misc-utils/findmnt.c:681
-#: misc-utils/lslocks.c:396 sys-utils/prlimit.c:220 sys-utils/swapon.c:149
-#: sys-utils/wdctl.c:208
+#: disk-utils/partx.c:546 misc-utils/findmnt.c:683 misc-utils/findmnt.c:700
+#: misc-utils/lslocks.c:401
msgid "failed to add line to output"
msgstr "向输出添加行出错"
-#: disk-utils/partx.c:621 misc-utils/findmnt.c:1435 misc-utils/lsblk.c:1583
-#: misc-utils/lslocks.c:455 sys-utils/losetup.c:311 sys-utils/lscpu.c:1152
-#: sys-utils/prlimit.c:290 sys-utils/swapon.c:242 sys-utils/wdctl.c:250
+#: disk-utils/partx.c:609
+#, fuzzy
+msgid "failed to add data to output table"
+msgstr "向输出添加行出错"
+
+#: disk-utils/partx.c:632 misc-utils/findmnt.c:1484 misc-utils/lsblk.c:1706
+#: misc-utils/lslocks.c:460 sys-utils/losetup.c:303 sys-utils/lscpu.c:1404
+#: sys-utils/prlimit.c:293 sys-utils/swapon.c:243 sys-utils/wdctl.c:258
msgid "failed to initialize output table"
msgstr "初始化输出表失败"
-#: disk-utils/partx.c:629 misc-utils/findmnt.c:1453 misc-utils/lsblk.c:1593
-#: misc-utils/lslocks.c:463 sys-utils/losetup.c:317 sys-utils/prlimit.c:298
-#: sys-utils/swapon.c:250 sys-utils/wdctl.c:259
+#: disk-utils/partx.c:643 misc-utils/findmnt.c:1506 misc-utils/lsblk.c:1722
+#: misc-utils/lslocks.c:470 sys-utils/losetup.c:311 sys-utils/losetup.c:347
+#: sys-utils/lscpu.c:1409 sys-utils/prlimit.c:302 sys-utils/swapon.c:252
+#: sys-utils/wdctl.c:269
msgid "failed to initialize output column"
msgstr "初始化输出列失败"
-#: disk-utils/partx.c:667
+#: disk-utils/partx.c:683
#, c-format
msgid "failed to initialize blkid filter for '%s'"
msgstr "初始化“%s”的 blkid 过滤器失败"
-#: disk-utils/partx.c:675
+#: disk-utils/partx.c:691
#, c-format
msgid "%s: failed to read partition table"
msgstr "%s:读取分区表失败"
-#: disk-utils/partx.c:681
+#: disk-utils/partx.c:697
#, c-format
msgid "%s: partition table type '%s' detected\n"
msgstr "%s:检测到分区表类型“%s”\n"
-#: disk-utils/partx.c:685
+#: disk-utils/partx.c:701
#, c-format
msgid "%s: partition table with no partitions"
msgstr "%s:分区表中无分区"
-#: disk-utils/partx.c:697
+#: disk-utils/partx.c:713
#, c-format
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:701
+#: disk-utils/partx.c:717
msgid " -a, --add add specified partitions or all of them\n"
msgstr " -a, --add 添加指定的分区或所有分区\n"
-#: disk-utils/partx.c:702
+#: disk-utils/partx.c:718
msgid " -d, --delete delete specified partitions or all of them\n"
msgstr " -d, --delete 删除指定的分区或所有分区\n"
-#: disk-utils/partx.c:703
+#: disk-utils/partx.c:719
msgid " -u, --update update specified partitions or all of them\n"
msgstr " -u, --update 更新指定的分区或所有分区\n"
-#: disk-utils/partx.c:704
+#: disk-utils/partx.c:720
msgid ""
" -s, --show list partitions\n"
"\n"
@@ -2311,39 +3295,39 @@ msgstr ""
" -s, --show 列出分区\n"
"\n"
-#: disk-utils/partx.c:705 misc-utils/lsblk.c:1370
+#: disk-utils/partx.c:721 misc-utils/lsblk.c:1472
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
-#: disk-utils/partx.c:706
+#: disk-utils/partx.c:722
msgid " -g, --noheadings don't print headings for --show\n"
msgstr " -g, --noheadings --show 时不打印标题\n"
-#: disk-utils/partx.c:707
+#: disk-utils/partx.c:723
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:708
+#: disk-utils/partx.c:724
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <list> 定义使用哪个输出列\n"
-#: disk-utils/partx.c:709 misc-utils/lsblk.c:1383
+#: disk-utils/partx.c:725 misc-utils/lsblk.c:1485
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 key=“value” 输出格式\n"
-#: disk-utils/partx.c:710 misc-utils/lsblk.c:1384
+#: disk-utils/partx.c:726 misc-utils/lsblk.c:1486
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: disk-utils/partx.c:711
+#: disk-utils/partx.c:727
msgid " -t, --type <type> specify the partition type (dos, bsd, solaris, etc.)\n"
msgstr " -t, --type <类型> 指定分区类型(dos、bsd、solaris 等)\n"
-#: disk-utils/partx.c:712
+#: disk-utils/partx.c:728 sys-utils/fallocate.c:85
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: disk-utils/partx.c:718
+#: disk-utils/partx.c:734
msgid ""
"\n"
"Available columns (for --show, --raw or --pairs):\n"
@@ -2351,30 +3335,30 @@ msgstr ""
"\n"
"可用的列(针对 --show、--raw 或 --pairs):\n"
-#: disk-utils/partx.c:791
+#: disk-utils/partx.c:807
msgid "failed to parse --nr <M-N> range"
msgstr "解析 --nr <M-N> 范围失败"
-#: disk-utils/partx.c:891
+#: disk-utils/partx.c:907
msgid "--nr and <partition> are mutually exclusive"
msgstr "--nr 和 <分区> 相互排斥"
-#: disk-utils/partx.c:910
+#: disk-utils/partx.c:926
#, c-format
msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
msgstr "分区:%s,磁盘:%s,从分区:%d,到分区:%d\n"
-#: disk-utils/partx.c:922
+#: disk-utils/partx.c:938
#, c-format
msgid "%s: cannot delete partitions"
msgstr "%s:不能删除分区"
-#: disk-utils/partx.c:925
+#: disk-utils/partx.c:941
#, c-format
msgid "%s: partitioned loop devices unsupported"
msgstr "%s:不支持已分区的回环设备"
-#: disk-utils/partx.c:942
+#: disk-utils/partx.c:958
#, c-format
msgid "%s: failed to initialize blkid prober"
msgstr "%s:初始化 blkid 探针失败"
@@ -2467,1533 +3451,76 @@ msgstr "%s:获取分区号 %s 的起点失败"
msgid "failed to resize partition"
msgstr "调整分区大小失败"
-#: 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/swaplabel.c:67
-#, c-format
-msgid "%s: not a valid swap partition"
-msgstr "%s:不是有效的交换分区"
-
-#: disk-utils/swaplabel.c:74
-#, c-format
-msgid "%s: unsupported swap version '%s'"
-msgstr "%s:不支持的交换版本“%s”"
-
-#: disk-utils/swaplabel.c:114
-#, c-format
-msgid "failed to parse UUID: %s"
-msgstr "解析 UUID 失败:%s"
-
-#: disk-utils/swaplabel.c:118
-#, c-format
-msgid "%s: failed to seek to swap UUID"
-msgstr "%s:定位到交换区 UUID 失败"
-
-#: disk-utils/swaplabel.c:122
-#, c-format
-msgid "%s: failed to write UUID"
-msgstr "%s:写 UUID 失败"
-
-#: disk-utils/swaplabel.c:133
-#, c-format
-msgid "%s: failed to seek to swap label "
-msgstr "%s:无法定位到交换区标签 "
-
-#: disk-utils/swaplabel.c:140
-#, c-format
-msgid "label is too long. Truncating it to '%s'"
-msgstr "标签过长。将截短到“%s”"
-
-#: disk-utils/swaplabel.c:143
-#, c-format
-msgid "%s: failed to write label"
-msgstr "%s:写标签失败"
-
-#: disk-utils/swaplabel.c:165
-msgid ""
-" -L, --label <label> specify a new label\n"
-" -U, --uuid <uuid> specify a new uuid\n"
-msgstr ""
-" -L, --label <标签> 指定一个新标签\n"
-" -U, --uuid <uuid> 指定一个新 uuid\n"
-
-#: disk-utils/swaplabel.c:208
-msgid "ignore -U (UUIDs are unsupported)"
-msgstr "忽略 -U (不支持 UUID)"
-
-#: fdisks/cfdisk.c:374
-#, c-format
-msgid "%s: Out of memory!\n"
-msgstr "%s:内存不足!\n"
-
-#: fdisks/cfdisk.c:399 fdisks/cfdisk.c:1913
-msgid "Unusable"
-msgstr "不可用"
-
-#: fdisks/cfdisk.c:401 fdisks/cfdisk.c:1915
-msgid "Free Space"
-msgstr "剩余空间"
-
-#: fdisks/cfdisk.c:413
-#, c-format
-msgid "write failed\n"
-msgstr "写失败\n"
-
-#: fdisks/cfdisk.c:420
-#, c-format
-msgid "Disk has been changed.\n"
-msgstr "磁盘已经更改。\n"
-
-#: fdisks/cfdisk.c:422
-#, c-format
-msgid "Reboot the system to ensure the partition table is correctly updated.\n"
-msgstr "请重启系统来确保分区表正确更新。\n"
-
-#: fdisks/cfdisk.c:426
-#, c-format
-msgid ""
-"\n"
-"WARNING: If you have created or modified any\n"
-"DOS 6.x partitions, please see the cfdisk manual\n"
-"page for additional information.\n"
-msgstr ""
-"\n"
-"警告:如果您创建或修改了 DOS 6.x 分区,请\n"
-"查阅 cfdisk 手册页面了解其他信息。\n"
-
-#: fdisks/cfdisk.c:570
-msgid "FATAL ERROR"
-msgstr "致使错误"
-
-#: fdisks/cfdisk.c:571
-msgid "Press any key to exit cfdisk"
-msgstr "按任意键退出 cfdisk"
-
-#: fdisks/cfdisk.c:618 fdisks/cfdisk.c:626
-msgid "Cannot seek on disk drive"
-msgstr "在磁盘设备上无法定位"
-
-#: fdisks/cfdisk.c:620
-msgid "Cannot read disk drive"
-msgstr "无法读磁盘驱动器"
-
-#: fdisks/cfdisk.c:628
-msgid "Cannot write disk drive"
-msgstr "无法写磁盘驱动器"
-
-#: fdisks/cfdisk.c:836
-msgid "Too many partitions"
-msgstr "分区过多"
-
-#: fdisks/cfdisk.c:841
-msgid "Partition begins before sector 0"
-msgstr "分区起始于扇区 0 之前"
-
-#: fdisks/cfdisk.c:846
-msgid "Partition ends before sector 0"
-msgstr "分区终止于扇区 0 之前"
-
-#: fdisks/cfdisk.c:851
-msgid "Partition begins after end-of-disk"
-msgstr "分区起始于磁盘终点之后"
-
-#: fdisks/cfdisk.c:856
-msgid "Partition ends after end-of-disk"
-msgstr "分区终止于磁盘终点之后"
-
-#: fdisks/cfdisk.c:880
-msgid "logical partitions not in disk order"
-msgstr "逻辑分区没有按磁盘顺序"
-
-#: fdisks/cfdisk.c:883
-msgid "logical partitions overlap"
-msgstr "逻辑分区重叠"
-
-#: fdisks/cfdisk.c:887
-msgid "enlarged logical partitions overlap"
-msgstr "扩大的(enlarged)逻辑分区重叠"
-
-#: fdisks/cfdisk.c:917
-msgid "!!!! Internal error creating logical drive with no extended partition !!!!"
-msgstr "!!! 内部错误,在没有扩展分区的情况下创建逻辑分区 !!!"
-
-#: fdisks/cfdisk.c:928 fdisks/cfdisk.c:940
-msgid "Cannot create logical drive here -- would create two extended partitions"
-msgstr "无法在此创建逻辑分区 -- 将创建两个扩展分区"
-
-#: fdisks/cfdisk.c:1074
-msgid "Menu item too long. Menu may look odd."
-msgstr "菜单项过长。菜单可能显示异常。"
-
-#: fdisks/cfdisk.c:1189
-msgid "Illegal key"
-msgstr "非法的键"
-
-#: fdisks/cfdisk.c:1214
-msgid "Press a key to continue"
-msgstr "按下一个键继续"
-
-#: fdisks/cfdisk.c:1261 fdisks/cfdisk.c:1884 fdisks/cfdisk.c:2424
-#: fdisks/cfdisk.c:2426
-msgid "Primary"
-msgstr "主分区"
-
-#: fdisks/cfdisk.c:1261
-msgid "Create a new primary partition"
-msgstr "创建新的主分区"
-
-#: fdisks/cfdisk.c:1262 fdisks/cfdisk.c:1884 fdisks/cfdisk.c:2423
-#: fdisks/cfdisk.c:2426
-msgid "Logical"
-msgstr "逻辑分区"
-
-#: fdisks/cfdisk.c:1262
-msgid "Create a new logical partition"
-msgstr "创建新的逻辑分区"
-
-#: fdisks/cfdisk.c:1263 fdisks/cfdisk.c:1318 fdisks/cfdisk.c:2097
-msgid "Cancel"
-msgstr "取消"
-
-#: fdisks/cfdisk.c:1263 fdisks/cfdisk.c:1318
-msgid "Don't create a partition"
-msgstr "不创建分区"
-
-#: fdisks/cfdisk.c:1279
-msgid "!!! Internal error !!!"
-msgstr "!!! 内部错误 !!!"
-
-#: fdisks/cfdisk.c:1282
-msgid "Size (in MB): "
-msgstr "大小(MB):"
-
-#: fdisks/cfdisk.c:1316
-msgid "Beginning"
-msgstr "开头"
-
-#: fdisks/cfdisk.c:1316
-msgid "Add partition at beginning of free space"
-msgstr "在剩余空间的开头添加分区"
-
-#: fdisks/cfdisk.c:1317 libfdisk/src/bsd.c:395 libfdisk/src/dos.c:1606
-#: libfdisk/src/gpt.c:1209 libfdisk/src/sgi.c:278 libfdisk/src/sun.c:703
-msgid "End"
-msgstr "末尾"
-
-#: fdisks/cfdisk.c:1317
-msgid "Add partition at end of free space"
-msgstr "在剩余空间的末尾添加分区"
-
-#: fdisks/cfdisk.c:1335
-msgid "No room to create the extended partition"
-msgstr "没有空间来创建扩展分区"
-
-#: fdisks/cfdisk.c:1404
-msgid "No partition table.\n"
-msgstr "无分区表。\n"
-
-#: fdisks/cfdisk.c:1408
-msgid "No partition table. Starting with zero table."
-msgstr "无分区表。将以空表启动。"
-
-#: fdisks/cfdisk.c:1418
-msgid "Bad signature on partition table"
-msgstr "分区表签名有误"
-
-#: fdisks/cfdisk.c:1422
-msgid "Unknown partition table type"
-msgstr "未知的分区表类型"
-
-#: fdisks/cfdisk.c:1424
-msgid "Do you wish to start with a zero table [y/N] ?"
-msgstr "您想以空表开始吗[y/N]?"
-
-#: fdisks/cfdisk.c:1471
-msgid "You specified more cylinders than fit on disk"
-msgstr "您指定了超过磁盘适合值的柱面数"
-
-#: fdisks/cfdisk.c:1507
-msgid "Cannot open disk drive"
-msgstr "无法打开磁盘驱动器"
-
-#: fdisks/cfdisk.c:1509 fdisks/cfdisk.c:1691
-msgid "Opened disk read-only - you have no permission to write"
-msgstr "已用只读方式打开磁盘 - 您没有写权限"
-
-#: fdisks/cfdisk.c:1532
-msgid "Cannot get disk size"
-msgstr "无法获得磁盘大小"
-
-#: fdisks/cfdisk.c:1558
-msgid "Bad primary partition"
-msgstr "主分区损坏"
-
-#: fdisks/cfdisk.c:1588
-msgid "Bad logical partition"
-msgstr "逻辑分区损坏"
-
-#: fdisks/cfdisk.c:1703
-msgid "Warning!! This may destroy data on your disk!"
-msgstr "警告!这可能毁坏您磁盘上的数据!"
-
-#: fdisks/cfdisk.c:1707
-msgid "Are you sure you want to write the partition table to disk? (yes or no): "
-msgstr "您确定想将分区表写入磁盘吗?(是 或 否):"
-
-#: fdisks/cfdisk.c:1713 sys-utils/lscpu.c:986 sys-utils/lscpu.c:996
-#, c-format
-msgid "no"
-msgstr "否"
-
-#: fdisks/cfdisk.c:1715
-msgid "Did not write partition table to disk"
-msgstr "不将分区表写入磁盘"
-
-#: fdisks/cfdisk.c:1717 sys-utils/lscpu.c:986 sys-utils/lscpu.c:996
-#, c-format
-msgid "yes"
-msgstr "是"
-
-#: fdisks/cfdisk.c:1721
-msgid "Please enter `yes' or `no'"
-msgstr "请输入“是”或“否”"
-
-#: fdisks/cfdisk.c:1725
-msgid "Writing partition table to disk..."
-msgstr "正在将分区表写入磁盘..."
-
-#: fdisks/cfdisk.c:1750 fdisks/cfdisk.c:1754
-msgid "Wrote partition table to disk"
-msgstr "已将分区表写入磁盘"
-
-#: fdisks/cfdisk.c:1752
-msgid "Wrote partition table, but re-read table failed. Run partprobe(8), kpartx(8) or reboot to update table."
-msgstr "已写入分区表,但重新读分区表失败。请运行 partprobe(8)、kpartx(8) 或重启来更新分区表。"
-
-#: fdisks/cfdisk.c:1762
-msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
-msgstr "没有标记为 可启动 的主分区。DOS MBR 无法启动它。"
-
-#: fdisks/cfdisk.c:1764
-msgid "More than one primary partition is marked bootable. DOS MBR cannot boot this."
-msgstr "超过一个主分区被标记为 可启动。DOS MBR 无法启动它。"
-
-#: fdisks/cfdisk.c:1822 fdisks/cfdisk.c:1945 fdisks/cfdisk.c:2033
-msgid "Enter filename or press RETURN to display on screen: "
-msgstr "输入文件名或按 回车 来显示在屏幕上:"
-
-#: fdisks/cfdisk.c:1842
-#, c-format
-msgid "Disk Drive: %s\n"
-msgstr "磁盘驱动器:%s\n"
-
-#: fdisks/cfdisk.c:1844
-msgid "Sector 0:\n"
-msgstr "扇区 0:\n"
-
-#: fdisks/cfdisk.c:1851
-#, c-format
-msgid "Sector %d:\n"
-msgstr "扇区 %d:\n"
-
-#: fdisks/cfdisk.c:1875
-msgid " None "
-msgstr " 无 "
-
-#: fdisks/cfdisk.c:1877
-msgid " Pri/Log"
-msgstr " 主/逻辑"
-
-#: fdisks/cfdisk.c:1879
-msgid " Primary"
-msgstr " 主分区"
-
-#: fdisks/cfdisk.c:1881
-msgid " Logical"
-msgstr " 逻辑分区"
-
-#: fdisks/cfdisk.c:1919 fdisks/fdisk.c:182 fdisks/fdisk.c:183
-#: fdisks/fdisk.c:188 fdisks/sfdisk.c:585 libfdisk/src/ask.c:660
-#: libfdisk/src/dos.c:1661
-msgid "Unknown"
-msgstr "未知"
-
-#: fdisks/cfdisk.c:1925 fdisks/cfdisk.c:2401 libfdisk/src/dos.c:1604
-#: libfdisk/src/sun.c:33
-msgid "Boot"
-msgstr "启动"
-
-#: fdisks/cfdisk.c:1927
-#, c-format
-msgid "(%02X)"
-msgstr "(%02X)"
-
-#: fdisks/cfdisk.c:1929
-msgid "None"
-msgstr "无"
-
-#: fdisks/cfdisk.c:1964 fdisks/cfdisk.c:2052
-#, c-format
-msgid "Partition Table for %s\n"
-msgstr "%s 分区表\n"
-
-# 以下三条打印表格的标题行,注意对齐
-#: fdisks/cfdisk.c:1966
-msgid " First Last\n"
-msgstr " 起始 终止\n"
-
-#: fdisks/cfdisk.c:1967
-msgid " # Type Sector Sector Offset Length Filesystem Type (ID) Flag\n"
-msgstr " # 类型 扇区 扇区 偏移 长度 文件系统类型 (ID) 标志\n"
-
-#: fdisks/cfdisk.c:1968
-msgid "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
-msgstr "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
-
-# 以下三条打印表格的标题行,注意对齐
-#: fdisks/cfdisk.c:2055
-msgid " ---Starting---- ----Ending----- Start Number of\n"
-msgstr " -----开始------ -----结束------ 起点 扇区\n"
-
-#: fdisks/cfdisk.c:2056
-msgid " # Flags Head Sect Cyl ID Head Sect Cyl Sector Sectors\n"
-msgstr " # 标志 磁头 扇区 柱面 ID 磁头 扇区 柱面 扇区 数量\n"
-
-#: fdisks/cfdisk.c:2057
-msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
-msgstr "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
-
-#: fdisks/cfdisk.c:2094
-msgid "Raw"
-msgstr "原生"
-
-#: fdisks/cfdisk.c:2094
-msgid "Print the table using raw data format"
-msgstr "以原生数据格式打印该表"
-
-#: fdisks/cfdisk.c:2095 fdisks/cfdisk.c:2198 libfdisk/src/sgi.c:279
-msgid "Sectors"
-msgstr "扇区"
-
-#: fdisks/cfdisk.c:2095
-msgid "Print the table ordered by sectors"
-msgstr "按扇区顺序打印表"
-
-#: fdisks/cfdisk.c:2096
-msgid "Table"
-msgstr "表"
-
-#: fdisks/cfdisk.c:2096
-msgid "Just print the partition table"
-msgstr "直接打印分区表"
-
-#: fdisks/cfdisk.c:2097
-msgid "Don't print the table"
-msgstr "不打印表"
-
-#: fdisks/cfdisk.c:2125
-msgid "Help Screen for cfdisk"
-msgstr "cfdisk 帮助页面"
-
-# 以下三句连贯,一起翻译
-#: fdisks/cfdisk.c:2127
-msgid "This is cfdisk, a curses based disk partitioning program, which"
-msgstr "这是 cfdisk,一款基于 curses 的磁盘分区程序,"
-
-#: fdisks/cfdisk.c:2128
-msgid "allows you to create, delete and modify partitions on your hard"
-msgstr "您可以通过它创建、删除和修改您硬盘驱动器上的"
-
-#: fdisks/cfdisk.c:2129
-msgid "disk drive."
-msgstr "分区。"
-
-#: fdisks/cfdisk.c:2131
-msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
-msgstr "版权所有 (C) 1994-1999 Kevin E. Martin & aeb"
-
-# 以下两条注意对齐
-#: fdisks/cfdisk.c:2133
-msgid "Command Meaning"
-msgstr "命令 意义"
-
-#: fdisks/cfdisk.c:2134
-msgid "------- -------"
-msgstr "------- -------"
-
-#: fdisks/cfdisk.c:2135
-msgid " b Toggle bootable flag of the current partition"
-msgstr " b 切换当前分区的 可启动 标志"
-
-#: fdisks/cfdisk.c:2136
-msgid " d Delete the current partition"
-msgstr " d 删除当前分区"
-
-#: fdisks/cfdisk.c:2137
-msgid " g Change cylinders, heads, sectors-per-track parameters"
-msgstr " g 更改柱面、磁头、每个磁道扇区数等参数"
-
-#: fdisks/cfdisk.c:2138
-msgid " WARNING: This option should only be used by people who"
-msgstr " 警告:不要使用此选项,除非您"
-
-#: fdisks/cfdisk.c:2139
-msgid " know what they are doing."
-msgstr " 清楚这样做的后果。"
-
-#: fdisks/cfdisk.c:2140
-msgid " h Print this screen"
-msgstr " h 打印此屏幕"
-
-#: fdisks/cfdisk.c:2141
-msgid " m Maximize disk usage of the current partition"
-msgstr " m 使当前分区的磁盘使用最大化"
-
-#: fdisks/cfdisk.c:2142
-msgid " Note: This may make the partition incompatible with"
-msgstr " 注:这可能使该分区与以下系统不兼容"
-
-#: fdisks/cfdisk.c:2143
-msgid " DOS, OS/2, ..."
-msgstr " DOS, OS/2, ..."
-
-#: fdisks/cfdisk.c:2144
-msgid " n Create new partition from free space"
-msgstr " n 从空闲空间创建新分区"
-
-#: fdisks/cfdisk.c:2145
-msgid " p Print partition table to the screen or to a file"
-msgstr " p 打印分区表到屏幕或文件"
-
-#: fdisks/cfdisk.c:2146
-msgid " There are several different formats for the partition"
-msgstr " 有几种不同的分区格式"
-
-#: fdisks/cfdisk.c:2147
-msgid " that you can choose from:"
-msgstr " 供您选择:"
-
-#: fdisks/cfdisk.c:2148
-msgid " r - Raw data (exactly what would be written to disk)"
-msgstr " r - 原生(raw)数据(数据会原样写入磁盘)"
-
-#: fdisks/cfdisk.c:2149
-msgid " s - Table ordered by sectors"
-msgstr " s - 按扇区排序的表"
-
-#: fdisks/cfdisk.c:2150
-msgid " t - Table in raw format"
-msgstr " t - 原生格式的表"
-
-#: fdisks/cfdisk.c:2151
-msgid " q Quit program without writing partition table"
-msgstr " q 退出程序但不写入分区表"
-
-#: fdisks/cfdisk.c:2152
-msgid " t Change the filesystem type"
-msgstr " t 更改文件系统类型"
-
-#: fdisks/cfdisk.c:2153
-msgid " u Change units of the partition size display"
-msgstr " u 更改分区大小的显示单位"
-
-#: fdisks/cfdisk.c:2154
-msgid " Rotates through MB, sectors and cylinders"
-msgstr " 在 MB、扇区数、柱面数之间循环"
-
-#: fdisks/cfdisk.c:2155
-msgid " W Write partition table to disk (must enter upper case W)"
-msgstr " W 将分区表写入磁盘(必须输入大写 W)"
-
-#: fdisks/cfdisk.c:2156
-msgid " Since this might destroy data on the disk, you must"
-msgstr " 由于这可能破坏磁盘上的数据,您必须"
-
-#: fdisks/cfdisk.c:2157
-msgid " either confirm or deny the write by entering `yes' or"
-msgstr " 通过输入“yes”或“no”来确实或拒绝"
-
-#: fdisks/cfdisk.c:2158
-msgid " `no'"
-msgstr " 写入"
-
-#: fdisks/cfdisk.c:2159
-msgid "Up Arrow Move cursor to the previous partition"
-msgstr "上箭头 光标移到上一分区"
-
-#: fdisks/cfdisk.c:2160
-msgid "Down Arrow Move cursor to the next partition"
-msgstr "下箭头 光标移到下一分区"
-
-#: fdisks/cfdisk.c:2161
-msgid "CTRL-L Redraws the screen"
-msgstr "CTRL-L 重绘屏幕"
-
-#: fdisks/cfdisk.c:2162
-msgid " ? Print this screen"
-msgstr " ? 打印此屏幕"
-
-#: fdisks/cfdisk.c:2164
-msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "注:所有命令均可以大写或小写"
-
-#: fdisks/cfdisk.c:2165
-msgid "case letters (except for Writes)."
-msgstr "字母输入(写入命令除外)。"
-
-#: fdisks/cfdisk.c:2196 libfdisk/src/sun.c:187
-msgid "Cylinders"
-msgstr "柱面"
-
-#: fdisks/cfdisk.c:2196
-msgid "Change cylinder geometry"
-msgstr "更改柱面几何属性"
-
-#: fdisks/cfdisk.c:2197 libfdisk/src/sun.c:183
-msgid "Heads"
-msgstr "磁头"
-
-#: fdisks/cfdisk.c:2197
-msgid "Change head geometry"
-msgstr "更改磁头几何属性"
-
-#: fdisks/cfdisk.c:2198
-msgid "Change sector geometry"
-msgstr "更改扇区几何属性"
-
-#: fdisks/cfdisk.c:2199 fdisks/sfdisk.c:2969 fdisks/sfdisk.c:3030
-#: fdisks/sfdisk.c:3066
-msgid "Done"
-msgstr "完成"
-
-#: fdisks/cfdisk.c:2199
-msgid "Done with changing geometry"
-msgstr "更改几何属性完成"
-
-#: fdisks/cfdisk.c:2212
-msgid "Enter the number of cylinders: "
-msgstr "请输入柱面数:"
-
-#: fdisks/cfdisk.c:2223 fdisks/cfdisk.c:2816
-msgid "Illegal cylinders value"
-msgstr "柱面数值不合法"
-
-#: fdisks/cfdisk.c:2229
-msgid "Enter the number of heads: "
-msgstr "请输入磁头数:"
-
-#: fdisks/cfdisk.c:2236 fdisks/cfdisk.c:2826
-msgid "Illegal heads value"
-msgstr "磁头数值不合法"
-
-#: fdisks/cfdisk.c:2242
-msgid "Enter the number of sectors per track: "
-msgstr "请输入每个磁道的扇区数:"
-
-#: fdisks/cfdisk.c:2249 fdisks/cfdisk.c:2833
-msgid "Illegal sectors value"
-msgstr "扇区数值不合法"
-
-#: fdisks/cfdisk.c:2352
-msgid "Enter filesystem type: "
-msgstr "请输入文件系统类型:"
-
-#: fdisks/cfdisk.c:2370
-msgid "Cannot change FS Type to empty"
-msgstr "无法将文件系统类型更改为空值"
-
-#: fdisks/cfdisk.c:2372
-msgid "Cannot change FS Type to extended"
-msgstr "无法将文件系统类型更改为扩展"
-
-#: fdisks/cfdisk.c:2403
-#, c-format
-msgid "Unk(%02X)"
-msgstr "未知(%02X)"
-
-#: fdisks/cfdisk.c:2406 fdisks/cfdisk.c:2409
-msgid ", NC"
-msgstr ",不可用"
-
-#: fdisks/cfdisk.c:2414 fdisks/cfdisk.c:2417
-msgid "NC"
-msgstr "不可用"
-
-#: fdisks/cfdisk.c:2425
-msgid "Pri/Log"
-msgstr "主/逻辑"
-
-#: fdisks/cfdisk.c:2432
-#, c-format
-msgid "Unknown (%02X)"
-msgstr "未知 (%02X)"
-
-#: fdisks/cfdisk.c:2501
-#, c-format
-msgid "Disk Drive: %s"
-msgstr "磁盘驱动器:%s"
-
-#: fdisks/cfdisk.c:2508
-#, c-format
-msgid "Size: %lld bytes, %lld MB"
-msgstr "大小:%lld 字节,%lld MB"
-
-#: fdisks/cfdisk.c:2511
-#, c-format
-msgid "Size: %lld bytes, %lld.%lld GB"
-msgstr "大小:%lld 字节,%lld.%lld GB"
-
-#: fdisks/cfdisk.c:2515
-#, c-format
-msgid "Heads: %d Sectors per Track: %d Cylinders: %lld"
-msgstr "磁头数:%d 每磁道扇区数:%d 柱面数:%lld"
-
-#: fdisks/cfdisk.c:2519 libfdisk/src/gpt.c:1215 libfdisk/src/sgi.c:335
-#: login-utils/chfn.c:235 login-utils/chfn.c:315
-msgid "Name"
-msgstr "名称"
-
-#: fdisks/cfdisk.c:2520
-msgid "Flags"
-msgstr "标志"
-
-#: fdisks/cfdisk.c:2521
-msgid "Part Type"
-msgstr "分区类型"
-
-#: fdisks/cfdisk.c:2522
-msgid "FS Type"
-msgstr "文件系统"
-
-#: fdisks/cfdisk.c:2523
-msgid "[Label]"
-msgstr "[标签]"
-
-#: fdisks/cfdisk.c:2525
-msgid " Sectors"
-msgstr " 扇区"
-
-#: fdisks/cfdisk.c:2527
-msgid " Cylinders"
-msgstr " 柱面"
-
-#: fdisks/cfdisk.c:2529
-msgid " Size (MB)"
-msgstr " 大小 (MB)"
-
-#: fdisks/cfdisk.c:2531
-msgid " Size (GB)"
-msgstr " 大小 (GB)"
-
-#: fdisks/cfdisk.c:2553
-msgid "No more partitions"
-msgstr "没有更多分区"
-
-#: fdisks/cfdisk.c:2586
-msgid "Bootable"
-msgstr "可启动"
-
-#: fdisks/cfdisk.c:2586
-msgid "Toggle bootable flag of the current partition"
-msgstr "开关当前分区的 可启动 标志"
-
-#: fdisks/cfdisk.c:2587
-msgid "Delete"
-msgstr "删除"
-
-#: fdisks/cfdisk.c:2587
-msgid "Delete the current partition"
-msgstr "删除当前分区"
-
-#: fdisks/cfdisk.c:2588 fdisks/fdisk-menu.c:138
-msgid "Geometry"
-msgstr "几何属性"
-
-#: fdisks/cfdisk.c:2588
-msgid "Change disk geometry (experts only)"
-msgstr "更改磁盘的几何属性(仅限专业人员)"
-
-#: fdisks/cfdisk.c:2589
-msgid "Help"
-msgstr "帮助"
-
-#: fdisks/cfdisk.c:2589
-msgid "Print help screen"
-msgstr "打印帮助界面"
-
-#: fdisks/cfdisk.c:2590
-msgid "Maximize"
-msgstr "最大化"
-
-#: fdisks/cfdisk.c:2590
-msgid "Maximize disk usage of the current partition (experts only)"
-msgstr "当前分区的最大磁盘使用量(仅限专业人员)"
-
-#: fdisks/cfdisk.c:2591
-msgid "New"
-msgstr "新建"
-
-#: fdisks/cfdisk.c:2591
-msgid "Create new partition from free space"
-msgstr "在剩余空间上创建新分区"
-
-#: fdisks/cfdisk.c:2592
-msgid "Print"
-msgstr "打印"
-
-#: fdisks/cfdisk.c:2592
-msgid "Print partition table to the screen or to a file"
-msgstr "向屏幕或文件打印分区表"
-
-#: fdisks/cfdisk.c:2593
-msgid "Quit"
-msgstr "退出"
-
-#: fdisks/cfdisk.c:2593
-msgid "Quit program without writing partition table"
-msgstr "退出程序而不写入分区表"
-
-#: fdisks/cfdisk.c:2594 libfdisk/src/bsd.c:397 libfdisk/src/gpt.c:1211
-msgid "Type"
-msgstr "类型"
-
-#: fdisks/cfdisk.c:2594
-msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "更改文件系统类型(DOS, Linux, OS/2 等)"
-
-#: fdisks/cfdisk.c:2595
-msgid "Units"
-msgstr "单位"
-
-#: fdisks/cfdisk.c:2595
-msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "更改分区大小的单位(MB、扇区,柱面)"
-
-#: fdisks/cfdisk.c:2596
-msgid "Write"
-msgstr "写入"
-
-#: fdisks/cfdisk.c:2596
-msgid "Write partition table to disk (this might destroy data)"
-msgstr "将分区表写入磁盘(可能损坏数据)"
-
-#: fdisks/cfdisk.c:2643
-msgid "Cannot make this partition bootable"
-msgstr "无法将此分区标记为 可启动"
-
-#: fdisks/cfdisk.c:2653
-msgid "Cannot delete an empty partition"
-msgstr "无法删除空分区"
-
-#: fdisks/cfdisk.c:2673 fdisks/cfdisk.c:2675
-msgid "Cannot maximize this partition"
-msgstr "无法最大化此分区"
-
-#: fdisks/cfdisk.c:2683
-msgid "This partition is unusable"
-msgstr "此分区无法使用"
-
-#: fdisks/cfdisk.c:2685
-msgid "This partition is already in use"
-msgstr "此分区已在使用中"
-
-#: fdisks/cfdisk.c:2702
-msgid "Cannot change the type of an empty partition"
-msgstr "无法更改空分区的类型"
-
-#: fdisks/cfdisk.c:2746
-msgid "Illegal command"
-msgstr "非法命令"
-
-#: fdisks/cfdisk.c:2756
-#, c-format
-msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "版权所有 (C) 1994-2002 Kevin E. Martin & aeb\n"
-
-#: fdisks/cfdisk.c:2765
-msgid " -c, --cylinders <number> set the number of cylinders to use\n"
-msgstr " -c, --cylinders <数字> 设置要使用的柱面数\n"
-
-#: fdisks/cfdisk.c:2766
-msgid " -h, --heads <number> set the number of heads to use\n"
-msgstr " -h, --heads <数字> 设置要使用的磁头数\n"
-
-#: fdisks/cfdisk.c:2767
-msgid " -s, --sectors <number> set the number of sectors to use\n"
-msgstr " -s, --sectors <数字> 设置要使用的扇区数\n"
-
-#: fdisks/cfdisk.c:2768
-msgid " -g, --guess guess a geometry from partition table\n"
-msgstr " -g, --guess 根据分区表推算几何属性\n"
-
-#: fdisks/cfdisk.c:2769
-msgid " -P, --print <r|s|t> print partition table in specified format\n"
-msgstr " -P, --print <r|s|t> 以指定的格式打印分区表\n"
-
-#: fdisks/cfdisk.c:2770
-msgid " -z, --zero start with zeroed partition table\n"
-msgstr " -z, --zero 以空分区表开始\n"
-
-#: fdisks/cfdisk.c:2771
-msgid " -a, --arrow use arrow for highlighting the current partition\n"
-msgstr " -a, --arrow 用箭头突出显示当前分区\n"
-
-#: fdisks/cfdisk.c:2773
-msgid " --help display this help and exit\n"
-msgstr " --help 显示此帮助并退出\n"
-
-#: fdisks/cfdisk.c:2814
-msgid "cannot parse number of cylinders"
-msgstr "无法解析柱面数"
-
-#: fdisks/cfdisk.c:2824
-msgid "cannot parse number of heads"
-msgstr "无法解析磁头数"
-
-#: fdisks/cfdisk.c:2831
-msgid "cannot parse number of sectors"
-msgstr "无法解析扇区数"
-
-#: fdisks/fdisk-ask.c:29
-#, c-format
-msgid ""
-"\n"
-"Do you really want to quit? "
-msgstr ""
-"\n"
-"您确实要退出吗?"
-
-#: fdisks/fdisk-ask.c:74
-#, c-format
-msgid "%s (%s, default %c): "
-msgstr "%s (%s,默认 %c):"
-
-#: fdisks/fdisk-ask.c:77 fdisks/fdisk-ask.c:143
-#, c-format
-msgid "%s (%s, default %jd): "
-msgstr "%s (%s,默认 %jd):"
-
-#: fdisks/fdisk-ask.c:82
-#, c-format
-msgid "%s (%c-%c, default %c): "
-msgstr "%s (%c-%c,默认为 %c):"
-
-#: fdisks/fdisk-ask.c:85 fdisks/fdisk-ask.c:145
-#, c-format
-msgid "%s (%jd-%jd, default %jd): "
-msgstr "%s (%jd-%jd,默认 %jd):"
-
-#: fdisks/fdisk-ask.c:88
-#, c-format
-msgid "%s (%c-%c): "
-msgstr "%s (%c-%c):"
-
-#: fdisks/fdisk-ask.c:91 fdisks/fdisk-ask.c:147
-#, c-format
-msgid "%s (%jd-%jd): "
-msgstr "%s (%jd-%jd): "
-
-#: fdisks/fdisk-ask.c:118 fdisks/fdisk-ask.c:189
-msgid "Value out of range."
-msgstr "值超出范围。"
-
-#: fdisks/fdisk-ask.c:214
-msgid ": "
-msgstr ":"
-
-#: fdisks/fdisk-ask.c:277
-msgid " [Y]es/[N]o: "
-msgstr "是[Y]/否[N]:"
-
-#: fdisks/fdisk-ask.c:298
-#, fuzzy, c-format
-msgid "internal error: unsupported dialog type %d"
-msgstr "内部错误:不支持的对话类型 %d"
-
-#: fdisks/fdisk-ask.c:312
-msgid "Partition type (type L to list all types): "
-msgstr "分区类型(输入 L 列出所有类型):"
-
-#: fdisks/fdisk-ask.c:313
-msgid "Hex code (type L to list all codes): "
-msgstr "Hex 代码(输入 L 列出所有代码):"
-
-#: fdisks/fdisk.c:53
-#, c-format
-msgid ""
-" %1$s [options] <disk> change partition table\n"
-" %1$s [options] -l <disk> list partition table(s)\n"
-msgstr ""
-" %1$s [选项] <磁盘> 更改分区表\n"
-" %1$s [选项] -l <磁盘> 列出分区表\n"
-
-#: fdisks/fdisk.c:58
-msgid " -b <size> sector size (512, 1024, 2048 or 4096)\n"
-msgstr " -b <size> 扇区大小(512, 1024, 2048 或 4096)\n"
-
-#: fdisks/fdisk.c:59 fdisks/fdisk.c:61
-msgid " -c[=<mode>] compatible mode: 'dos' or 'nondos' (default)\n"
-msgstr " -c[=<模式>] 兼容模式:“dos”或“nondos”(默认)\n"
-
-#: fdisks/fdisk.c:60
-msgid " -h print this help text\n"
-msgstr " -h 显示此帮助并退出\n"
-
-#: fdisks/fdisk.c:62
-msgid " -L[=<when>] colorize output (auto, always or never)\n"
-msgstr " -L[=<何时>] 彩色显示输出(auto自动,always总是或never从不)\n"
-
-#: fdisks/fdisk.c:63
-msgid " -t <type> force fdisk to recognize specified partition table type only\n"
-msgstr " -t <类型> 强制 disk 只重新识别特定的分区表类型\n"
-
-#: fdisks/fdisk.c:64
-msgid " -u[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"
-msgstr " -u[=<单位>] 显示单位:“cylinders”柱面 或“sectors”扇区(默认)\n"
-
-#: fdisks/fdisk.c:65
-msgid " -v print program version\n"
-msgstr " -v 打印程序版本\n"
-
-#: fdisks/fdisk.c:66
-msgid " -C <number> specify the number of cylinders\n"
-msgstr " -C <数字> 指定柱面数\n"
-
-#: fdisks/fdisk.c:67
-msgid " -H <number> specify the number of heads\n"
-msgstr " -H <数字> 指定磁头数\n"
-
-#: fdisks/fdisk.c:68
-msgid " -S <number> specify the number of sectors per track\n"
-msgstr " -S <数字> 指定每条磁道的扇区数\n"
-
-#: fdisks/fdisk.c:151
-msgid "DOS Compatibility flag is set (DEPRECATED!)"
-msgstr "已设置 DOS 兼容性标志(已废弃!)"
-
-#: fdisks/fdisk.c:152
-msgid "DOS Compatibility flag is not set"
-msgstr "DOS 兼容性标志未设置"
-
-#: fdisks/fdisk.c:173
-#, c-format
-msgid "Partition %zu does not exist yet!"
-msgstr "分区 %zu 还不存在!"
-
-#: fdisks/fdisk.c:181
-#, c-format
-msgid "Changed type of partition '%s' to '%s'."
-msgstr "已将分区“%s”的类型更改为“%s”。"
-
-#: fdisks/fdisk.c:186
-#, c-format
-msgid "Type of partition %zu is unchanged: %s."
-msgstr "分区 %zu 的类型未更改:%s。"
-
-#: fdisks/fdisk.c:202
-#, c-format
-msgid "Disk %s: %s, %llu bytes, %llu sectors"
-msgstr "Disk %s:%s,%llu 字节,%llu 个扇区"
-
-#: fdisks/fdisk.c:207
-#, c-format
-msgid "Geometry: %d heads, %llu sectors/track, %llu cylinders"
-msgstr "几何属性:%d 个磁头, %llu 个扇区/磁道, %llu 个柱面"
-
-#: fdisks/fdisk.c:210
-#, c-format
-msgid "Units: %s of %d * %ld = %ld bytes"
-msgstr "单元:%s / %d * %ld = %ld 字节"
-
-#: fdisks/fdisk.c:216
-#, c-format
-msgid "Sector size (logical/physical): %lu bytes / %lu bytes"
-msgstr "扇区大小(逻辑/物理):%lu 字节 / %lu 字节"
-
-#: fdisks/fdisk.c:218
-#, c-format
-msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes"
-msgstr "I/O 大小(最小/最佳):%lu 字节 / %lu 字节"
-
-#: fdisks/fdisk.c:221
-#, c-format
-msgid "Alignment offset: %lu bytes"
-msgstr "对齐偏移量:%lu 字节"
-
-#: fdisks/fdisk.c:224
-#, c-format
-msgid "Disklabel type: %s"
-msgstr "磁盘标签类型:%s"
-
-#: fdisks/fdisk.c:227
-#, c-format
-msgid "Disk identifier: %s"
-msgstr "磁盘标识符:%s"
-
-#: fdisks/fdisk.c:275
-#, c-format
-msgid ""
-"\n"
-"%s: offset = %ju, size = %zu bytes."
-msgstr ""
-"\n"
-"%s: 偏移 = %ju, 大小 = %zu 字节。"
-
-#: fdisks/fdisk.c:279
-msgid "cannot seek"
-msgstr "无法 seek"
-
-#: fdisks/fdisk.c:284
-msgid "cannot read"
-msgstr "不能读"
-
-#: fdisks/fdisk.c:298 libfdisk/src/bsd.c:215 libfdisk/src/dos.c:876
-#: libfdisk/src/gpt.c:1696
-msgid "First sector"
-msgstr "第一个扇区"
-
-#: fdisks/fdisk.c:384
-#, c-format
-msgid "BLKGETSIZE ioctl failed on %s"
-msgstr "对 %s 进行 BLKGETSIZE ioctl 失败"
-
-#: fdisks/fdisk.c:410
-msgid "failed to allocate libfdisk context"
-msgstr "分配 libfdisk 上下文失败"
-
-#: fdisks/fdisk.c:419
-msgid "invalid sector size argument"
-msgstr "无效的 扇区大小 参数"
-
-#: fdisks/fdisk.c:428 fdisks/sfdisk.c:2597
-msgid "invalid cylinders argument"
-msgstr "无效的 柱面数 参数"
-
-#: fdisks/fdisk.c:437
-msgid "not found DOS label driver"
-msgstr "未找到 DOS 标签驱动"
-
-#: fdisks/fdisk.c:450 fdisks/sfdisk.c:2606
-msgid "invalid heads argument"
-msgstr "无效的 磁头数 参数"
-
-#: fdisks/fdisk.c:456 fdisks/sfdisk.c:2624
-msgid "invalid sectors argument"
-msgstr "无效的 扇区数 参数"
-
-#: fdisks/fdisk.c:464 misc-utils/cal.c:351 sys-utils/dmesg.c:1286
-msgid "unsupported color mode"
-msgstr "不支持的颜色模式"
-
-#: fdisks/fdisk.c:478
-#, c-format
-msgid "unsupported disklabel: %s"
-msgstr "不支持的磁盘标签:%s"
-
-#: fdisks/fdisk.c:499
-msgid "The device properties (sector size and geometry) should be used with one specified device only."
-msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。"
-
-#: fdisks/fdisk.c:538
-#, c-format
-msgid "Welcome to fdisk (%s)."
-msgstr "欢迎使用 fdisk (%s)。"
-
-#: fdisks/fdisk.c:540
-msgid ""
-"Changes will remain in memory only, until you decide to write them.\n"
-"Be careful before using the write command.\n"
-msgstr ""
-"更改将停留在内存中,直到您决定将更改写入磁盘。\n"
-"使用写入命令前请三思。\n"
-
-#: fdisks/fdisk.c:545
-msgid "Device does not contain a recognized partition table."
-msgstr "设备不包含可识别的分区表。"
-
-#: fdisks/fdisk-menu.c:90
-msgid "Generic"
-msgstr "常规"
-
-#: fdisks/fdisk-menu.c:91
-msgid "delete a partition"
-msgstr "删除分区"
-
-#: fdisks/fdisk-menu.c:92
-msgid "list known partition types"
-msgstr "列出已知分区类型"
-
-#: fdisks/fdisk-menu.c:93
-msgid "add a new partition"
-msgstr "添加新分区"
-
-#: fdisks/fdisk-menu.c:94
-msgid "print the partition table"
-msgstr "打印分区表"
-
-#: fdisks/fdisk-menu.c:95
-msgid "change a partition type"
-msgstr "更改分区类型"
-
-#: fdisks/fdisk-menu.c:96
-msgid "verify the partition table"
-msgstr "检查分区表"
-
-#: fdisks/fdisk-menu.c:98
-msgid "print the raw data of the first sector from the device"
-msgstr "打印设备第1个扇区的原始数据"
-
-#: fdisks/fdisk-menu.c:99
-msgid "print the raw data of the disklabel from the device"
-msgstr "打印设备磁盘标签的原始数据"
-
-#: fdisks/fdisk-menu.c:101
-msgid "Misc"
-msgstr "杂项"
-
-#: fdisks/fdisk-menu.c:102
-msgid "print this menu"
-msgstr "打印此菜单"
-
-#: fdisks/fdisk-menu.c:103
-msgid "change display/entry units"
-msgstr "更改 显示/记录 单位"
-
-#: fdisks/fdisk-menu.c:104
-msgid "extra functionality (experts only)"
-msgstr "更多功能(仅限专业人员)"
-
-#: fdisks/fdisk-menu.c:106
-msgid "Save & Exit"
-msgstr "保存并退出"
-
-#: fdisks/fdisk-menu.c:107
-msgid "write table to disk and exit"
-msgstr "将分区表写入磁盘并退出"
-
-#: fdisks/fdisk-menu.c:108
-msgid "write table to disk"
-msgstr "将分区表写入磁盘"
-
-#: fdisks/fdisk-menu.c:109
-msgid "quit without saving changes"
-msgstr "退出而不保存更改"
-
-#: fdisks/fdisk-menu.c:110 fdisks/fdisk-menu.c:111
-msgid "return to main menu"
-msgstr "返回主菜单"
-
-#: fdisks/fdisk-menu.c:121
-msgid "Create a new label"
-msgstr "新建空磁盘标签"
-
-#: fdisks/fdisk-menu.c:122
-msgid "create a new empty GPT partition table"
-msgstr "新建一份 GPT 分区表"
-
-#: fdisks/fdisk-menu.c:123
-msgid "create a new empty SGI (IRIX) partition table"
-msgstr "新建一份空 GPT (IRIX) 分区表"
-
-#: fdisks/fdisk-menu.c:124
-msgid "create a new empty DOS partition table"
-msgstr "新建一份的空 DOS 分区表"
-
-#: fdisks/fdisk-menu.c:125
-msgid "create a new empty Sun partition table"
-msgstr "新建一份空 Sun 分区表"
-
-#: fdisks/fdisk-menu.c:129
-msgid "create an IRIX (SGI) partition table"
-msgstr "创建一份 IRIX(SGI) 分区表"
-
-#: fdisks/fdisk-menu.c:139
-msgid "change number of cylinders"
-msgstr "更改柱面数"
-
-#: fdisks/fdisk-menu.c:140
-msgid "change number of heads"
-msgstr "更改磁头数"
-
-#: fdisks/fdisk-menu.c:141
-msgid "change number of sectors/track"
-msgstr "更改扇区/磁道数"
-
-#: fdisks/fdisk-menu.c:150 include/pt-mbr-partnames.h:91
-msgid "GPT"
-msgstr "GPT"
-
-#: fdisks/fdisk-menu.c:151
-msgid "change disk GUID"
-msgstr "更改磁盘 GUID"
-
-#: fdisks/fdisk-menu.c:152
-msgid "change partition name"
-msgstr "更改分区名"
-
-#: fdisks/fdisk-menu.c:153
-msgid "change partition UUID"
-msgstr "更改分区 UUID"
-
-#: fdisks/fdisk-menu.c:163
-msgid "Sun"
-msgstr "Sun"
-
-#: fdisks/fdisk-menu.c:164
-msgid "toggle the read-only flag"
-msgstr "开关 只读 标志"
-
-#: fdisks/fdisk-menu.c:165
-msgid "toggle the mountable flag"
-msgstr "开关 可挂臷 标志"
-
-#: fdisks/fdisk-menu.c:167
-msgid "change number of alternate cylinders"
-msgstr "更改备选柱面数"
-
-#: fdisks/fdisk-menu.c:168
-msgid "change number of extra sectors per cylinder"
-msgstr "更改每柱面的额外扇区数"
-
-#: fdisks/fdisk-menu.c:169
-msgid "change interleave factor"
-msgstr "更改交错系数"
-
-#: fdisks/fdisk-menu.c:170
-msgid "change rotation speed (rpm)"
-msgstr "更改转速(转/分)"
-
-#: fdisks/fdisk-menu.c:171
-msgid "change number of physical cylinders"
-msgstr "更改物理柱面数"
-
-#: fdisks/fdisk-menu.c:180
-msgid "SGI"
-msgstr "SGI"
-
-#: fdisks/fdisk-menu.c:181
-msgid "select bootable partition"
-msgstr "选择可启动分区"
-
-#: fdisks/fdisk-menu.c:182
-msgid "edit bootfile entry"
-msgstr "编辑启动文件记录"
-
-#: fdisks/fdisk-menu.c:183
-msgid "select sgi swap partition"
-msgstr "选择 sgi 交换分区"
-
-#: fdisks/fdisk-menu.c:184
-msgid "create SGI info"
-msgstr "创建 SGI 信息"
-
-#: fdisks/fdisk-menu.c:193
-msgid "DOS (MBR)"
-msgstr "DOS (MBR)"
-
-#: fdisks/fdisk-menu.c:194
-msgid "toggle a bootable flag"
-msgstr "开关 可启动 标志"
-
-#: fdisks/fdisk-menu.c:195
-msgid "edit nested BSD disklabel"
-msgstr "编辑嵌套的 BSD 磁盘标签"
-
-#: fdisks/fdisk-menu.c:196
-msgid "toggle the dos compatibility flag"
-msgstr "开关 dos 兼容性标志"
-
-#: fdisks/fdisk-menu.c:198
-msgid "move beginning of data in a partition"
-msgstr "移动分区数据的起始点"
-
-#: fdisks/fdisk-menu.c:199
-msgid "list extended partitions"
-msgstr "列出扩展分区"
-
-#: fdisks/fdisk-menu.c:200
-msgid "fix partition order"
-msgstr "修复分区顺序"
-
-#: fdisks/fdisk-menu.c:201
-msgid "change the disk identifier"
-msgstr "更改磁盘标识符"
-
-#: fdisks/fdisk-menu.c:210
-msgid "BSD"
-msgstr "BSD"
-
-#: fdisks/fdisk-menu.c:211
-msgid "edit drive data"
-msgstr "编辑驱动数据"
-
-#: fdisks/fdisk-menu.c:212
-msgid "install bootstrap"
-msgstr "安装引导程序"
-
-#: fdisks/fdisk-menu.c:213
-msgid "show complete disklabel"
-msgstr "显示完整磁盘标签"
-
-#: fdisks/fdisk-menu.c:214
-msgid "link BSD partition to non-BSD partition"
-msgstr "将 BSD 分区链接到非 BSD 分区"
-
-#: fdisks/fdisk-menu.c:324
-#, c-format
-msgid ""
-"\n"
-"Help (expert commands):\n"
-msgstr ""
-"\n"
-"帮助 (专业命令):\n"
-
-#: fdisks/fdisk-menu.c:326
-#, c-format
-msgid ""
-"\n"
-"Help:\n"
-msgstr ""
-"\n"
-"帮助:\n"
-
-#: fdisks/fdisk-menu.c:364
-msgid "Expert command (m for help): "
-msgstr "专家命令(输入 m 显示帮助):"
-
-#: fdisks/fdisk-menu.c:366
-msgid "Command (m for help): "
-msgstr "命令(输入 m 获取帮助):"
-
-#: fdisks/fdisk-menu.c:376
-#, c-format
-msgid "%c: unknown command"
-msgstr "%c:未知命令"
-
-#: fdisks/fdisk-menu.c:416
-msgid "failed to write disklabel"
-msgstr "写磁盘标签失败"
-
-#: fdisks/fdisk-menu.c:419
-msgid "The partition table has been altered."
-msgstr "分区表已调整。"
-
-#: fdisks/fdisk-menu.c:459
-#, c-format
-msgid "Could not delete partition %d"
-msgstr "无法删除分区 %d"
-
-#: fdisks/fdisk-menu.c:461
-#, c-format
-msgid "Partition %d has been deleted."
-msgstr "分区 %d 已删除。"
-
-#: fdisks/fdisk-menu.c:477
-msgid "Changing display/entry units to cylinders (DEPRECATED!)."
-msgstr "将显示/记录单位更改为柱面(已废弃!)。"
-
-#: fdisks/fdisk-menu.c:479
-msgid "Changing display/entry units to sectors."
-msgstr "将显示/记录单位更改为盲区。"
-
-#: fdisks/fdisk-menu.c:489
-msgid "Leaving nested disklabel."
-msgstr "离开嵌套的磁盘标签。"
-
-#: fdisks/fdisk-menu.c:572
-msgid "Entering nested BSD disklabel."
-msgstr "进入嵌套的 BSD 磁盘标签。"
-
-#: fdisks/fdisk-menu.c:754
-msgid "Number of cylinders"
-msgstr "柱面数"
-
-#: fdisks/fdisk-menu.c:758
-msgid "Number of heads"
-msgstr "磁头数"
-
-#: fdisks/fdisk-menu.c:762
-msgid "Number of sectors"
-msgstr "扇区数"
-
-#: fdisks/sfdisk.c:112
+#: disk-utils/sfdisk.c:113
#, c-format
msgid "seek error on %s - cannot seek to %lu"
msgstr "在 %s 上定位出错 - 无法定位到 %lu"
-#: fdisks/sfdisk.c:117
+#: 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"
-#: fdisks/sfdisk.c:165 fdisks/sfdisk.c:243
+#: disk-utils/sfdisk.c:166 disk-utils/sfdisk.c:244
#, c-format
msgid "read error on %s - cannot read sector %llu"
msgstr "在 %s 上定位出错 - 无法定位到 %llu"
-#: fdisks/sfdisk.c:195
+#: disk-utils/sfdisk.c:196
#, c-format
msgid "write error on %s - cannot write sector %llu"
msgstr "在 %s 上定位出错 - 无法定位到 %llu"
-#: fdisks/sfdisk.c:232
+#: disk-utils/sfdisk.c:233
#, c-format
msgid "cannot open partition sector save file (%s)"
msgstr "打不开分区扇区保存文件(%s)"
-#: fdisks/sfdisk.c:248
+#: disk-utils/sfdisk.c:249
#, c-format
msgid "write error on %s"
msgstr "%s 写出错"
-#: fdisks/sfdisk.c:277
+#: disk-utils/sfdisk.c:278
#, c-format
msgid "cannot stat partition restore file (%s)"
msgstr "无法 stat 分区恢复文件(%s)"
-#: fdisks/sfdisk.c:282
+#: disk-utils/sfdisk.c:283
msgid "partition restore file has wrong size - not restoring"
msgstr "分区恢复文件大小有误 - 将不恢复"
-#: fdisks/sfdisk.c:291
+#: disk-utils/sfdisk.c:292
#, c-format
msgid "cannot open partition restore file (%s)"
msgstr "无法打开分区恢复文件(%s)"
-#: fdisks/sfdisk.c:296
+#: disk-utils/sfdisk.c:297
#, c-format
msgid "error reading %s"
msgstr "读 %s 出错"
-#: fdisks/sfdisk.c:302
+#: disk-utils/sfdisk.c:303
#, c-format
msgid "cannot open device %s for writing"
msgstr "不能打开 %s 以写入"
-#: fdisks/sfdisk.c:312
+#: disk-utils/sfdisk.c:313
#, c-format
msgid "error writing sector %lu on %s"
msgstr "写 %2$s 上的 %1$lu 扇区出错"
-#: fdisks/sfdisk.c:383
+#: disk-utils/sfdisk.c:384
#, c-format
msgid "Disk %s: cannot get geometry"
msgstr "磁盘 %s:无法获取几何属性"
-#: fdisks/sfdisk.c:400
+#: disk-utils/sfdisk.c:401
#, c-format
msgid "Disk %s: cannot get size"
msgstr "磁盘 %s:无法获取尺寸"
-#: fdisks/sfdisk.c:432
+#: disk-utils/sfdisk.c:433
#, c-format
msgid ""
"Warning: start=%lu - this looks like a partition rather than\n"
@@ -4003,22 +3530,22 @@ msgstr ""
"警告:起点为%lu - 这似乎是一个分区,而不是整个盘。对它执行\n"
"fdisk 可能没有意义。[如果您真想这么做,请使用 --force 选项]"
-#: fdisks/sfdisk.c:440
+#: disk-utils/sfdisk.c:441
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %lu heads"
msgstr "警告:HDIO_GETGEO 表明有 %lu 个磁头"
-#: fdisks/sfdisk.c:443
+#: disk-utils/sfdisk.c:444
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %lu sectors"
msgstr "警告:HDIO_GETGEO 表明有 %lu 个扇区"
-#: fdisks/sfdisk.c:447
+#: disk-utils/sfdisk.c:448
#, c-format
msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders"
msgstr "警告:BLKGETSIZE/HDIO_GETGEO 表明有 %lu 个柱面"
-#: fdisks/sfdisk.c:452
+#: disk-utils/sfdisk.c:453
#, c-format
msgid ""
"Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4027,7 +3554,7 @@ msgstr ""
"警告:扇区数异常(%lu) - 通常最多是 63\n"
"这会给所有使用 C/H/S 地址的软件带来问题。"
-#: fdisks/sfdisk.c:456
+#: disk-utils/sfdisk.c:457
#, c-format
msgid ""
"\n"
@@ -4036,22 +3563,22 @@ msgstr ""
"\n"
"磁盘 %s:%lu 个柱面,%lu 个磁头,%lu 个扇区/磁道\n"
-#: fdisks/sfdisk.c:542
+#: 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 范围)"
-#: fdisks/sfdisk.c:547
+#: 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 范围)"
-#: fdisks/sfdisk.c:552
+#: 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 范围)"
-#: fdisks/sfdisk.c:592
+#: disk-utils/sfdisk.c:593
#, c-format
msgid ""
"Id Name\n"
@@ -4060,12 +3587,12 @@ msgstr ""
"Id 名称\n"
"\n"
-#: fdisks/sfdisk.c:755
+#: disk-utils/sfdisk.c:756
#, c-format
msgid "Re-reading the partition table ...\n"
msgstr "正在重新读取分区表...;\n"
-#: fdisks/sfdisk.c:757
+#: 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"
@@ -4075,34 +3602,34 @@ msgstr ""
"在使用 mkfs 前,请先运行 partprobe(8)、kpartx(8) 或\n"
"重启系统。"
-#: fdisks/sfdisk.c:765
+#: disk-utils/sfdisk.c:766
#, c-format
msgid "Error closing %s"
msgstr "关闭 %s 出错"
-#: fdisks/sfdisk.c:806
+#: disk-utils/sfdisk.c:807
#, c-format
msgid "%s: no such partition\n"
msgstr "%s:没有此分区\n"
-#: fdisks/sfdisk.c:829
+#: disk-utils/sfdisk.c:830
msgid "unrecognized format - using sectors"
msgstr "无法识别的格式 - 将使用扇区"
-#: fdisks/sfdisk.c:890
+#: disk-utils/sfdisk.c:891
#, c-format
msgid "unimplemented format - using %s"
msgstr "未实现的格式 - 将使用 %s"
-#: fdisks/sfdisk.c:891 libfdisk/src/bsd.c:496
+#: disk-utils/sfdisk.c:892 libfdisk/src/bsd.c:478
msgid "cylinders"
msgstr "柱面"
-#: fdisks/sfdisk.c:891
+#: disk-utils/sfdisk.c:892
msgid "sectors"
msgstr "扇区"
-#: fdisks/sfdisk.c:895
+#: disk-utils/sfdisk.c:896
#, c-format
msgid ""
"Units: cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4111,12 +3638,12 @@ msgstr ""
"单位:%lu 的柱面,1024字节的块,从 %d 开始计算\n"
"\n"
-#: fdisks/sfdisk.c:897
+#: disk-utils/sfdisk.c:898
#, c-format
msgid " Device Boot Start End #cyls #blocks Id System\n"
msgstr " 设备 启动 开头 结束 #柱面 #块 Id 系统\n"
-#: fdisks/sfdisk.c:902
+#: disk-utils/sfdisk.c:903
#, c-format
msgid ""
"Units: sectors of 512 bytes, counting from %d\n"
@@ -4125,12 +3652,12 @@ msgstr ""
"单位:512字节的扇区,从 %d 开始计算\n"
"\n"
-#: fdisks/sfdisk.c:904
+#: disk-utils/sfdisk.c:905
#, c-format
msgid " Device Boot Start End #sectors Id System\n"
msgstr " 设备 启动 开头 结束 #扇区 Id 系统\n"
-#: fdisks/sfdisk.c:907
+#: disk-utils/sfdisk.c:908
#, c-format
msgid ""
"Units: blocks of 1024 bytes, counting from %d\n"
@@ -4139,12 +3666,12 @@ msgstr ""
"单位:1024字节的块,从 %d 开始计算\n"
"\n"
-#: fdisks/sfdisk.c:909
+#: disk-utils/sfdisk.c:910
#, c-format
msgid " Device Boot Start End #blocks Id System\n"
msgstr " 设备 启动 开头 结束 #块 Id 系统\n"
-#: fdisks/sfdisk.c:912
+#: disk-utils/sfdisk.c:913
#, c-format
msgid ""
"Units: 1MiB = 1024*1024 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4153,31 +3680,31 @@ msgstr ""
"单位:1MiB = 1024*1024 字节,1024字节的块,从 %d 开始计算\n"
"\n"
-#: fdisks/sfdisk.c:914
+#: disk-utils/sfdisk.c:915
#, c-format
msgid " Device Boot Start End MiB #blocks Id System\n"
msgstr " 设备 启动 开头 结束 MiB #块 Id 系统\n"
-#: fdisks/sfdisk.c:1073
+#: 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"
-#: fdisks/sfdisk.c:1080
+#: 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"
-#: fdisks/sfdisk.c:1083
+#: disk-utils/sfdisk.c:1084
#, c-format
msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
msgstr "分区结束在柱面 %ld,超过了磁盘的末尾\n"
-#: fdisks/sfdisk.c:1094
+#: disk-utils/sfdisk.c:1095
msgid "No partitions found"
msgstr "未找到分区"
-#: fdisks/sfdisk.c:1097
+#: disk-utils/sfdisk.c:1098
#, c-format
msgid ""
"Warning: The partition table looks like it was made\n"
@@ -4188,58 +3715,58 @@ msgstr ""
"(而非 %ld/%ld/%ld)。\n"
"对这次列表程序将使用该几何属性。"
-#: fdisks/sfdisk.c:1146
+#: disk-utils/sfdisk.c:1147
msgid "no partition table present."
msgstr "不存在分区表。"
-#: fdisks/sfdisk.c:1148
+#: disk-utils/sfdisk.c:1149
#, c-format
msgid "strange, only %d partitions defined."
msgstr "异常,只定义了 %d 个分区。"
-#: fdisks/sfdisk.c:1157
+#: disk-utils/sfdisk.c:1158
#, c-format
msgid "Warning: partition %s has size 0 but is not marked Empty"
msgstr "警告:分区 %s 大小为 0 但未标记为 空"
-#: fdisks/sfdisk.c:1160
+#: disk-utils/sfdisk.c:1161
#, c-format
msgid "Warning: partition %s has size 0 and is bootable"
msgstr "警告:分区 %s 大小为 0 并且标记了 可启动"
-#: fdisks/sfdisk.c:1163
+#: disk-utils/sfdisk.c:1164
#, c-format
msgid "Warning: partition %s has size 0 and nonzero start"
msgstr "警告:分区 %s 大小为 0 且起始位置不为 0"
-#: fdisks/sfdisk.c:1175
+#: disk-utils/sfdisk.c:1176
#, c-format
msgid "Warning: partition %s is not contained in partition %s"
msgstr "警告:分区 %s 未包含在分区 %s 中"
-#: fdisks/sfdisk.c:1187
+#: disk-utils/sfdisk.c:1188
#, c-format
msgid "Warning: partitions %s and %s overlap"
msgstr "警告:分区 %s 和 %s 有重叠"
-#: fdisks/sfdisk.c:1199
+#: disk-utils/sfdisk.c:1200
#, c-format
msgid ""
"Warning: partition %s contains part of the partition table (sector %llu),\n"
"and will destroy it when filled"
msgstr "警告:分区 %s 包含部分分区表(%llu),填充会破坏它。"
-#: fdisks/sfdisk.c:1212
+#: disk-utils/sfdisk.c:1213
#, c-format
msgid "Warning: partition %s starts at sector 0"
msgstr "警告:分区 %s 起始于扇区 0"
-#: fdisks/sfdisk.c:1217
+#: disk-utils/sfdisk.c:1218
#, c-format
msgid "Warning: partition %s extends past end of disk"
msgstr "警告:分区 %s 超出了磁盘终点"
-#: fdisks/sfdisk.c:1233
+#: disk-utils/sfdisk.c:1234
#, c-format
msgid ""
"Warning: partition %s has size %d.%d TB (%llu bytes),\n"
@@ -4249,7 +3776,7 @@ msgstr ""
"警告:分区 %s 大小为 %d.%d TB (%llu 字节),大于\n"
"%llu 字节(DOS 分区表对 %d-字节扇区的强制限定值)"
-#: fdisks/sfdisk.c:1249
+#: disk-utils/sfdisk.c:1250
#, c-format
msgid ""
"Warning: partition %s starts at sector %llu (%d.%d TB for %d-byte sectors),\n"
@@ -4258,7 +3785,7 @@ msgstr ""
"警告:分区 %s 起点为第 %llu 扇区 (%d.%d TB,对于 %d-字节扇区),\n"
"这超过了 DOS 分区表 %llu 个扇区的限制"
-#: fdisks/sfdisk.c:1269
+#: disk-utils/sfdisk.c:1270
msgid ""
"Among the primary partitions, at most one can be extended\n"
" (although this is not a problem under Linux)"
@@ -4266,17 +3793,17 @@ msgstr ""
"主分区中只有一个可设为扩展分区\n"
"(尽管 Linux 下不存在这个问题)"
-#: fdisks/sfdisk.c:1289
+#: disk-utils/sfdisk.c:1290
#, c-format
msgid "Warning: partition %s does not start at a cylinder boundary"
msgstr "警告:分区 %s 未起始于柱面边界。"
-#: fdisks/sfdisk.c:1295
+#: disk-utils/sfdisk.c:1296
#, c-format
msgid "Warning: partition %s does not end at a cylinder boundary"
msgstr "警告:分区 %s 未结束于柱面边界。"
-#: fdisks/sfdisk.c:1314
+#: disk-utils/sfdisk.c:1315
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."
@@ -4284,7 +3811,7 @@ msgstr ""
"超过一个主分区被标记为 可启动(活动)。这对 LILO 没有影响,但 \n"
"DOS MBR 将无法启动该磁盘。"
-#: fdisks/sfdisk.c:1321
+#: disk-utils/sfdisk.c:1322
msgid ""
"Warning: usually one can boot from primary partitions only\n"
"LILO disregards the `bootable' flag."
@@ -4292,7 +3819,7 @@ msgstr ""
"警告:通常只能从主分区启动\n"
"LILO 会忽略“可启动”标志。"
-#: fdisks/sfdisk.c:1327
+#: disk-utils/sfdisk.c:1328
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."
@@ -4300,30 +3827,30 @@ msgstr ""
"警告:没有一个主分区被标记为 可启动(活动)。这对 LILO 没有影响,但 \n"
"DOS MBR 将无法启动该磁盘。"
-#: fdisks/sfdisk.c:1341
+#: disk-utils/sfdisk.c:1342
msgid "start"
msgstr "起点"
-#: fdisks/sfdisk.c:1344
+#: disk-utils/sfdisk.c:1345
#, 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)"
-#: fdisks/sfdisk.c:1350
+#: disk-utils/sfdisk.c:1351
msgid "end"
msgstr "末尾"
-#: fdisks/sfdisk.c:1353
+#: disk-utils/sfdisk.c:1354
#, 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)"
-#: fdisks/sfdisk.c:1356
+#: disk-utils/sfdisk.c:1357
#, c-format
msgid "partition %s ends on cylinder %ld, beyond the end of the disk"
msgstr "分区 %s 结束于 %ld,超出了磁盘的末尾"
-#: fdisks/sfdisk.c:1381
+#: disk-utils/sfdisk.c:1382
#, c-format
msgid ""
"Warning: shifted start of the extd partition from %lld to %lld\n"
@@ -4332,7 +3859,7 @@ msgstr ""
"警告:扩展分区的起点从 %lld 移到了 %lld\n"
"(仅用于列表。不改变其内容。)"
-#: fdisks/sfdisk.c:1386
+#: disk-utils/sfdisk.c:1387
msgid ""
"Warning: extended partition does not start at a cylinder boundary.\n"
"DOS and Linux will interpret the contents differently."
@@ -4340,136 +3867,136 @@ msgstr ""
"警告:扩展分区未开始于柱面边界处。\n"
"DOS 和 Linux 对其内容的解释会有分歧。"
-#: fdisks/sfdisk.c:1399
+#: disk-utils/sfdisk.c:1400
#, c-format
msgid "ERROR: sector %llu does not have an msdos signature"
msgstr "错误:扇区 %llu 没有 msdos 签名"
-#: fdisks/sfdisk.c:1406 fdisks/sfdisk.c:1483
+#: disk-utils/sfdisk.c:1407 disk-utils/sfdisk.c:1484
#, c-format
msgid "too many partitions - ignoring those past nr (%zu)"
msgstr "分区过多 - 将忽略超过 nr (%zu) 的那些分区"
-#: fdisks/sfdisk.c:1421
+#: disk-utils/sfdisk.c:1422
msgid "tree of partitions?"
msgstr "分区树?"
-#: fdisks/sfdisk.c:1530
+#: disk-utils/sfdisk.c:1531
msgid "detected Disk Manager - unable to handle that"
msgstr "检测到磁盘管理器 - 无法处理它"
-#: fdisks/sfdisk.c:1538
+#: disk-utils/sfdisk.c:1539
msgid "DM6 signature found - giving up"
msgstr "找到 DM6 签名 - 将放弃"
-#: fdisks/sfdisk.c:1558
+#: disk-utils/sfdisk.c:1559
msgid "strange..., an extended partition of size 0?"
msgstr "不对呀...,一个大小为 0 的扩展分区?"
-#: fdisks/sfdisk.c:1565 fdisks/sfdisk.c:1576
+#: disk-utils/sfdisk.c:1566 disk-utils/sfdisk.c:1577
msgid "strange..., a BSD partition of size 0?"
msgstr "不对呀...,一个大小为 0 的 BSD 分区?"
-#: fdisks/sfdisk.c:1620
+#: disk-utils/sfdisk.c:1621
#, c-format
msgid " %s: unrecognized partition table type"
msgstr " %s:未识别的分区表类型"
-#: fdisks/sfdisk.c:1632
+#: disk-utils/sfdisk.c:1633
msgid "-n flag was given: Nothing changed"
msgstr "指定了 -n 标志:未做更改"
-#: fdisks/sfdisk.c:1649
+#: disk-utils/sfdisk.c:1650
msgid "Failed saving the old sectors - aborting\n"
msgstr "保存旧扇区失败 - 将中止\n"
-#: fdisks/sfdisk.c:1654 fdisks/sfdisk.c:1658
+#: disk-utils/sfdisk.c:1655 disk-utils/sfdisk.c:1659
#, c-format
msgid "Failed writing the partition on %s"
msgstr "写 %s 上的分区失败"
-#: fdisks/sfdisk.c:1736
+#: disk-utils/sfdisk.c:1737
msgid "long or incomplete input line - quitting"
msgstr "输入行太长或不完整 - 将退出"
-#: fdisks/sfdisk.c:1772
+#: disk-utils/sfdisk.c:1773
#, c-format
msgid "input error: `=' expected after %s field"
msgstr "输入错误:%s 字段后应为“=”"
-#: fdisks/sfdisk.c:1779
+#: disk-utils/sfdisk.c:1780
#, c-format
msgid "input error: unexpected character %c after %s field"
msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
-#: fdisks/sfdisk.c:1785
+#: disk-utils/sfdisk.c:1786
#, c-format
msgid "unrecognized input: %s"
msgstr "无法识别的输入:%s"
-#: fdisks/sfdisk.c:1826 fdisks/sfdisk.c:1863
+#: disk-utils/sfdisk.c:1827 disk-utils/sfdisk.c:1864
msgid "number too big"
msgstr "数字过大"
-#: fdisks/sfdisk.c:1830 fdisks/sfdisk.c:1867
+#: disk-utils/sfdisk.c:1831 disk-utils/sfdisk.c:1868
msgid "trailing junk after number"
msgstr "数字后有垃圾内容"
-#: fdisks/sfdisk.c:1992
+#: disk-utils/sfdisk.c:1993
msgid "no room for partition descriptor"
msgstr "没有空间放置分区描述符"
-#: fdisks/sfdisk.c:2025
+#: disk-utils/sfdisk.c:2026
msgid "cannot build surrounding extended partition"
msgstr "无法创建环绕扩展分区"
-#: fdisks/sfdisk.c:2076
+#: disk-utils/sfdisk.c:2077
msgid "too many input fields"
msgstr "输入字段过多"
-#: fdisks/sfdisk.c:2110
+#: disk-utils/sfdisk.c:2111
msgid "No room for more"
msgstr "空间不足"
-#: fdisks/sfdisk.c:2129
+#: disk-utils/sfdisk.c:2130
msgid "Illegal type"
msgstr "非法类型"
-#: fdisks/sfdisk.c:2163
+#: disk-utils/sfdisk.c:2164
#, c-format
msgid "Warning: given size (%llu) exceeds max allowable size (%llu)"
msgstr "警告:指定大小(%llu)超过了最大允许大小(%llu)"
-#: fdisks/sfdisk.c:2169
+#: disk-utils/sfdisk.c:2170
msgid "Warning: empty partition"
msgstr "警告:空分区"
-#: fdisks/sfdisk.c:2183
+#: disk-utils/sfdisk.c:2184
#, c-format
msgid "Warning: bad partition start (earliest %llu)"
msgstr "警告:分区起点有误(最早 %llu)"
-#: fdisks/sfdisk.c:2196
+#: disk-utils/sfdisk.c:2197
msgid "unrecognized bootable flag - choose - or *"
msgstr "无法识别的可启动标志 - 选择 - 或 *"
-#: fdisks/sfdisk.c:2213 fdisks/sfdisk.c:2227
+#: disk-utils/sfdisk.c:2214 disk-utils/sfdisk.c:2228
msgid "partial c,h,s specification?"
msgstr "不完整的 c,h,s 说明?"
-#: fdisks/sfdisk.c:2238
+#: disk-utils/sfdisk.c:2239
msgid "Extended partition not where expected"
msgstr "扩展分区位置异常"
-#: fdisks/sfdisk.c:2270
+#: disk-utils/sfdisk.c:2271
msgid "bad input"
msgstr "输入错误"
-#: fdisks/sfdisk.c:2293
+#: disk-utils/sfdisk.c:2294
msgid "too many partitions"
msgstr "分区过多"
-#: fdisks/sfdisk.c:2326
+#: disk-utils/sfdisk.c:2327
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"
@@ -4479,12 +4006,12 @@ msgstr ""
"<起始> <大小> <类型 [E,S,L,X,hex]> <可启动 [-,*]> <c,h,s> <c,h,s>\n"
"通常您只须指定 <起始> 和 <大小> (可能还要指定 <类型>)。"
-#: fdisks/sfdisk.c:2348
-#, c-format
-msgid " %s [options] <device> [...]\n"
+#: disk-utils/sfdisk.c:2349
+#, fuzzy, c-format
+msgid " %s [options] <device>...\n"
msgstr " %s [选项] <设备> [...]\n"
-#: fdisks/sfdisk.c:2351
+#: disk-utils/sfdisk.c:2352
msgid ""
" -s, --show-size list size of a partition\n"
" -c, --id change or print partition Id\n"
@@ -4496,7 +4023,7 @@ msgstr ""
" --change-id 更改 Id\n"
" --print-id 打印 Id\n"
-#: fdisks/sfdisk.c:2355
+#: disk-utils/sfdisk.c:2356
msgid ""
" -l, --list list partitions of each device\n"
" -d, --dump idem, but in a format suitable for later input\n"
@@ -4510,7 +4037,7 @@ msgstr ""
" -u, --unit <字母> 要使用的单位;<字母> 可以是以下之一\n"
" S (扇区),C (柱面),B (块) 或 M (MB)\n"
-#: fdisks/sfdisk.c:2360
+#: disk-utils/sfdisk.c:2361
msgid ""
" -1, --one-only reserved option that does nothing currently\n"
" -T, --list-types list the known partition types\n"
@@ -4524,7 +4051,7 @@ msgstr ""
" -E, --DOS-extended 与 DOS 扩展分区兼容\n"
" -R, --re-read 让内核重新读取分区表\n"
-#: fdisks/sfdisk.c:2365
+#: disk-utils/sfdisk.c:2366
msgid ""
" -N <number> change only the partition with this <number>\n"
" -n do not actually write to disk\n"
@@ -4536,7 +4063,7 @@ msgstr ""
" -O <文件> 将要覆盖的分区保存到 <文件> 中\n"
" -I <文件> 从 <文件> 恢复扇区\n"
-#: fdisks/sfdisk.c:2369
+#: disk-utils/sfdisk.c:2370
msgid ""
" -V, --verify check that the listed partitions are reasonable\n"
" -v, --version display version information and exit\n"
@@ -4546,7 +4073,7 @@ msgstr ""
" -v, --version 显示版本信息并退出\n"
" -h, --help 显示此帮助并退出\n"
-#: fdisks/sfdisk.c:2373
+#: disk-utils/sfdisk.c:2374
msgid ""
"\n"
"Dangerous options:\n"
@@ -4554,7 +4081,7 @@ msgstr ""
"\n"
"危险选项:\n"
-#: fdisks/sfdisk.c:2374
+#: disk-utils/sfdisk.c:2375
msgid ""
" -f, --force disable all consistency checking\n"
" --no-reread do not check whether the partition is in use\n"
@@ -4566,7 +4093,7 @@ msgstr ""
" -q, --quiet 抑制警告消息输出\n"
" -L, --Linux 不报告与 Linux 无关的事情\n"
-#: fdisks/sfdisk.c:2378
+#: disk-utils/sfdisk.c:2379
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"
@@ -4574,10 +4101,11 @@ msgstr ""
" -g, --show-geometry 打印内核检测到的几何属性\n"
" -G, --show-pt-geometry 打印从分区表推测出的几何属性\n"
-#: fdisks/sfdisk.c:2380
+#: disk-utils/sfdisk.c:2381
+#, fuzzy
msgid ""
-" -A, --activate[=<device>] activate bootable flag\n"
-" -U, --unhide[=<dev>] set partition unhidden\n"
+" -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 ""
@@ -4586,7 +4114,7 @@ msgstr ""
" -x, --show-extended 输出时也列出扩展分区,\n"
" 或输入时请求提供它们的描述符\n"
-#: fdisks/sfdisk.c:2384
+#: disk-utils/sfdisk.c:2385
msgid ""
" --leave-last do not allocate the last cylinder\n"
" --IBM same as --leave-last\n"
@@ -4594,7 +4122,7 @@ msgstr ""
" --leave-last 不分配最后一个柱面\n"
" --IBM 同 --leave-last\n"
-#: fdisks/sfdisk.c:2386
+#: disk-utils/sfdisk.c:2387
msgid ""
" --in-order partitions are in order\n"
" --not-in-order partitions are not in order\n"
@@ -4606,7 +4134,7 @@ msgstr ""
" --inside-outer 所有逻辑分区位于最外的扩展分区内\n"
" --not-inside-outer 不要求所有逻辑分区位于最外的扩展分区内\n"
-#: fdisks/sfdisk.c:2390
+#: disk-utils/sfdisk.c:2391
msgid ""
" --nested every partition is disjoint from all others\n"
" --chained like nested, but extended partitions may lie outside\n"
@@ -4615,7 +4143,7 @@ msgstr ""
" --nested 每个分区与所有其他分区不相交 --chained 与 nested 相似,但扩展分区可以超界\n"
" --onesector 各分区互不相交\n"
-#: fdisks/sfdisk.c:2394
+#: disk-utils/sfdisk.c:2395
msgid ""
"\n"
"Override the detected geometry using:\n"
@@ -4629,81 +4157,85 @@ msgstr ""
" -H, --heads <数字> 设置要使用的磁头数\n"
" -S, --sectors <数字> 设置要使用的扇区数n\n"
-#: fdisks/sfdisk.c:2412
+#: disk-utils/sfdisk.c:2413
#, c-format
msgid " %s%sdevice list active partitions on device\n"
msgstr " %s%sdevice 列出设备上的活动分区\n"
-#: fdisks/sfdisk.c:2414
+#: disk-utils/sfdisk.c:2415
#, c-format
msgid " %s%sdevice n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
msgstr " %s%s设备 n1 n2 ... 激活分区 n1 ..., 取消激活其他分区\n"
-#: fdisks/sfdisk.c:2543
+#: disk-utils/sfdisk.c:2556
msgid "no command?"
msgstr "没有命令?"
-#: fdisks/sfdisk.c:2612
+#: disk-utils/sfdisk.c:2625
msgid "invalid number of partitions argument"
msgstr "无效的 分区数 参数"
-#: fdisks/sfdisk.c:2682
+#: disk-utils/sfdisk.c:2695
#, c-format
msgid "cannot open %s\n"
msgstr "打不开 %s\n"
-#: fdisks/sfdisk.c:2701
+#: disk-utils/sfdisk.c:2714
#, c-format
msgid "total: %llu blocks\n"
msgstr "共计:%llu 个块\n"
-#: fdisks/sfdisk.c:2738
+#: disk-utils/sfdisk.c:2751
msgid "usage: sfdisk --print-id device partition-number"
msgstr "用法:sfdisk --print-id 设备 分区号"
-#: fdisks/sfdisk.c:2740
+#: disk-utils/sfdisk.c:2753
msgid "usage: sfdisk --change-id device partition-number Id"
msgstr "用法:sfdisk --change-id 设备 分区号 Id"
-#: fdisks/sfdisk.c:2742
+#: disk-utils/sfdisk.c:2755
msgid "usage: sfdisk --id device partition-number [Id]"
msgstr "用法:sfdisk --id 设备 分区号 [Id]"
-#: fdisks/sfdisk.c:2749
+#: disk-utils/sfdisk.c:2762
msgid "can specify only one device (except with -l or -s)"
msgstr "只能指定一台设备(除非指定 -l 或 -s)"
-#: fdisks/sfdisk.c:2774
+#: disk-utils/sfdisk.c:2787
#, c-format
msgid "cannot open %s read-write"
msgstr "不能以读写方式打开 %s"
-#: fdisks/sfdisk.c:2776
+#: disk-utils/sfdisk.c:2789
#, c-format
msgid "cannot open %s for reading"
msgstr "不能以读方式打开 %s"
-#: fdisks/sfdisk.c:2801
+#: disk-utils/sfdisk.c:2814
#, c-format
msgid "%s: OK"
msgstr "%s:OK"
-#: fdisks/sfdisk.c:2820 fdisks/sfdisk.c:2852
+#: disk-utils/sfdisk.c:2833 disk-utils/sfdisk.c:2865
#, c-format
msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
msgstr "%s:%ld 个柱面,%ld 个磁头,%ld 个扇区/磁道\n"
-#: fdisks/sfdisk.c:2870
+#: disk-utils/sfdisk.c:2883
#, c-format
msgid "Cannot get size of %s"
msgstr "无法获得 %s 的大小"
-#: fdisks/sfdisk.c:2950
+#: disk-utils/sfdisk.c:2963
#, c-format
msgid "bad active byte: 0x%x instead of 0x80"
msgstr "错误的 活动 字节:0x%x 而非 0x80"
-#: fdisks/sfdisk.c:2978
+#: disk-utils/sfdisk.c:2982 disk-utils/sfdisk.c:3043 disk-utils/sfdisk.c:3079
+msgid "Done"
+msgstr "完成"
+
+#: disk-utils/sfdisk.c:2991
#, c-format
msgid ""
"You have %d active primary partitions. This does not matter for LILO,\n"
@@ -4712,35 +4244,35 @@ msgstr ""
"您有 %d 个活动的主分区。这对 LILO 没有影响,但 DOS MBR 只能启动带一个活动分区\n"
"的磁盘。"
-#: fdisks/sfdisk.c:2999
+#: disk-utils/sfdisk.c:3012
#, c-format
msgid "partition %s has id %x and is not hidden"
msgstr "分区 %s 标识为 %x,不是隐藏的"
-#: fdisks/sfdisk.c:3062
+#: disk-utils/sfdisk.c:3075
#, c-format
msgid "Bad Id %lx"
msgstr "错误的 Id %lx"
-#: fdisks/sfdisk.c:3083
+#: disk-utils/sfdisk.c:3096
msgid "This disk is currently in use."
msgstr "此分区正在使用中。"
-#: fdisks/sfdisk.c:3103
+#: disk-utils/sfdisk.c:3116
#, c-format
msgid "Fatal error: cannot find %s"
msgstr "致命错误:找不到 %s"
-#: fdisks/sfdisk.c:3105
+#: disk-utils/sfdisk.c:3118
#, c-format
msgid "Warning: %s is not a block device"
msgstr "警告:%s 不是一个块设备"
-#: fdisks/sfdisk.c:3111
+#: disk-utils/sfdisk.c:3124
msgid "Checking that no-one is using this disk right now ..."
msgstr "请检查现在是不是有人在使用此磁盘..."
-#: fdisks/sfdisk.c:3113
+#: disk-utils/sfdisk.c:3126
msgid ""
"\n"
"This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -4752,30 +4284,30 @@ msgstr ""
"请卸载此磁盘上所有的文件系统,并关闭(swapoff)上面的交换分区。\n"
"可使用 --no-reread 标志阻止此检查。"
-#: fdisks/sfdisk.c:3117
+#: disk-utils/sfdisk.c:3130
msgid "Use the --force flag to overrule all checks."
msgstr "使用 --force 标志否决所有检查。"
-#: fdisks/sfdisk.c:3119
+#: disk-utils/sfdisk.c:3132
msgid "OK"
msgstr "正常"
-#: fdisks/sfdisk.c:3128
+#: disk-utils/sfdisk.c:3141
#, c-format
msgid "Old situation:\n"
msgstr "旧状况:\n"
-#: fdisks/sfdisk.c:3132
+#: disk-utils/sfdisk.c:3145
#, c-format
msgid "Partition %d does not exist, cannot change it"
msgstr "分区 %d 不存在,无法更改它"
-#: fdisks/sfdisk.c:3140
+#: disk-utils/sfdisk.c:3153
#, c-format
msgid "New situation:\n"
msgstr "新状况:\n"
-#: fdisks/sfdisk.c:3145
+#: disk-utils/sfdisk.c:3158
msgid ""
"I don't like these partitions - nothing changed.\n"
"(If you really want this, use the --force option.)"
@@ -4783,32 +4315,32 @@ msgstr ""
"我不愿这样分区 - 未做更改。\n"
"(如果您真的想这样做,可使用 --force 选项。)"
-#: fdisks/sfdisk.c:3148
+#: disk-utils/sfdisk.c:3161
msgid "I don't like this - probably you should answer No"
msgstr "我不愿这样做 - 建议您取消"
#. TRANSLATORS: sfdisk uses rpmatch which means the answers y and n
#. * should be translated, but that is not the case with q answer.
-#: fdisks/sfdisk.c:3155
+#: disk-utils/sfdisk.c:3168
#, c-format
msgid "Are you satisfied with this? [ynq] "
msgstr "这样您满意吗?[ynq] "
-#: fdisks/sfdisk.c:3157
+#: disk-utils/sfdisk.c:3170
#, c-format
msgid "Do you want to write this to disk? [ynq] "
msgstr "您想把这些写入磁盘吗?[ynq] "
-#: fdisks/sfdisk.c:3160
+#: disk-utils/sfdisk.c:3173
msgid "Quitting - nothing changed"
msgstr "将退出 - 未做更改"
-#: fdisks/sfdisk.c:3166
+#: disk-utils/sfdisk.c:3179
#, c-format
msgid "Please answer one of y,n,q\n"
msgstr "请回答 y, n 或 q\n"
-#: fdisks/sfdisk.c:3174
+#: disk-utils/sfdisk.c:3187
#, c-format
msgid ""
"Successfully wrote the new partition table\n"
@@ -4817,7 +4349,7 @@ msgstr ""
"成功写入了新分区表\n"
"\n"
-#: fdisks/sfdisk.c:3182
+#: disk-utils/sfdisk.c:3195
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"
@@ -4827,11 +4359,129 @@ msgstr ""
"将前 512 个字节清零:dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
"(参阅 fdisk(8)。)"
-#: include/c.h:275 misc-utils/getopt.c:314 misc-utils/look.c:366
-#: misc-utils/mcookie.c:68 misc-utils/namei.c:418 misc-utils/uuidd.c:70
-#: misc-utils/uuidgen.c:34 misc-utils/wipefs.c:411 sys-utils/hwclock.c:1442
-#: sys-utils/renice.c:55 term-utils/script.c:130 term-utils/scriptreplay.c:40
-#: term-utils/setterm.c:677 term-utils/write.c:80
+#: 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/swaplabel.c:67
+#, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s:不是有效的交换分区"
+
+#: disk-utils/swaplabel.c:74
+#, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s:不支持的交换版本“%s”"
+
+#: disk-utils/swaplabel.c:114
+#, c-format
+msgid "failed to parse UUID: %s"
+msgstr "解析 UUID 失败:%s"
+
+#: disk-utils/swaplabel.c:118
+#, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s:定位到交换区 UUID 失败"
+
+#: disk-utils/swaplabel.c:122
+#, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s:写 UUID 失败"
+
+#: disk-utils/swaplabel.c:133
+#, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s:无法定位到交换区标签 "
+
+#: disk-utils/swaplabel.c:140
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr "标签过长。将截短到“%s”"
+
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "%s: failed to write label"
+msgstr "%s:写标签失败"
+
+#: disk-utils/swaplabel.c:165
+msgid ""
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid> specify a new uuid\n"
+msgstr ""
+" -L, --label <标签> 指定一个新标签\n"
+" -U, --uuid <uuid> 指定一个新 uuid\n"
+
+#: disk-utils/swaplabel.c:208
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr "忽略 -U (不支持 UUID)"
+
+#: Documentation/boilerplate.c:35
+#, c-format
+msgid " %s [options] file...\n"
+msgstr " %s [选项] 文件...\n"
+
+#: Documentation/boilerplate.c:37
+#, fuzzy
+msgid " -n, --no-argument option does not use argument\n"
+msgstr " -c, --noreset 不重置控制模式\n"
+
+#: Documentation/boilerplate.c:38
+msgid " -o, --optional[=<arg>] option argument is optional\n"
+msgstr ""
+
+#: Documentation/boilerplate.c:39
+#, fuzzy
+msgid " -r, --required <arg> option requires an argument\n"
+msgstr "选项需要一个参数 -- %s"
+
+#: Documentation/boilerplate.c:40
+#, fuzzy
+msgid " -z no long option\n"
+msgstr " -a 纯兼容性选项,忽略\n"
+
+#: Documentation/boilerplate.c:41
+#, fuzzy
+msgid " --xyzzy a long option only\n"
+msgstr " --nohints 不打印提示信息\n"
+
+#: Documentation/boilerplate.c:42
+msgid " -e, --extremely-long-long-option\n"
+msgstr ""
+
+#: Documentation/boilerplate.c:43
+#, fuzzy
+msgid " use next line for description when needed\n"
+msgstr " -a 纯兼容性选项,忽略\n"
+
+#: Documentation/boilerplate.c:44
+msgid " -l, --long-explanation an example of very verbose, and chatty option\n"
+msgstr ""
+
+#: Documentation/boilerplate.c:45
+#, fuzzy
+msgid " description on two, or multiple lines, where the\n"
+msgstr " 而不创建新会话\n"
+
+#: Documentation/boilerplate.c:46
+#, fuzzy
+msgid " consecutive lines are intended by two spaces\n"
+msgstr " 而不创建新会话\n"
+
+#: Documentation/boilerplate.c:47
+#, fuzzy
+msgid " -f, --foobar next option description resets indent\n"
+msgstr " -c, --noreset 不重置控制模式\n"
+
+#: 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:1561 sys-utils/renice.c:55
+#: term-utils/script.c:141 term-utils/scriptreplay.c:40 term-utils/write.c:80
msgid ""
"\n"
"Usage:\n"
@@ -4839,19 +4489,15 @@ msgstr ""
"\n"
"用法:\n"
-#: include/c.h:277 sys-utils/ipcs.c:59 sys-utils/ipcs.c:65
-msgid "\n"
-msgstr "\n"
-
-#: include/c.h:278
+#: include/c.h:282
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help 显示此帮助并退出\n"
-#: include/c.h:279
+#: include/c.h:283
msgid " -V, --version output version information and exit\n"
msgstr " -V, --version 输出版本信息并退出\n"
-#: include/c.h:280
+#: include/c.h:284
#, c-format
msgid ""
"\n"
@@ -4860,25 +4506,10 @@ msgstr ""
"\n"
"更多信息请参阅 %s。\n"
-#: include/c.h:282 schedutils/chrt.c:266 schedutils/ionice.c:171
-#: schedutils/taskset.c:166 sys-utils/chcpu.c:307 sys-utils/cytune.c:378
-#: sys-utils/dmesg.c:1328 sys-utils/hwclock.c:1422 sys-utils/lscpu.c:1453
-#: sys-utils/renice.c:102 sys-utils/rtcwake.c:474 sys-utils/tunelp.c:249
-#: term-utils/agetty.c:723 term-utils/script.c:212
-#: term-utils/scriptreplay.c:172 term-utils/setterm.c:813
-#: 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"
-
-#: include/closestream.h:41 include/closestream.h:43 login-utils/vipw.c:280
-#: login-utils/vipw.c:299 mount-deprecated/mount_mntent.c:58
-#: sys-utils/rtcwake.c:276 term-utils/script.c:290 term-utils/script.c:300
-#: term-utils/script.c:413 term-utils/script.c:424 term-utils/script.c:492
-#: term-utils/setterm.c:1119 term-utils/wall.c:306 text-utils/col.c:144
-#, c-format
+#: 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:583
+#: term-utils/script.c:587 term-utils/setterm.c:815 term-utils/wall.c:307
+#: text-utils/col.c:144
msgid "write error"
msgstr "写出错"
@@ -5121,8 +4752,8 @@ msgstr "NTFS 卷集"
msgid "Linux plaintext"
msgstr "Linux 纯文本"
-#: include/pt-mbr-partnames.h:59 libfdisk/src/gpt.c:164 libfdisk/src/sgi.c:55
-#: libfdisk/src/sun.c:46
+#: include/pt-mbr-partnames.h:59 libfdisk/src/gpt.c:180 libfdisk/src/sgi.c:57
+#: libfdisk/src/sun.c:48
msgid "Linux LVM"
msgstr "Linux LVM"
@@ -5182,7 +4813,7 @@ msgstr "BSDI swap"
msgid "Boot Wizard hidden"
msgstr "Boot Wizard 隐藏"
-#: include/pt-mbr-partnames.h:74 libfdisk/src/gpt.c:186
+#: include/pt-mbr-partnames.h:74 libfdisk/src/gpt.c:201
msgid "Solaris boot"
msgstr "Solaris 启动"
@@ -5254,7 +4885,7 @@ msgstr "VMware VMFS"
msgid "VMware VMKCORE"
msgstr "VMware VMKCORE"
-#: include/pt-mbr-partnames.h:99 libfdisk/src/sun.c:47
+#: include/pt-mbr-partnames.h:99 libfdisk/src/sun.c:49
msgid "Linux raid autodetect"
msgstr "Linux raid 自动检测"
@@ -5266,13 +4897,21 @@ msgstr "LANstep"
msgid "BBT"
msgstr "BBT"
+#: lib/boottime.c:20
+msgid "gettimeofday failed"
+msgstr "gettimeofday 失败"
+
+#: lib/boottime.c:32
+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:741
-#: login-utils/sulogin.c:745 schedutils/chrt.c:334 schedutils/ionice.c:232
-#: schedutils/taskset.c:237 sys-utils/flock.c:298 sys-utils/nsenter.c:339
-#: sys-utils/prlimit.c:636 sys-utils/rtcwake.c:587 sys-utils/setarch.c:292
-#: sys-utils/setarch.c:355 sys-utils/setsid.c:114 sys-utils/swapon.c:295
-#: sys-utils/switch_root.c:233 sys-utils/unshare.c:157 term-utils/script.c:459
+#: login-utils/su-common.c:972 login-utils/sulogin.c:803
+#: login-utils/sulogin.c:807 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:639 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:546
#: text-utils/pg.c:1363
#, c-format
msgid "failed to execute %s"
@@ -5283,1076 +4922,1187 @@ msgstr "执行 %s 失败"
msgid "Partition %i does not start on physical sector boundary.\n"
msgstr "分区 %i 未起始于物理扇区边界。\n"
-#: libfdisk/src/alignment.c:518
+#: libfdisk/src/alignment.c:520
msgid "Calling ioctl() to re-read partition table."
msgstr "将调用 ioctl() 来重新读分区表。"
-#: libfdisk/src/alignment.c:527
+#: libfdisk/src/alignment.c:529
msgid "Re-reading the partition table failed."
msgstr "重新读取分区表失败。"
-#: libfdisk/src/alignment.c:529
+#: libfdisk/src/alignment.c:531
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:334 libfdisk/src/ask.c:346
-#, c-format
-msgid "Selected partition %d"
+#: libfdisk/src/ask.c:342 libfdisk/src/ask.c:354
+#, fuzzy, c-format
+msgid "Selected partition %ju"
msgstr "已选择分区 %d"
-#: libfdisk/src/ask.c:337
+#: libfdisk/src/ask.c:345
msgid "No partition is defined yet!"
msgstr "还没有定义分区!"
-#: libfdisk/src/ask.c:349
+#: libfdisk/src/ask.c:357
msgid "No free partition available!"
msgstr "无空闲分区可用!"
-#: libfdisk/src/ask.c:359
+#: libfdisk/src/ask.c:367
msgid "Partition number"
msgstr "分区号"
-#: libfdisk/src/ask.c:659
+#: libfdisk/src/ask.c:750
#, c-format
msgid "Created a new partition %d of type '%s' and of size %s."
msgstr "创建了一个新分区 %d,类型为“%s”,大小为 %s。"
-#: libfdisk/src/bsd.c:152
+#: libfdisk/src/bsd.c:161
#, c-format
msgid "Partition %zd: has invalid starting sector 0."
msgstr "分区 %zd:无效的起始扇区 0。"
-#: libfdisk/src/bsd.c:167
+#: libfdisk/src/bsd.c:176
#, c-format
msgid "There is no *BSD partition on %s."
msgstr "%s 上没有 *BSD 分区。"
-#: libfdisk/src/bsd.c:213 libfdisk/src/dos.c:874
+#: libfdisk/src/bsd.c:233 libfdisk/src/dos.c:894
msgid "First cylinder"
msgstr "第一个柱面"
-#: libfdisk/src/bsd.c:240 libfdisk/src/dos.c:936
+#: libfdisk/src/bsd.c:266 libfdisk/src/dos.c:1050
msgid "Last cylinder, +cylinders or +size{K,M,G,T,P}"
msgstr "最后一个柱面, +cylinders 或 +size{K,M,G,T,P}"
-#: libfdisk/src/bsd.c:245 libfdisk/src/dos.c:941 libfdisk/src/gpt.c:1717
+#: libfdisk/src/bsd.c:271 libfdisk/src/dos.c:1055 libfdisk/src/gpt.c:1882
msgid "Last sector, +sectors or +size{K,M,G,T,P}"
msgstr "上个扇区,+sectors 或 +size{K,M,G,T,P}"
-#: libfdisk/src/bsd.c:281
+#: libfdisk/src/bsd.c:310
#, c-format
msgid "The device %s does not contain BSD disklabel."
msgstr "设备 %s 不包含BSD 磁盘标签。"
-#: libfdisk/src/bsd.c:283
+#: libfdisk/src/bsd.c:312
msgid "Do you want to create a BSD disklabel?"
msgstr "您想创建一个 BSD 磁盘标签吗?"
-#: libfdisk/src/bsd.c:346
+#: libfdisk/src/bsd.c:373
#, c-format
msgid "type: %s"
msgstr "类型:%s"
-#: libfdisk/src/bsd.c:348
+#: libfdisk/src/bsd.c:375
#, c-format
msgid "type: %d"
msgstr "类型:%d"
-#: libfdisk/src/bsd.c:350
+#: libfdisk/src/bsd.c:377
#, c-format
msgid "disk: %.*s"
msgstr "磁盘:%.*s"
-#: libfdisk/src/bsd.c:351
+#: libfdisk/src/bsd.c:378
#, c-format
msgid "label: %.*s"
msgstr "标签:%.*s"
-#: libfdisk/src/bsd.c:353
+#: libfdisk/src/bsd.c:380
#, c-format
msgid "flags: %s"
msgstr "标志:%s"
-#: libfdisk/src/bsd.c:354
+#: libfdisk/src/bsd.c:381
msgid " removable"
msgstr " 可移动"
-#: libfdisk/src/bsd.c:355
+#: libfdisk/src/bsd.c:382
msgid " ecc"
msgstr " ecc"
-#: libfdisk/src/bsd.c:356
+#: libfdisk/src/bsd.c:383
msgid " badsect"
msgstr " 坏扇区"
-#: libfdisk/src/bsd.c:360
+#: libfdisk/src/bsd.c:387
#, c-format
msgid "bytes/sector: %ld"
msgstr "字节/扇区:%ld"
-#: libfdisk/src/bsd.c:361
+#: libfdisk/src/bsd.c:388
#, c-format
msgid "sectors/track: %ld"
msgstr "扇区/磁道:%ld"
-#: libfdisk/src/bsd.c:362
+#: libfdisk/src/bsd.c:389
#, c-format
msgid "tracks/cylinder: %ld"
msgstr "磁道/柱面:%ld"
-#: libfdisk/src/bsd.c:363
+#: libfdisk/src/bsd.c:390
#, c-format
msgid "sectors/cylinder: %ld"
msgstr "扇区/柱面:%ld"
-#: libfdisk/src/bsd.c:364
+#: libfdisk/src/bsd.c:391
#, c-format
msgid "cylinders: %ld"
msgstr "柱面:%ld"
-#: libfdisk/src/bsd.c:365
+#: libfdisk/src/bsd.c:392
#, c-format
msgid "rpm: %d"
msgstr "转/分:%d"
-#: libfdisk/src/bsd.c:366
+#: libfdisk/src/bsd.c:393
#, c-format
msgid "interleave: %d"
msgstr "交错:%d"
-#: libfdisk/src/bsd.c:367
+#: libfdisk/src/bsd.c:394
#, c-format
msgid "trackskew: %d"
msgstr "磁道螺距:%d"
-#: libfdisk/src/bsd.c:368
+#: libfdisk/src/bsd.c:395
#, c-format
msgid "cylinderskew: %d"
msgstr "柱面螺距:%d"
-#: libfdisk/src/bsd.c:369
+#: libfdisk/src/bsd.c:396
#, c-format
msgid "headswitch: %ld (milliseconds)"
msgstr "磁头切换:%ld (毫秒)"
-#: libfdisk/src/bsd.c:370
+#: libfdisk/src/bsd.c:397
#, c-format
msgid "track-to-track seek: %ld (milliseconds)"
msgstr "跨磁道定位:%ld (毫秒)"
-#: libfdisk/src/bsd.c:383
+#: libfdisk/src/bsd.c:400
#, c-format
msgid "partitions: %d"
msgstr "分区数:%d"
-#: libfdisk/src/bsd.c:393 libfdisk/src/sgi.c:334
-msgid "#"
-msgstr "#"
-
-#: libfdisk/src/bsd.c:394 libfdisk/src/dos.c:1512 libfdisk/src/dos.c:1605
-#: libfdisk/src/gpt.c:1208 libfdisk/src/sgi.c:277 libfdisk/src/sun.c:702
-msgid "Start"
-msgstr "起点"
-
-#: libfdisk/src/bsd.c:396 libfdisk/src/dos.c:1513 libfdisk/src/gpt.c:1210
-#: libfdisk/src/sgi.c:337
-msgid "Size"
-msgstr "大小"
-
-#: libfdisk/src/bsd.c:398
-msgid "fsize"
-msgstr "fsize"
-
-#: libfdisk/src/bsd.c:399
-msgid "bsize"
-msgstr "bsize"
-
-#: libfdisk/src/bsd.c:400
-msgid "cpg"
-msgstr "cpg"
-
-#: libfdisk/src/bsd.c:491
+#: libfdisk/src/bsd.c:473
msgid "bytes/sector"
msgstr "字节/扇区"
-#: libfdisk/src/bsd.c:494
+#: libfdisk/src/bsd.c:476
msgid "sectors/track"
msgstr "扇区/磁道"
-#: libfdisk/src/bsd.c:495
+#: libfdisk/src/bsd.c:477
msgid "tracks/cylinder"
msgstr "磁道/柱面"
-#: libfdisk/src/bsd.c:500
+#: libfdisk/src/bsd.c:482
msgid "sectors/cylinder"
msgstr "扇区/柱面"
-#: libfdisk/src/bsd.c:503
+#: libfdisk/src/bsd.c:485
msgid "rpm"
msgstr "rpm"
-#: libfdisk/src/bsd.c:504
+#: libfdisk/src/bsd.c:486
msgid "interleave"
msgstr "交错"
-#: libfdisk/src/bsd.c:505
+#: libfdisk/src/bsd.c:487
msgid "trackskew"
msgstr "磁道螺距"
-#: libfdisk/src/bsd.c:506
+#: libfdisk/src/bsd.c:488
msgid "cylinderskew"
msgstr "柱头螺距"
-#: libfdisk/src/bsd.c:508
+#: libfdisk/src/bsd.c:490
msgid "headswitch"
msgstr "磁头切换"
-#: libfdisk/src/bsd.c:509
+#: libfdisk/src/bsd.c:491
msgid "track-to-track seek"
msgstr "跨磁道定位"
-#: libfdisk/src/bsd.c:532
+#: libfdisk/src/bsd.c:514
#, c-format
msgid "The bootstrap file %s successfully loaded."
msgstr "成功加载了引导程序文件 %s。"
-#: libfdisk/src/bsd.c:548
+#: libfdisk/src/bsd.c:530
#, fuzzy, c-format
msgid "Bootstrap: %1$sboot -> boot%1$s (default %1$s)"
msgstr "引导:%1$sboot -> boot%1$s (默认 %1$s)"
-#: libfdisk/src/bsd.c:579
+#: libfdisk/src/bsd.c:561
msgid "Bootstrap overlaps with disklabel!"
msgstr "引导程序与磁盘标签重叠!"
-#: libfdisk/src/bsd.c:598 libfdisk/src/bsd.c:765 sys-utils/hwclock.c:155
-#: sys-utils/hwclock.c:157
+#: 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:604
+#: libfdisk/src/bsd.c:586
#, c-format
msgid "Bootstrap installed on %s."
msgstr "已在 %s 上安装引导程序。"
-#: libfdisk/src/bsd.c:771
+#: libfdisk/src/bsd.c:758
#, c-format
msgid "Disklabel written to %s."
msgstr "磁盘标签已写入 %s。"
-#: libfdisk/src/bsd.c:777 libfdisk/src/context.c:240
+#: libfdisk/src/bsd.c:764 libfdisk/src/context.c:306
msgid "Syncing disks."
msgstr "正在同步磁盘。"
-#: libfdisk/src/bsd.c:811
+#: libfdisk/src/bsd.c:800
msgid "BSD label is not nested within a DOS partition"
msgstr "BSD 标签未嵌套在 DOS 分区中"
-#: libfdisk/src/bsd.c:840
-#, c-format
-msgid "BSD partition '%c' linked to DOS partition %d."
+#: libfdisk/src/bsd.c:829
+#, fuzzy, c-format
+msgid "BSD partition '%c' linked to DOS partition %zu."
msgstr "BSD 分区“%c”已链接到 DOS 分区 %d。"
-#: libfdisk/src/context.c:236
+#: libfdisk/src/bsd.c:884
+msgid "Slice"
+msgstr ""
+
+#: libfdisk/src/bsd.c:885 libfdisk/src/dos.c:1981 libfdisk/src/gpt.c:2399
+#: libfdisk/src/sgi.c:1083 libfdisk/src/sun.c:997
+msgid "Start"
+msgstr "起点"
+
+#: libfdisk/src/bsd.c:886 libfdisk/src/dos.c:1982 libfdisk/src/gpt.c:2400
+#: libfdisk/src/sgi.c:1084 libfdisk/src/sun.c:998
+msgid "End"
+msgstr "末尾"
+
+#: libfdisk/src/bsd.c:887 libfdisk/src/dos.c:1983 libfdisk/src/gpt.c:2401
+#: libfdisk/src/sgi.c:1085 libfdisk/src/sun.c:999
+msgid "Sectors"
+msgstr "扇区"
+
+#: libfdisk/src/bsd.c:888 libfdisk/src/dos.c:1984 libfdisk/src/gpt.c:2402
+#: libfdisk/src/sgi.c:1086 libfdisk/src/sun.c:189 libfdisk/src/sun.c:1000
+msgid "Cylinders"
+msgstr "柱面"
+
+#: libfdisk/src/bsd.c:889 libfdisk/src/dos.c:1985 libfdisk/src/gpt.c:2403
+#: libfdisk/src/sgi.c:1087 libfdisk/src/sun.c:1001
+msgid "Size"
+msgstr "大小"
+
+#: libfdisk/src/bsd.c:891
+#, fuzzy
+msgid "Fsize"
+msgstr "大小"
+
+#: libfdisk/src/bsd.c:892
+#, fuzzy
+msgid "Bsize"
+msgstr "大小"
+
+#: libfdisk/src/bsd.c:893
+#, fuzzy
+msgid "Cpg"
+msgstr "cpg"
+
+#: libfdisk/src/context.c:229
+#, 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."
+msgstr ""
+
+#: libfdisk/src/context.c:302
#, c-format
msgid "%s: close device failed"
msgstr "%s:关闭设备失败"
-#: libfdisk/src/context.c:370
+#: libfdisk/src/context.c:442
msgid "cylinder"
msgid_plural "cylinders"
msgstr[0] "柱面"
-#: libfdisk/src/context.c:371
+#: libfdisk/src/context.c:443
msgid "sector"
msgid_plural "sectors"
msgstr[0] "扇区"
-#: libfdisk/src/dos.c:170
+#: libfdisk/src/dos.c:201
msgid "All primary partitions have been defined already."
msgstr "已经定义了所有主分区。"
-#: libfdisk/src/dos.c:215
-#, c-format
-msgid "Failed to read extended partition table (offset=%jd)"
+#: libfdisk/src/dos.c:253
+#, fuzzy, c-format
+msgid "Failed to read extended partition table (offset=%ju)"
msgstr "读取扩展分区表失败(偏移=%jd)"
-#: libfdisk/src/dos.c:275
+#: libfdisk/src/dos.c:316
msgid "You can set geometry from the extra functions menu."
msgstr "您可以从 更多功能 菜单获取几何属性。"
-#: libfdisk/src/dos.c:278
+#: libfdisk/src/dos.c:319
msgid "DOS-compatible mode is deprecated."
msgstr "DOS 兼容模式已废弃。"
-#: libfdisk/src/dos.c:282
+#: libfdisk/src/dos.c:323
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:288
+#: libfdisk/src/dos.c:329
msgid "Cylinders as display units are deprecated."
msgstr "以柱面为显示单位的方式已废弃。"
-#: libfdisk/src/dos.c:295
-#, c-format
-msgid "The size of this disk is %s (%llu bytes). DOS partition table format can not be used on drives for volumes larger than (%llu bytes) for %ld-byte sectors. Use GUID partition table format (GPT)."
+#: libfdisk/src/dos.c:336
+#, fuzzy, 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 (%llu 个字节)。DOS 分区表不能用于卷容量大于 %llu 字节,%ld 字节扇区的驱动器。请使用 GUID 分区表格式(GPT)。"
-#: libfdisk/src/dos.c:421
+#: libfdisk/src/dos.c:479
msgid "Bad offset in primary extended partition."
msgstr "主扩展分区中的偏移错误。"
-#: libfdisk/src/dos.c:437
-#, c-format
-msgid "Omitting partitions after #%zd. They will be deleted if you save this partition table."
+#: libfdisk/src/dos.c:495
+#, fuzzy, c-format
+msgid "Omitting partitions after #%zu. They will be deleted if you save this partition table."
msgstr "警告:将忽略 #%zd 后的扇区。如果您保存此分区表,它们会被删除。"
-#: libfdisk/src/dos.c:459
-#, c-format
-msgid "Extra link pointer in partition table %zd."
+#: libfdisk/src/dos.c:521
+#, fuzzy, c-format
+msgid "Extra link pointer in partition table %zu."
msgstr "在分区表 %zd 中有额外链接指针。"
-#: libfdisk/src/dos.c:467
-#, c-format
-msgid "Ignoring extra data in partition table %zd."
+#: libfdisk/src/dos.c:529
+#, fuzzy, c-format
+msgid "Ignoring extra data in partition table %zu."
msgstr "将忽略分区表 %zd 中的额外数据。"
-#: libfdisk/src/dos.c:501
-#, c-format
-msgid "omitting empty partition (%zd)"
+#: libfdisk/src/dos.c:563
+#, fuzzy, c-format
+msgid "omitting empty partition (%zu)"
msgstr "将忽略空分区(%zd)"
-#: libfdisk/src/dos.c:569
+#: libfdisk/src/dos.c:631
msgid "Enter the new disk identifier"
msgstr "输入新磁盘标识符"
-#: libfdisk/src/dos.c:576
+#: libfdisk/src/dos.c:638
msgid "Incorrect value."
msgstr "无效的值。"
-#: libfdisk/src/dos.c:586
+#: libfdisk/src/dos.c:648
#, c-format
msgid "Disk identifier changed from 0x%08x to 0x%08x."
msgstr "磁盘标识从 0x%08x 改为 0x%08x。"
-#: libfdisk/src/dos.c:678
-#, c-format
-msgid "Ignoring extra extended partition %zd"
+#: libfdisk/src/dos.c:740
+#, fuzzy, c-format
+msgid "Ignoring extra extended partition %zu"
msgstr "将忽略额外的扩展分区 %zd"
-#: libfdisk/src/dos.c:690
-#, c-format
-msgid "Invalid flag 0x%02x%02x of partition table %zd will be corrected by w(rite)"
+#: libfdisk/src/dos.c:753
+#, fuzzy, c-format
+msgid "Invalid flag 0x%02x%02x of EBR (for partition %zu) will be corrected by w(rite)."
msgstr "分区表 %3$zd 的无效标志 0x%1$02x%2$02x 将通过写入来更正"
-#: libfdisk/src/dos.c:811
-#, c-format
-msgid "Partition %d is already defined. Delete it before re-adding it."
-msgstr "分区 %d 已经定义。请删除它再重新添加。"
+#: libfdisk/src/dos.c:881
+#, fuzzy, c-format
+msgid "Start sector %ju out of range."
+msgstr "值超出范围。"
+
+#: libfdisk/src/dos.c:934 libfdisk/src/gpt.c:1795 libfdisk/src/sgi.c:787
+#: libfdisk/src/sun.c:498
+#, fuzzy, c-format
+msgid "Partition %zu is already defined. Delete it before re-adding it."
+msgstr "分区 %zd 已经定义过。请删除后再重新添加它。"
-#: libfdisk/src/dos.c:863
+#: libfdisk/src/dos.c:991
#, c-format
msgid "Sector %llu is already allocated."
msgstr "扇区 %llu 已经分配."
-#: libfdisk/src/dos.c:920 libfdisk/src/gpt.c:1672
+#: libfdisk/src/dos.c:1025 libfdisk/src/gpt.c:1805
msgid "No free sectors available."
msgstr "无空闲扇区可用。"
-#: libfdisk/src/dos.c:1029
-#, c-format
-msgid "Adding logical partition %zd"
+#: libfdisk/src/dos.c:1145
+#, fuzzy, c-format
+msgid "Adding logical partition %zu"
msgstr "添加逻辑分区 %zd"
-#: libfdisk/src/dos.c:1045
-#, c-format
-msgid "Partition %zd: contains sector 0"
+#: libfdisk/src/dos.c:1161
+#, fuzzy, c-format
+msgid "Partition %zu: contains sector 0"
msgstr "分区 %zd:包含扇区 0"
-#: libfdisk/src/dos.c:1047
-#, c-format
-msgid "Partition %zd: head %d greater than maximum %d"
+#: libfdisk/src/dos.c:1163
+#, fuzzy, c-format
+msgid "Partition %zu: head %d greater than maximum %d"
msgstr "分区 %zd:磁头 %d 大于最大值 %d"
-#: libfdisk/src/dos.c:1050
-#, c-format
-msgid "Partition %zd: sector %d greater than maximum %llu"
+#: libfdisk/src/dos.c:1166
+#, fuzzy, c-format
+msgid "Partition %zu: sector %d greater than maximum %llu"
msgstr "分区 %zd:扇区 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1053
-#, c-format
-msgid "Partition %zd: cylinder %d greater than maximum %llu"
+#: libfdisk/src/dos.c:1169
+#, fuzzy, c-format
+msgid "Partition %zu: cylinder %d greater than maximum %llu"
msgstr "分区 %zd:柱面 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1059
-#, c-format
-msgid "Partition %zd: previous sectors %d disagrees with total %d"
+#: libfdisk/src/dos.c:1175
+#, fuzzy, c-format
+msgid "Partition %zu: previous sectors %u disagrees with total %u"
msgstr "分区 %zd:之前的扇区数 %d 与总数 %d 不符"
-#: libfdisk/src/dos.c:1112
-#, c-format
-msgid "Partition %zd: different physical/logical beginnings (non-Linux?): phys=(%d, %d, %d), logical=(%d, %d, %d)"
+#: libfdisk/src/dos.c:1228
+#, fuzzy, c-format
+msgid "Partition %zu: different physical/logical beginnings (non-Linux?): phys=(%d, %d, %d), logical=(%d, %d, %d)"
msgstr "分区 %zd 的物理/逻辑起点不同(非 Linux 分区?):物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
-#: libfdisk/src/dos.c:1123
-#, c-format
-msgid "Partition %zd: different physical/logical endings: phys=(%d, %d, %d), logical=(%d, %d, %d)"
+#: libfdisk/src/dos.c:1239
+#, fuzzy, c-format
+msgid "Partition %zu: different physical/logical endings: phys=(%d, %d, %d), logical=(%d, %d, %d)"
msgstr "分区 %zd 的物理/逻辑终点不同:物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
-#: libfdisk/src/dos.c:1132
-#, c-format
-msgid "Partition %zd: does not end on cylinder boundary."
+#: libfdisk/src/dos.c:1248
+#, fuzzy, c-format
+msgid "Partition %zu: does not end on cylinder boundary."
msgstr "分区 %zd 未结束在柱面边界上。"
-#: libfdisk/src/dos.c:1159
-#, c-format
-msgid "Partition %zd: bad start-of-data."
+#: libfdisk/src/dos.c:1275
+#, fuzzy, c-format
+msgid "Partition %zu: bad start-of-data."
msgstr "分区 %zd:数据起点错误。"
-#: libfdisk/src/dos.c:1169
-#, c-format
-msgid "Partition %zd: overlaps partition %zd."
+#: libfdisk/src/dos.c:1285
+#, fuzzy, c-format
+msgid "Partition %zu: overlaps partition %zu."
msgstr "分区 %zd:与 分区 %zd 重叠。"
-#: libfdisk/src/dos.c:1195
-#, c-format
-msgid "Partition %zd: empty."
+#: libfdisk/src/dos.c:1311
+#, fuzzy, c-format
+msgid "Partition %zu: empty."
msgstr "分区 %zd:空分区。"
-#: libfdisk/src/dos.c:1200
-#, c-format
-msgid "Logical partition %zd: not entirely in partition %zd."
+#: libfdisk/src/dos.c:1316
+#, fuzzy, c-format
+msgid "Logical partition %zu: not entirely in partition %zu."
msgstr "逻辑分区 %zd:没有完全在分区 %zd 中。"
-#: libfdisk/src/dos.c:1208
+#: libfdisk/src/dos.c:1324
#, c-format
msgid "Total allocated sectors %llu greater than the maximum %llu."
msgstr "分配的总扇区数 %llu 大于最大值 %llu。"
-#: libfdisk/src/dos.c:1211
+#: libfdisk/src/dos.c:1327
#, c-format
msgid "Remaining %lld unallocated %ld-byte sectors."
msgstr "剩余 %lld 未分配的 %ld字节 扇区。"
-#: libfdisk/src/dos.c:1242
+#: libfdisk/src/dos.c:1379
msgid "The maximum number of partitions has been created."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/dos.c:1250
+#: libfdisk/src/dos.c:1387
msgid "All primary partitions are in use."
msgstr "所有主分区都在使用中。"
-#: libfdisk/src/dos.c:1253
+#: libfdisk/src/dos.c:1390
msgid "If you want to create more than four partitions, you must replace a primary partition with an extended partition first."
msgstr "要想创建多于 4 个分区,您需要先将一个主分区替换为扩展分区。"
-#: libfdisk/src/dos.c:1261
+#: libfdisk/src/dos.c:1398
msgid "All logical partitions are in use. Adding a primary partition."
msgstr "所有逻辑分区都在使用中。将添加一个主分区。"
-#: libfdisk/src/dos.c:1274
+#: libfdisk/src/dos.c:1412
+#, fuzzy
+msgid "Partition type"
+msgstr "分区号"
+
+#: libfdisk/src/dos.c:1416
#, c-format
-msgid ""
-"Partition type:\n"
-" p primary (%zd primary, %d extended, %zd free)\n"
-"%s\n"
-"Select (default %c)"
+msgid "%zu primary, %d extended, %zu free"
msgstr ""
-"分区类型:\n"
-" p 主分区(%zd 个主分区,%d 个扩展分区,%zd 空闲)\n"
-"%s\n"
-"请选择(默认为 %c):"
-#: libfdisk/src/dos.c:1280
-msgid " l logical (numbered from 5)"
-msgstr " l 逻辑分区(从 5 开始编号)"
+#: libfdisk/src/dos.c:1421
+#, fuzzy
+msgid "primary"
+msgstr "主分区"
+
+#: libfdisk/src/dos.c:1423
+#, fuzzy
+msgid "extended"
+msgstr "扩展"
-#: libfdisk/src/dos.c:1280
-msgid " e extended"
-msgstr " e 扩展分区"
+#: libfdisk/src/dos.c:1423
+#, fuzzy
+msgid "container for logical partitions"
+msgstr "逻辑分区损坏"
-#: libfdisk/src/dos.c:1288
-#, c-format
-msgid "Using default response %c."
-msgstr "将使用默认回应 %c。"
+#: libfdisk/src/dos.c:1425
+#, fuzzy
+msgid "logical"
+msgstr "逻辑分区"
-#: libfdisk/src/dos.c:1310
+#: libfdisk/src/dos.c:1425
+#, fuzzy
+msgid "numbered from 5"
+msgstr " l 逻辑分区(从 5 开始编号)"
+
+#: libfdisk/src/dos.c:1456
#, c-format
msgid "Invalid partition type `%c'."
msgstr "无效的分区类型“%c”。"
-#: libfdisk/src/dos.c:1325
+#: libfdisk/src/dos.c:1471
#, c-format
msgid "Cannot write sector %jd: seek failed"
msgstr "写扇区 %jd 失败:定位失败"
-#: libfdisk/src/dos.c:1417
+#: libfdisk/src/dos.c:1591
msgid "You cannot change a partition into an extended one or vice versa. Delete it first."
msgstr "您不能将分区更改为扩展分区或从扩展分区改回。请先删除该分区。"
-#: libfdisk/src/dos.c:1423
+#: libfdisk/src/dos.c:1597
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:1501
-msgid "Nr"
-msgstr "Nr"
+#: libfdisk/src/dos.c:1602
+msgid "Type 0 means free space to many systems. Having partitions of type 0 is probably unwise."
+msgstr ""
-#: libfdisk/src/dos.c:1502
-msgid "AF"
-msgstr "AF"
+#: libfdisk/src/dos.c:1823
+msgid "Nothing to do. Ordering is correct already."
+msgstr "无须操作。顺序已经是正确的了。"
-#: libfdisk/src/dos.c:1504 libfdisk/src/dos.c:1508
-msgid "Hd"
-msgstr "Hd"
+#: libfdisk/src/dos.c:1852 libfdisk/src/gpt.c:2316
+msgid "Done."
+msgstr "完成。"
-#: libfdisk/src/dos.c:1505 libfdisk/src/dos.c:1509
-msgid "Sec"
-msgstr "Sec"
+#: libfdisk/src/dos.c:1872
+#, fuzzy, c-format
+msgid "Partition %zu: no data area."
+msgstr "分区 %d:无数据区。"
-#: libfdisk/src/dos.c:1506 libfdisk/src/dos.c:1510
-msgid "Cyl"
-msgstr "Cyl"
+#: libfdisk/src/dos.c:1902
+msgid "New beginning of data"
+msgstr "新数据起点"
-#: libfdisk/src/dos.c:1514 libfdisk/src/dos.c:1609 libfdisk/src/sgi.c:280
-#: libfdisk/src/sun.c:706
-msgid "Id"
-msgstr "Id"
+#: libfdisk/src/dos.c:1958
+#, fuzzy, c-format
+msgid "Partition %zu: is an extended partition."
+msgstr "分区 %d:是一个扩展分区。"
+
+#: libfdisk/src/dos.c:1965
+#, fuzzy, c-format
+msgid "The bootable flag on partition %zu is enabled now."
+msgstr "分区 %zu 的类型未更改:%s。"
-#: libfdisk/src/dos.c:1588
-msgid "This doesn't look like a partition table. Probably you selected the wrong device."
-msgstr "这似乎不是分区表。您可能选错了设备。"
+#: libfdisk/src/dos.c:1966
+#, fuzzy, c-format
+msgid "The bootable flag on partition %zu is disabled now."
+msgstr "分区 %zu 的类型未更改:%s。"
-#: libfdisk/src/dos.c:1603 libfdisk/src/gpt.c:1207 libfdisk/src/sgi.c:275
-#: libfdisk/src/sun.c:700
+#: libfdisk/src/dos.c:1979 libfdisk/src/gpt.c:2398 libfdisk/src/sgi.c:1082
+#: libfdisk/src/sun.c:996
msgid "Device"
msgstr "设备"
-#. TRANSLATORS: keep one blank space behind 'Blocks'
-#: libfdisk/src/dos.c:1608 libfdisk/src/sun.c:705
-msgid "Blocks "
-msgstr "块 "
-
-#: libfdisk/src/dos.c:1610 libfdisk/src/sgi.c:281 libfdisk/src/sun.c:707
-msgid "System"
-msgstr "系统"
-
-#: libfdisk/src/dos.c:1677
-msgid "Partition table entries are not in disk order."
-msgstr "分区表记录没有按磁盘顺序。"
-
-#: libfdisk/src/dos.c:1754
-msgid "Nothing to do. Ordering is correct already."
-msgstr "无须操作。顺序已经是正确的了。"
+#: libfdisk/src/dos.c:1980 libfdisk/src/sun.c:35
+msgid "Boot"
+msgstr "启动"
-#: libfdisk/src/dos.c:1783
-msgid "Done."
-msgstr "完成。"
+#: libfdisk/src/dos.c:1986 libfdisk/src/sgi.c:1088 libfdisk/src/sun.c:1002
+msgid "Id"
+msgstr "Id"
-#: libfdisk/src/dos.c:1803
-#, c-format
-msgid "Partition %d: no data area."
-msgstr "分区 %d:无数据区。"
+#: libfdisk/src/dos.c:1990
+#, fuzzy
+msgid "Start-C/H/S"
+msgstr "起点"
-#: libfdisk/src/dos.c:1833
-msgid "New beginning of data"
-msgstr "新数据起点"
+#: libfdisk/src/dos.c:1991
+msgid "End-C/H/S"
+msgstr ""
-#: libfdisk/src/dos.c:1895
-#, c-format
-msgid "Partition %d: is an extended partition."
-msgstr "分区 %d:是一个扩展分区。"
+#: libfdisk/src/dos.c:1992 libfdisk/src/gpt.c:2409 libfdisk/src/sgi.c:1090
+msgid "Attrs"
+msgstr ""
-#: libfdisk/src/gpt.c:142
+#: libfdisk/src/gpt.c:150
msgid "EFI System"
msgstr "EFI 系统"
-#: libfdisk/src/gpt.c:144
+#: libfdisk/src/gpt.c:152
msgid "MBR partition scheme"
msgstr "MBR 分区方案"
-#: libfdisk/src/gpt.c:146
-msgid "BIOS boot partition"
-msgstr "BIOS 启动分区"
+#: libfdisk/src/gpt.c:153
+msgid "Intel Fast Flash"
+msgstr ""
+
+#: libfdisk/src/gpt.c:156
+#, fuzzy
+msgid "BIOS boot"
+msgstr "FreeBSD 启动"
-#: libfdisk/src/gpt.c:149
+#: libfdisk/src/gpt.c:159
msgid "Microsoft reserved"
msgstr "Microsoft 保留"
-#: libfdisk/src/gpt.c:150
+#: libfdisk/src/gpt.c:160
msgid "Microsoft basic data"
msgstr "Microsoft 基本数据"
-#: libfdisk/src/gpt.c:151
+#: libfdisk/src/gpt.c:161
msgid "Microsoft LDM metadata"
msgstr "Microsoft LDM 元数据"
-#: libfdisk/src/gpt.c:152
+#: libfdisk/src/gpt.c:162
msgid "Microsoft LDM data"
msgstr "Microsoft LDM 数据"
-#: libfdisk/src/gpt.c:153
+#: libfdisk/src/gpt.c:163
msgid "Windows recovery environment"
msgstr "Windows 恢复环境"
-#: libfdisk/src/gpt.c:154
+#: libfdisk/src/gpt.c:164
msgid "IBM General Parallel Fs"
msgstr "IBM 通用并行文件系统"
-#: libfdisk/src/gpt.c:157
-msgid "HP-UX data partition"
+#: libfdisk/src/gpt.c:167
+#, fuzzy
+msgid "HP-UX data"
msgstr "HP-UX 数据分区"
-#: libfdisk/src/gpt.c:158
-msgid "HP-UX service partition"
+#: libfdisk/src/gpt.c:168
+#, fuzzy
+msgid "HP-UX service"
msgstr "HP-UX 服务分区"
-#: libfdisk/src/gpt.c:161
+#: libfdisk/src/gpt.c:171 libfdisk/src/sgi.c:55 libfdisk/src/sun.c:46
+msgid "Linux swap"
+msgstr "Linux swap"
+
+#: libfdisk/src/gpt.c:172
msgid "Linux filesystem"
msgstr "Linux 文件系统"
-#: libfdisk/src/gpt.c:162 libfdisk/src/sgi.c:56
-msgid "Linux RAID"
-msgstr "Linux RAID"
+#: libfdisk/src/gpt.c:173
+#, fuzzy
+msgid "Linux server data"
+msgstr "Linux 保留"
-#: libfdisk/src/gpt.c:163 libfdisk/src/sgi.c:53 libfdisk/src/sun.c:44
-msgid "Linux swap"
-msgstr "Linux swap"
+#: libfdisk/src/gpt.c:174
+msgid "Linux root (x86)"
+msgstr ""
-#: libfdisk/src/gpt.c:165
+#: libfdisk/src/gpt.c:175
+msgid "Linux root (x86-64)"
+msgstr ""
+
+#: libfdisk/src/gpt.c:176
msgid "Linux reserved"
msgstr "Linux 保留"
-#: libfdisk/src/gpt.c:168
+#: libfdisk/src/gpt.c:177
+#, fuzzy
+msgid "Linux home"
+msgstr "Linux"
+
+#: libfdisk/src/gpt.c:178 libfdisk/src/sgi.c:58
+msgid "Linux RAID"
+msgstr "Linux RAID"
+
+#: libfdisk/src/gpt.c:179
+#, fuzzy
+msgid "Linux extended boot"
+msgstr "Linux 扩展"
+
+#: libfdisk/src/gpt.c:183
msgid "FreeBSD data"
msgstr "FreeBSD 数据"
-#: libfdisk/src/gpt.c:169
+#: libfdisk/src/gpt.c:184
msgid "FreeBSD boot"
msgstr "FreeBSD 启动"
-#: libfdisk/src/gpt.c:170
+#: libfdisk/src/gpt.c:185
msgid "FreeBSD swap"
msgstr "FreeBSD 交换"
-#: libfdisk/src/gpt.c:171
+#: libfdisk/src/gpt.c:186
msgid "FreeBSD UFS"
msgstr "FreeBSD UFS"
-#: libfdisk/src/gpt.c:172
+#: libfdisk/src/gpt.c:187
msgid "FreeBSD ZFS"
msgstr "FreeBSD ZFS"
-#: libfdisk/src/gpt.c:173
+#: libfdisk/src/gpt.c:188
msgid "FreeBSD Vinum"
msgstr "FreeBSD Vinum"
-#: libfdisk/src/gpt.c:176
+#: libfdisk/src/gpt.c:191
msgid "Apple HFS/HFS+"
msgstr "Apple HFS/HFS+"
-#: libfdisk/src/gpt.c:177
+#: libfdisk/src/gpt.c:192
msgid "Apple UFS"
msgstr "Apple UFS"
-#: libfdisk/src/gpt.c:178
+#: libfdisk/src/gpt.c:193
msgid "Apple RAID"
msgstr "Apple RAID"
-#: libfdisk/src/gpt.c:179
+#: libfdisk/src/gpt.c:194
msgid "Apple RAID offline"
msgstr "Apple RAID 离线"
-#: libfdisk/src/gpt.c:180
+#: libfdisk/src/gpt.c:195
msgid "Apple boot"
msgstr "Apple 启动"
-#: libfdisk/src/gpt.c:181
+#: libfdisk/src/gpt.c:196
msgid "Apple label"
msgstr "Apple 标签"
-#: libfdisk/src/gpt.c:182
+#: libfdisk/src/gpt.c:197
msgid "Apple TV recovery"
msgstr "Apple TV 恢复"
-#: libfdisk/src/gpt.c:183
+#: libfdisk/src/gpt.c:198
msgid "Apple Core storage"
msgstr "Apple Core 存储"
-#: libfdisk/src/gpt.c:187
+#: libfdisk/src/gpt.c:202
msgid "Solaris root"
msgstr "Solaris root"
-#: libfdisk/src/gpt.c:189
+#: libfdisk/src/gpt.c:204
msgid "Solaris /usr & Apple ZFS"
msgstr "Solaris /usr & Apple ZFS"
-#: libfdisk/src/gpt.c:190
+#: libfdisk/src/gpt.c:205
msgid "Solaris swap"
msgstr "Solaris 交换"
-#: libfdisk/src/gpt.c:191
+#: libfdisk/src/gpt.c:206
msgid "Solaris backup"
msgstr "Solaris 备份"
-#: libfdisk/src/gpt.c:192
+#: libfdisk/src/gpt.c:207
msgid "Solaris /var"
msgstr "Solaris /var"
-#: libfdisk/src/gpt.c:193
+#: libfdisk/src/gpt.c:208
msgid "Solaris /home"
msgstr "Solaris /home"
-#: libfdisk/src/gpt.c:194
+#: libfdisk/src/gpt.c:209
msgid "Solaris alternate sector"
msgstr "Solaris 备选扇区"
-#: libfdisk/src/gpt.c:195
+#: libfdisk/src/gpt.c:210
msgid "Solaris reserved 1"
msgstr "Solaris 保留 1"
-#: libfdisk/src/gpt.c:196
+#: libfdisk/src/gpt.c:211
msgid "Solaris reserved 2"
msgstr "Solaris 保留 2"
-#: libfdisk/src/gpt.c:197
+#: libfdisk/src/gpt.c:212
msgid "Solaris reserved 3"
msgstr "Solaris 保留 3"
-#: libfdisk/src/gpt.c:198
+#: libfdisk/src/gpt.c:213
msgid "Solaris reserved 4"
msgstr "Solaris 保留 4"
-#: libfdisk/src/gpt.c:199
+#: libfdisk/src/gpt.c:214
msgid "Solaris reserved 5"
msgstr "Solaris 保留 5"
-#: libfdisk/src/gpt.c:202
+#: libfdisk/src/gpt.c:217
msgid "NetBSD swap"
msgstr "NetBSD 交换"
-#: libfdisk/src/gpt.c:203
+#: libfdisk/src/gpt.c:218
msgid "NetBSD FFS"
msgstr "NetBSD FFS"
-#: libfdisk/src/gpt.c:204
+#: libfdisk/src/gpt.c:219
msgid "NetBSD LFS"
msgstr "NetBSD LFS"
-#: libfdisk/src/gpt.c:205
+#: libfdisk/src/gpt.c:220
msgid "NetBSD concatenated"
msgstr "NetBSD concatenated"
-#: libfdisk/src/gpt.c:206
+#: libfdisk/src/gpt.c:221
msgid "NetBSD encrypted"
msgstr "NetBSD 加密"
-#: libfdisk/src/gpt.c:207
+#: libfdisk/src/gpt.c:222
msgid "NetBSD RAID"
msgstr "NetBSD RAID"
-#: libfdisk/src/gpt.c:210
+#: libfdisk/src/gpt.c:225
msgid "ChromeOS kernel"
msgstr "ChromeOS 内核"
-#: libfdisk/src/gpt.c:211
+#: libfdisk/src/gpt.c:226
msgid "ChromeOS root fs"
msgstr "ChromeOS 根文件系统"
-#: libfdisk/src/gpt.c:212
+#: libfdisk/src/gpt.c:227
msgid "ChromeOS reserved"
msgstr "ChromeOS 保留"
-#: libfdisk/src/gpt.c:215
+#: libfdisk/src/gpt.c:230
msgid "MidnightBSD data"
msgstr "MidnightBSD 数据"
-#: libfdisk/src/gpt.c:216
+#: libfdisk/src/gpt.c:231
msgid "MidnightBSD boot"
msgstr "MidnightBSD 启动"
-#: libfdisk/src/gpt.c:217
+#: libfdisk/src/gpt.c:232
msgid "MidnightBSD swap"
msgstr "MidnightBSD 交换"
-#: libfdisk/src/gpt.c:218
+#: libfdisk/src/gpt.c:233
msgid "MidnightBSD UFS"
msgstr "MidnightBSD UFS"
-#: libfdisk/src/gpt.c:219
+#: libfdisk/src/gpt.c:234
msgid "MidnightBSD ZFS"
msgstr "MidnightBSD ZFS"
-#: libfdisk/src/gpt.c:220
+#: libfdisk/src/gpt.c:235
msgid "MidnightBSD Vinum"
msgstr "MidnightBSD Vinum"
-#: libfdisk/src/gpt.c:519
+#: libfdisk/src/gpt.c:447
+#, fuzzy
+msgid "failed to allocate GPT header"
+msgstr "分配迭代器失败"
+
+#: libfdisk/src/gpt.c:593
#, 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:536
+#: libfdisk/src/gpt.c:611
msgid "gpt: stat() failed"
msgstr "gpt:stat() 失败"
-#: libfdisk/src/gpt.c:546
+#: libfdisk/src/gpt.c:621
#, c-format
msgid "gpt: cannot handle files with mode %o"
msgstr "gpt:无法操作模式为 %o 的文件"
-#: libfdisk/src/gpt.c:803
+#: libfdisk/src/gpt.c:883
msgid "GPT Header"
msgstr "GPT 头"
-#: libfdisk/src/gpt.c:808
+#: libfdisk/src/gpt.c:888
msgid "GPT Entries"
msgstr "GPT 记录项"
-#: libfdisk/src/gpt.c:1201
+#: libfdisk/src/gpt.c:1199
+msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used."
+msgstr ""
+
+#: libfdisk/src/gpt.c:1208
+msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used."
+msgstr ""
+
+#: libfdisk/src/gpt.c:1390
#, c-format
msgid "First LBA: %ju"
msgstr "第一个 LBA:%ju"
-#: libfdisk/src/gpt.c:1202
+#: libfdisk/src/gpt.c:1391
#, c-format
msgid "Last LBA: %ju"
msgstr "上个 LBA: %ju"
-#: libfdisk/src/gpt.c:1203
+#: libfdisk/src/gpt.c:1392
#, c-format
msgid "Alternative LBA: %ju"
msgstr "备用 LBA:%ju"
-#: libfdisk/src/gpt.c:1204
+#: libfdisk/src/gpt.c:1393
#, c-format
msgid "Partitions entries LBA: %ju"
msgstr "分区记录项 LBA:%ju"
-#: libfdisk/src/gpt.c:1205
-#, c-format
-msgid "Allocated partition entries: %ju"
+#: libfdisk/src/gpt.c:1394
+#, fuzzy, c-format
+msgid "Allocated partition entries: %u"
msgstr "已分配的分区项:%ju"
-#: libfdisk/src/gpt.c:1214
-msgid "UUID"
-msgstr "UUID"
+#: libfdisk/src/gpt.c:1541
+msgid "The device contains hybrid MBR -- writing GPT only. You have to sync the MBR manually."
+msgstr ""
-#: libfdisk/src/gpt.c:1453
+#: libfdisk/src/gpt.c:1576
msgid "Disk does not contain a valid backup header."
msgstr "磁盘不含有效的备用磁头。"
-#: libfdisk/src/gpt.c:1458
+#: libfdisk/src/gpt.c:1581
msgid "Invalid primary header CRC checksum."
msgstr "无效的主磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:1462
+#: libfdisk/src/gpt.c:1585
msgid "Invalid backup header CRC checksum."
msgstr "无效的备份磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:1467
+#: libfdisk/src/gpt.c:1590
msgid "Invalid partition entry checksum."
msgstr "无效的分区记录校验和。"
-#: libfdisk/src/gpt.c:1472
+#: libfdisk/src/gpt.c:1595
msgid "Invalid primary header LBA sanity checks."
msgstr "无效的主磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:1476
+#: libfdisk/src/gpt.c:1599
msgid "Invalid backup header LBA sanity checks."
msgstr "无效的备用磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:1481
+#: libfdisk/src/gpt.c:1604
msgid "MyLBA mismatch with real position at primary header."
msgstr "MyLBA 不匹配,真正位置在主磁头。"
-#: libfdisk/src/gpt.c:1485
+#: libfdisk/src/gpt.c:1608
msgid "MyLBA mismatch with real position at backup header."
msgstr "MyLBA 不匹配,真正位置在备份磁头。"
-#: libfdisk/src/gpt.c:1490
+#: libfdisk/src/gpt.c:1613
msgid "Disk is too small to hold all data."
msgstr "磁盘太小,放不下所有数据。"
-#: libfdisk/src/gpt.c:1500
+#: libfdisk/src/gpt.c:1623
msgid "Primary and backup header mismatch."
msgstr "主磁头和备份磁头不匹配。"
-#: libfdisk/src/gpt.c:1506
+#: libfdisk/src/gpt.c:1629
#, c-format
msgid "Partition %u overlaps with partition %u."
msgstr "分区 %u 与 %u 重叠。"
-#: libfdisk/src/gpt.c:1513
+#: libfdisk/src/gpt.c:1636
#, c-format
msgid "Partition %u is too big for the disk."
msgstr "分区 %u 对于该磁盘而言过大。"
-#: libfdisk/src/gpt.c:1520
+#: libfdisk/src/gpt.c:1643
#, c-format
msgid "Partition %u ends before it starts."
msgstr "分区 %u 结束于起点之前。"
-#: libfdisk/src/gpt.c:1528
+#: libfdisk/src/gpt.c:1652
msgid "No errors detected."
msgstr "未检测到错误。"
-#: libfdisk/src/gpt.c:1529
+#: libfdisk/src/gpt.c:1653
#, c-format
msgid "Header version: %s"
msgstr "磁头版本:%s"
-#: libfdisk/src/gpt.c:1530
+#: libfdisk/src/gpt.c:1654
#, c-format
msgid "Using %u out of %d partitions."
msgstr "使用着 %2$d 个分区中的 %1$u 个。"
-#: libfdisk/src/gpt.c:1537
-#, c-format
-msgid "A total of %ld free sectors is available in %d segment."
-msgid_plural "A total of %ld free sectors is available in %d segments (the largest is %ld)."
+#: libfdisk/src/gpt.c:1665
+#, fuzzy, 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$d 个片段中共有 %1$ld 个空闲扇区(最大的是 %3$ld)。"
-#: libfdisk/src/gpt.c:1543
+#: libfdisk/src/gpt.c:1673
#, c-format
msgid "%d error detected."
msgid_plural "%d errors detected."
msgstr[0] "检测到 %d 个错误。"
-#: libfdisk/src/gpt.c:1661
-#, c-format
-msgid "Partition %zd is already defined. Delete it before re-adding it."
-msgstr "分区 %zd 已定义。请删除它再重新添加。"
-
-#: libfdisk/src/gpt.c:1667
+#: libfdisk/src/gpt.c:1801
msgid "All partitions are already in use."
msgstr "所有分区均已占用。"
-#: libfdisk/src/gpt.c:1708
+#: libfdisk/src/gpt.c:1826 libfdisk/src/gpt.c:1853
#, c-format
msgid "Sector %ju already used."
msgstr "扇区 %ju 已使用。"
-#: libfdisk/src/gpt.c:1738
-#, c-format
-msgid "Could not create partition %zd"
+#: libfdisk/src/gpt.c:1909
+#, fuzzy, c-format
+msgid "Could not create partition %zu"
msgstr "无法创建分区 %zd"
-#: libfdisk/src/gpt.c:1822
+#: libfdisk/src/gpt.c:1994
#, c-format
msgid "Created a new GPT disklabel (GUID: %s)."
msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
-#: libfdisk/src/gpt.c:1859
+#: libfdisk/src/gpt.c:2031
msgid "Enter new disk UUID (in 8-4-4-4-12 format)"
msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)"
-#: libfdisk/src/gpt.c:1866 libfdisk/src/gpt.c:1994
+#: libfdisk/src/gpt.c:2038 libfdisk/src/gpt.c:2131
msgid "Failed to parse your UUID."
msgstr "解析您的 UUID 失败。"
-#: libfdisk/src/gpt.c:1881
+#: libfdisk/src/gpt.c:2053
#, c-format
msgid "Disk identifier changed from %s to %s."
msgstr "将磁盘标识从 %s 更改为 %s 失败。"
-#: libfdisk/src/gpt.c:1987
+#: libfdisk/src/gpt.c:2124
msgid "New UUID (in 8-4-4-4-12 format)"
msgstr "新 UUID (以 8-4-4-4-12 格式)"
-#: libfdisk/src/gpt.c:2009
+#: libfdisk/src/gpt.c:2146
#, c-format
msgid "Partition UUID changed from %s to %s."
msgstr "分区 UUID 已从 %s 更改为 %s。"
-#: libfdisk/src/gpt.c:2032
+#: libfdisk/src/gpt.c:2169
msgid "New name"
msgstr "新名称"
-#: libfdisk/src/gpt.c:2054
+#: libfdisk/src/gpt.c:2191
#, c-format
msgid "Partition name changed from '%s' to '%.*s'."
msgstr "分区名已由“%s”改为“%.*s”。"
-#: libfdisk/src/label.c:105
+#: libfdisk/src/gpt.c:2243
+msgid "Enter GUID specific bit"
+msgstr ""
+
+#: libfdisk/src/gpt.c:2263
+#, fuzzy, c-format
+msgid "The GUID specific bit %d on partition %zu is enabled now."
+msgstr "分区 %zu 的类型未更改:%s。"
+
+#: libfdisk/src/gpt.c:2264
+#, c-format
+msgid "The GUID specific bit %d on partition %zu is disabled now."
+msgstr ""
+
+#: libfdisk/src/gpt.c:2269
+#, fuzzy, c-format
+msgid "The %s flag on partition %zu is enabled now."
+msgstr "分区 %zu 的类型未更改:%s。"
+
+#: libfdisk/src/gpt.c:2270
+#, fuzzy, c-format
+msgid "The %s flag on partition %zu is disabled now."
+msgstr "分区 %zu 的类型未更改:%s。"
+
+#: libfdisk/src/gpt.c:2406
+#, fuzzy
+msgid "Type-UUID"
+msgstr "类型"
+
+#: libfdisk/src/gpt.c:2407
+msgid "UUID"
+msgstr "UUID"
+
+#: libfdisk/src/gpt.c:2408 login-utils/chfn.c:235 login-utils/chfn.c:315
+msgid "Name"
+msgstr "名称"
+
+#: libfdisk/src/label.c:104
msgid "Incomplete geometry setting."
msgstr "不完整的几何属性设置。"
-#: libfdisk/src/parttype.c:85 misc-utils/findmnt.c:631 schedutils/ionice.c:79
-#: sys-utils/hwclock.c:317
+#: libfdisk/src/partition.c:336
+#, fuzzy
+msgid "Free space"
+msgstr "剩余空间"
+
+#: libfdisk/src/parttype.c:85 misc-utils/findmnt.c:650 schedutils/ionice.c:79
+#: sys-utils/hwclock.c:322
msgid "unknown"
msgstr "未知"
-#: libfdisk/src/sgi.c:39
+#: libfdisk/src/sgi.c:41
msgid "SGI volhdr"
msgstr "SGI volhdr"
-#: libfdisk/src/sgi.c:40
+#: libfdisk/src/sgi.c:42
msgid "SGI trkrepl"
msgstr "SGI trkrepl"
-#: libfdisk/src/sgi.c:41
+#: libfdisk/src/sgi.c:43
msgid "SGI secrepl"
msgstr "SGI secrepl"
-#: libfdisk/src/sgi.c:42
+#: libfdisk/src/sgi.c:44
msgid "SGI raw"
msgstr "SGI raw"
-#: libfdisk/src/sgi.c:43
+#: libfdisk/src/sgi.c:45
msgid "SGI bsd"
msgstr "SGI bsd"
-#: libfdisk/src/sgi.c:44
+#: libfdisk/src/sgi.c:46
msgid "SGI sysv"
msgstr "SGI sysv"
-#: libfdisk/src/sgi.c:45
+#: libfdisk/src/sgi.c:47
msgid "SGI volume"
msgstr "SGI volume"
-#: libfdisk/src/sgi.c:46
+#: libfdisk/src/sgi.c:48
msgid "SGI efs"
msgstr "SGI efs"
-#: libfdisk/src/sgi.c:47
+#: libfdisk/src/sgi.c:49
msgid "SGI lvol"
msgstr "SGI lvol"
-#: libfdisk/src/sgi.c:48
+#: libfdisk/src/sgi.c:50
msgid "SGI rlvol"
msgstr "SGI rlvol"
-#: libfdisk/src/sgi.c:49
+#: libfdisk/src/sgi.c:51
msgid "SGI xfs"
msgstr "SGI xfs"
-#: libfdisk/src/sgi.c:50
+#: libfdisk/src/sgi.c:52
msgid "SGI xfslog"
msgstr "SGI xfslog"
-#: libfdisk/src/sgi.c:51
+#: libfdisk/src/sgi.c:53
msgid "SGI xlv"
msgstr "SGI xlv"
-#: libfdisk/src/sgi.c:52
+#: libfdisk/src/sgi.c:54
msgid "SGI xvm"
msgstr "SGI xvm"
-#: libfdisk/src/sgi.c:54 libfdisk/src/sun.c:45
+#: libfdisk/src/sgi.c:56 libfdisk/src/sun.c:47
msgid "Linux native"
msgstr "Linux native"
-#: libfdisk/src/sgi.c:141
+#: libfdisk/src/sgi.c:143
msgid "SGI info created on second sector"
msgstr "在第二扇区创建了 SGI 信息"
-#: libfdisk/src/sgi.c:241
+#: libfdisk/src/sgi.c:243
msgid "Detected an SGI disklabel with wrong checksum."
msgstr "检测到校验和错误的 sgi 磁盘标签。"
-#: libfdisk/src/sgi.c:260
+#: libfdisk/src/sgi.c:259
#, c-format
msgid ""
"Label geometry: %d heads, %llu sectors\n"
@@ -6363,302 +6113,280 @@ msgstr ""
" %llu 个柱面,%d 个物理柱面\n"
" %d 个额外扇区/柱面,交错 %d:1\n"
-#: libfdisk/src/sgi.c:274
-msgid "Pt#"
-msgstr "Pt#"
-
-#: libfdisk/src/sgi.c:276
-msgid "Info"
-msgstr "信息"
-
-#: libfdisk/src/sgi.c:336
-msgid "Sector"
-msgstr "扇区"
-
-#: libfdisk/src/sgi.c:365
+#: libfdisk/src/sgi.c:266
#, c-format
msgid "Bootfile: %s"
msgstr "启动文件:%s"
-#: libfdisk/src/sgi.c:414
+#: libfdisk/src/sgi.c:354
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:420
+#: libfdisk/src/sgi.c:360
#, 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:427
+#: libfdisk/src/sgi.c:367
msgid "Bootfile must have a fully qualified pathname."
msgstr "启动文件必须用完全限定路径名。"
-#: libfdisk/src/sgi.c:433
+#: libfdisk/src/sgi.c:373
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:449
+#: libfdisk/src/sgi.c:389
#, c-format
msgid "The current boot file is: %s"
msgstr "当前启动文件为:%s"
-#: libfdisk/src/sgi.c:451
+#: libfdisk/src/sgi.c:391
msgid "Enter of the new boot file"
msgstr "输入新启动文件的路径"
-#: libfdisk/src/sgi.c:456
+#: libfdisk/src/sgi.c:396
msgid "Boot file is unchanged."
msgstr "启动文件未改变。"
-#: libfdisk/src/sgi.c:468
+#: libfdisk/src/sgi.c:408
#, c-format
msgid "Bootfile has been changed to \"%s\"."
msgstr "启动文件已更改为“%s”。"
-#: libfdisk/src/sgi.c:608
+#: libfdisk/src/sgi.c:548
msgid "More than one entire disk entry present."
msgstr "存在超过一个整磁盘记录。"
-#: libfdisk/src/sgi.c:615 libfdisk/src/sun.c:435
+#: libfdisk/src/sgi.c:555 libfdisk/src/sun.c:440
msgid "No partitions defined."
msgstr "未定义分区。"
-#: libfdisk/src/sgi.c:623
+#: libfdisk/src/sgi.c:563
msgid "IRIX likes it when partition 11 covers the entire disk."
msgstr "IRIX 偏向于让分区 11 覆盖整个磁盘。"
-#: libfdisk/src/sgi.c:627
+#: libfdisk/src/sgi.c:567
#, c-format
msgid "The entire disk partition should start at block 0, not at block %d."
msgstr "整磁盘分区应开始于块 0,而非块 %d。"
-#: libfdisk/src/sgi.c:638
+#: libfdisk/src/sgi.c:578
msgid "Partition 11 should cover the entire disk."
msgstr "分区 11 应覆盖整个磁盘。"
-#: libfdisk/src/sgi.c:662
+#: libfdisk/src/sgi.c:602
#, 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:673 libfdisk/src/sgi.c:695
+#: libfdisk/src/sgi.c:613 libfdisk/src/sgi.c:635
#, 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:708
+#: libfdisk/src/sgi.c:648
msgid "The boot partition does not exist."
msgstr "启动分区不存在。"
-#: libfdisk/src/sgi.c:712
+#: libfdisk/src/sgi.c:652
msgid "The swap partition does not exist."
msgstr "交换分区不存在。"
-#: libfdisk/src/sgi.c:716
+#: libfdisk/src/sgi.c:656
msgid "The swap partition has no swap type."
msgstr "交换分区不是交换类型。"
-#: libfdisk/src/sgi.c:719
+#: libfdisk/src/sgi.c:659
msgid "You have chosen an unusual bootfile name."
msgstr "您选择了一个不常用的启动文件名。"
-#: libfdisk/src/sgi.c:769
+#: libfdisk/src/sgi.c:709
msgid "Partition overlap on the disk."
msgstr "磁盘上的分区重叠。"
-#: libfdisk/src/sgi.c:844 libfdisk/src/sun.c:471
-#, c-format
-msgid "Partition %zd is already defined. Delete it before re-adding it."
-msgstr "分区 %zd 已经定义过。请删除后再重新添加它。"
-
-#: libfdisk/src/sgi.c:849
+#: libfdisk/src/sgi.c:792
msgid "Attempting to generate entire disk entry automatically."
msgstr "尝试自动生成整磁盘记录。"
-#: libfdisk/src/sgi.c:854
+#: libfdisk/src/sgi.c:797
msgid "The entire disk is already covered with partitions."
msgstr "整个磁盘已经被分区覆盖。"
-#: libfdisk/src/sgi.c:858
+#: libfdisk/src/sgi.c:801
msgid "You got a partition overlap on the disk. Fix it first!"
msgstr "磁盘上有重叠分区。请先修复它!"
-#: libfdisk/src/sgi.c:862 libfdisk/src/sun.c:487
+#: libfdisk/src/sgi.c:823 libfdisk/src/sun.c:525
#, c-format
msgid "First %s"
msgstr "起始 %s"
-#: libfdisk/src/sgi.c:892 libfdisk/src/sgi.c:945
+#: libfdisk/src/sgi.c:847 libfdisk/src/sgi.c:897
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:903
-msgid "You will get a partition overlap on the disk. Fix it first!"
-msgstr "磁盘上将产生重叠分区。请先修复它!"
-
-#: libfdisk/src/sgi.c:910 libfdisk/src/sun.c:567
+#: libfdisk/src/sgi.c:862 libfdisk/src/sun.c:620
#, 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:980
+#: libfdisk/src/sgi.c:932 libfdisk/src/sun.c:231
#, c-format
-msgid "Warning: 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.8GB 的设备这个值可能会截短。"
+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:1041
+#: libfdisk/src/sgi.c:993
msgid "Created a new SGI disklabel."
msgstr "创建新的SGI 磁盘标签。"
-#: libfdisk/src/sgi.c:1068
+#: libfdisk/src/sgi.c:1007
msgid "Sorry, only for non-empty partitions you can change the tag."
msgstr "抱歉,只有非空分区才能更改标志(tag)。"
-#: libfdisk/src/sgi.c:1074
+#: libfdisk/src/sgi.c:1013
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:1082
+#: libfdisk/src/sgi.c:1021
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:32
+#: libfdisk/src/sun.c:34
msgid "Unassigned"
msgstr "未分配"
-#: libfdisk/src/sun.c:34
+#: libfdisk/src/sun.c:36
msgid "SunOS root"
msgstr "SunOS 根"
-#: libfdisk/src/sun.c:35
+#: libfdisk/src/sun.c:37
msgid "SunOS swap"
msgstr "SunOS 交换"
-#: libfdisk/src/sun.c:36
+#: libfdisk/src/sun.c:38
msgid "SunOS usr"
msgstr "SunOS usr"
-#: libfdisk/src/sun.c:37
+#: libfdisk/src/sun.c:39
msgid "Whole disk"
msgstr "整个磁盘"
-#: libfdisk/src/sun.c:38
+#: libfdisk/src/sun.c:40
msgid "SunOS stand"
msgstr "SunOS stand"
-#: libfdisk/src/sun.c:39
+#: libfdisk/src/sun.c:41
msgid "SunOS var"
msgstr "SunOS var"
-#: libfdisk/src/sun.c:40
+#: libfdisk/src/sun.c:42
msgid "SunOS home"
msgstr "SunOS home"
-#: libfdisk/src/sun.c:41
+#: libfdisk/src/sun.c:43
msgid "SunOS alt sectors"
msgstr "SunOS alt sectors"
-#: libfdisk/src/sun.c:42
+#: libfdisk/src/sun.c:44
msgid "SunOS cachefs"
msgstr "SunOS cachefs"
-#: libfdisk/src/sun.c:43
+#: libfdisk/src/sun.c:45
msgid "SunOS reserved"
msgstr "SunOS 保留"
-#: libfdisk/src/sun.c:128
+#: libfdisk/src/sun.c:130
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:141
+#: libfdisk/src/sun.c:143
#, c-format
msgid "Detected sun disklabel with wrong version [%d]."
msgstr "检测到带错误版本 [%d] 的 sun 磁盘标签 。"
-#: libfdisk/src/sun.c:146
+#: libfdisk/src/sun.c:148
#, c-format
msgid "Detected sun disklabel with wrong vtoc.sanity [0x%08x]."
msgstr "检测到带错误的 vtoc.sanity [0x%08x] 的 sun 磁盘标签。"
-#: libfdisk/src/sun.c:151
+#: libfdisk/src/sun.c:153
#, c-format
msgid "Detected sun disklabel with wrong vtoc.nparts [%u]."
msgstr "检测到带错误 vtoc.nparts [%u] 的 sun 磁盘标签。"
-#: libfdisk/src/sun.c:156
+#: libfdisk/src/sun.c:158
msgid "Warning: Wrong values need to be fixed up and will be corrected by w(rite)"
msgstr "警告:错误值需要修复,并且将通过 w(写) 操作修正。"
#: libfdisk/src/sun.c:185
+msgid "Heads"
+msgstr "磁头"
+
+#: libfdisk/src/sun.c:187
msgid "Sectors/track"
msgstr "扇区/磁道"
-#: libfdisk/src/sun.c:229
-#, 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/sun.c:282
+#: libfdisk/src/sun.c:284
msgid "Created a new Sun disklabel."
msgstr "创建新的 Sun 磁盘标签。"
-#: libfdisk/src/sun.c:395
-#, c-format
-msgid "Partition %d doesn't end on cylinder boundary."
+#: libfdisk/src/sun.c:398
+#, fuzzy, c-format
+msgid "Partition %u doesn't end on cylinder boundary."
msgstr "分区 %d 未结束在柱面边界上。"
-#: libfdisk/src/sun.c:415
-#, c-format
-msgid "Partition %d overlaps with others in sectors %d-%d."
+#: libfdisk/src/sun.c:417
+#, fuzzy, c-format
+msgid "Partition %u overlaps with others in sectors %u-%u."
msgstr "分区 %d 在扇区 %d-%d 与其他分区重叠0。"
-#: libfdisk/src/sun.c:440
-#, c-format
-msgid "Unused gap - sectors 0-%d."
+#: libfdisk/src/sun.c:445
+#, fuzzy, c-format
+msgid "Unused gap - sectors 0-%u."
msgstr "未使用的间隙 - 扇区 0-%d。"
-#: libfdisk/src/sun.c:442 libfdisk/src/sun.c:448
-#, c-format
-msgid "Unused gap - sectors %d-%d."
+#: libfdisk/src/sun.c:447 libfdisk/src/sun.c:453
+#, fuzzy, c-format
+msgid "Unused gap - sectors %u-%u."
msgstr "未使用的间隙 - 扇区 %d-%d。"
-#: libfdisk/src/sun.c:482
+#: libfdisk/src/sun.c:509
msgid "Other partitions already cover the whole disk. Delete some/shrink them before retry."
msgstr "其他分区已覆盖了整个磁盘。删除几个分区或压缩它们,然后重试。"
-#: libfdisk/src/sun.c:521
+#: libfdisk/src/sun.c:574
#, c-format
-msgid "Aligning the first sector from %u to %u to be on cylinder boundary."
-msgstr "将把从 %u 到 %u 的首个扇区对齐到柱面边界。"
+msgid "Sector %d is already allocated"
+msgstr "扇区 %d 已分配"
-#: libfdisk/src/sun.c:528
+#: libfdisk/src/sun.c:581
msgid "It is highly recommended that the third partition covers the whole disk and is of type `Whole disk'"
msgstr "强烈建议让第三个分区覆盖整个磁盘,并设为“Whole disk”类型"
-#: libfdisk/src/sun.c:556
+#: libfdisk/src/sun.c:591
#, c-format
-msgid "Sector %d is already allocated"
-msgstr "扇区 %d 已分配"
+msgid "Aligning the first sector from %u to %u to be on cylinder boundary."
+msgstr "将把从 %u 到 %u 的首个扇区对齐到柱面边界。"
-#: libfdisk/src/sun.c:618
-#, c-format
+#: libfdisk/src/sun.c:666
+#, fuzzy, c-format
msgid ""
"You haven't covered the whole disk with the 3rd partition, but your value\n"
-"%d %s covers some other partition. Your entry has been changed\n"
-"to %d %s"
+"%lu %s covers some other partition. Your entry has been changed\n"
+"to %lu %s"
msgstr ""
"您没有使第三个分区覆盖整个磁盘,但是值 %d %s 覆盖了其他分区。\n"
"您的记录已经更改为 %d %s"
-#: libfdisk/src/sun.c:657
+#: libfdisk/src/sun.c:705
#, 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:684
+#: libfdisk/src/sun.c:729
#, c-format
msgid ""
"Label geometry: %d rpm, %d alternate and %d physical cylinders,\n"
@@ -6667,45 +6395,41 @@ msgstr ""
"标签任何属性:%d rpm, %d 个备用柱面和 %d 个物理柱面,\n"
" %d 个额外扇区/柱面,交错 %d:1"
-#: libfdisk/src/sun.c:691
+#: libfdisk/src/sun.c:736
#, c-format
msgid "Label ID: %s"
msgstr "标签 ID:%s"
-#: libfdisk/src/sun.c:692
+#: libfdisk/src/sun.c:737
#, c-format
msgid "Volume ID: %s"
msgstr "卷 ID:%s"
-#: libfdisk/src/sun.c:693
+#: libfdisk/src/sun.c:738
msgid "<none>"
msgstr "<无>"
-#: libfdisk/src/sun.c:701
-msgid "Flag"
-msgstr "标志"
-
-#: libfdisk/src/sun.c:768
+#: libfdisk/src/sun.c:812
msgid "Number of alternate cylinders"
msgstr "备用柱面的数量"
-#: libfdisk/src/sun.c:784
+#: libfdisk/src/sun.c:828
msgid "Extra sectors per cylinder"
msgstr "每个柱面的额外扇区数"
-#: libfdisk/src/sun.c:799
+#: libfdisk/src/sun.c:843
msgid "Interleave factor"
msgstr "交错系数"
-#: libfdisk/src/sun.c:814
+#: libfdisk/src/sun.c:858
msgid "Rotation speed (rpm)"
msgstr "转速(转/分)"
-#: libfdisk/src/sun.c:829
+#: libfdisk/src/sun.c:873
msgid "Number of physical cylinders"
msgstr "物理柱面数"
-#: libfdisk/src/sun.c:910
+#: libfdisk/src/sun.c:934
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -6713,7 +6437,7 @@ msgstr ""
"考虑保持分区 3 为整盘(5),\n"
"这是 SunOS/Solaris 的规定,Linux 也建议这么做。\n"
-#: libfdisk/src/sun.c:919
+#: libfdisk/src/sun.c:943
msgid ""
"It is highly recommended that the partition at offset 0\n"
"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -6725,26 +6449,34 @@ msgstr ""
"和启动锁。\n"
"您确信要把该分区标记为 Linux 交换分区吗?"
+#: libfdisk/src/sun.c:1004
+msgid "Flags"
+msgstr "标志"
+
#: lib/pager.c:102
#, c-format
msgid "waitpid failed (%s)"
msgstr "waitpid 失败(%s)"
-#: lib/path.c:199 sys-utils/lscpu.c:1252
+#: lib/path.c:212 sys-utils/lscpu.c:1509
#, fuzzy
msgid "failed to callocate cpu set"
msgstr "分配 CPU 组 失败"
-#: lib/path.c:203
+#: lib/path.c:216
#, c-format
msgid "failed to parse CPU list %s"
msgstr "解析 CPU 列表 %s 失败"
-#: lib/path.c:206
+#: lib/path.c:219
#, c-format
msgid "failed to parse CPU mask %s"
msgstr "解析 CPU 掩码 %s 失败"
+#: lib/randutils.c:130
+msgid "libc pseudo-random functions"
+msgstr ""
+
#: login-utils/chfn.c:83 login-utils/chsh.c:72
#, c-format
msgid " %s [options] [username]\n"
@@ -6963,87 +6695,87 @@ msgstr "无已知 shell。"
msgid "Usage: %s <passwordfile> <username>...\n"
msgstr "用法:%s <密码文件> <用户名>...\n"
-#: login-utils/last.c:154 sys-utils/dmesg.c:1170
+#: login-utils/last.c:156 sys-utils/dmesg.c:1173
#, c-format
msgid "unknown time format: %s"
msgstr "未知时间格式: %s"
-#: login-utils/last.c:262 login-utils/last.c:270
+#: login-utils/last.c:264 login-utils/last.c:272
#, c-format
msgid "Interrupted %s"
msgstr "中断的 %s"
-#: login-utils/last.c:425
+#: login-utils/last.c:427
msgid "preallocation size exceeded"
msgstr "超过了预分配大小"
-#: login-utils/last.c:547
+#: login-utils/last.c:553
#, c-format
msgid " %s [options] [<username>...] [<tty>...]\n"
msgstr " %s [选项] [<用户名>...] [<tty>...]\n"
-#: login-utils/last.c:550
+#: login-utils/last.c:556
msgid " -<number> how many lines to show\n"
msgstr " -<数字> 显示行数\n"
-#: login-utils/last.c:551
+#: login-utils/last.c:557
msgid " -a, --hostlast display hostnames in the last column\n"
msgstr " -a, --hostlast 最后一列显示主机名\n"
-#: login-utils/last.c:552
+#: login-utils/last.c:558
msgid " -d, --dns translate the IP number back into a hostname\n"
msgstr " -d, --dns 将 IP 号转换回主机名\n"
-#: login-utils/last.c:554
+#: login-utils/last.c:560
#, c-format
msgid " -f, --file <file> use a specific file instead of %s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: login-utils/last.c:555
+#: login-utils/last.c:561
msgid " -F, --fulltimes print full login and logout times and dates\n"
msgstr " -F, --fulltimes 打印完整的登录和注销时间和日期\n"
-#: login-utils/last.c:556
+#: login-utils/last.c:562
msgid " -i, --ip display IP numbers in numbers-and-dots notation\n"
msgstr " -i, --ip 以数字和点的形式显示 IP 号\n"
-#: login-utils/last.c:557
+#: login-utils/last.c:563
msgid " -n, --limit <number> how many lines to show\n"
msgstr " -n, --limit <数字> 要显示的行数\n"
-#: login-utils/last.c:558
+#: login-utils/last.c:564
msgid " -R, --nohostname don't display the hostname field\n"
msgstr " -R, --nohostname 不显示主机名字段\n"
-#: login-utils/last.c:559
+#: login-utils/last.c:565
msgid " -s, --since <time> display the lines since the specified time\n"
msgstr " -s, --since <时间> 显示从指定时间起的行\n"
-#: login-utils/last.c:560
+#: login-utils/last.c:566
msgid " -t, --until <time> display the lines until the specified time\n"
msgstr " -t, --until <时间> 显示到指定时间为止的行\n"
-#: login-utils/last.c:561
+#: login-utils/last.c:567
msgid " -p, --present <time> display who where present at the specified time\n"
msgstr " -p, --present <时间> 显示指定时间谁,在哪里出现(present)\n"
-#: login-utils/last.c:562
+#: login-utils/last.c:568
msgid " -w, --fullnames display full user and domain names\n"
msgstr " -w, --fullnames 显示完整的用户名和域名\n"
-#: login-utils/last.c:563
+#: login-utils/last.c:569
msgid " -x, --system display system shutdown entries and run level changes\n"
msgstr " -x, --system 显示系统关机项和运行级别更改\n"
-#: login-utils/last.c:564
+#: login-utils/last.c:570
msgid " --time-format <format> show time stamp using format:\n"
msgstr " --time-format <格式> 以指定格式显示时间戳:\n"
-#: login-utils/last.c:565
+#: login-utils/last.c:571
msgid " [notime|short|full|iso]\n"
msgstr " [notime|short|full|iso]\n"
-#: login-utils/last.c:821
+#: login-utils/last.c:850
#, c-format
msgid ""
"\n"
@@ -7052,11 +6784,11 @@ msgstr ""
"\n"
"%s 开始 %s"
-#: login-utils/last.c:891
+#: login-utils/last.c:920
msgid "failed to parse number"
msgstr "解析数字失败"
-#: login-utils/last.c:913 login-utils/last.c:918 login-utils/last.c:923
+#: login-utils/last.c:941 login-utils/last.c:946 login-utils/last.c:951
#, c-format
msgid "invalid time value \"%s\""
msgstr "无效的时间值\"%s\""
@@ -7212,7 +6944,7 @@ msgstr "无法初始化 PAM:%s"
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:957
+#: login-utils/login.c:821 login-utils/sulogin.c:1019
#, c-format
msgid ""
"Login incorrect\n"
@@ -7240,7 +6972,7 @@ msgstr ""
"\n"
"登录不正确\n"
-#: login-utils/login.c:878 login-utils/login.c:1331 login-utils/login.c:1354
+#: login-utils/login.c:878 login-utils/login.c:1213 login-utils/login.c:1236
msgid ""
"\n"
"Session setup problem, abort."
@@ -7253,76 +6985,476 @@ msgstr ""
msgid "NULL user name in %s:%d. Abort."
msgstr "%s:%d 中是空(NULL)用户名。中止。"
-#: login-utils/login.c:1030
-msgid "hush login status: restore original IDs failed"
-msgstr "散列(hush)登录状态:恢复原 ID 失败"
-
-#: login-utils/login.c:1134
+#: login-utils/login.c:1016
#, c-format
msgid "TIOCSCTTY failed: %m"
msgstr "TIOCSCTTY 失败:%m"
-#: login-utils/login.c:1275
+#: login-utils/login.c:1157
#, c-format
msgid "login: -h is for superuser only\n"
msgstr "login:-h 是超级用户专用选项\n"
-#: login-utils/login.c:1290
+#: login-utils/login.c:1172
#, c-format
msgid "Usage: login [-p] [-h <host>] [-H] [[-f] <username>]\n"
msgstr "用法:login [-p] [-h <主机>] [-H] [[-f] <用户名>]\n"
-#: login-utils/login.c:1332
+#: login-utils/login.c:1214
#, c-format
msgid "Invalid user name \"%s\" in %s:%d. Abort."
msgstr "%2$s:%3$d 中是无效用户名“%1$s”。中止。"
-#: login-utils/login.c:1353
+#: login-utils/login.c:1235
#, c-format
msgid "groups initialization failed: %m"
msgstr "组初始化失败:%m"
-#: login-utils/login.c:1378
+#: login-utils/login.c:1260
msgid "setgid() failed"
msgstr "setgid() 失败"
-#: login-utils/login.c:1408
+#: login-utils/login.c:1290
#, c-format
msgid "You have new mail.\n"
msgstr "有您的新邮件。\n"
-#: login-utils/login.c:1410
+#: login-utils/login.c:1292
#, c-format
msgid "You have mail.\n"
msgstr "有您的邮件。\n"
-#: login-utils/login.c:1424
+#: login-utils/login.c:1306
msgid "setuid() failed"
msgstr "setuid() 失败"
-#: login-utils/login.c:1430 login-utils/sulogin.c:679
+#: login-utils/login.c:1312 login-utils/sulogin.c:741
#, c-format
msgid "%s: change directory failed"
msgstr "%s:更改目录失败"
-#: login-utils/login.c:1437 login-utils/sulogin.c:680
+#: login-utils/login.c:1319 login-utils/sulogin.c:742
#, c-format
msgid "Logging in with home = \"/\".\n"
msgstr "以 home = “/” 登录。\n"
-#: login-utils/login.c:1466
+#: login-utils/login.c:1348
msgid "couldn't exec shell script"
msgstr "无法执行(exec) shell 脚本"
-#: login-utils/login.c:1468
+#: login-utils/login.c:1350
msgid "no shell"
msgstr "无 shell"
-#: login-utils/logindefs.c:203
+#: login-utils/logindefs.c:206
#, c-format
msgid "%s: %s contains invalid numerical value: %s"
msgstr "%s:%s 包含无效的数字值:%s"
+#: login-utils/logindefs.c:375
+msgid "hush login status: restore original IDs failed"
+msgstr "散列(hush)登录状态:恢复原 ID 失败"
+
+#: login-utils/lslogins.c:208 sys-utils/lscpu.c:1233 sys-utils/lscpu.c:1243
+#, c-format
+msgid "no"
+msgstr "否"
+
+#: login-utils/lslogins.c:217 misc-utils/lsblk.c:160
+msgid "user name"
+msgstr "用户名"
+
+#: login-utils/lslogins.c:217
+#, fuzzy
+msgid "Username"
+msgstr "用户名"
+
+#: login-utils/lslogins.c:218 sys-utils/renice.c:164
+msgid "user ID"
+msgstr "用户 ID"
+
+#: login-utils/lslogins.c:219
+msgid "password not requiured"
+msgstr ""
+
+#: login-utils/lslogins.c:219
+#, fuzzy
+msgid "Password no required"
+msgstr "密码:"
+
+#: login-utils/lslogins.c:220
+#, fuzzy
+msgid "login by password disabled"
+msgstr "%s:root 密码有误"
+
+#: login-utils/lslogins.c:220
+#, fuzzy
+msgid "Login by password disabled"
+msgstr "%s:root 密码有误"
+
+#: login-utils/lslogins.c:221
+msgid "password defined, but locked"
+msgstr ""
+
+#: login-utils/lslogins.c:221
+#, fuzzy
+msgid "Password is locked"
+msgstr "密码:"
+
+#: login-utils/lslogins.c:222
+msgid "log in disabled by nologin(8) or pam_nologin(8)"
+msgstr ""
+
+#: login-utils/lslogins.c:222
+#, fuzzy
+msgid "No login"
+msgstr "登录:"
+
+#: login-utils/lslogins.c:223
+#, fuzzy
+msgid "primary group name"
+msgstr "组名"
+
+#: login-utils/lslogins.c:223
+#, fuzzy
+msgid "Primary group"
+msgstr "主分区"
+
+#: login-utils/lslogins.c:224
+#, fuzzy
+msgid "primary group ID"
+msgstr "进程组 ID"
+
+#: login-utils/lslogins.c:225
+#, fuzzy
+msgid "supplementary group names"
+msgstr "附属组:"
+
+#: login-utils/lslogins.c:225
+#, fuzzy
+msgid "Supplementary groups"
+msgstr "附属组:"
+
+#: login-utils/lslogins.c:226
+#, fuzzy
+msgid "supplementary group IDs"
+msgstr "附属组:"
+
+#: login-utils/lslogins.c:226
+#, fuzzy
+msgid "Supplementary group IDs"
+msgstr "附属组:"
+
+#: login-utils/lslogins.c:227
+#, fuzzy
+msgid "home directory"
+msgstr "%s:不是一个目录"
+
+#: login-utils/lslogins.c:227
+#, fuzzy
+msgid "Home directory"
+msgstr "%s:不是一个目录"
+
+#: login-utils/lslogins.c:228
+#, fuzzy
+msgid "login shell"
+msgstr "无 shell"
+
+#: login-utils/lslogins.c:228
+#, fuzzy
+msgid "Shell"
+msgstr "无 shell"
+
+#: login-utils/lslogins.c:229
+#, fuzzy
+msgid "full user name"
+msgstr "用户名"
+
+#: login-utils/lslogins.c:229
+msgid "Gecos field"
+msgstr ""
+
+#: login-utils/lslogins.c:230
+#, fuzzy
+msgid "date of last login"
+msgstr "越过第一行"
+
+#: login-utils/lslogins.c:230
+#, fuzzy
+msgid "Last login"
+msgstr "上次登录:%.*s "
+
+#: login-utils/lslogins.c:231
+msgid "last tty used"
+msgstr ""
+
+#: login-utils/lslogins.c:231
+#, fuzzy
+msgid "Last terminal"
+msgstr "致命:%s 不是终端"
+
+#: login-utils/lslogins.c:232
+msgid "hostname during the last session"
+msgstr ""
+
+#: login-utils/lslogins.c:232
+msgid "Last hostname"
+msgstr ""
+
+#: login-utils/lslogins.c:233
+#, fuzzy
+msgid "date of last failed login"
+msgstr "写 lastlog 失败"
+
+#: login-utils/lslogins.c:233
+msgid "Failed login"
+msgstr ""
+
+#: login-utils/lslogins.c:234
+#, fuzzy
+msgid "where did the login fail?"
+msgstr "写 lastlog 失败"
+
+#: login-utils/lslogins.c:234
+#, fuzzy
+msgid "Failed login terminal"
+msgstr "设置控制终端失败"
+
+#: login-utils/lslogins.c:235
+msgid "user's hush settings"
+msgstr ""
+
+#: login-utils/lslogins.c:235
+msgid "Hushed"
+msgstr ""
+
+#: login-utils/lslogins.c:236
+msgid "days user is warned of password expiration"
+msgstr ""
+
+#: login-utils/lslogins.c:236
+msgid "Password expiration warn interval"
+msgstr ""
+
+#: login-utils/lslogins.c:237
+msgid "password expiration date"
+msgstr ""
+
+#: login-utils/lslogins.c:237
+#, fuzzy
+msgid "Password expiration"
+msgstr "密码:"
+
+#: login-utils/lslogins.c:238
+msgid "date of last password change"
+msgstr ""
+
+#: login-utils/lslogins.c:238
+#, fuzzy
+msgid "Password changed"
+msgstr "密码:"
+
+#: login-utils/lslogins.c:239
+msgid "number of days required between changes"
+msgstr ""
+
+#: login-utils/lslogins.c:239
+#, fuzzy
+msgid "Minimal change time"
+msgstr "无改变"
+
+#: login-utils/lslogins.c:240
+msgid "max number of days a password may remain unchanged"
+msgstr ""
+
+#: login-utils/lslogins.c:240
+#, fuzzy
+msgid "Maximal change time"
+msgstr "更改 root 失败"
+
+#: login-utils/lslogins.c:241
+msgid "the user's security context"
+msgstr ""
+
+#: login-utils/lslogins.c:241
+#, fuzzy
+msgid "Selinux context"
+msgstr "Linux 纯文本"
+
+#: login-utils/lslogins.c:242
+#, fuzzy
+msgid "number of processes run by the user"
+msgstr "最大进程数"
+
+#: login-utils/lslogins.c:242
+#, fuzzy
+msgid "Running process"
+msgstr "找不到进程“%s”"
+
+#: login-utils/lslogins.c:332
+#, fuzzy
+msgid "unssupported time type"
+msgstr "不支持的参数:%s"
+
+#: login-utils/lslogins.c:598
+#, fuzzy
+msgid "failed to get supplementary groups"
+msgstr "无效的附属组 id"
+
+#: login-utils/lslogins.c:1003
+#, fuzzy
+msgid "internal error: unknown column"
+msgstr "内部错误:iov 过多"
+
+#: login-utils/lslogins.c:1007
+#, fuzzy
+msgid "failed to set data"
+msgstr "设置 PATH 失败"
+
+#: login-utils/lslogins.c:1104
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Last logs:\n"
+msgstr "上次登录:%.*s "
+
+#: login-utils/lslogins.c:1154 login-utils/nologin.c:26
+#: misc-utils/lslocks.c:506 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
+#: sys-utils/lscpu.c:1614 sys-utils/readprofile.c:104 sys-utils/rtcwake.c:72
+#: term-utils/setterm.c:403
+#, c-format
+msgid " %s [options]\n"
+msgstr " %s [选项]\n"
+
+#: login-utils/lslogins.c:1157
+msgid " -a, --acc-expiration display info about passwords expiration\n"
+msgstr ""
+
+#: login-utils/lslogins.c:1158
+msgid " -c, --colon-separate display data in a format similar to /etc/passwd\n"
+msgstr ""
+
+#: login-utils/lslogins.c:1159
+#, fuzzy
+msgid " -e, --export display in an export-able output format\n"
+msgstr " -r, --raw 使用原生输出格式\n"
+
+#: login-utils/lslogins.c:1160
+#, fuzzy
+msgid " -f, --failed display data about the last users' failed logins\n"
+msgstr " -u, --userspace 显示用户空间消息\n"
+
+#: login-utils/lslogins.c:1161
+#, fuzzy
+msgid " -G, --groups-info display information about groups\n"
+msgstr " -h, --help 使用信息(此信息)\n"
+
+#: login-utils/lslogins.c:1162
+msgid " -g, --groups=<groups> display users belonging to a group in <groups>\n"
+msgstr ""
+
+#: login-utils/lslogins.c:1163
+#, fuzzy
+msgid " -L, --last show info about the users' last login sessions\n"
+msgstr " -i, --info 只打印有关采样步骤的信息\n"
+
+#: login-utils/lslogins.c:1164
+#, fuzzy
+msgid " -l, --logins=<logins> display only users from <logins>\n"
+msgstr " -w, --fullnames 显示完整的用户名和域名\n"
+
+#: login-utils/lslogins.c:1165
+#, fuzzy
+msgid " -m, --supp-groups display supplementary groups as well\n"
+msgstr " --keep-groups 保留附属组\n"
+
+#: login-utils/lslogins.c:1166
+#, fuzzy
+msgid " -n, --newline display each piece of information on a new line\n"
+msgstr " -h, --help 使用信息(此信息)\n"
+
+#: login-utils/lslogins.c:1167
+#, fuzzy
+msgid " --notruncate don't truncate output\n"
+msgstr " --nohints 不打印提示信息\n"
+
+#: login-utils/lslogins.c:1168
+#, fuzzy
+msgid " -o, --output[=<list>] define the columns to output\n"
+msgstr " -o, --output <list> 定义使用哪个输出列\n"
+
+#: login-utils/lslogins.c:1169
+#, fuzzy
+msgid " -p, --pwd display information related to login by password.\n"
+msgstr " -h, --help 使用信息(此信息)\n"
+
+#: login-utils/lslogins.c:1170
+#, fuzzy
+msgid " -r, --raw display in raw mode\n"
+msgstr " -k, --kernel 显示内核消息\n"
+
+#: login-utils/lslogins.c:1171
+#, fuzzy
+msgid " -s, --system-accs display system accounts\n"
+msgstr " -a, --hostlast 最后一列显示主机名\n"
+
+#: login-utils/lslogins.c:1172
+#, fuzzy
+msgid " --time-format=<type> display dates in short, full or iso format\n"
+msgstr " --time-format <格式> 以指定格式显示时间戳:\n"
+
+#: login-utils/lslogins.c:1173
+#, fuzzy
+msgid " -u, --user-accs display user accounts\n"
+msgstr " -u, --userspace 显示用户空间消息\n"
+
+#: login-utils/lslogins.c:1174
+#, fuzzy
+msgid " -Z, --context display SELinux contexts\n"
+msgstr " -k, --kernel 显示内核消息\n"
+
+#: login-utils/lslogins.c:1175
+#, fuzzy
+msgid " -z, --print0 delimit user entries with a nul character\n"
+msgstr " -p, --pid 打印 pid 而不向它们发送信号\n"
+
+#: login-utils/lslogins.c:1176
+msgid " --wtmp-file <path> set an alternate path for wtmp\n"
+msgstr ""
+
+#: login-utils/lslogins.c:1177
+msgid " --btmp-file <path> set an alternate path for btmp\n"
+msgstr ""
+
+#: login-utils/lslogins.c:1182 misc-utils/findmnt.c:1179
+#: sys-utils/lscpu.c:1628
+#, c-format
+msgid ""
+"\n"
+"Available columns:\n"
+msgstr ""
+"\n"
+"可用的列:\n"
+
+#: login-utils/lslogins.c:1187
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more details see lslogins(1).\n"
+msgstr ""
+"\n"
+"更多信息请参阅 lscpu(1)。\n"
+
+#: login-utils/lslogins.c:1371
+#, fuzzy
+msgid "failed to request selinux state"
+msgstr "解析 起点 失败"
+
+#: login-utils/lslogins.c:1381
+msgid "Only one user may be specified. Use -l for multiple users."
+msgstr ""
+
#: login-utils/newgrp.c:102
msgid "Password: "
msgstr "密码:"
@@ -7340,7 +7472,7 @@ msgstr " %s <group>\n"
msgid "who are you?"
msgstr "您是哪位?"
-#: login-utils/newgrp.c:162 login-utils/newgrp.c:174 sys-utils/nsenter.c:334
+#: login-utils/newgrp.c:162 login-utils/newgrp.c:174 sys-utils/nsenter.c:335
msgid "setgid failed"
msgstr "setgid 失败"
@@ -7348,22 +7480,14 @@ msgstr "setgid 失败"
msgid "no such group"
msgstr "无此组"
-#: login-utils/newgrp.c:176 sys-utils/mount.c:476
+#: login-utils/newgrp.c:176 sys-utils/mount.c:480
msgid "permission denied"
msgstr "权限不足"
-#: login-utils/newgrp.c:181 sys-utils/nsenter.c:332
+#: login-utils/newgrp.c:181 sys-utils/nsenter.c:337
msgid "setuid failed"
msgstr "setuid 失败"
-#: login-utils/nologin.c:26 misc-utils/lslocks.c:499 misc-utils/mcookie.c:70
-#: misc-utils/uuidd.c:72 misc-utils/uuidgen.c:36 sys-utils/dmesg.c:236
-#: sys-utils/ipcmk.c:66 sys-utils/lscpu.c:1356 sys-utils/readprofile.c:104
-#: sys-utils/rtcwake.c:72 term-utils/setterm.c:679
-#, c-format
-msgid " %s [options]\n"
-msgstr " %s [选项]\n"
-
#: login-utils/nologin.c:72
#, c-format
msgid "This account is currently not available.\n"
@@ -7388,7 +7512,7 @@ msgid "cannot block signals"
msgstr "无法阻塞信号"
#: login-utils/su-common.c:328 login-utils/su-common.c:336
-#: login-utils/su-common.c:342 sys-utils/cytune.c:170
+#: login-utils/su-common.c:342
msgid "cannot set signal handler"
msgstr "无法设置信号处理函数"
@@ -7551,68 +7675,68 @@ msgstr "将使用受限 shell %s"
msgid "warning: cannot change directory to %s"
msgstr "警告:无法更改到 %s 目录"
-#: login-utils/sulogin.c:91
+#: login-utils/sulogin.c:145
msgid "tcgetattr failed"
msgstr "tcgetattr 失败"
-#: login-utils/sulogin.c:166
+#: login-utils/sulogin.c:222
msgid "tcsetattr failed"
msgstr "tcsetattr 失败"
-#: login-utils/sulogin.c:426
+#: login-utils/sulogin.c:488
#, c-format
msgid "%s: no entry for root\n"
msgstr "%s:无 root 的记录\n"
-#: login-utils/sulogin.c:453
+#: login-utils/sulogin.c:515
#, c-format
msgid "%s: no entry for root"
msgstr "%s:无 root 的记录"
-#: login-utils/sulogin.c:457
+#: login-utils/sulogin.c:519
#, c-format
msgid "%s: root password garbled"
msgstr "%s:root 密码有误"
-#: login-utils/sulogin.c:485
+#: login-utils/sulogin.c:547
#, c-format
msgid "Give root password for login: "
msgstr "指定 root 的登录密码:"
-#: login-utils/sulogin.c:487
+#: login-utils/sulogin.c:549
#, c-format
msgid "Press Enter for login: "
msgstr "按 Enter 键登录:"
-#: login-utils/sulogin.c:490
+#: login-utils/sulogin.c:552
#, c-format
msgid "Give root password for maintenance\n"
msgstr "指定 root 的维护密码\n"
-#: login-utils/sulogin.c:492
+#: login-utils/sulogin.c:554
#, c-format
msgid "Press Enter for maintenance"
msgstr "按 Enter 键进行维护"
-#: login-utils/sulogin.c:493
+#: login-utils/sulogin.c:555
#, c-format
msgid "(or press Control-D to continue): "
msgstr "(或按 Control-D 键继续):"
-#: login-utils/sulogin.c:683
+#: login-utils/sulogin.c:745
msgid "change directory to system root failed"
msgstr "更改到系统根目录失败"
-#: login-utils/sulogin.c:732
+#: login-utils/sulogin.c:794
msgid "setexeccon failed"
msgstr "setexeccon 失败"
-#: login-utils/sulogin.c:752
+#: login-utils/sulogin.c:814
#, c-format
msgid " %s [options] [tty device]\n"
msgstr " %s [选项] [tty 设备]\n"
-#: login-utils/sulogin.c:755
+#: login-utils/sulogin.c:817
msgid ""
" -p, --login-shell start a login shell\n"
" -t, --timeout <seconds> max time to wait for a password (default: no limit)\n"
@@ -7622,28 +7746,28 @@ msgstr ""
" -t, --timeout <秒数> 等待密码的最大时间(默认:无限制)\n"
" -e, --force 如果 getpwnam(3) 失败,直接检查密码文件\n"
-#: login-utils/sulogin.c:806 misc-utils/findmnt.c:1335 sys-utils/wdctl.c:512
-#: term-utils/wall.c:130
+#: login-utils/sulogin.c:868 misc-utils/findmnt.c:1379 sys-utils/wdctl.c:522
+#: term-utils/wall.c:131
msgid "invalid timeout argument"
msgstr "无效的 timeout 超时参数"
-#: login-utils/sulogin.c:828
+#: login-utils/sulogin.c:890
msgid "only root can run this program."
msgstr "只有 root 用户能运行此程序。"
-#: login-utils/sulogin.c:871
+#: login-utils/sulogin.c:933
msgid "cannot open console"
msgstr "打不开终端"
-#: login-utils/sulogin.c:878
+#: login-utils/sulogin.c:940
msgid "cannot open password database."
msgstr "无法打开密码数据库。"
-#: login-utils/sulogin.c:937
+#: login-utils/sulogin.c:999
msgid "crypt failed"
msgstr "crypt 失败"
-#: login-utils/sulogin.c:954
+#: login-utils/sulogin.c:1016
#, c-format
msgid ""
"Can not execute su shell\n"
@@ -7652,7 +7776,7 @@ msgstr ""
"无法执行 su shell\n"
"\n"
-#: login-utils/sulogin.c:961
+#: login-utils/sulogin.c:1023
msgid ""
"Timed out\n"
"\n"
@@ -7660,57 +7784,57 @@ msgstr ""
"超时\n"
"\n"
-#: login-utils/utmpdump.c:128
+#: login-utils/utmpdump.c:129
#, c-format
msgid "%s: stat failed"
msgstr "%s:stat 失败"
-#: login-utils/utmpdump.c:165 text-utils/tailf.c:164
+#: login-utils/utmpdump.c:166 text-utils/tailf.c:164
#, c-format
msgid "%s: cannot add inotify watch."
msgstr "%s:无法添加 inotify 观察。"
-#: login-utils/utmpdump.c:174 text-utils/tailf.c:173
+#: login-utils/utmpdump.c:175 text-utils/tailf.c:173
#, c-format
msgid "%s: cannot read inotify events"
msgstr "%s:无法读 inotify 事件"
-#: login-utils/utmpdump.c:235 login-utils/utmpdump.c:240
+#: login-utils/utmpdump.c:236 login-utils/utmpdump.c:241
msgid "Extraneous newline in file. Exiting."
msgstr "文件中有无关的换行符。将退出。"
-#: login-utils/utmpdump.c:297
+#: login-utils/utmpdump.c:298
#, c-format
msgid " %s [options] [filename]\n"
msgstr " %s [选项] [文件名]\n"
-#: login-utils/utmpdump.c:300
+#: login-utils/utmpdump.c:301
msgid " -f, --follow output appended data as the file grows\n"
msgstr " -f, --follow 随文件增长输出追加的数据\n"
-#: login-utils/utmpdump.c:301
+#: login-utils/utmpdump.c:302
msgid " -r, --reverse write back dumped data into utmp file\n"
msgstr " -r, --reverse 将转储的数据写回 utmp 文件\n"
-#: login-utils/utmpdump.c:302
+#: login-utils/utmpdump.c:303
msgid " -o, --output <file> write to file instead of standard output\n"
msgstr " -o, --output <文件> 写入文件而非标准输出\n"
-#: login-utils/utmpdump.c:369
+#: login-utils/utmpdump.c:370
msgid "following standard input is unsupported"
msgstr "不支持跟随(follow)标准输入"
-#: login-utils/utmpdump.c:375
+#: login-utils/utmpdump.c:376
#, c-format
msgid "Utmp undump of %s\n"
msgstr "%s 的 Utmp undump\n"
-#: login-utils/utmpdump.c:378
+#: login-utils/utmpdump.c:379
#, c-format
msgid "Utmp dump of %s\n"
msgstr "%s 的 Utmp dump\n"
-#: login-utils/vipw.c:151 term-utils/wall.c:192
+#: login-utils/vipw.c:151 term-utils/wall.c:193
msgid "can't open temporary file"
msgstr "无法打开临时文件"
@@ -7763,248 +7887,260 @@ msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n"
msgid "Would you like to edit %s now [y/n]? "
msgstr "您想现在编辑 %s 吗[y/n]?"
-#: misc-utils/cal.c:370
+#: misc-utils/cal.c:369
+#, fuzzy
+msgid "invalid week argument"
+msgstr "无效的 速度 参数"
+
+#: misc-utils/cal.c:371
+#, fuzzy
+msgid "illegal week value: use 1-53"
+msgstr "日 值不合法:请使用 1-%d"
+
+#: misc-utils/cal.c:404
msgid "illegal day value"
msgstr "日 值不合法"
-#: misc-utils/cal.c:372 misc-utils/cal.c:386
+#: misc-utils/cal.c:406 misc-utils/cal.c:422
#, c-format
msgid "illegal day value: use 1-%d"
msgstr "日 值不合法:请使用 1-%d"
-#: misc-utils/cal.c:375 misc-utils/cal.c:377
+#: misc-utils/cal.c:409 misc-utils/cal.c:411
msgid "illegal month value: use 1-12"
msgstr "月份值不合法:请使用 1-12"
-#: misc-utils/cal.c:380
+#: misc-utils/cal.c:414 misc-utils/cal.c:418
msgid "illegal year value"
msgstr "年份值不合法"
-#: misc-utils/cal.c:382
+#: misc-utils/cal.c:416
msgid "illegal year value: use positive integer"
msgstr "年份值不合法:请使用正整数"
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:447 misc-utils/cal.c:460
+#, fuzzy, c-format
+msgid "illegal week value: year %d doesn't have week %d"
+msgstr "年份值不合法:请使用正整数"
+
+#: misc-utils/cal.c:606
#, c-format
msgid "%s"
msgstr "%s"
-#: misc-utils/cal.c:465
-#, c-format
-msgid "%ld"
+#: misc-utils/cal.c:612
+#, fuzzy, c-format
+msgid "%d"
msgstr "%ld"
-#. TRANSLATORS: %s is the month name, %ld the year number.
-#. * You can change the order and/or add something here;
-#. * e.g. for Basque the translation should be "%2$ldko %1$s".
-#.
-#: misc-utils/cal.c:473
-#, c-format
-msgid "%s %ld"
+#: misc-utils/cal.c:618
+#, fuzzy, c-format
+msgid "%s %d"
msgstr "%s %ld"
-#: misc-utils/cal.c:806
+#: misc-utils/cal.c:927
#, c-format
msgid " %s [options] [[[day] month] year]\n"
msgstr " %s [选项] [[[日] 月] 年]\n"
-#: misc-utils/cal.c:809
+#: misc-utils/cal.c:930
msgid "Display a calendar, or some part of it.\n"
msgstr "显示日历或部分日历。\n"
-#: misc-utils/cal.c:810
+#: misc-utils/cal.c:931
msgid "Without any arguments, display the current month.\n"
msgstr "不带参数时,显示当月日历。\n"
-#: misc-utils/cal.c:813
+#: misc-utils/cal.c:934
msgid " -1, --one show only a single month (default)\n"
msgstr " -1, --one 只显示一个月(默认)\n"
-#: misc-utils/cal.c:814
+#: misc-utils/cal.c:935
msgid " -3, --three show three months spanning the date\n"
msgstr " -3, --three 显示该日期前后三个月\n"
-#: misc-utils/cal.c:815
+#: misc-utils/cal.c:936
msgid " -s, --sunday Sunday as first day of week\n"
msgstr " -s, --sunday 周日作为一周的第一天\n"
-#: misc-utils/cal.c:816
+#: misc-utils/cal.c:937
msgid " -m, --monday Monday as first day of week\n"
msgstr " -m, --monday 周一作为一周的第一天\n"
-#: misc-utils/cal.c:817
+#: misc-utils/cal.c:938
msgid " -j, --julian output Julian dates\n"
msgstr " -j, --julian 输出儒略日期\n"
-#: misc-utils/cal.c:818
+#: misc-utils/cal.c:939
msgid " -y, --year show the whole year\n"
msgstr " -y, --year 显示全年\n"
-#: misc-utils/cal.c:819
+#: misc-utils/cal.c:940
+msgid " -w, --week[=<num>] show US or ISO-8601 week numbers\n"
+msgstr ""
+
+#: misc-utils/cal.c:941
msgid " --color[=<when>] colorize messages (auto, always or never)\n"
msgstr " --color[=<when>] 消息彩色显示(auto自动, always总是 或 never从不)\n"
-#: misc-utils/findfs.c:22
+#: misc-utils/findfs.c:28
#, c-format
-msgid ""
-" %1$s [options] LABEL=<label>\n"
-" %1$s [options] UUID=<uuid>\n"
+msgid " %s [options] {LABEL,UUID,PARTUUID,PARTLABEL}=<value>\n"
msgstr ""
-" %1$s [选项] LABEL=<label>\n"
-" %1$s [选项] UUID=<uuid>\n"
-#: misc-utils/findfs.c:64
+#: misc-utils/findfs.c:63
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析“%s”"
-#: misc-utils/findmnt.c:113
+#: misc-utils/findmnt.c:123
msgid "source device"
msgstr "源设备"
-#: misc-utils/findmnt.c:114
+#: misc-utils/findmnt.c:124
msgid "mountpoint"
msgstr "挂载点"
-#: misc-utils/findmnt.c:115 misc-utils/lsblk.c:123
+#: misc-utils/findmnt.c:125 misc-utils/lsblk.c:141
msgid "filesystem type"
msgstr "文件系统类型"
-#: misc-utils/findmnt.c:116
+#: misc-utils/findmnt.c:126
msgid "all mount options"
msgstr "全部挂臷选项"
-#: misc-utils/findmnt.c:117
+#: misc-utils/findmnt.c:127
msgid "VFS specific mount options"
msgstr "VFS 的特定挂载选项"
-#: misc-utils/findmnt.c:118
+#: misc-utils/findmnt.c:128
msgid "FS specific mount options"
msgstr "FS 的特定挂载选项"
-#: misc-utils/findmnt.c:119
+#: misc-utils/findmnt.c:129
msgid "filesystem label"
msgstr "文件系统标签"
-#: misc-utils/findmnt.c:120 misc-utils/lsblk.c:126
+#: misc-utils/findmnt.c:130 misc-utils/lsblk.c:144
msgid "filesystem UUID"
msgstr "文件系统 UUID"
-#: misc-utils/findmnt.c:121
+#: misc-utils/findmnt.c:131
msgid "partition label"
msgstr "分区标签"
-#: misc-utils/findmnt.c:123 misc-utils/lsblk.c:122
+#: misc-utils/findmnt.c:133 misc-utils/lsblk.c:140
msgid "major:minor device number"
msgstr "主:次 设备号"
-#: misc-utils/findmnt.c:124
+#: misc-utils/findmnt.c:134
msgid "action detected by --poll"
msgstr "--poll 检测到的操作"
-#: misc-utils/findmnt.c:125
+#: misc-utils/findmnt.c:135
msgid "old mount options saved by --poll"
msgstr "--poll 保存的旧挂载选项"
-#: misc-utils/findmnt.c:126
+#: misc-utils/findmnt.c:136
msgid "old mountpoint saved by --poll"
msgstr "--poll 保存的旧挂载点"
-#: misc-utils/findmnt.c:127
+#: misc-utils/findmnt.c:137
msgid "filesystem size"
msgstr "文件系统大小"
-#: misc-utils/findmnt.c:128
+#: misc-utils/findmnt.c:138
msgid "filesystem size available"
msgstr "文件系统可用大小"
-#: misc-utils/findmnt.c:129
+#: misc-utils/findmnt.c:139
msgid "filesystem size used"
msgstr "文件系统已用大小"
-#: misc-utils/findmnt.c:130
+#: misc-utils/findmnt.c:140
msgid "filesystem use percentage"
msgstr "文件系统使用百分比"
-#: misc-utils/findmnt.c:131
+#: misc-utils/findmnt.c:141
msgid "filesystem root"
msgstr "文件系统 root"
-#: misc-utils/findmnt.c:132
+#: misc-utils/findmnt.c:142
msgid "task ID"
msgstr "任务 ID"
-#: misc-utils/findmnt.c:133
+#: misc-utils/findmnt.c:143
msgid "mount ID"
msgstr "挂载 ID"
-#: misc-utils/findmnt.c:134
+#: misc-utils/findmnt.c:144
msgid "optional mount fields"
msgstr "可选的挂载字段"
-#: misc-utils/findmnt.c:135
+#: misc-utils/findmnt.c:145
msgid "VFS propagation flags"
msgstr "VFS 传播标志"
-#: misc-utils/findmnt.c:136
+#: misc-utils/findmnt.c:146
msgid "dump(8) period in days [fstab only]"
msgstr "dump(8) 周期(天数) [仅 fstab]"
-#: misc-utils/findmnt.c:137
+#: misc-utils/findmnt.c:147
msgid "pass number on parallel fsck(8) [fstab only]"
msgstr "并行 fsck(8) 的遍数(pass number) [仅 fstab]"
-#: misc-utils/findmnt.c:318
+#: misc-utils/findmnt.c:331
#, c-format
msgid "unknown action: %s"
msgstr "未知操作: %s"
-#: misc-utils/findmnt.c:619
+#: misc-utils/findmnt.c:638
msgid "mount"
msgstr "挂载"
-#: misc-utils/findmnt.c:622
+#: misc-utils/findmnt.c:641
msgid "umount"
msgstr "卸载"
-#: misc-utils/findmnt.c:625
+#: misc-utils/findmnt.c:644
msgid "remount"
msgstr "重新挂载"
-#: misc-utils/findmnt.c:628
+#: misc-utils/findmnt.c:647
msgid "move"
msgstr "移动"
-#: misc-utils/findmnt.c:749
+#: misc-utils/findmnt.c:772
#, c-format
msgid "%s: parse error at line %d"
msgstr "%s:第 %d 行解析出错"
-#: misc-utils/findmnt.c:778 misc-utils/findmnt.c:997 sys-utils/eject.c:731
-#: sys-utils/mount.c:640
+#: misc-utils/findmnt.c:801 misc-utils/findmnt.c:1021 sys-utils/eject.c:731
+#: sys-utils/mount.c:644
msgid "failed to initialize libmount table"
msgstr "初始化 libmount table 失败"
-#: misc-utils/findmnt.c:805 text-utils/parse.c:64
+#: misc-utils/findmnt.c:828 text-utils/hexdump-parse.c:84
#, c-format
msgid "can't read %s"
msgstr "不能读 %s"
-#: misc-utils/findmnt.c:937 misc-utils/findmnt.c:1003 sys-utils/mount.c:135
-#: sys-utils/mount.c:183 sys-utils/swapoff.c:98 sys-utils/swapon.c:207
-#: sys-utils/swapon.c:238 sys-utils/swapon.c:636 sys-utils/umount.c:272
+#: misc-utils/findmnt.c:961 misc-utils/findmnt.c:1027 sys-utils/fstrim.c:170
+#: 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
msgid "failed to initialize libmount iterator"
msgstr "无法初始化 libmount 迭代器"
-#: misc-utils/findmnt.c:1009
+#: misc-utils/findmnt.c:1033
msgid "failed to initialize libmount tabdiff"
msgstr "初始化 libmount tabdiff 失败"
-#: misc-utils/findmnt.c:1037
+#: misc-utils/findmnt.c:1061
msgid "poll() failed"
msgstr "poll() 失败"
-#: misc-utils/findmnt.c:1099
+#: misc-utils/findmnt.c:1131
#, c-format
msgid ""
" %1$s [options]\n"
@@ -8017,16 +8153,21 @@ msgstr ""
" %1$s [选项] <设备> <挂臷点>\n"
" %1$s [选项] [--source <设备>] [--target <挂臷点>]\n"
-#: misc-utils/findmnt.c:1106
-#, c-format
+#: misc-utils/findmnt.c:1138
+#, fuzzy
+msgid " -s, --fstab search in static table of filesystems\n"
+msgstr " -f, --fs 输出文件系统信息\n"
+
+#: misc-utils/findmnt.c:1139
+#, fuzzy
+msgid " -m, --mtab search in table of mounted filesystems\n"
+msgstr " -a, --all 卸载所有文件系统\n"
+
+#: misc-utils/findmnt.c:1140
+#, fuzzy
msgid ""
-"\n"
-"Options:\n"
-" -s, --fstab search in static table of filesystems\n"
-" -m, --mtab search in table of mounted filesystems\n"
" -k, --kernel search in kernel table of mounted\n"
" filesystems (default)\n"
-"\n"
msgstr ""
"\n"
"选项:\n"
@@ -8036,121 +8177,163 @@ msgstr ""
" 搜索(默认)\n"
"\n"
-#: misc-utils/findmnt.c:1113
-#, c-format
-msgid ""
-" -p, --poll[=<list>] monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num> upper limit in milliseconds that --poll will block\n"
+#: misc-utils/findmnt.c:1143
+#, fuzzy
+msgid " -p, --poll[=<list>] monitor changes in table of mounted filesystems\n"
+msgstr ""
+" -p, --poll[=<列表>] 监测已挂臷文件系统表的改变\n"
+" -w, --timeout <数字> --poll 阻塞的时间上限(毫秒)\n"
"\n"
+
+#: misc-utils/findmnt.c:1144
+#, fuzzy
+msgid " -w, --timeout <num> upper limit in milliseconds that --poll will block\n"
msgstr ""
" -p, --poll[=<列表>] 监测已挂臷文件系统表的改变\n"
" -w, --timeout <数字> --poll 阻塞的时间上限(毫秒)\n"
"\n"
-#: misc-utils/findmnt.c:1117
-#, c-format
+#: misc-utils/findmnt.c:1147
+#, fuzzy
+msgid " -A, --all disable all built-in filters, print all filesystems\n"
+msgstr " -a, --all 卸载所有文件系统\n"
+
+#: misc-utils/findmnt.c:1148
+#, fuzzy
+msgid " -a, --ascii use ASCII chars for tree formatting\n"
+msgstr " -r, --raw 使用原生输出格式\n"
+
+#: misc-utils/findmnt.c:1149
+#, fuzzy
+msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
+msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
+
+#: misc-utils/findmnt.c:1150
+#, fuzzy
+msgid " -c, --canonicalize canonicalize printed paths\n"
+msgstr " -c, --no-canonicalize 不对路径规范化\n"
+
+#: misc-utils/findmnt.c:1151
+#, fuzzy
+msgid " -C, --nocanonicalize don't canonicalize when compare paths\n"
+msgstr " -c, --no-canonicalize 不对路径规范化\n"
+
+#: misc-utils/findmnt.c:1152
+#, fuzzy
+msgid " -D, --df imitate the output of df(1)\n"
+msgstr " -u, --unquoted 不引用输出\n"
+
+#: misc-utils/findmnt.c:1153
+msgid " -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:1154
msgid ""
-" -A, --all disable all built-in filters, print all filesystems\n"
-" -a, --ascii use ASCII chars for tree formatting\n"
-" -c, --canonicalize canonicalize printed paths\n"
-" -D, --df imitate the output of df(1)\n"
-" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
" -e, --evaluate convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n"
" to device names\n"
-" -F, --tab-file <path> alternative file for --fstab, --mtab or --kernel options\n"
-" -f, --first-only print the first found filesystem only\n"
msgstr ""
-" -A, --all 禁用所有内建过滤器,打印所有文件系统\n"
-" -a, --ascii 使用 ASCII 进行树格式化\n"
-" -c, --canonicalize 规范输出路径\n"
-" -D, --df 仿照 df(1) 形式输出\n"
-" -d, --direction <词> 搜索方向,“forward”或“backward”\n"
-" -e, --evaluate 将标志(LABEL,UUID,PARTUUID,PARTLABEL)\n"
-" 转换为设备名\n"
-" -F, --tab-file <路径> --fstab、--mtab 或 --kernel 选项的备选文件\n"
-" -f, --first-only 只打印找到的第一个文件系统\n"
-#: misc-utils/findmnt.c:1128
-#, c-format
-msgid ""
-" -i, --invert invert the sense of matching\n"
-" -l, --list use list format output\n"
-" -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n"
-" -n, --noheadings don't print column headings\n"
-" -u, --notruncate don't truncate text in columns\n"
+#: misc-utils/findmnt.c:1156
+msgid " -F, --tab-file <path> alternative file for -s, -m or -k options\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:1157
+#, fuzzy
+msgid " -f, --first-only print the first found filesystem only\n"
+msgstr " -t, --types <列表> 限制文件系统集合\n"
+
+#: misc-utils/findmnt.c:1158
+#, fuzzy
+msgid " -i, --invert invert the sense of matching\n"
+msgstr " -s, --inverse 反向依赖\n"
+
+#: misc-utils/findmnt.c:1159
+#, fuzzy
+msgid " -l, --list use list format output\n"
+msgstr " -l, --list 使用列表格式的输出\n"
+
+#: misc-utils/findmnt.c:1160
+msgid " -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n"
msgstr ""
-" -i, --invert 反转匹配规则\n"
-" -l, --list 使用列表格式的输出\n"
-" -N, --task <tid> 使用备选名字空间(/proc/<tid>/mountinfo 文件)\n"
-" -n, --noheadings 不打印列标题\n"
-" -u, --notruncate 不截短列中的文本\n"
-#: misc-utils/findmnt.c:1133
+#: misc-utils/findmnt.c:1161
+#, fuzzy
+msgid " -n, --noheadings don't print column headings\n"
+msgstr " -n, --noheadings 不打印标题\n"
+
+#: misc-utils/findmnt.c:1162
+#, fuzzy
+msgid " -U, --uniq ignore filesystems with duplicate target\n"
+msgstr " -l, --lazy 立即断开文件系统,所有清理以后执行\n"
+
+#: misc-utils/findmnt.c:1163
+#, fuzzy
+msgid " -u, --notruncate don't truncate text in columns\n"
+msgstr " -n, --no-mtab 不写 /etc/mtab\n"
+
+#: misc-utils/findmnt.c:1164
msgid " -O, --options <list> limit the set of filesystems by mount options\n"
msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n"
-#: misc-utils/findmnt.c:1134
+#: misc-utils/findmnt.c:1165
msgid " -o, --output <list> the output columns to be shown\n"
msgstr " -o, --output <列表> 要显示的列\n"
-#: misc-utils/findmnt.c:1135
+#: misc-utils/findmnt.c:1166
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 键=“值”的输出格式\n"
-#: misc-utils/findmnt.c:1136
+#: misc-utils/findmnt.c:1167
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/findmnt.c:1137
+#: misc-utils/findmnt.c:1168
msgid " -t, --types <list> limit the set of filesystems by FS types\n"
msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
-#: misc-utils/findmnt.c:1139
-#, c-format
+#: misc-utils/findmnt.c:1169
+#, fuzzy
+msgid " -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n"
+msgstr " -n, --nobanner 不打印欢迎消息,只对 root 用户生效\n"
+
+#: misc-utils/findmnt.c:1170
+#, fuzzy
+msgid " -R, --submounts print all submounts for the matching filesystems\n"
+msgstr " -f, --fs 输出文件系统信息\n"
+
+#: misc-utils/findmnt.c:1171
msgid ""
-" -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts print all submounts for the matching filesystems\n"
" -S, --source <string> the device to mount (by name, maj:min, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
-" -T, --target <string> the mountpoint to use\n"
msgstr ""
-" -v, --nofsroot bind 或 btrfs 挂臷时不打印 [/dir]\n"
-" -R, --submounts 打印匹配文件系统的所有子挂臷\n"
-" -S, --source <字符串> 要挂臷的设备(按名称、主设备号:次设备号、\n"
-" LABEL=、UUID=、ARTUUID=、ARTLABEL=)\n"
-" -T, --target <字符串> 要使用的挂臷点\n"
-#: misc-utils/findmnt.c:1149 sys-utils/lscpu.c:1370
-#, c-format
-msgid ""
-"\n"
-"Available columns:\n"
-msgstr ""
-"\n"
-"可用的列:\n"
+#: misc-utils/findmnt.c:1173
+#, fuzzy
+msgid " -T, --target <string> the mountpoint to use\n"
+msgstr " -o, --output <列表> 要显示的列\n"
-#: misc-utils/findmnt.c:1249
+#: misc-utils/findmnt.c:1290
#, c-format
msgid "unknown direction '%s'"
msgstr "未知方向“%s”"
-#: misc-utils/findmnt.c:1318
+#: misc-utils/findmnt.c:1359
msgid "invalid TID argument"
msgstr "无效的 TID 参数"
-#: misc-utils/findmnt.c:1375
+#: misc-utils/findmnt.c:1419
msgid "--poll accepts only one file, but more specified by --tab-file"
msgstr "--poll 只接受一个文件,但用 --tab-file 指定了多个"
-#: misc-utils/findmnt.c:1379
+#: misc-utils/findmnt.c:1423
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:1424
+#: misc-utils/findmnt.c:1470
msgid "failed to initialize libmount cache"
msgstr "初始化 libmount 缓存失败"
-#: misc-utils/findmnt.c:1447
+#: misc-utils/findmnt.c:1500
#, c-format
msgid "%s column is requested, but --poll is not enabled"
msgstr "请示了 %s 列,但未启用 --poll"
@@ -8231,31 +8414,17 @@ msgstr "缺少 optstring 参数"
msgid "internal error, contact the author."
msgstr "内部错误,请联系作者。"
-#: misc-utils/kill.c:205 misc-utils/kill.c:213
-#, c-format
-msgid "unknown signal: %s"
-msgstr "未知信号:%s"
-
-#: misc-utils/kill.c:248
-msgid "invalid sigval argument"
-msgstr "无效的 sigval 参数"
-
-#: misc-utils/kill.c:304
-#, c-format
-msgid "cannot find process \"%s\""
-msgstr "找不到进程“%s”"
-
-#: misc-utils/kill.c:382
+#: misc-utils/kill.c:238
#, c-format
msgid "unknown signal %s; valid signals:"
msgstr "未知信号 %s;有效信号为:"
-#: misc-utils/kill.c:461
-#, c-format
-msgid " %s [options] <pid|name> [...]\n"
+#: misc-utils/kill.c:306
+#, fuzzy, c-format
+msgid " %s [options] <pid|name>...\n"
msgstr " %s [选项] <pid|名称> [...]\n"
-#: misc-utils/kill.c:463
+#: misc-utils/kill.c:309
msgid ""
" -a, --all do not restrict the name-to-pid conversion to processes\n"
" with the same uid as the present process\n"
@@ -8263,111 +8432,164 @@ msgstr ""
" -a, --all 不限于只对和当前进程的用户 id 相同的进程进行\n"
" 名称-进程id 转换\n"
-#: misc-utils/kill.c:465
+#: misc-utils/kill.c:311
msgid " -s, --signal <sig> send specified signal\n"
msgstr " -s, --signal <信号> 发送指定的信号\n"
-#: misc-utils/kill.c:466
+#: misc-utils/kill.c:313
msgid " -q, --queue <sig> use sigqueue(2) rather than kill(2)\n"
msgstr " -q, --queue <信号> 使用 sigqueue(2) 代替 kill(2)\n"
-#: misc-utils/kill.c:467
+#: misc-utils/kill.c:315
msgid " -p, --pid print pids without signaling them\n"
msgstr " -p, --pid 打印 pid 而不向它们发送信号\n"
-#: misc-utils/kill.c:468
+#: misc-utils/kill.c:316
msgid " -l, --list [=<signal>] list signal names, or convert one to a name\n"
msgstr " -l, --list [=<信号>] 列出信号名,或将一个信号转换为名称\n"
-#: misc-utils/kill.c:469
+#: misc-utils/kill.c:317
msgid " -L, --table list signal names and numbers\n"
msgstr " -L, --table 列出信号名和数值\n"
-#: misc-utils/kill.c:494
+#: misc-utils/kill.c:318
+#, fuzzy
+msgid " --verbose print pids that will be signaled\n"
+msgstr " -v, --verbose 打印当前进行的操作\n"
+
+#: misc-utils/kill.c:368 misc-utils/kill.c:377
+#, 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:437
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive"
+msgstr "相互排斥。"
+
+#: misc-utils/kill.c:397 misc-utils/kill.c:441 misc-utils/rename.c:153
+#: sys-utils/ipcrm.c:154 term-utils/agetty.c:753 term-utils/agetty.c:762
+msgid "not enough arguments"
+msgstr "参数不够"
+
+#: misc-utils/kill.c:410
+#, fuzzy, c-format
+msgid "option '%s' requires an argument"
+msgstr "%s 需要一个参数"
+
+#: misc-utils/kill.c:434
+msgid "invalid sigval argument"
+msgstr "无效的 sigval 参数"
+
+#: misc-utils/kill.c:451
+#, fuzzy, c-format
+msgid "sending signal %d to pid %d\n"
+msgstr "向 %s 发送信号失败"
+
+#: misc-utils/kill.c:464
#, c-format
msgid "sending signal to %s failed"
msgstr "向 %s 发送信号失败"
-#: misc-utils/logger.c:115
+#: misc-utils/kill.c:480
+msgid "use of 'kill --pid' option as command name is deprecated"
+msgstr ""
+
+#: misc-utils/kill.c:514
+#, fuzzy, c-format
+msgid "cannot find process \"%s\"."
+msgstr "找不到进程“%s”"
+
+#: misc-utils/logger.c:133
#, c-format
msgid "unknown facility name: %s."
msgstr "未知设施名称:%s。"
-#: misc-utils/logger.c:124
+#: misc-utils/logger.c:142
#, c-format
msgid "unknown priority name: %s."
msgstr "未知优先级名称:%s。"
-#: misc-utils/logger.c:134
+#: misc-utils/logger.c:152
#, c-format
msgid "openlog %s: pathname too long"
msgstr "openlog %s:路径名过长"
-#: misc-utils/logger.c:156
+#: misc-utils/logger.c:174
#, c-format
msgid "socket %s"
msgstr "套接字 %s"
-#: misc-utils/logger.c:185
+#: misc-utils/logger.c:203
#, c-format
msgid "failed to resolve name %s port %s: %s"
msgstr "解析名称 %s 端口 %s 失败:%s"
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:220
#, c-format
msgid "failed to connect to %s port %s"
msgstr "连接 %s 端口 %s 失败"
-#: misc-utils/logger.c:238
+#: misc-utils/logger.c:247
+#, c-format
+msgid "maximum input lines (%d) exceeded"
+msgstr ""
+
+#: misc-utils/logger.c:292
#, c-format
msgid " %s [options] [<message>]\n"
msgstr " %s [选项] [<消息>]\n"
-#: misc-utils/logger.c:241
+#: misc-utils/logger.c:295
msgid " -T, --tcp use TCP only\n"
msgstr " -T, --tcp 只使用 TCP\n"
-#: misc-utils/logger.c:242
+#: misc-utils/logger.c:296
msgid " -d, --udp use UDP only\n"
msgstr " -d, --udp 只使用 UDP\n"
-#: misc-utils/logger.c:243
+#: misc-utils/logger.c:297
msgid " -i, --id log the process ID too\n"
msgstr " -i, --id 也记录进程 ID\n"
-#: misc-utils/logger.c:244
+#: misc-utils/logger.c:298
msgid " -f, --file <file> log the contents of this file\n"
msgstr " -f, --file <文件> 记录此文件的内容\n"
-#: misc-utils/logger.c:245
+#: 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:246
+#: misc-utils/logger.c:300
msgid " -P, --port <number> use this UDP port\n"
msgstr " -P, --port <数字> 使用此 UDP 端口\n"
-#: misc-utils/logger.c:247
+#: misc-utils/logger.c:301
msgid " -p, --priority <prio> mark given message with this priority\n"
msgstr " -p, --priority <级别> 将指定消息标记为此优先级\n"
-#: misc-utils/logger.c:248
+#: misc-utils/logger.c:302
msgid " --prio-prefix look for a prefix on every line read from stdin\n"
msgstr " --prio-prefix 在从 stdin 读取的每一行上查找前缀\n"
-#: misc-utils/logger.c:249
+#: misc-utils/logger.c:303
msgid " -s, --stderr output message to standard error as well\n"
msgstr " -s, --stderr 也向标准错误输出消息\n"
-#: misc-utils/logger.c:250
+#: misc-utils/logger.c:304
msgid " -t, --tag <tag> mark every line with this tag\n"
msgstr " -t, --tag <标志> 用此标志标记每一行\n"
-#: misc-utils/logger.c:251
+#: misc-utils/logger.c:305
msgid " -u, --socket <socket> write to this Unix socket\n"
msgstr " -u, --socket <套接字> 写入此 Unix 套接字\n"
#: misc-utils/logger.c:307
+msgid " --journald[=<file>] write journald entry\n"
+msgstr ""
+
+#: misc-utils/logger.c:369
#, c-format
msgid "file %s"
msgstr "文件 %s"
@@ -8395,282 +8617,284 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: misc-utils/lsblk.c:119
+#: misc-utils/lsblk.c:137
msgid "device name"
msgstr "设备名"
-#: misc-utils/lsblk.c:120
+#: misc-utils/lsblk.c:138
msgid "internal kernel device name"
msgstr "内部内核设备名称"
-#: misc-utils/lsblk.c:121
+#: misc-utils/lsblk.c:139
msgid "internal parent kernel device name"
msgstr "内部上级内核设备名称"
-#: misc-utils/lsblk.c:124
+#: misc-utils/lsblk.c:142
msgid "where the device is mounted"
msgstr "设备挂载位置"
-#: misc-utils/lsblk.c:125
+#: misc-utils/lsblk.c:143
msgid "filesystem LABEL"
msgstr "文件系统标签"
-#: misc-utils/lsblk.c:128
+#: misc-utils/lsblk.c:146
+#, fuzzy
+msgid "partition type UUID"
+msgstr "分区 UUID"
+
+#: misc-utils/lsblk.c:147
msgid "partition LABEL"
msgstr "分区 LABEL"
-#: misc-utils/lsblk.c:131
+#: misc-utils/lsblk.c:151
msgid "read-ahead of the device"
msgstr "该设备的预读(read-ahead)"
-#: misc-utils/lsblk.c:132 sys-utils/losetup.c:68
+#: misc-utils/lsblk.c:152 sys-utils/losetup.c:71
msgid "read-only device"
msgstr "只读设备"
-#: misc-utils/lsblk.c:133
+#: misc-utils/lsblk.c:153
msgid "removable device"
msgstr "可移动设备"
-#: misc-utils/lsblk.c:134
+#: misc-utils/lsblk.c:154
msgid "rotational device"
msgstr "转动设备"
-#: misc-utils/lsblk.c:135
+#: misc-utils/lsblk.c:155
msgid "adds randomness"
msgstr "添加随机性"
-#: misc-utils/lsblk.c:136
+#: misc-utils/lsblk.c:156
msgid "device identifier"
msgstr "设备标识符"
-#: misc-utils/lsblk.c:137
+#: misc-utils/lsblk.c:157
msgid "disk serial number"
msgstr "磁盘序列号"
-#: misc-utils/lsblk.c:138
+#: misc-utils/lsblk.c:158
msgid "size of the device"
msgstr "磁盘容量"
-#: misc-utils/lsblk.c:139
+#: misc-utils/lsblk.c:159
msgid "state of the device"
msgstr "设备的状态"
-#: misc-utils/lsblk.c:140
-msgid "user name"
-msgstr "用户名"
-
-#: misc-utils/lsblk.c:141
+#: misc-utils/lsblk.c:161
msgid "group name"
msgstr "组名"
-#: misc-utils/lsblk.c:142
+#: misc-utils/lsblk.c:162
msgid "device node permissions"
msgstr "设备节点权限"
-#: misc-utils/lsblk.c:143
+#: misc-utils/lsblk.c:163
msgid "alignment offset"
msgstr "对齐偏移量"
-#: misc-utils/lsblk.c:144
+#: misc-utils/lsblk.c:164
msgid "minimum I/O size"
msgstr "最小 I/O 大小"
-#: misc-utils/lsblk.c:145
+#: misc-utils/lsblk.c:165
msgid "optimal I/O size"
msgstr "最优 I/O 大小"
-#: misc-utils/lsblk.c:146
+#: misc-utils/lsblk.c:166
msgid "physical sector size"
msgstr "物理扇区大小"
-#: misc-utils/lsblk.c:147
+#: misc-utils/lsblk.c:167
msgid "logical sector size"
msgstr "逻辑扇区大小"
-#: misc-utils/lsblk.c:148
+#: misc-utils/lsblk.c:168
msgid "I/O scheduler name"
msgstr "I/O 调度器名称"
-#: misc-utils/lsblk.c:149
+#: misc-utils/lsblk.c:169
msgid "request queue size"
msgstr "请求队列大小"
-#: misc-utils/lsblk.c:150
+#: misc-utils/lsblk.c:170
msgid "device type"
msgstr "设备类型"
-#: misc-utils/lsblk.c:151
+#: misc-utils/lsblk.c:171
msgid "discard alignment offset"
msgstr "忽略对齐偏移量"
-#: misc-utils/lsblk.c:152
+#: misc-utils/lsblk.c:172
msgid "discard granularity"
msgstr "忽略粒度"
-#: misc-utils/lsblk.c:153
+#: misc-utils/lsblk.c:173
msgid "discard max bytes"
msgstr "忽略最大字节数"
-#: misc-utils/lsblk.c:154
+#: misc-utils/lsblk.c:174
msgid "discard zeroes data"
msgstr "忽略零数据"
-#: misc-utils/lsblk.c:155
+#: misc-utils/lsblk.c:175
msgid "write same max bytes"
msgstr "写相同的最大字节数"
-#: misc-utils/lsblk.c:156
+#: misc-utils/lsblk.c:176
msgid "unique storage identifier"
msgstr "惟一存储标识符"
-#: misc-utils/lsblk.c:157
+#: misc-utils/lsblk.c:177
msgid "Host:Channel:Target:Lun for SCSI"
msgstr "SCSI 的 Host:Channel:Target:Lun"
-#: misc-utils/lsblk.c:158
+#: misc-utils/lsblk.c:178
msgid "device transport type"
msgstr "设备传输类型"
-#: misc-utils/lsblk.c:159
+#: misc-utils/lsblk.c:179
msgid "device revision"
msgstr "设备修订版本"
-#: misc-utils/lsblk.c:160
+#: misc-utils/lsblk.c:180
msgid "device vendor"
msgstr "设备制造商"
-#: misc-utils/lsblk.c:979
+#: misc-utils/lsblk.c:1062
#, c-format
msgid "%s: failed to get device path"
msgstr "%s:获取设备路径失败"
-#: misc-utils/lsblk.c:986
+#: misc-utils/lsblk.c:1069
#, c-format
msgid "%s: unknown device name"
msgstr "%s:未知设备名称"
-#: misc-utils/lsblk.c:992 misc-utils/lsblk.c:999
-#, c-format
-msgid "%s: failed to initialize sysfs handler"
-msgstr "%s:初始化 sysfs 处理函数失败"
-
-#: misc-utils/lsblk.c:1022
+#: misc-utils/lsblk.c:1105
#, c-format
msgid "%s: failed to get dm name"
msgstr "%s:获取 dm 名称失败"
-#: misc-utils/lsblk.c:1063
+#: misc-utils/lsblk.c:1146
msgid "failed to open device directory in sysfs"
msgstr "打开 sysfs 中的设备目录失败"
-#: misc-utils/lsblk.c:1231
+#: misc-utils/lsblk.c:1314
#, c-format
msgid "%s: failed to compose sysfs path"
msgstr "%s:组成 sysfs 路径失败"
-#: misc-utils/lsblk.c:1237
+#: misc-utils/lsblk.c:1320
#, c-format
msgid "%s: failed to read link"
msgstr "%s:读链接失败"
-#: misc-utils/lsblk.c:1260
+#: misc-utils/lsblk.c:1343
#, c-format
msgid "%s: failed to get sysfs name"
msgstr "%s:获取 sysfs 名称失败"
-#: misc-utils/lsblk.c:1269
+#: misc-utils/lsblk.c:1352
#, c-format
msgid "%s: failed to get whole-disk device number"
msgstr "%s:获取整盘设备号失败"
-#: misc-utils/lsblk.c:1321 misc-utils/lsblk.c:1323 misc-utils/lsblk.c:1348
-#: misc-utils/lsblk.c:1350
+#: misc-utils/lsblk.c:1404 misc-utils/lsblk.c:1406 misc-utils/lsblk.c:1431
+#: misc-utils/lsblk.c:1433
#, c-format
msgid "failed to parse list '%s'"
msgstr "解析列表“%s”失败"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1328
+#: misc-utils/lsblk.c:1411
#, 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:1355
+#: misc-utils/lsblk.c:1438
#, c-format
msgid "the list of included devices is too large (limit is %d devices)"
msgstr "包含设备列表过大(限制为 %d 台设备)"
-#: misc-utils/lsblk.c:1367 sys-utils/wdctl.c:169
+#: misc-utils/lsblk.c:1469 sys-utils/wdctl.c:175
#, c-format
msgid " %s [options] [<device> ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: misc-utils/lsblk.c:1369
+#: misc-utils/lsblk.c:1471
msgid " -a, --all print all devices\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/lsblk.c:1371
+#: misc-utils/lsblk.c:1473
msgid " -d, --nodeps don't print slaves or holders\n"
msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
-#: misc-utils/lsblk.c:1372
+#: misc-utils/lsblk.c:1474
msgid " -D, --discard print discard capabilities\n"
msgstr " -D, --discard 打印时丢弃能力\n"
-#: misc-utils/lsblk.c:1373
+#: misc-utils/lsblk.c:1475
msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认:内存盘)\n"
-#: misc-utils/lsblk.c:1374
-msgid " -I, --include <list> show only devices with specified major numbers\n"
-msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
-
-#: misc-utils/lsblk.c:1375
+#: misc-utils/lsblk.c:1476
msgid " -f, --fs output info about filesystems\n"
msgstr " -f, --fs 输出文件系统信息\n"
-#: misc-utils/lsblk.c:1376
-msgid " -h, --help usage information (this)\n"
-msgstr " -h, --help 使用信息(此信息)\n"
-
-#: misc-utils/lsblk.c:1377
+#: misc-utils/lsblk.c:1477
msgid " -i, --ascii use ascii characters only\n"
msgstr " -i, --ascii 只使用 ascii 字符\n"
-#: misc-utils/lsblk.c:1378
-msgid " -m, --perms output info about permissions\n"
-msgstr " -m, --perms 输出权限信息\n"
+#: misc-utils/lsblk.c:1478
+msgid " -I, --include <list> show only devices with specified major numbers\n"
+msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
-#: misc-utils/lsblk.c:1379
+#: misc-utils/lsblk.c:1479
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/lsblk.c:1380
+#: misc-utils/lsblk.c:1480
+msgid " -m, --perms output info about permissions\n"
+msgstr " -m, --perms 输出权限信息\n"
+
+#: misc-utils/lsblk.c:1481
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lsblk.c:1381
+#: misc-utils/lsblk.c:1482
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/lsblk.c:1382
+#: misc-utils/lsblk.c:1483
+#, fuzzy
+msgid " -O, --output-all output all columns\n"
+msgstr " -o, --output <列表> 输出列\n"
+
+#: misc-utils/lsblk.c:1484
msgid " -p, --paths print complete device path\n"
msgstr " -p, --paths 打印完整设备路径\n"
-#: misc-utils/lsblk.c:1385
+#: misc-utils/lsblk.c:1487
msgid " -s, --inverse inverse dependencies\n"
msgstr " -s, --inverse 反向依赖\n"
-#: misc-utils/lsblk.c:1386
+#: misc-utils/lsblk.c:1488
+msgid " -S, --scsi output info about SCSI devices\n"
+msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
+
+#: misc-utils/lsblk.c:1489
msgid " -t, --topology output info about topology\n"
msgstr " -t, --topology 输出拓扑信息\n"
-#: misc-utils/lsblk.c:1387
-msgid " -S, --scsi output info about SCSI devices\n"
-msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
+#: misc-utils/lsblk.c:1490
+#, fuzzy
+msgid " -x, --sort <column> sort output by <colum>\n"
+msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/lsblk.c:1392 misc-utils/lslocks.c:510 sys-utils/prlimit.c:186
+#: misc-utils/lsblk.c:1495 misc-utils/lslocks.c:517 sys-utils/prlimit.c:191
#, c-format
msgid ""
"\n"
@@ -8679,72 +8903,76 @@ msgstr ""
"\n"
"可用列(用于 --output):\n"
-#: misc-utils/lsblk.c:1405
+#: misc-utils/lsblk.c:1508
#, c-format
msgid "failed to access sysfs directory: %s"
msgstr "无法访问 sysfs 目录:%s"
-#: misc-utils/lslocks.c:71
+#: misc-utils/lsblk.c:1697
+msgid "the sort column has to be between output columns."
+msgstr ""
+
+#: misc-utils/lslocks.c:72
msgid "command of the process holding the lock"
msgstr "持有锁的进程命令"
-#: misc-utils/lslocks.c:72
+#: misc-utils/lslocks.c:73
msgid "PID of the process holding the lock"
msgstr "持有锁的进程 PID"
-#: misc-utils/lslocks.c:73
+#: misc-utils/lslocks.c:74
msgid "kind of lock: FL_FLOCK or FL_POSIX."
msgstr "锁类型:FL_FLOCK 或 FL_POSIX。"
-#: misc-utils/lslocks.c:74
+#: misc-utils/lslocks.c:75
msgid "size of the lock"
msgstr "锁的大小"
-#: misc-utils/lslocks.c:75
+#: misc-utils/lslocks.c:76
msgid "lock access mode"
msgstr "锁访问模式"
-#: misc-utils/lslocks.c:76
+#: misc-utils/lslocks.c:77
msgid "mandatory state of the lock: 0 (none), 1 (set)"
msgstr "锁的强制(mandatory)状态:0(未设置),1(设置)"
-#: misc-utils/lslocks.c:77
+#: misc-utils/lslocks.c:78
msgid "relative byte offset of the lock"
msgstr "锁的相对字节偏移量"
-#: misc-utils/lslocks.c:78
+#: misc-utils/lslocks.c:79
msgid "ending offset of the lock"
msgstr "锁的末尾偏移量"
-#: misc-utils/lslocks.c:79
+#: misc-utils/lslocks.c:80
msgid "path of the locked file"
msgstr "锁定文件的路径"
-#: misc-utils/lslocks.c:80
+#: misc-utils/lslocks.c:81
msgid "PID of the process blocking the lock"
msgstr "阻塞锁的进程的 PID"
-#: misc-utils/lslocks.c:256
+#: misc-utils/lslocks.c:261
msgid "failed to parse ID"
msgstr "解析 ID 失败"
-#: misc-utils/lslocks.c:278 sys-utils/nsenter.c:205
+#: misc-utils/lslocks.c:283 sys-utils/nsenter.c:206
msgid "failed to parse pid"
msgstr "解析 pid 失败"
-#: misc-utils/lslocks.c:281
+#: misc-utils/lslocks.c:286
msgid "(unknown)"
msgstr "(未知)"
-#: misc-utils/lslocks.c:290
+#: misc-utils/lslocks.c:295
msgid "failed to parse start"
msgstr "解析 起点 失败"
-#: misc-utils/lslocks.c:297
+#: misc-utils/lslocks.c:302
msgid "failed to parse end"
msgstr "解析 终点 失败"
-#: misc-utils/lslocks.c:502
+#: misc-utils/lslocks.c:509
msgid ""
" -p, --pid <pid> process id\n"
" -o, --output <list> define which output columns to use\n"
@@ -8762,53 +8990,66 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
" -V, --version 输出版本信息并退出\n"
-#: misc-utils/lslocks.c:546 schedutils/chrt.c:257 schedutils/ionice.c:165
-#: schedutils/ionice.c:213 schedutils/ionice.c:223 schedutils/taskset.c:160
-#: sys-utils/prlimit.c:580
+#: misc-utils/lslocks.c:553 schedutils/chrt.c:257 schedutils/ionice.c:176
+#: schedutils/taskset.c:160 sys-utils/prlimit.c:581
msgid "invalid PID argument"
msgstr "无效的 PID 参数"
-#: misc-utils/mcookie.c:73
-msgid ""
-" -f, --file <file> use file as a cookie seed\n"
-" -v, --verbose explain what is being done\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
+#: misc-utils/mcookie.c:85
+#, fuzzy
+msgid " -f, --file <file> use file as a cookie seed\n"
+msgstr " -F, --file <文件> 用指定文件代替 %s\n"
+
+#: misc-utils/mcookie.c:86
+msgid " -m, --max-size <num> limit how much is read from seed files\n"
msgstr ""
-" -f, --file <文件> 使用指定文件作为 cookie seed\n"
-" -v, --verbose 解释正在进行的操作\n"
-" -V, --version 输出版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
-"\n"
-#: misc-utils/mcookie.c:150 misc-utils/mcookie.c:175
-#, c-format
-msgid "Got %d byte from %s\n"
-msgid_plural "Got %d bytes from %s\n"
+#: misc-utils/mcookie.c:87
+#, fuzzy
+msgid " -v, --verbose explain what is being done\n"
+msgstr " -v, --verbose 解释正在进行的操作\n"
+
+#: misc-utils/mcookie.c:117
+#, fuzzy, c-format
+msgid "Got %zu byte from %s\n"
+msgid_plural "Got %zu bytes from %s\n"
msgstr[0] "从 %2$s 获取到 %1$d 字节\n"
-#: misc-utils/mcookie.c:157
+#: misc-utils/mcookie.c:124
#, c-format
msgid "closing %s failed"
msgstr "关闭 %s 失败"
+#: misc-utils/mcookie.c:164 sys-utils/blkdiscard.c:105 sys-utils/fstrim.c:283
+#: text-utils/hexdump.c:117
+msgid "failed to parse length"
+msgstr "解析长度失败"
+
+#: misc-utils/mcookie.c:177
+msgid "--max-size ignored when used without --file."
+msgstr ""
+
+#: misc-utils/mcookie.c:185
+#, fuzzy, c-format
+msgid "Got %d bytes from %s\n"
+msgstr "从 %2$s 获取到 %1$d 字节\n"
+
#: misc-utils/namei.c:186
#, c-format
msgid "failed to read symlink: %s"
msgstr "读符号链接失败:%s"
-#: misc-utils/namei.c:370
+#: misc-utils/namei.c:379
#, c-format
msgid "%s - No such file or directory\n"
msgstr "%s - 无此文件或目录\n"
-#: misc-utils/namei.c:420
+#: misc-utils/namei.c:429
#, c-format
msgid " %s [options] pathname [pathname ...]\n"
msgstr " %s [选项] 路径名 [路径名 ...]\n"
-#: misc-utils/namei.c:423
+#: misc-utils/namei.c:432
msgid ""
" -h, --help displays this help text\n"
" -V, --version output version information and exit\n"
@@ -8828,7 +9069,7 @@ msgstr ""
" -n, --nosymlinks 不显示符号链接\n"
" -v, --vertical 竖直对齐 模式 和 拥有者\n"
-#: misc-utils/namei.c:432
+#: misc-utils/namei.c:441
msgid ""
"\n"
"For more information see namei(1).\n"
@@ -8836,11 +9077,11 @@ msgstr ""
"\n"
"更多信息参见 namei(1)。\n"
-#: misc-utils/namei.c:492
+#: misc-utils/namei.c:501
msgid "pathname argument is missing"
msgstr "缺少 路径名 参数"
-#: misc-utils/namei.c:516
+#: misc-utils/namei.c:525
#, c-format
msgid "%s: exceeded limit of symlinks"
msgstr "%s:超过了符号链接限制"
@@ -8860,40 +9101,35 @@ msgstr "%s:不是符号链接"
msgid "%s: readlink failed"
msgstr "%s:readlink 失败"
-#: misc-utils/rename.c:79
+#: misc-utils/rename.c:81
#, c-format
msgid "%s: unlink failed"
msgstr "%s:unlink 失败"
-#: misc-utils/rename.c:81
+#: misc-utils/rename.c:83
#, c-format
msgid "%s: symlinking to %s failed"
msgstr "%s:符号链接到 %s 失败"
-#: misc-utils/rename.c:86
+#: misc-utils/rename.c:88
#, c-format
msgid "%s: rename to %s failed"
msgstr "%s:重命名为 %s 失败"
-#: misc-utils/rename.c:100
+#: misc-utils/rename.c:102
#, c-format
msgid " %s [options] expression replacement file...\n"
msgstr " %s [选项] 表达式 替换文件...\n"
-#: misc-utils/rename.c:103
+#: misc-utils/rename.c:105
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: misc-utils/rename.c:104
+#: misc-utils/rename.c:106
msgid " -s, --symlink act on symlink target\n"
msgstr " -s, --symlink 在符号链接上执行\n"
-#: misc-utils/rename.c:151 sys-utils/ipcrm.c:154 term-utils/agetty.c:736
-#: term-utils/agetty.c:745
-msgid "not enough arguments"
-msgstr "参数不够"
-
-#: misc-utils/uuidd.c:75
+#: misc-utils/uuidd.c:76
msgid ""
" -p, --pid <path> path to pid file\n"
" -s, --socket <path> path to socket\n"
@@ -8927,160 +9163,161 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: misc-utils/uuidd.c:129
+#: misc-utils/uuidd.c:130
msgid "bad arguments"
msgstr "参数错误"
-#: misc-utils/uuidd.c:136
+#: misc-utils/uuidd.c:137
msgid "socket"
msgstr "套接字"
-#: misc-utils/uuidd.c:147
+#: misc-utils/uuidd.c:148
msgid "connect"
msgstr "连接"
-#: misc-utils/uuidd.c:167
+#: misc-utils/uuidd.c:168
msgid "write"
msgstr "写"
-#: misc-utils/uuidd.c:175
+#: misc-utils/uuidd.c:176
msgid "read count"
msgstr "读计数"
-#: misc-utils/uuidd.c:181
+#: misc-utils/uuidd.c:182
msgid "bad response length"
msgstr "响应长度错误"
-#: misc-utils/uuidd.c:235
+#: misc-utils/uuidd.c:236
#, c-format
msgid "cannot lock %s"
msgstr "无法锁定 %s"
-#: misc-utils/uuidd.c:259
+#: misc-utils/uuidd.c:260
msgid "couldn't create unix stream socket"
msgstr "无法创建 unix 流套接字"
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
#, c-format
msgid "couldn't bind unix socket %s"
msgstr "无法绑定 unix 套接字 %s"
-#: misc-utils/uuidd.c:321
+#: misc-utils/uuidd.c:322
#, c-format
msgid "uuidd daemon is already running at pid %s"
msgstr "uuidd 守护进程已运行,pid 为 %s"
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
#, c-format
msgid "couldn't listen on unix socket %s"
msgstr "无法侦听 unix 套接字 %s"
-#: misc-utils/uuidd.c:358
+#: misc-utils/uuidd.c:343
+#, fuzzy, c-format
+msgid "could not truncate file: %s"
+msgstr "无法读目录 %s"
+
+#: misc-utils/uuidd.c:361
msgid "no or too many file descriptors received"
msgstr "未收到或收到过多的文件描述符"
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:382 text-utils/column.c:384
msgid "read failed"
msgstr "read 失败"
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:384
#, c-format
msgid "error reading from client, len = %d"
msgstr "从客户端读取出错,长度 = %d"
-#: misc-utils/uuidd.c:390
+#: misc-utils/uuidd.c:393
#, c-format
msgid "operation %d, incoming num = %d\n"
msgstr "操作 %d,接收数 = %d\n"
-#: misc-utils/uuidd.c:393
+#: misc-utils/uuidd.c:396
#, c-format
msgid "operation %d\n"
msgstr "操作 %d\n"
-#: misc-utils/uuidd.c:409
+#: misc-utils/uuidd.c:412
#, c-format
msgid "Generated time UUID: %s\n"
msgstr "已生成时间 UUID:%s\n"
-#: misc-utils/uuidd.c:419
+#: misc-utils/uuidd.c:422
#, c-format
msgid "Generated random UUID: %s\n"
msgstr "已生成随机 UUID:%s\n"
-#: misc-utils/uuidd.c:428
+#: misc-utils/uuidd.c:431
#, 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:449
+#: misc-utils/uuidd.c:452
#, c-format
msgid "Generated %d UUID:\n"
msgid_plural "Generated %d UUIDs:\n"
msgstr[0] "已生成 %d 个 UUID:\n"
-#: misc-utils/uuidd.c:463
+#: misc-utils/uuidd.c:466
#, c-format
msgid "Invalid operation %d\n"
msgstr "无效操作 %d\n"
-#: misc-utils/uuidd.c:475
+#: misc-utils/uuidd.c:478
#, c-format
msgid "Unexpected reply length from server %d"
msgstr "服务器 %d 响应长度异常"
-#: misc-utils/uuidd.c:529
+#: misc-utils/uuidd.c:540
msgid "failed to parse --uuids"
msgstr "解析 --uuids 失败"
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:557
msgid "uuidd has been built without support for socket activation"
msgstr "uuidd 构建时没有添加套接字激活支持"
-#: misc-utils/uuidd.c:565
+#: misc-utils/uuidd.c:576
msgid "failed to parse --timeout"
msgstr "解析 --timeout 失败"
-#: misc-utils/uuidd.c:578
-msgid "Both --pid and --no-pid specified. Ignoring --no-pid."
-msgstr "同时指定了 --pid 和 --no-pid。将忽略 --no-pid。"
-
-#: misc-utils/uuidd.c:587
+#: misc-utils/uuidd.c:595
msgid "Both --socket-activation and --socket specified. Ignoring --socket."
msgstr "同时指定了 --socket-activation 和 --socket。将忽略 --socket"
-#: misc-utils/uuidd.c:594 misc-utils/uuidd.c:622
+#: misc-utils/uuidd.c:602 misc-utils/uuidd.c:630
#, c-format
msgid "error calling uuidd daemon (%s)"
msgstr "调用 uuidd 守护进程(%s)出错"
-#: misc-utils/uuidd.c:595 misc-utils/uuidd.c:623
+#: misc-utils/uuidd.c:603 misc-utils/uuidd.c:631
msgid "unexpected error"
msgstr "意外错误"
-#: misc-utils/uuidd.c:603
+#: misc-utils/uuidd.c:611
#, 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:607
+#: misc-utils/uuidd.c:615
#, c-format
msgid "List of UUIDs:\n"
msgstr "UUID 列表:\n"
-#: misc-utils/uuidd.c:639
+#: misc-utils/uuidd.c:647
#, c-format
msgid "couldn't kill uuidd running at pid %d"
msgstr "无法运行 pid 为 %d 的 uuidd"
-#: misc-utils/uuidd.c:644
+#: misc-utils/uuidd.c:652
#, c-format
msgid "Killed uuidd running at pid %d.\n"
msgstr "已杀死运行 pid 为 %d 的 uuidd。\n"
-#: misc-utils/uuidgen.c:39
+#: misc-utils/uuidgen.c:36
msgid ""
" -r, --random generate random-based uuid\n"
" -t, --time generate time-based uuid\n"
@@ -9130,37 +9367,57 @@ msgstr " -u 搜索不常见记录\n"
msgid " -l output effective lookup paths\n"
msgstr " -l 输出有效查找路径\n"
-#: misc-utils/wipefs.c:260
+#: misc-utils/wipefs.c:195
+#, fuzzy
+msgid "partition table"
+msgstr "分区标签"
+
+#: misc-utils/wipefs.c:268
#, c-format
msgid "error: %s: probing initialization failed"
msgstr "错误:%s:探测初始化失败"
-#: misc-utils/wipefs.c:305
+#: misc-utils/wipefs.c:313
#, c-format
msgid "%s: failed to erase %s magic string at offset 0x%08jx"
msgstr "%1$s:擦除位于偏移 0x%3$08jx 处的魔数字符串 %2$s 失败"
-#: misc-utils/wipefs.c:311
+#: misc-utils/wipefs.c:319
#, c-format
msgid "%s: %zd byte was erased at offset 0x%08jx (%s): "
msgid_plural "%s: %zd bytes were erased at offset 0x%08jx (%s): "
msgstr[0] "%s:%zd 个字节已擦除,位置偏移为 0x%08jx (%s):"
-#: misc-utils/wipefs.c:340
+#: misc-utils/wipefs.c:348
#, c-format
msgid "%s: failed to create a signature backup"
msgstr "%s:创建签名备份失败"
#: misc-utils/wipefs.c:361
+#, fuzzy, c-format
+msgid "%s: calling ioclt to re-read partition table: %m\n"
+msgstr "将调用 ioctl() 来重新读分区表。"
+
+#: misc-utils/wipefs.c:383
msgid "failed to create a signature backup, $HOME undefined"
msgstr "创建签名备份失败,未定义 $HOME"
-#: misc-utils/wipefs.c:395
+#: misc-utils/wipefs.c:411
+#, c-format
+msgid "%s: ignore nested \"%s\" partition table on non-whole disk device."
+msgstr ""
+
+#: misc-utils/wipefs.c:428
#, c-format
msgid "%s: offset 0x%jx not found"
msgstr "%s:找不到偏移 0x%jx"
-#: misc-utils/wipefs.c:416
+#: misc-utils/wipefs.c:432
+#, fuzzy
+msgid "Use the --force option to force erase."
+msgstr "使用 --force 标志否决所有检查。"
+
+#: misc-utils/wipefs.c:456
#, fuzzy
msgid ""
" -a, --all wipe all magic strings (BE CAREFUL!)\n"
@@ -9183,7 +9440,7 @@ msgstr ""
" -t, --types <列表> 限制文件系统、RAID 或分区表的集合\n"
" -V, --version 输出版本信息并退出\n"
-#: misc-utils/wipefs.c:427
+#: misc-utils/wipefs.c:467
#, c-format
msgid ""
"\n"
@@ -9192,884 +9449,14 @@ msgstr ""
"\n"
"更多信息请参阅 wipefs(8)。\n"
-#: misc-utils/wipefs.c:487
+#: misc-utils/wipefs.c:527
msgid "invalid offset argument"
msgstr "无效的 偏移 参数"
-#: misc-utils/wipefs.c:512
+#: misc-utils/wipefs.c:552
msgid "The --backup option is meaningless in this context"
msgstr "--backup 在此环境下无意义"
-#: mount-deprecated/fstab.c:145
-#, c-format
-msgid "warning: error reading %s: %s"
-msgstr "警告:读取 %s 出错:%s"
-
-#: mount-deprecated/fstab.c:172 mount-deprecated/fstab.c:197
-#, c-format
-msgid "warning: can't open %s: %s"
-msgstr "警告:打不开 %s:%s"
-
-#: mount-deprecated/fstab.c:177
-#, c-format
-msgid "mount: could not open %s - using %s instead\n"
-msgstr "挂载:打不开 %s - 将转用 %s\n"
-
-#: mount-deprecated/fstab.c:635
-#, c-format
-msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr "无法创建锁文件 %s:%s (可使用 -n 标志覆盖)"
-
-#: mount-deprecated/fstab.c:661
-#, c-format
-msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr "无法链接锁文件 %s:%s (可使用 -n 标志覆盖)"
-
-#: mount-deprecated/fstab.c:677
-#, c-format
-msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr "打不开锁文件 %s:%s (可使用 -n 标志覆盖)"
-
-#: mount-deprecated/fstab.c:692
-#, c-format
-msgid "Can't lock lock file %s: %s\n"
-msgstr "无法锁定锁文件 %s:%s\n"
-
-#: mount-deprecated/fstab.c:706
-#, c-format
-msgid "can't lock lock file %s: %s"
-msgstr "无法锁定锁文件 %s:%s"
-
-#: mount-deprecated/fstab.c:708
-msgid "timed out"
-msgstr "已超时"
-
-#: mount-deprecated/fstab.c:715
-#, c-format
-msgid ""
-"Cannot create link %s\n"
-"Perhaps there is a stale lock file?\n"
-msgstr ""
-"无法创建链接 %s\n"
-"有一个过期的锁文件吗?\n"
-
-#: mount-deprecated/fstab.c:857 mount-deprecated/fstab.c:914
-#, c-format
-msgid "cannot open %s (%s) - mtab not updated"
-msgstr "无法打开 %s (%s) - mtab 未更新"
-
-#: mount-deprecated/fstab.c:922
-#, c-format
-msgid "error writing %s: %s"
-msgstr "写 %s 出错:%s"
-
-#: mount-deprecated/fstab.c:937
-#, c-format
-msgid "%s: cannot fflush changes: %s"
-msgstr "%s:无法 fflush 更改:%s"
-
-#: mount-deprecated/fstab.c:954
-#, c-format
-msgid "error changing mode of %s: %s\n"
-msgstr "更改 %s 的模式出错:%s\n"
-
-#: mount-deprecated/fstab.c:967
-#, c-format
-msgid "error changing owner of %s: %s\n"
-msgstr "更改 %s 的所有者失败:%s\n"
-
-#: mount-deprecated/fstab.c:978
-#, c-format
-msgid "can't rename %s to %s: %s\n"
-msgstr "无法将 %s 改名为 %s:%s\n"
-
-#: mount-deprecated/mount.c:315
-#, c-format
-msgid ""
-"\n"
-"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
-" It's possible that information reported by mount(8) is not\n"
-" up to date. For actual information about system mount points\n"
-" check the /proc/mounts file.\n"
-"\n"
-msgstr ""
-"\n"
-"mount:/etc/mtab 不可写(比如是只读文件系统)。\n"
-" mount(8) 报告的信息可能不是最新的。\n"
-" 有关系统挂载点的实际信息请检查\n"
-" /proc/mounts 获取。\n"
-"\n"
-
-#: mount-deprecated/mount.c:365
-#, c-format
-msgid "mount: improperly quoted option string '%s'"
-msgstr "mount:选项字符串“%s”引号没有正确闭合"
-
-#: mount-deprecated/mount.c:398
-#, c-format
-msgid "mount: translated %s '%s' to '%s'\n"
-msgstr "mount:已将 %s “%s”转换为“%s”\n"
-
-#: mount-deprecated/mount.c:455
-#, c-format
-msgid "mount: SELinux *context= options are ignore on remount.\n"
-msgstr "mount:SELinux *context= 选项重新挂载会时忽略。\n"
-
-#: mount-deprecated/mount.c:651
-#, c-format
-msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr "mount:根据 mtab,%s 已挂载于 %s"
-
-#: mount-deprecated/mount.c:656
-#, c-format
-msgid "mount: according to mtab, %s is mounted on %s"
-msgstr "mount:根据 mtab,%s 挂载于 %s"
-
-#: mount-deprecated/mount.c:680
-#, c-format
-msgid "mount: can't open %s for writing: %s"
-msgstr "mount:无法打开 %s 进行写入:%s"
-
-#: mount-deprecated/mount.c:697
-#, c-format
-msgid "mount: error writing %s: %s"
-msgstr "mount:写 %s 出错:%s"
-
-#: mount-deprecated/mount.c:705
-#, c-format
-msgid "mount: error changing mode of %s: %s"
-msgstr "mount:更改 %s 的模式出错:%s"
-
-#: mount-deprecated/mount.c:807
-#, c-format
-msgid "mount: cannot set group id: %m"
-msgstr "mount:无法设置组 id:%m"
-
-#: mount-deprecated/mount.c:810
-#, c-format
-msgid "mount: cannot set user id: %m"
-msgstr "mount:无法设置用户 id:%m"
-
-#: mount-deprecated/mount.c:857 mount-deprecated/mount.c:2153
-#, c-format
-msgid "mount: cannot fork: %s"
-msgstr "mount:无法 fork:%s"
-
-#: mount-deprecated/mount.c:993
-#, c-format
-msgid "Trying %s\n"
-msgstr "正在尝试 %s\n"
-
-#: mount-deprecated/mount.c:1021
-#, c-format
-msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr "mount:您没有指定 %s 的文件系统类型\n"
-
-#: mount-deprecated/mount.c:1024
-#, c-format
-msgid " I will try all types mentioned in %s or %s\n"
-msgstr " 程序将尝试 %s 或 %s 中提到的所有类型\n"
-
-#: mount-deprecated/mount.c:1027
-#, c-format
-msgid " and it looks like this is swapspace\n"
-msgstr " 这似乎是交换空间\n"
-
-#: mount-deprecated/mount.c:1029
-#, c-format
-msgid " I will try type %s\n"
-msgstr " 程序将尝试 %s 类型\n"
-
-#: mount-deprecated/mount.c:1054
-#, c-format
-msgid "%s looks like swapspace - not mounted"
-msgstr "%s 似乎是交换空间 - 未挂载"
-
-#: mount-deprecated/mount.c:1062
-#, c-format
-msgid ""
-"mount: %s: more filesystems detected. This should not happen,\n"
-" use -t <type> to explicitly specify the filesystem type or\n"
-" use wipefs(8) to clean up the device.\n"
-msgstr ""
-"mount:%s:检测到了更多文件系统。这不应该发生, \n"
-" 请使用 -t <类型> 来明确指定文件系统类型或\n"
-" 使用 wipefs(8) 来清理设备。\n"
-
-#: mount-deprecated/mount.c:1150
-msgid "mount failed"
-msgstr "挂载失败"
-
-#: mount-deprecated/mount.c:1152
-#, c-format
-msgid "mount: only root can mount %s on %s"
-msgstr "mount:只有 root 才能将 %s 挂载于 %s"
-
-#: mount-deprecated/mount.c:1243
-msgid "mount: loop device specified twice"
-msgstr "mount:回环设备指定了两次"
-
-#: mount-deprecated/mount.c:1248
-msgid "mount: type specified twice"
-msgstr "mount:类型指定了两次"
-
-#: mount-deprecated/mount.c:1276
-#, c-format
-msgid "mount: skipping the setup of a loop device\n"
-msgstr "mount:将跳过回环设备的设置\n"
-
-#: mount-deprecated/mount.c:1287
-#, c-format
-msgid "mount: enabling autoclear loopdev flag\n"
-msgstr "mount:将启用 自动清除 环回设备标志\n"
-
-#: mount-deprecated/mount.c:1295
-#, c-format
-msgid "mount: invalid offset '%s' specified"
-msgstr "mount:指定了无效的偏移“%s”"
-
-#: mount-deprecated/mount.c:1299
-#, c-format
-msgid "mount: invalid sizelimit '%s' specified"
-msgstr "mount:指定了无效的大小限制“%s”"
-
-#: mount-deprecated/mount.c:1304
-#, c-format
-msgid "mount: according to mtab %s is already mounted on %s as loop"
-msgstr "mount:根据 mtab,%s 已作为回环设备挂载于 %s"
-
-#: mount-deprecated/mount.c:1309 sys-utils/losetup.c:513
-msgid "encryption not supported, use cryptsetup(8) instead"
-msgstr "不支持加密,请改用 cryptsetup(8)"
-
-#: mount-deprecated/mount.c:1314
-msgid "mount: failed to initialize loopdev context"
-msgstr "mount:初始化 loopdev 环境失败"
-
-#: mount-deprecated/mount.c:1319
-#, c-format
-msgid "mount: failed to use %s device"
-msgstr "mount:使用 %s 设备失败"
-
-#: mount-deprecated/mount.c:1330
-msgid "mount: failed to found free loop device"
-msgstr "mount:查找空闲的回环设备失败"
-
-#: mount-deprecated/mount.c:1335
-#, c-format
-msgid "mount: going to use the loop device %s\n"
-msgstr "mount:将使用回环设备 %s\n"
-
-#: mount-deprecated/mount.c:1347
-#, c-format
-msgid "mount: %s: failed to set loopdev attributes"
-msgstr "mount:%s:设置回环设备属性失败"
-
-#: mount-deprecated/mount.c:1358
-#, c-format
-msgid "mount: %s: failed setting up loop device: %m"
-msgstr "挂臷:%s:设置回环设备失败:%m"
-
-#: mount-deprecated/mount.c:1369
-#, c-format
-msgid "mount: stolen loop=%s ...trying again\n"
-msgstr "mount:被挪用回环=%s ...将重试\n"
-
-#: mount-deprecated/mount.c:1374
-#, c-format
-msgid "mount: stolen loop=%s"
-msgstr "挂载:被挪用回环=%s"
-
-#: mount-deprecated/mount.c:1381
-#, c-format
-msgid "mount: setup loop device successfully\n"
-msgstr "mount:设置回环设备成功\n"
-
-#: mount-deprecated/mount.c:1429
-#, c-format
-msgid "mount: no %s found - creating it..\n"
-msgstr "mount:未找到 %s - 将创建它...\n"
-
-#: mount-deprecated/mount.c:1456
-#, c-format
-msgid "mount: cannot open %s for setting speed"
-msgstr "mount:无法打开 %s 来设置速度"
-
-#: mount-deprecated/mount.c:1459
-#, c-format
-msgid "mount: cannot set speed: %m"
-msgstr "mount:无法设置速度:%m"
-
-#: mount-deprecated/mount.c:1550
-#, c-format
-msgid "mount: according to mtab, %s is already mounted on %s\n"
-msgstr "mount:根据 mtab,%s 已挂载于 %s\n"
-
-#: mount-deprecated/mount.c:1629
-#, c-format
-msgid "mount: warning: %s seems to be mounted read-write.\n"
-msgstr "mounted:警告:%s 似乎是以读写方式挂载的。\n"
-
-#: mount-deprecated/mount.c:1641
-#, c-format
-msgid "mount: warning: %s seems to be mounted read-only.\n"
-msgstr "挂载:警告:%s 似乎是以只读方式挂载的。\n"
-
-#: mount-deprecated/mount.c:1677
-msgid "mount: I could not determine the filesystem type, and none was specified"
-msgstr "mount:程序无法确定文件系统类型,并且没有指定"
-
-#: mount-deprecated/mount.c:1680
-msgid "mount: you must specify the filesystem type"
-msgstr "mount:您必须指定文件系统类型"
-
-#: mount-deprecated/mount.c:1683
-msgid "mount: mount failed"
-msgstr "mount:挂载失败"
-
-#: mount-deprecated/mount.c:1689 mount-deprecated/mount.c:1726
-#, c-format
-msgid "mount: mount point %s is not a directory"
-msgstr "mount:挂载点 %s 不是一个目录"
-
-#: mount-deprecated/mount.c:1691
-msgid "mount: permission denied"
-msgstr "mount:权限不足"
-
-#: mount-deprecated/mount.c:1693
-msgid "mount: must be superuser to use mount"
-msgstr "mount:必须是超级用户才能使用 mount"
-
-#: mount-deprecated/mount.c:1697 mount-deprecated/mount.c:1701
-#, c-format
-msgid "mount: %s is busy"
-msgstr "mount:%s 忙"
-
-#: mount-deprecated/mount.c:1703
-msgid "mount: proc already mounted"
-msgstr "mount:proc 已挂载"
-
-#: mount-deprecated/mount.c:1705
-#, c-format
-msgid "mount: %s already mounted or %s busy"
-msgstr "mount:%s 已挂载或 %s 忙"
-
-#: mount-deprecated/mount.c:1711
-#, c-format
-msgid "mount: mount point %s does not exist"
-msgstr "mount:挂载点 %s 不存在"
-
-#: mount-deprecated/mount.c:1713
-#, c-format
-msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr "mount:挂载点 %s 是一个没有目标位置的符号链接"
-
-#: mount-deprecated/mount.c:1718
-#, c-format
-msgid "mount: special device %s does not exist"
-msgstr "mount:特殊设备 %s 不存在"
-
-#: mount-deprecated/mount.c:1730
-#, c-format
-msgid ""
-"mount: special device %s does not exist\n"
-" (a path prefix is not a directory)\n"
-msgstr ""
-"mount:特殊设备 %s 不存在\n"
-" (路径前缀不是目录)\n"
-
-#: mount-deprecated/mount.c:1742
-#, c-format
-msgid "mount: %s not mounted or bad option"
-msgstr "mount:%s 未挂载或选项错误"
-
-#: mount-deprecated/mount.c:1744
-#, c-format
-msgid ""
-"mount: wrong fs type, bad option, bad superblock on %s,\n"
-" missing codepage or helper program, or other error"
-msgstr ""
-"mount:文件系统类型错误、选项错误、%s 有坏超级块,\n"
-" 缺少代码页或助手程序,或其他错误"
-
-#: mount-deprecated/mount.c:1751
-msgid ""
-" (for several filesystems (e.g. nfs, cifs) you might\n"
-" need a /sbin/mount.<type> helper program)"
-msgstr ""
-" (对某些文件系统(如 nfs、cifs) 您可能需要\n"
-" 一款 /sbin/mount.<类型> 助手程序)"
-
-#: mount-deprecated/mount.c:1760
-msgid ""
-" (could this be the IDE device where you in fact use\n"
-" ide-scsi so that sr0 or sda or so is needed?)"
-msgstr ""
-" (这是不是一台通过 ide-scsi 方式使用的 IDE 设备,\n"
-" 因而需要 sr0 或 sda 或 so?)"
-
-#: mount-deprecated/mount.c:1765
-msgid ""
-" (aren't you trying to mount an extended partition,\n"
-" instead of some logical partition inside?)"
-msgstr ""
-" (您不是要试图挂载一个扩展分区,而非扩展分区中的\n"
-" 一些逻辑分区吧?)"
-
-#: mount-deprecated/mount.c:1772
-msgid ""
-" In some cases useful info is found in syslog - try\n"
-" dmesg | tail or so\n"
-msgstr ""
-" 有些情况下在 syslog 中可以找到一些有用信息- 请尝试\n"
-" dmesg | tail 这样的命令看看。\n"
-
-#: mount-deprecated/mount.c:1778 sys-utils/mount.c:563
-msgid "mount table full"
-msgstr "挂载表满"
-
-#: mount-deprecated/mount.c:1780
-#, c-format
-msgid "mount: %s: can't read superblock"
-msgstr "mount:%s:无法读取超级块"
-
-#: mount-deprecated/mount.c:1786
-#, c-format
-msgid "mount: %s: unknown device"
-msgstr "mount:%s:未知设备"
-
-#: mount-deprecated/mount.c:1791
-#, c-format
-msgid "mount: unknown filesystem type '%s'"
-msgstr "mount:未知文件系统类型“%s”"
-
-#: mount-deprecated/mount.c:1803
-#, c-format
-msgid "mount: probably you meant %s"
-msgstr "mount:您可能指的是 %s"
-
-#: mount-deprecated/mount.c:1806
-msgid "mount: maybe you meant 'iso9660'?"
-msgstr "mount:可能您指的是“iso9660”?"
-
-#: mount-deprecated/mount.c:1809
-msgid "mount: maybe you meant 'vfat'?"
-msgstr "mount:可能您指的是“vfat”?"
-
-#: mount-deprecated/mount.c:1812
-#, c-format
-msgid "mount: %s has wrong device number or fs type %s not supported"
-msgstr "mount:%s 设备号错误或不支持文件系统 %s"
-
-#: mount-deprecated/mount.c:1820
-#, c-format
-msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount:%s 不是块设备,且 stat 命令失败?"
-
-#: mount-deprecated/mount.c:1822
-#, c-format
-msgid ""
-"mount: the kernel does not recognize %s as a block device\n"
-" (maybe `modprobe driver'?)"
-msgstr ""
-"mount:内核无法将 %s 识别为块设备\n"
-" (试试“modprobe driver”?)"
-
-#: mount-deprecated/mount.c:1825
-#, c-format
-msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr "mount:%s 不是块设备(要不试试“-o loop”?)"
-
-#: mount-deprecated/mount.c:1828
-#, c-format
-msgid "mount: %s is not a block device"
-msgstr "mount:%s 不是块设备"
-
-#: mount-deprecated/mount.c:1833
-#, c-format
-msgid "mount: %s is not a valid block device"
-msgstr "mount:%s 不是有效的块设备"
-
-#: mount-deprecated/mount.c:1836
-msgid "block device "
-msgstr "块设备 "
-
-#: mount-deprecated/mount.c:1838
-#, c-format
-msgid "mount: cannot mount %s%s read-only"
-msgstr "mount:无法以只读方式挂载 %s%s"
-
-#: mount-deprecated/mount.c:1842
-#, c-format
-msgid "mount: %s%s is write-protected but explicit `-w' flag given"
-msgstr "mount:%s%s 是写保护的,但指明了“-w”标志"
-
-#: mount-deprecated/mount.c:1846
-#, c-format
-msgid "mount: cannot remount %s%s read-write, is write-protected"
-msgstr "mount:无法以读写方式重新挂载 %s%s,它是写保护的"
-
-#: mount-deprecated/mount.c:1861
-#, c-format
-msgid "mount: %s%s is write-protected, mounting read-only"
-msgstr "mount:%s%s 写保护,将以只读方式挂载"
-
-#: mount-deprecated/mount.c:1869
-#, c-format
-msgid "mount: no medium found on %s"
-msgstr "mount:在 %s 上找不到媒体"
-
-#: mount-deprecated/mount.c:1887 sys-utils/mount.c:309
-#, c-format
-msgid ""
-"mount: %s does not contain SELinux labels.\n"
-" You just mounted an file system that supports labels which does not\n"
-" contain labels, onto an SELinux box. It is likely that confined\n"
-" applications will generate AVC messages and not be allowed access to\n"
-" this file system. For more details see restorecon(8) and mount(8).\n"
-msgstr ""
-"mount:%s 不包含 SELinux 标志\n"
-" 您刚将一个支持标签但未包含标签的文件系统挂载到了 SELinux 机器上。\n"
-" 受限制的应用程序可能会生成 AVC 消息,并被阻止访问该文件系统。\n"
-" 更多详细信息请参阅 restorecon(8) 和 mount(8)。\n"
-
-#: mount-deprecated/mount.c:1967
-#, c-format
-msgid "mount: no type was given - I'll assume nfs because of the colon\n"
-msgstr "mount:没有指定类型 - 程序将根据冒号假定为 nfs\n"
-
-#: mount-deprecated/mount.c:1973
-#, c-format
-msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
-msgstr "mount:没有指定类型 - 程序将根据 // 前缀假定为 cifs\n"
-
-#: mount-deprecated/mount.c:2041
-#, c-format
-msgid "mount: ignore %s (unparsable offset= option)\n"
-msgstr "mount:忽略 %s(无法解析的 offset= 选项)\n"
-
-#: mount-deprecated/mount.c:2054
-#, c-format
-msgid "mount: %s already mounted on %s\n"
-msgstr "mount:%s 已挂载于 %s\n"
-
-#: mount-deprecated/mount.c:2234
-#, c-format
-msgid ""
-"Usage: mount -V : print version\n"
-" mount -h : print this help\n"
-" mount : list mounted filesystems\n"
-" mount -l : idem, including volume labels\n"
-"So far the informational part. Next the mounting.\n"
-"The command is `mount [-t fstype] something somewhere'.\n"
-"Details found in /etc/fstab may be omitted.\n"
-" mount -a [-t|-O] ... : mount all stuff from /etc/fstab\n"
-" mount device : mount device at the known place\n"
-" mount directory : mount known device here\n"
-" mount -t type dev dir : ordinary mount command\n"
-"Note that one does not really mount a device, one mounts\n"
-"a filesystem (of the given type) found on the device.\n"
-"One can also mount an already visible directory tree elsewhere:\n"
-" mount --bind olddir newdir\n"
-"or move a subtree:\n"
-" mount --move olddir newdir\n"
-"One can change the type of mount containing the directory dir:\n"
-" mount --make-shared dir\n"
-" mount --make-slave dir\n"
-" mount --make-private dir\n"
-" mount --make-unbindable dir\n"
-"One can change the type of all the mounts in a mount subtree\n"
-"containing the directory dir:\n"
-" mount --make-rshared dir\n"
-" mount --make-rslave dir\n"
-" mount --make-rprivate dir\n"
-" mount --make-runbindable dir\n"
-"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
-"or by label, using -L label or by uuid, using -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
-"For many more details, say man 8 mount .\n"
-msgstr ""
-"用法: mount -V : 打印版本\n"
-" mount -h : 打印此帮助\n"
-" mount : 列出已挂臷的文件系统\n"
-" mount -l : 同上,包含卷标\n"
-"以上为信息部分。以下是挂臷。\n"
-"挂臷命令为“mount [-t 文件系统类型] 待挂臷项 挂臷位置”。\n"
-"在 /etc/fstab 中列出的细节可以忽略。\n"
-" mount -a [-t|-O] ... : 挂臷 /etc/fstab 中的所有项\n"
-" mount 设备 : 挂臷未知位置的设备\n"
-" mount 目录 : 将已知设备挂臷到此处\n"
-" mount -t 类型 设备 目录 : 正常挂臷命令\n"
-"注意,挂臷设备其实是(以指定类型)挂臷设备上的文件系统。\n"
-"\n"
-"也可以将已经可见的目录树挂臷到别处:\n"
-" mount --bind 旧目录 新目录\n"
-"或移动子树:\n"
-" mount --move 旧目录 新目录\n"
-"可以改变包含 dir 目录的挂臷的类型:\n"
-" mount --make-shared dir\n"
-" mount --make-slave dir\n"
-" mount --make-private dir\n"
-" mount --make-unbindable dir\n"
-"可以指定包含 dir 目录的已挂臷子树中\n"
-"所有挂臷的类型:\n"
-" mount --make-rshared dir\n"
-" mount --make-rslave dir\n"
-" mount --make-rprivate dir\n"
-" mount --make-runbindable dir\n"
-"可以通过名称指定设备,如 /dev/hda1 或 /dev/cdrom,\n"
-"或使用 -L 标签 按标签指定设备,或者使用 -U uuid 按 uuid 指定。\n"
-"其他选项:[-nfFrsvw] [-o 选项] [-p 密码文件描述符].\n"
-"更多细节,请输入 man 8 mount 了解。\n"
-
-#: mount-deprecated/mount.c:2445 sys-utils/losetup.c:543 sys-utils/mount.c:905
-msgid "--pass-fd is no longer supported"
-msgstr "--pass-fd 已不再支持"
-
-#: mount-deprecated/mount.c:2552
-#, c-format
-msgid "mount: only root can do that (effective UID is %u)"
-msgstr "挂臷:只有 root 用户才能执行(有效 UID 为 %u)"
-
-#: mount-deprecated/mount.c:2555
-msgid "mount: only root can do that"
-msgstr "挂臷:只有 root 用户才能执行"
-
-#: mount-deprecated/mount.c:2566
-msgid "nothing was mounted"
-msgstr "未挂臷任何项目"
-
-#: mount-deprecated/mount.c:2584 mount-deprecated/mount.c:2610
-msgid "mount: no such partition found"
-msgstr "挂臷:没有找到该分区"
-
-#: mount-deprecated/mount.c:2587
-#, c-format
-msgid "mount: can't find %s in %s or %s"
-msgstr "mount:在 %2$s 或 %3$s 中找不到 %1$s"
-
-#: mount-deprecated/mount_mntent.c:110
-#, c-format
-msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr "[mntent]:警告:%s 末尾没有以空行结束\n"
-
-#: mount-deprecated/mount_mntent.c:160
-#, c-format
-msgid "[mntent]: line %d in %s is bad%s\n"
-msgstr "[mntent]:%2$s 中的第 %1$d 行有误%3$s\n"
-
-#: mount-deprecated/mount_mntent.c:163
-msgid "; rest of file ignored"
-msgstr ";文件的其余部分被忽略"
-
-#: mount-deprecated/sundries.c:211 mount-deprecated/sundries.c:269
-#: mount-deprecated/sundries.c:284
-msgid "not enough memory"
-msgstr "内存不足"
-
-#: mount-deprecated/umount.c:43
-#, c-format
-msgid "umount: compiled without support for -f\n"
-msgstr "umount:编译时未添加 -f 支持\n"
-
-#: mount-deprecated/umount.c:139
-#, c-format
-msgid "umount: cannot set group id: %m"
-msgstr "umount:无法设置组 id:%m"
-
-#: mount-deprecated/umount.c:142
-#, c-format
-msgid "umount: cannot set user id: %m"
-msgstr "umount:无法设置用户 id:%m"
-
-#: mount-deprecated/umount.c:171
-#, c-format
-msgid "umount: cannot fork: %s"
-msgstr "umount:无法 fork:%s"
-
-#: mount-deprecated/umount.c:192
-#, c-format
-msgid "umount: %s: invalid block device"
-msgstr "umount:%s:无效的块设备"
-
-#: mount-deprecated/umount.c:194
-#, c-format
-msgid "umount: %s: not mounted"
-msgstr "umount:%s:未挂载"
-
-#: mount-deprecated/umount.c:196
-#, c-format
-msgid "umount: %s: can't write superblock"
-msgstr "umount:%s:无法写超级块"
-
-#: mount-deprecated/umount.c:200
-#, c-format
-msgid ""
-"umount: %s: device is busy.\n"
-" (In some cases useful info about processes that use\n"
-" the device is found by lsof(8) or fuser(1))"
-msgstr ""
-"umount:%s:设备忙。\n"
-" (有些情况下在 lsof(8) 或 fuser(1)) 中可以找到\n"
-" 有关使用该设备的进程的有用信息"
-
-#: mount-deprecated/umount.c:205
-#, c-format
-msgid "umount: %s: not found"
-msgstr "umount:%s:未找到"
-
-#: mount-deprecated/umount.c:207
-#, c-format
-msgid "umount: %s: must be superuser to umount"
-msgstr "umount:%s:只有超级用户才能卸载"
-
-#: mount-deprecated/umount.c:209
-#, c-format
-msgid "umount: %s: block devices not permitted on fs"
-msgstr "umount:%s:文件系统上不允许块设备"
-
-#: mount-deprecated/umount.c:211
-#, c-format
-msgid "umount: %s: %s"
-msgstr "umount:%s:%s"
-
-#: mount-deprecated/umount.c:239
-#, c-format
-msgid "umount: internal error: invalid abs path: %s"
-msgstr "umount:内部错误:无效的绝对路径:%s"
-
-#: mount-deprecated/umount.c:254
-#, c-format
-msgid "umount: failed to chdir to %s: %m"
-msgstr "umount:更改目录到 %s 失败:%m"
-
-#: mount-deprecated/umount.c:257
-#, c-format
-msgid "umount: failed to obtain current directory: %m"
-msgstr "umount:获取当前目录失败:%m"
-
-#: mount-deprecated/umount.c:260
-#, c-format
-msgid "umount: mountpoint moved (%s -> %s)"
-msgstr "umount:挂载点已移动(%s -> %s)"
-
-#: mount-deprecated/umount.c:263
-#, c-format
-msgid "current directory moved to %s\n"
-msgstr "当前目录已移动到 %s\n"
-
-#: mount-deprecated/umount.c:328
-#, c-format
-msgid "no umount2, trying umount...\n"
-msgstr "无 umount2,将尝试 umount...\n"
-
-#: mount-deprecated/umount.c:348
-#, c-format
-msgid "umount: %s busy - remounted read-only\n"
-msgstr "umount:%s 忙 - 已重新挂载为只读\n"
-
-#: mount-deprecated/umount.c:366
-#, c-format
-msgid "umount: could not remount %s read-only\n"
-msgstr "umount:无法以只读方式重新挂载 %s\n"
-
-#: mount-deprecated/umount.c:375
-#, c-format
-msgid "%s has been unmounted\n"
-msgstr "%s 已经卸载\n"
-
-#: mount-deprecated/umount.c:482
-msgid "umount: cannot find list of filesystems to unmount"
-msgstr "umount:找不到要卸载的文件系统列表"
-
-#: mount-deprecated/umount.c:514
-#, c-format
-msgid ""
-"Usage: umount -h | -V\n"
-" umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-" umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
-msgstr ""
-"用法:umount -h | -V\n"
-" umount -a [-d] [-f] [-r] [-n] [-v] [-t 文件系统类型] [-O 选项]\n"
-" umount [-d] [-f] [-r] [-n] [-v] 特殊 | 节点...\n"
-
-#: mount-deprecated/umount.c:558
-#, c-format
-msgid "failed to parse 'offset=%s' options\n"
-msgstr "解析 'offset=%s' 选项失败\n"
-
-#: mount-deprecated/umount.c:566
-#, c-format
-msgid "device %s is associated with %s\n"
-msgstr "设备 %s 与 %s 关联\n"
-
-#: mount-deprecated/umount.c:572
-#, c-format
-msgid "device %s is not associated with %s\n"
-msgstr "设备 %s 未与 %s 关联\n"
-
-#: mount-deprecated/umount.c:606
-msgid "Cannot unmount \"\"\n"
-msgstr "无法卸载 \"\"\n"
-
-#: mount-deprecated/umount.c:614
-#, c-format
-msgid "Trying to unmount %s\n"
-msgstr "正在尝试卸载 %s\n"
-
-#: mount-deprecated/umount.c:628
-msgid "umount: confused when analyzing mtab"
-msgstr "umount:分析 mtab 时出现混乱"
-
-#: mount-deprecated/umount.c:634
-#, fuzzy, c-format
-msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
-msgstr "unmount:无法卸载 %s -- %s 已在同一挂载点上挂载替换了它"
-
-#: mount-deprecated/umount.c:642
-#, c-format
-msgid "Could not find %s in mtab\n"
-msgstr "在 mtab 中找不到 %s\n"
-
-#: mount-deprecated/umount.c:652
-#, c-format
-msgid "%s is associated with %s\n"
-msgstr "%s 与 %s 关联\n"
-
-#: mount-deprecated/umount.c:658
-#, c-format
-msgid "umount: warning: %s is associated with more than one loop device\n"
-msgstr "umount:警告:%s 与超过一个回环设备关联\n"
-
-#: mount-deprecated/umount.c:676
-#, c-format
-msgid "umount: %s is not mounted (according to mtab)"
-msgstr "umount:%s 未挂载(从 mtab 得知)"
-
-#: mount-deprecated/umount.c:690
-#, c-format
-msgid "umount: it seems %s is mounted multiple times"
-msgstr "umount:似乎 %s 挂载了多次"
-
-#: mount-deprecated/umount.c:704
-#, c-format
-msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr "umount:%s 不在 fstab 中(并且您不是 root 用户)"
-
-#: mount-deprecated/umount.c:710
-#, c-format
-msgid "umount: %s mount disagrees with the fstab"
-msgstr "umount:%s 挂载与 fstab 不一致"
-
-#: mount-deprecated/umount.c:751
-#, c-format
-msgid "umount: only %s can unmount %s from %s"
-msgstr "umount:只有 %s 可以从 %s 上卸载 %s"
-
-#: mount-deprecated/umount.c:848
-msgid "umount: only root can do that"
-msgstr "umount:只有 root 能执行该操作"
-
#: schedutils/chrt.c:63
#, c-format
msgid ""
@@ -10223,67 +9610,90 @@ msgstr "%s:优先级 %lu\n"
msgid "ioprio_set failed"
msgstr "ioprio_set 失败"
-#: schedutils/ionice.c:104
-#, c-format
+#: schedutils/ionice.c:103
msgid ""
"\n"
-"%1$s - sets or gets process io scheduling class and priority.\n"
-"\n"
-"Usage:\n"
-" %1$s [OPTION] -p PID [PID...]\n"
-" %1$s [OPTION] COMMAND\n"
-"\n"
-"Options:\n"
-" -c, --class <class> scheduling class name or number\n"
-" 0: none, 1: realtime, 2: best-effort, 3: idle\n"
-" -n, --classdata <num> scheduling class data\n"
-" 0-7 for realtime and best-effort classes\n"
-" -p, --pid=PID view or modify already running process\n"
-" -t, --ignore ignore failures\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
+"Sets or gets the IO scheduling class and priority of processes.\n"
msgstr ""
-"\n"
-"%1$s - 设置或获取进程 io 调度类别和优先级。\n"
-"\n"
-"用法:\n"
-" %1$s [选项] -p PID [PID...]\n"
-" %1$s [选项] 命令\n"
-"\n"
-"选项:\n"
-" -c, --class <类> 调度类别名或数字\n"
-" 0:无,1:实时,2:尽量(best-effort),3:空闲\n"
-" -n, --classdata <数字> 调度类别数据\n"
-" 0-7,针对 实时 和 尽量 调度类别\n"
-" -p, --pid=PID 查看或修改已运行的进程\n"
-" -t, --ignore 忽略失败\n"
-" -V, --version 输出版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
-"\n"
-#: schedutils/ionice.c:148
+#: schedutils/ionice.c:106
+#, fuzzy, c-format
+msgid ""
+" %1$s [options] -p <pid>...\n"
+" %1$s [options] -P <pgid>...\n"
+" %1$s [options] -u <uid>...\n"
+" %1$s [options] <command>\n"
+msgstr ""
+" %1$s [选项]\n"
+" %1$s [选项] <设备> | <挂臷点>\n"
+" %1$s [选项] <设备> <挂臷点>\n"
+" %1$s [选项] [--source <设备>] [--target <挂臷点>]\n"
+
+#: schedutils/ionice.c:112
+msgid ""
+" -c, --class <class> name or number of scheduling class,\n"
+" 0: none, 1: realtime, 2: best-effort, 3: idle\n"
+msgstr ""
+
+#: schedutils/ionice.c:114
+msgid ""
+" -n, --classdata <num> priority (0..7) in the specified scheduling class,\n"
+" only for the realtime and best-effort classes\n"
+msgstr ""
+
+#: schedutils/ionice.c:116
+msgid " -p, --pid <pid>... act on these already running processes\n"
+msgstr ""
+
+#: schedutils/ionice.c:117
+msgid " -P, --pgid <pgrp>... act on already running processes in these groups\n"
+msgstr ""
+
+#: schedutils/ionice.c:118
+#, fuzzy
+msgid " -t, --ignore ignore failures\n"
+msgstr " -s, --inverse 反向依赖\n"
+
+#: schedutils/ionice.c:119
+msgid " -u, --uid <uid>... act on already running processes owned by these users\n"
+msgstr ""
+
+#: schedutils/ionice.c:156
msgid "invalid class data argument"
msgstr "无效的类别数据参数"
-#: schedutils/ionice.c:154
+#: schedutils/ionice.c:162
msgid "invalid class argument"
msgstr "无效的类别参数"
-#: schedutils/ionice.c:159
+#: schedutils/ionice.c:167
#, c-format
msgid "unknown scheduling class: '%s'"
msgstr "未知的调度类别:“%s”"
-#: schedutils/ionice.c:183
+#: schedutils/ionice.c:175 schedutils/ionice.c:183 schedutils/ionice.c:191
+msgid "can handle only one of pid, pgid or uid at once"
+msgstr ""
+
+#: schedutils/ionice.c:184
+#, fuzzy
+msgid "invalid PGID argument"
+msgstr "无效的 PID 参数"
+
+#: schedutils/ionice.c:192
+#, fuzzy
+msgid "invalid UID argument"
+msgstr "无效的 TID 参数"
+
+#: schedutils/ionice.c:211
msgid "ignoring given class data for none class"
msgstr "将忽略为“无”类别指定的类别数据"
-#: schedutils/ionice.c:191
+#: schedutils/ionice.c:219
msgid "ignoring given class data for idle class"
msgstr "将忽略为“空闲”类别指定的类别数据"
-#: schedutils/ionice.c:196
+#: schedutils/ionice.c:224
#, c-format
msgid "unknown prio class %d"
msgstr "未知的优先级类别 %d"
@@ -10384,15 +9794,15 @@ msgstr "获取 pid %d 的亲缘失败"
msgid "failed to set pid %d's affinity"
msgstr "设置 pid %d 的亲缘失败"
-#: schedutils/taskset.c:184 sys-utils/chcpu.c:263
+#: schedutils/taskset.c:184 sys-utils/chcpu.c:286
msgid "cannot determine NR_CPUS; aborting"
msgstr "无法确定 NR_CPUS;将中止"
-#: schedutils/taskset.c:193 schedutils/taskset.c:206 sys-utils/chcpu.c:269
+#: schedutils/taskset.c:193 schedutils/taskset.c:206 sys-utils/chcpu.c:292
msgid "cpuset_alloc failed"
msgstr "cpuset_alloc 失败"
-#: schedutils/taskset.c:213 sys-utils/chcpu.c:209
+#: schedutils/taskset.c:213 sys-utils/chcpu.c:232
#, c-format
msgid "failed to parse CPU list: %s"
msgstr "解析 CPU 列表失败:%s"
@@ -10414,13 +9824,8 @@ msgstr ""
" -s, --secure 执行安全忽略\n"
" -v, --verbose 打印对齐的长度和偏移\n"
-#: sys-utils/blkdiscard.c:105 sys-utils/fstrim.c:106
-#: text-utils/hexsyntax.c:104
-msgid "failed to parse length"
-msgstr "解析长度失败"
-
-#: sys-utils/blkdiscard.c:109 sys-utils/fstrim.c:110 sys-utils/losetup.c:535
-#: text-utils/hexsyntax.c:111
+#: sys-utils/blkdiscard.c:109 sys-utils/fstrim.c:287 sys-utils/losetup.c:533
+#: text-utils/hexdump.c:124
msgid "failed to parse offset"
msgstr "解析偏移失败"
@@ -10428,8 +9833,8 @@ msgstr "解析偏移失败"
msgid "no device specified"
msgstr "未指定设备"
-#: sys-utils/blkdiscard.c:129 sys-utils/fallocate.c:147
-#: sys-utils/fsfreeze.c:118 sys-utils/fstrim.c:131
+#: sys-utils/blkdiscard.c:129 sys-utils/fallocate.c:353
+#: sys-utils/fsfreeze.c:118 sys-utils/fstrim.c:309
msgid "unexpected number of arguments"
msgstr "参数数量异常"
@@ -10459,137 +9864,137 @@ msgstr "%s:BLKDISCARD ioctl 失败"
msgid "%s: Discarded %<PRIu64> bytes from the offset %<PRIu64>\n"
msgstr "%1$s:已忽略从偏移 %3$<PRIu64> 位置开始的 %2$<PRIu64> 个字节\n"
-#: sys-utils/chcpu.c:79 sys-utils/chcpu.c:161
-#, c-format
-msgid "CPU %d does not exist\n"
+#: sys-utils/chcpu.c:87 sys-utils/chcpu.c:179
+#, fuzzy, c-format
+msgid "CPU %d does not exist"
msgstr "CPU %d 不存在\n"
-#: sys-utils/chcpu.c:83
-#, c-format
-msgid "CPU %d is not hot pluggable\n"
+#: sys-utils/chcpu.c:92
+#, fuzzy, c-format
+msgid "CPU %d is not hot pluggable"
msgstr "CPU %d 不可热插拔\n"
-#: sys-utils/chcpu.c:88
+#: sys-utils/chcpu.c:98
#, c-format
msgid "CPU %d is already enabled\n"
msgstr "CPU %d 已经启用\n"
-#: sys-utils/chcpu.c:92
+#: sys-utils/chcpu.c:102
#, c-format
msgid "CPU %d is already disabled\n"
msgstr "CPU %d 已经禁用\n"
-#: sys-utils/chcpu.c:100
+#: sys-utils/chcpu.c:110
#, c-format
msgid "CPU %d enable failed (CPU is deconfigured)"
msgstr "启用 CPU %d 失败(CPU 已解除配置)"
-#: sys-utils/chcpu.c:103
+#: sys-utils/chcpu.c:113
#, c-format
msgid "CPU %d enable failed"
msgstr "启用 CPU %d 失败"
-#: sys-utils/chcpu.c:105
+#: sys-utils/chcpu.c:116
#, c-format
msgid "CPU %d enabled\n"
msgstr "已启用 CPU %d\n"
-#: sys-utils/chcpu.c:108
-#, c-format
-msgid "CPU %d disable failed (last enabled CPU)\n"
+#: sys-utils/chcpu.c:119
+#, fuzzy, c-format
+msgid "CPU %d disable failed (last enabled CPU)"
msgstr "禁用 CPU %d 失败(上次启用的 CPU)\n"
-#: sys-utils/chcpu.c:114
+#: sys-utils/chcpu.c:125
#, c-format
msgid "CPU %d disable failed"
msgstr "禁用 CPU %d 失败"
-#: sys-utils/chcpu.c:116
+#: sys-utils/chcpu.c:128
#, c-format
msgid "CPU %d disabled\n"
msgstr "CPU %d 已禁用\n"
-#: sys-utils/chcpu.c:128
+#: sys-utils/chcpu.c:141
msgid "This system does not support rescanning of CPUs"
msgstr "该系统不支持重新扫描 CPU"
-#: sys-utils/chcpu.c:130
+#: sys-utils/chcpu.c:143
msgid "Failed to trigger rescan of CPUs"
msgstr "触发 CPU 重新扫描失败"
-#: sys-utils/chcpu.c:131
+#: sys-utils/chcpu.c:144
#, c-format
msgid "Triggered rescan of CPUs\n"
msgstr "已触发 CPU 重新扫描\n"
-#: sys-utils/chcpu.c:138
+#: sys-utils/chcpu.c:151
msgid "This system does not support setting the dispatching mode of CPUs"
msgstr "此系统不支持设置 CPU 分派模式(dispatching mode)"
-#: sys-utils/chcpu.c:142
+#: sys-utils/chcpu.c:155
msgid "Failed to set horizontal dispatch mode"
msgstr "设置水平分派模式失败"
-#: sys-utils/chcpu.c:143
+#: sys-utils/chcpu.c:156
#, c-format
msgid "Successfully set horizontal dispatching mode\n"
msgstr "成功设置了水平分派模式\n"
-#: sys-utils/chcpu.c:146
+#: sys-utils/chcpu.c:159
msgid "Failed to set vertical dispatch mode"
msgstr "设置竖直分派模式失败"
-#: sys-utils/chcpu.c:147
+#: sys-utils/chcpu.c:160
#, c-format
msgid "Successfully set vertical dispatching mode\n"
msgstr "成功设置了竖直分派模式\n"
-#: sys-utils/chcpu.c:165
-#, c-format
-msgid "CPU %d is not configurable\n"
+#: sys-utils/chcpu.c:184
+#, fuzzy, c-format
+msgid "CPU %d is not configurable"
msgstr "CPU %d 是不可配置的\n"
-#: sys-utils/chcpu.c:170
+#: sys-utils/chcpu.c:190
#, c-format
msgid "CPU %d is already configured\n"
msgstr "CPU %d 已经配置\n"
-#: sys-utils/chcpu.c:174
+#: sys-utils/chcpu.c:194
#, c-format
msgid "CPU %d is already deconfigured\n"
msgstr "CPU %d 已经解除配置\n"
-#: sys-utils/chcpu.c:179
-#, c-format
-msgid "CPU %d deconfigure failed (CPU is enabled)\n"
+#: sys-utils/chcpu.c:199
+#, fuzzy, c-format
+msgid "CPU %d deconfigure failed (CPU is enabled)"
msgstr "CPU %d 解除配置失败(CPU 已启用)\n"
-#: sys-utils/chcpu.c:186
+#: sys-utils/chcpu.c:206
#, c-format
msgid "CPU %d configure failed"
msgstr "CPU %d 配置失败"
-#: sys-utils/chcpu.c:188
+#: sys-utils/chcpu.c:209
#, c-format
msgid "CPU %d configured\n"
msgstr "CPU %d 已配置\n"
-#: sys-utils/chcpu.c:192
+#: sys-utils/chcpu.c:213
#, c-format
msgid "CPU %d deconfigure failed"
msgstr "CPU %d 解除配置失败"
-#: sys-utils/chcpu.c:194
+#: sys-utils/chcpu.c:216
#, c-format
msgid "CPU %d deconfigured\n"
msgstr "CPU %d 已解除配置\n"
-#: sys-utils/chcpu.c:208
+#: sys-utils/chcpu.c:231
#, c-format
msgid "invalid CPU number in CPU list: %s"
msgstr "CPU 列表中的 CPU 数量无效:%s"
-#: sys-utils/chcpu.c:215 text-utils/col.c:121
+#: sys-utils/chcpu.c:238 text-utils/col.c:121
#, c-format
msgid ""
"\n"
@@ -10600,7 +10005,7 @@ msgstr ""
"用法:\n"
" %s [选项]\n"
-#: sys-utils/chcpu.c:218
+#: sys-utils/chcpu.c:241
msgid ""
"\n"
"Options:\n"
@@ -10624,7 +10029,7 @@ msgstr ""
" -r, --rescan 触发重新扫描 cpu\n"
" -V, --version 输出版本信息并退出\n"
-#: sys-utils/chcpu.c:300
+#: sys-utils/chcpu.c:323
#, c-format
msgid "unsupported argument: %s"
msgstr "不支持的参数:%s"
@@ -10635,347 +10040,181 @@ msgid " %s <hard|soft>\n"
msgstr " %s <hard|soft>\n"
#: sys-utils/ctrlaltdel.c:56
-msgid "You must be root to set the Ctrl-Alt-Del behaviour"
+#, fuzzy
+msgid "You must be root to set the Ctrl-Alt-Del behavior"
msgstr "您必须以 root 用户身份来设置 Ctrl-Alt-Del 行为"
-#: sys-utils/cytune.c:92
-#, c-format
-msgid " %s [options] <tty> [...]\n"
-msgstr " %s [选项] <tty> [...]\n"
-
-#: sys-utils/cytune.c:94
-#, c-format
-msgid " -s, --set-threshold <num> set interruption threshold value\n"
-msgstr " -s, --set-threshold <数字> 设置中断阈值\n"
-
-#: sys-utils/cytune.c:95
-#, c-format
-msgid " -g, --get-threshold display current threshold value\n"
-msgstr " -g, --get-threshold 显示当前阈值\n"
-
-#: sys-utils/cytune.c:96
-#, c-format
-msgid " -S, --set-default-threshold <num> set default threshold value\n"
-msgstr " -S, --set-default-threshold <数字> 设置默认阈值\n"
-
-#: sys-utils/cytune.c:97
-#, c-format
-msgid " -t, --set-flush <num> set flush timeout to value\n"
-msgstr " -t, --set-flush <数字> 设置冲刷(flush)超时值\n"
-
-#: sys-utils/cytune.c:98
-#, c-format
-msgid " -G, --get-flush display default flush timeout value\n"
-msgstr " -G, --get-glush 显示默认冲刷超时\n"
-
-#: sys-utils/cytune.c:99
-#, c-format
-msgid " -T, --set-default-flush <num> set the default flush timeout to value\n"
-msgstr " -T, --set-default-flush <数字> 设置默认冲刷超时\n"
-
-#: sys-utils/cytune.c:100
-#, c-format
-msgid " -q, --stats display statistics about the tty\n"
-msgstr " -q, --stats 显示 tty 统计信息\n"
-
-#: sys-utils/cytune.c:101
-#, c-format
-msgid " -i, --interval <seconds> gather statistics every <seconds> interval\n"
-msgstr " -i, --interval <秒数> 每隔这些 <秒数> 收集一次统计\n"
-
-#: sys-utils/cytune.c:132
-#, c-format
-msgid ""
-"File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
-"and the maximum transfer rate in characters/second was %f"
-msgstr ""
-"文件 %s,对应阈值 %lu,fifo 中的最大字符数为 %d,\n"
-"最大传输速度(字节/秒)为 %f"
-
-#: sys-utils/cytune.c:141
-#, c-format
-msgid ""
-"File %s, For threshold value %lu and timeout value %lu, Maximum characters in fifo were %d,\n"
-"and the maximum transfer rate in characters/second was %f"
-msgstr ""
-"文件 %s,对应阈值 %lu 和超时 %lu,fifo 中的最大字符数为 %d,\n"
-"最大传输速度(字节/秒)为 %f"
-
-#: sys-utils/cytune.c:172 sys-utils/cytune.c:196 sys-utils/dmesg.c:482
-msgid "gettimeofday failed"
-msgstr "gettimeofday 失败"
-
-#: sys-utils/cytune.c:181 sys-utils/cytune.c:204
-#, c-format
-msgid "cannot issue CYGETMON on %s"
-msgstr "无法对 %s 实施 CYGETMON 命令"
-
-#: sys-utils/cytune.c:186 sys-utils/cytune.c:209 sys-utils/cytune.c:439
-#, c-format
-msgid "cannot get threshold for %s"
-msgstr "无法获取 %s 的阈值"
-
-#: sys-utils/cytune.c:189 sys-utils/cytune.c:214 sys-utils/cytune.c:444
-#, c-format
-msgid "cannot get timeout for %s"
-msgstr "无法获取 %s 的超时"
-
-#: sys-utils/cytune.c:247
-#, c-format
-msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-
-#: sys-utils/cytune.c:253
-#, c-format
-msgid " %f int/sec; %f rec, %f send (char/sec)\n"
-msgstr " %f int/秒; %f rec, %f 发送 (char/秒)\n"
-
-#: sys-utils/cytune.c:256
-#, c-format
-msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-
-#: sys-utils/cytune.c:261
-#, c-format
-msgid " %f int/sec; %f rec (char/sec)\n"
-msgstr " %f int/秒; %f rec (char/秒)\n"
-
-#: sys-utils/cytune.c:326
-msgid "Invalid interval value"
-msgstr "无效的间隔值"
-
-#: sys-utils/cytune.c:328
-#, c-format
-msgid "Invalid interval value: %d"
-msgstr "无效的间隔值:%d"
-
-#: sys-utils/cytune.c:335
-msgid "Invalid set value"
-msgstr "无效的设置值"
-
-#: sys-utils/cytune.c:337
-#, c-format
-msgid "Invalid set value: %d"
-msgstr "无效的设置值:%d"
-
-#: sys-utils/cytune.c:344
-msgid "Invalid default value"
-msgstr "无效的默认值"
-
-#: sys-utils/cytune.c:346
-#, c-format
-msgid "Invalid default value: %d"
-msgstr "无效的默认值:%d"
-
-#: sys-utils/cytune.c:354
-msgid "Invalid set time value"
-msgstr "无效的设置时间值"
-
-#: sys-utils/cytune.c:356
-#, c-format
-msgid "Invalid set time value: %d"
-msgstr "无效的设置时间值:%d"
-
-#: sys-utils/cytune.c:364
-msgid "Invalid default time value"
-msgstr "无效的默认时间值"
-
-#: sys-utils/cytune.c:366
-#, c-format
-msgid "Invalid default time value: %d"
-msgstr "无效的默认时间值:%d"
-
-#: sys-utils/cytune.c:409
-#, c-format
-msgid "cannot set %s to threshold %d"
-msgstr "无法将 %s 设置为阈值 %d"
-
-#: sys-utils/cytune.c:423
-#, c-format
-msgid "cannot set %s to time threshold %d"
-msgstr "无法将 %s 设置为时间阈值 %d"
-
-#: sys-utils/cytune.c:447
-#, c-format
-msgid "%s: %ld current threshold and %ld current timeout\n"
-msgstr "%s:%ld 的当前阈值和 %ld 的当前超时\n"
-
-#: sys-utils/cytune.c:450
-#, c-format
-msgid "%s: %ld default threshold and %ld default timeout\n"
-msgstr "%s:%ld 的默认阈值和 %ld 的默认超时\n"
-
-#: sys-utils/dmesg.c:86
+#: sys-utils/dmesg.c:108
msgid "system is unusable"
msgstr "系统无法使用"
-#: sys-utils/dmesg.c:87
+#: sys-utils/dmesg.c:109
msgid "action must be taken immediately"
msgstr "操作必须立即执行"
-#: sys-utils/dmesg.c:88
+#: sys-utils/dmesg.c:110
msgid "critical conditions"
msgstr "紧急条件"
-#: sys-utils/dmesg.c:89
+#: sys-utils/dmesg.c:111
msgid "error conditions"
msgstr "错误条件"
-#: sys-utils/dmesg.c:90
+#: sys-utils/dmesg.c:112
msgid "warning conditions"
msgstr "警告条件"
-#: sys-utils/dmesg.c:91
+#: sys-utils/dmesg.c:113
msgid "normal but significant condition"
msgstr "正常但重要的条件"
-#: sys-utils/dmesg.c:92
+#: sys-utils/dmesg.c:114
msgid "informational"
msgstr "信息"
-#: sys-utils/dmesg.c:93
+#: sys-utils/dmesg.c:115
msgid "debug-level messages"
msgstr "调试级别的消息"
-#: sys-utils/dmesg.c:107
+#: sys-utils/dmesg.c:129
msgid "kernel messages"
msgstr "内核消息"
-#: sys-utils/dmesg.c:108
+#: sys-utils/dmesg.c:130
msgid "random user-level messages"
msgstr "随机的用户级消息"
-#: sys-utils/dmesg.c:109
+#: sys-utils/dmesg.c:131
msgid "mail system"
msgstr "邮件系统"
-#: sys-utils/dmesg.c:110
+#: sys-utils/dmesg.c:132
msgid "system daemons"
msgstr "系统守护进程"
-#: sys-utils/dmesg.c:111
+#: sys-utils/dmesg.c:133
msgid "security/authorization messages"
msgstr "安全/认证消息"
-#: sys-utils/dmesg.c:112
+#: sys-utils/dmesg.c:134
msgid "messages generated internally by syslogd"
msgstr "syslogd 内部生成的消息"
-#: sys-utils/dmesg.c:113
+#: sys-utils/dmesg.c:135
msgid "line printer subsystem"
msgstr "行打印机子系统"
-#: sys-utils/dmesg.c:114
+#: sys-utils/dmesg.c:136
msgid "network news subsystem"
msgstr "网络新闻子系统"
-#: sys-utils/dmesg.c:115
+#: sys-utils/dmesg.c:137
msgid "UUCP subsystem"
msgstr "UUCP 子系统"
-#: sys-utils/dmesg.c:116
+#: sys-utils/dmesg.c:138
msgid "clock daemon"
msgstr "时钟守护进程"
-#: sys-utils/dmesg.c:117
+#: sys-utils/dmesg.c:139
msgid "security/authorization messages (private)"
msgstr "安全/认证消息(私有)"
-#: sys-utils/dmesg.c:118
+#: sys-utils/dmesg.c:140
msgid "FTP daemon"
msgstr "ftp 守护进程"
-#: sys-utils/dmesg.c:238
+#: sys-utils/dmesg.c:263
msgid " -C, --clear clear the kernel ring buffer\n"
msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n"
-#: sys-utils/dmesg.c:239
+#: sys-utils/dmesg.c:264
msgid " -c, --read-clear read and clear all messages\n"
msgstr " -c, --read-clear 读取并清除所有消息\n"
-#: sys-utils/dmesg.c:240
+#: sys-utils/dmesg.c:265
msgid " -D, --console-off disable printing messages to console\n"
msgstr " -D, --console-off 禁止向终端打印消息\n"
-#: sys-utils/dmesg.c:241
+#: sys-utils/dmesg.c:266
msgid " -E, --console-on enable printing messages to console\n"
msgstr " -E, --console-on 启用向终端打印消息\n"
-#: sys-utils/dmesg.c:242
+#: sys-utils/dmesg.c:267
msgid " -F, --file <file> use the file instead of the kernel log buffer\n"
msgstr " -F, --file <文件> 用 文件 代替内核日志缓冲区\n"
-#: sys-utils/dmesg.c:243
+#: sys-utils/dmesg.c:268
msgid " -f, --facility <list> restrict output to defined facilities\n"
msgstr " -f, --facility <列表> 将输出限制为定义的设施\n"
-#: sys-utils/dmesg.c:244
+#: sys-utils/dmesg.c:269
msgid " -H, --human human readable output\n"
msgstr " -H, --human 易读格式输出\n"
-#: sys-utils/dmesg.c:245
+#: sys-utils/dmesg.c:270
msgid " -k, --kernel display kernel messages\n"
msgstr " -k, --kernel 显示内核消息\n"
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:271
msgid " -L, --color[=<when>] colorize messages (auto, always or never)\n"
msgstr ""
" -L, --color[=<何时>] 彩色显示消息,auto(自动), always(总是)或\n"
" never(从不)\n"
-#: sys-utils/dmesg.c:247
+#: sys-utils/dmesg.c:272
msgid " -l, --level <list> restrict output to defined levels\n"
msgstr " -l, --level <列表> 限制输出级别\n"
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:273
msgid " -n, --console-level <level> set level of messages printed to console\n"
msgstr " -n, --console-level <级别> 设置打印到终端的消息级别\n"
-#: sys-utils/dmesg.c:249
+#: sys-utils/dmesg.c:274
msgid " -P, --nopager do not pipe output into a pager\n"
msgstr " -P, --nopager 不将输出通过管道传递给分页程序\n"
-#: sys-utils/dmesg.c:250
+#: sys-utils/dmesg.c:275
msgid " -r, --raw print the raw message buffer\n"
msgstr " -r, --raw 打印原生消息缓冲区\n"
-#: sys-utils/dmesg.c:251
+#: sys-utils/dmesg.c:276
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:252
+#: sys-utils/dmesg.c:277
msgid " -s, --buffer-size <size> buffer size to query the kernel ring buffer\n"
msgstr " -s, --buffer-size <大小> 查询内核环形缓冲区所用的缓冲区大小\n"
-#: sys-utils/dmesg.c:253
+#: sys-utils/dmesg.c:278
msgid " -u, --userspace display userspace messages\n"
msgstr " -u, --userspace 显示用户空间消息\n"
-#: sys-utils/dmesg.c:254
+#: sys-utils/dmesg.c:279
msgid " -w, --follow wait for new messages\n"
msgstr " -w, --follow 等待新消息\n"
-#: sys-utils/dmesg.c:255
+#: sys-utils/dmesg.c:280
msgid " -x, --decode decode facility and level to readable string\n"
msgstr " -x, --decode 将设施和级别解码为可读的字符串\n"
-#: sys-utils/dmesg.c:256
+#: sys-utils/dmesg.c:281
msgid " -d, --show-delta show time delta between printed messages\n"
msgstr " -d, --show-delta 显示打印消息之间的时间差\n"
-#: sys-utils/dmesg.c:257
+#: sys-utils/dmesg.c:282
msgid " -e, --reltime show local time and time delta in readable format\n"
msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n"
-#: sys-utils/dmesg.c:258
+#: sys-utils/dmesg.c:283
msgid " -T, --ctime show human readable timestamp\n"
msgstr " -T, --ctime 显示易读的时间戳\n"
-#: sys-utils/dmesg.c:259
+#: sys-utils/dmesg.c:284
msgid " -t, --notime don't print messages timestamp\n"
msgstr " -t, --notime 不打印消息时间戳\n"
-#: sys-utils/dmesg.c:260
+#: sys-utils/dmesg.c:285
msgid ""
" --time-format <format> show time stamp using format:\n"
" [delta|reltime|ctime|notime|iso]\n"
@@ -10985,7 +10224,7 @@ msgstr ""
" [delta|reltime|ctime|notime|iso]\n"
"挂起/恢复会使 ctime 和 iso 时间戳不精确。\n"
-#: sys-utils/dmesg.c:266
+#: sys-utils/dmesg.c:291
msgid ""
"\n"
"Supported log facilities:\n"
@@ -10993,7 +10232,7 @@ msgstr ""
"\n"
"支持的日志设施:\n"
-#: sys-utils/dmesg.c:272
+#: sys-utils/dmesg.c:297
msgid ""
"\n"
"Supported log levels (priorities):\n"
@@ -11001,56 +10240,53 @@ msgstr ""
"\n"
"支持的日志级别(优先级):\n"
-#: sys-utils/dmesg.c:326
+#: sys-utils/dmesg.c:351
#, c-format
msgid "failed to parse level '%s'"
msgstr "解析级别“%s”失败"
-#: sys-utils/dmesg.c:328
+#: sys-utils/dmesg.c:353
#, c-format
msgid "unknown level '%s'"
msgstr "未知级别“%s”"
-#: sys-utils/dmesg.c:364
+#: sys-utils/dmesg.c:389
#, c-format
msgid "failed to parse facility '%s'"
msgstr "解析设施“%s”失败"
-#: sys-utils/dmesg.c:366
+#: sys-utils/dmesg.c:391
#, c-format
msgid "unknown facility '%s'"
msgstr "未知设施“%s”"
-#: sys-utils/dmesg.c:495
-msgid "sysinfo failed"
-msgstr "sysinfo 失败"
-
-#: sys-utils/dmesg.c:521
+#: sys-utils/dmesg.c:519
#, c-format
msgid "cannot mmap: %s"
msgstr "无法 mmap:%s"
-#: sys-utils/dmesg.c:1311
+#: sys-utils/dmesg.c:1317
msgid "invalid buffer size argument"
msgstr "无效的 缓冲区大小 参数"
-#: sys-utils/dmesg.c:1368
+#: sys-utils/dmesg.c:1374
msgid "--show-delta is ignored when used together with iso8601 time format"
msgstr "--show-delta 与 iso8601 时间格式共用时将忽略"
-#: sys-utils/dmesg.c:1377
-msgid "--raw can't be used together with level, facility, decode, delta, ctime or notime options"
+#: sys-utils/dmesg.c:1397
+#, fuzzy
+msgid "--raw could be used together with --level or --facility only when read messages from /dev/kmsg"
msgstr "--raw 不能与 level, facility, decode, delta, ctime 或 notime 选项同时使用"
-#: sys-utils/dmesg.c:1400
+#: sys-utils/dmesg.c:1407
msgid "read kernel buffer failed"
msgstr "读取内核缓冲区失败"
-#: sys-utils/dmesg.c:1413
+#: sys-utils/dmesg.c:1420
msgid "unsupported command"
msgstr "不支持的命令"
-#: sys-utils/dmesg.c:1419
+#: sys-utils/dmesg.c:1426
msgid "klogctl failed"
msgstr "klogctl 失败"
@@ -11275,7 +10511,7 @@ 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:405 sys-utils/umount.c:428
+#: sys-utils/umount.c:407 sys-utils/umount.c:430
#, c-format
msgid "%s: not mounted"
msgstr "%s:未挂载"
@@ -11396,47 +10632,83 @@ msgstr "磁带离线命令失败"
msgid "unable to eject"
msgstr "无法弹出"
-#: sys-utils/fallocate.c:60
+#: sys-utils/fallocate.c:76
#, c-format
msgid " %s [options] <filename>\n"
msgstr " %s [选项] <文件名>\n"
-#: sys-utils/fallocate.c:62
-msgid ""
-" -n, --keep-size don't modify the length of the file\n"
-" -p, --punch-hole punch holes in the file\n"
-" -o, --offset <num> offset of the allocation, in bytes\n"
-" -l, --length <num> length of the allocation, in bytes\n"
+#: sys-utils/fallocate.c:78
+msgid " -c, --collapse-range collapse space in the file\n"
msgstr ""
-" -n, --keep-size 不修改文件长度\n"
-" -p, --punch-hole 在文件中留出空洞\n"
-" -o, --offset <数字> 分配的偏移(字节数)\n"
-" -l, --length <数字> 分配的长度(字节数)\n"
-#: sys-utils/fallocate.c:136
-msgid "no length argument specified"
-msgstr "没有指定长度参数"
+#: sys-utils/fallocate.c:79
+#, fuzzy
+msgid " -d, --dig-holes detect and dig holes\n"
+msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
+
+#: sys-utils/fallocate.c:80
+msgid " -l, --length <num> length of the (de)allocation, in bytes\n"
+msgstr ""
-#: sys-utils/fallocate.c:138
+#: sys-utils/fallocate.c:81
+#, fuzzy
+msgid " -n, --keep-size don't modify the length of the file\n"
+msgstr " -R, --nohostname 不显示主机名字段\n"
+
+#: sys-utils/fallocate.c:82
+msgid " -o, --offset <num> offset of the (de)allocation, in bytes\n"
+msgstr ""
+
+#: sys-utils/fallocate.c:83
+msgid " -p, --punch-hole punch holes in the file\n"
+msgstr ""
+
+#: sys-utils/fallocate.c:84
+msgid " -z, --zero-range zeroes a range in the file\n"
+msgstr ""
+
+#: sys-utils/fallocate.c:119
+msgid "keep size mode (-n option) unsupported"
+msgstr "不支持保持大小模式(-n 选项)"
+
+#: sys-utils/fallocate.c:120
+#, fuzzy
+msgid "fallocate failed"
+msgstr "%s:fallocate 失败"
+
+#: sys-utils/fallocate.c:210
+#, c-format
+msgid "%s: read failed"
+msgstr "%s:read 失败"
+
+#: sys-utils/fallocate.c:256
+#, c-format
+msgid "%s: %s (%ju bytes) converted to sparse holes.\n"
+msgstr ""
+
+#: sys-utils/fallocate.c:331
+msgid "Can't use other modes with --dig-holes"
+msgstr ""
+
+#: sys-utils/fallocate.c:335 sys-utils/fallocate.c:340
msgid "invalid length value specified"
msgstr "指定的长度值无效"
-#: sys-utils/fallocate.c:140
+#: sys-utils/fallocate.c:338
+msgid "no length argument specified"
+msgstr "没有指定长度参数"
+
+#: sys-utils/fallocate.c:343
msgid "invalid offset value specified"
msgstr "指定的偏移值无效"
-#: sys-utils/fallocate.c:142
+#: sys-utils/fallocate.c:345
msgid "no filename specified."
msgstr "未指定文件名。"
-#: sys-utils/fallocate.c:167
-msgid "keep size mode (-n option) unsupported"
-msgstr "不支持保持大小模式(-n 选项)"
-
-#: sys-utils/fallocate.c:168
-#, c-format
-msgid "%s: fallocate failed"
-msgstr "%s:fallocate 失败"
+#: sys-utils/fallocate.c:347
+msgid "only -n mode can be used with --zero-range"
+msgstr ""
#: sys-utils/flock.c:52
#, c-format
@@ -11507,10 +10779,6 @@ msgstr "%s 需要惟一的命令行参数"
msgid "requires file descriptor, file or directory"
msgstr "需要文件描述符、文件或目录"
-#: sys-utils/flock.c:309 sys-utils/swapon.c:303 sys-utils/unshare.c:141
-msgid "waitpid failed"
-msgstr "waitpid 失败"
-
#: sys-utils/fsfreeze.c:50
#, c-format
msgid " %s [options] <mountpoint>\n"
@@ -11547,61 +10815,82 @@ msgstr "%s:冻结失败"
msgid "%s: unfreeze failed"
msgstr "%s:解冻失败"
-#: sys-utils/fstrim.c:58
-#, c-format
-msgid " %s [options] <mount point>\n"
-msgstr " %s [选项] <挂臷点>\n"
-
-#: sys-utils/fstrim.c:60
-msgid ""
-" -o, --offset <num> offset in bytes to discard from\n"
-" -l, --length <num> length of bytes to discard from the offset\n"
-" -m, --minimum <num> minimum extent length to discard\n"
-" -v, --verbose print number of discarded bytes\n"
-msgstr ""
-" -o, --offset <数字> 要丢弃内容的起始偏移量\n"
-" -l, --length <数字> 从偏移量开始的丢弃长度\n"
-" -m, --minimum <数字> 要丢弃的最小范围长度\n"
-" -v, --verbose 打印丢弃字节的长度\n"
-
-#: sys-utils/fstrim.c:114
-msgid "failed to parse minimum extent length"
-msgstr "解析 最小范围长度 失败"
-
-#: sys-utils/fstrim.c:126
-msgid "no mountpoint specified"
-msgstr "未指定挂载点"
-
-#: sys-utils/fstrim.c:138 sys-utils/mountpoint.c:197
+#: sys-utils/fstrim.c:75 sys-utils/mountpoint.c:197
#, c-format
msgid "%s: not a directory"
msgstr "%s:不是一个目录"
-#: sys-utils/fstrim.c:145
+#: sys-utils/fstrim.c:89
#, c-format
msgid "%s: FITRIM ioctl failed"
msgstr "%s:FITRIM ioctl 失败"
#. TRANSLATORS: The standard value here is a very large number.
-#: sys-utils/fstrim.c:152
+#: sys-utils/fstrim.c:99
#, c-format
msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgstr "%s:%s (%<PRIu64> 字节) 已修剪\n"
-#: sys-utils/hwclock.c:226
+#: sys-utils/fstrim.c:174 sys-utils/swapon.c:627 sys-utils/umount.c:327
+#, c-format
+msgid "failed to parse %s"
+msgstr "解析 %s 失败"
+
+#: sys-utils/fstrim.c:230
+#, c-format
+msgid " %s [options] <mount point>\n"
+msgstr " %s [选项] <挂臷点>\n"
+
+#: sys-utils/fstrim.c:232
+#, fuzzy
+msgid " -a, --all trim all mounted filesystems that are supported\n"
+msgstr " -a, --all 卸载所有文件系统\n"
+
+#: sys-utils/fstrim.c:233
+msgid " -o, --offset <num> the offset in bytes to start discarding from\n"
+msgstr ""
+
+#: sys-utils/fstrim.c:234
+#, fuzzy
+msgid " -l, --length <num> the number of bytes to discard\n"
+msgstr " -c, --cylinders <数字> 设置要使用的柱面数\n"
+
+#: sys-utils/fstrim.c:235
+msgid " -m, --minimum <num> the minimum extent length to discard\n"
+msgstr ""
+
+#: sys-utils/fstrim.c:236
+#, fuzzy
+msgid " -v, --verbose print number of discarded bytes\n"
+msgstr " -v, --verbose 打印详细信息\n"
+
+#: sys-utils/fstrim.c:291
+msgid "failed to parse minimum extent length"
+msgstr "解析 最小范围长度 失败"
+
+#: sys-utils/fstrim.c:304
+msgid "no mountpoint specified"
+msgstr "未指定挂载点"
+
+#: sys-utils/fstrim.c:318
+#, fuzzy, c-format
+msgid "%s: discard operation not supported."
+msgstr "不支持交换空间版本 %d"
+
+#: sys-utils/hwclock.c:231
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "将假设硬件时钟保持为 %s 时间。\n"
-#: sys-utils/hwclock.c:227 sys-utils/hwclock.c:317
+#: sys-utils/hwclock.c:232 sys-utils/hwclock.c:322
msgid "UTC"
msgstr "UTC"
-#: sys-utils/hwclock.c:227 sys-utils/hwclock.c:316
+#: sys-utils/hwclock.c:232 sys-utils/hwclock.c:321
msgid "local"
msgstr "当地"
-#: sys-utils/hwclock.c:301
+#: sys-utils/hwclock.c:306
msgid ""
"Warning: unrecognized third line in adjtime file\n"
"(Expected: `UTC' or `LOCAL' or nothing.)"
@@ -11609,88 +10898,106 @@ msgstr ""
"警告:adjtime 文件第三行无法识别\n"
"(应为:“UTC”或“LOCAL”或空)"
-#: sys-utils/hwclock.c:310
+#: sys-utils/hwclock.c:315
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "上次漂移调整完成于1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:312
+#: sys-utils/hwclock.c:317
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "上次校准完成于1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:314
+#: sys-utils/hwclock.c:319
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "硬件时钟为 %s 时间\n"
-#: sys-utils/hwclock.c:341
+#: sys-utils/hwclock.c:346
#, c-format
msgid "Waiting for clock tick...\n"
msgstr "正在等等时钟滴答...\n"
-#: sys-utils/hwclock.c:347
+#: sys-utils/hwclock.c:352
#, c-format
msgid "...synchronization failed\n"
msgstr "...同步失败\n"
-#: sys-utils/hwclock.c:349
+#: sys-utils/hwclock.c:354
#, c-format
msgid "...got clock tick\n"
msgstr "...已获取时钟滴答\n"
-#: sys-utils/hwclock.c:412
+#: sys-utils/hwclock.c:417
#, 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:421
+#: sys-utils/hwclock.c:426
#, 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:455
+#: sys-utils/hwclock.c:460
#, 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:483
+#: sys-utils/hwclock.c:488
#, 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:489
+#: sys-utils/hwclock.c:494
#, c-format
msgid "Clock not changed - testing only.\n"
msgstr "时钟未更改 - 纯测试。\n"
-#: sys-utils/hwclock.c:547
+#: sys-utils/hwclock.c:598
+#, c-format
+msgid "sleeping ~%d usec\n"
+msgstr ""
+
+#: sys-utils/hwclock.c:609
+#, c-format
+msgid "time jumped backward %.6f seconds to %ld.%06d - retargeting\n"
+msgstr ""
+
+#: sys-utils/hwclock.c:617
+#, c-format
+msgid "%ld.%06d < %ld.%06d (%.6f)\n"
+msgstr ""
+
+#: sys-utils/hwclock.c:633
+#, c-format
+msgid "missed it - %ld.%06d is too far past %ld.%06d (%.6f > %.6f)\n"
+msgstr ""
+
+#: sys-utils/hwclock.c:661
#, c-format
msgid ""
-"Time elapsed since reference time has been %.6f seconds.\n"
-"Delaying further to reach the new time.\n"
+"%ld.%06d is close enough to %ld.%06d (%.6f < %.6f)\n"
+"Set RTC to %ld (%ld + %d; refsystime = %ld.%06d)\n"
msgstr ""
-"时间从参考时刻起已流逝 %.6f 秒。\n"
-"将延迟更长时间来到达新时间。\n"
-#: sys-utils/hwclock.c:583
+#: sys-utils/hwclock.c:686
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:593
+#: sys-utils/hwclock.c:696
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f 秒\n"
-#: sys-utils/hwclock.c:624
+#: sys-utils/hwclock.c:727
msgid "No --date option specified."
msgstr "未指定 --date 选项。"
-#: sys-utils/hwclock.c:630
+#: sys-utils/hwclock.c:733
msgid "--date argument too long"
msgstr "--date 的参数过长"
-#: sys-utils/hwclock.c:637
+#: sys-utils/hwclock.c:740
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks."
@@ -11698,21 +11005,21 @@ msgstr ""
"--date 选项的参数不是有效的日期。\n"
"具体说,它包含了引号。"
-#: sys-utils/hwclock.c:645
+#: sys-utils/hwclock.c:748
#, c-format
msgid "Issuing date command: %s\n"
msgstr "正在发出 date 命令:%s\n"
-#: sys-utils/hwclock.c:649
+#: sys-utils/hwclock.c:752
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr "无法在 /bin/sh shell 中运行“date”程序。popen() 失败"
-#: sys-utils/hwclock.c:657
+#: sys-utils/hwclock.c:760
#, c-format
msgid "response from date command = %s\n"
msgstr "date 命令的响应为 %s\n"
-#: sys-utils/hwclock.c:659
+#: sys-utils/hwclock.c:762
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -11727,7 +11034,7 @@ msgstr ""
"响应为:\n"
" %s"
-#: sys-utils/hwclock.c:670
+#: sys-utils/hwclock.c:773
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
@@ -11742,59 +11049,59 @@ msgstr ""
"响应为:\n"
" %s\n"
-#: sys-utils/hwclock.c:682
+#: sys-utils/hwclock.c:785
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "数据字符串 %s 等价于 1969年后 %ld 秒。\n"
-#: sys-utils/hwclock.c:714
+#: sys-utils/hwclock.c:817
msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it."
msgstr "硬件时钟不包含有效时间,因此无法从它来设置系统时间。"
-#: sys-utils/hwclock.c:736 sys-utils/hwclock.c:816
+#: sys-utils/hwclock.c:839 sys-utils/hwclock.c:919
#, c-format
msgid "Calling settimeofday:\n"
msgstr "正在调用 settimeofday:\n"
-#: sys-utils/hwclock.c:737 sys-utils/hwclock.c:818
+#: sys-utils/hwclock.c:840 sys-utils/hwclock.c:921
#, 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:739 sys-utils/hwclock.c:820
+#: sys-utils/hwclock.c:842 sys-utils/hwclock.c:923
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: sys-utils/hwclock.c:743 sys-utils/hwclock.c:824
+#: sys-utils/hwclock.c:846 sys-utils/hwclock.c:927
#, c-format
msgid "Not setting system clock because running in test mode.\n"
msgstr "将不设置系统时钟,因为正以测试方式运行。\n"
-#: sys-utils/hwclock.c:752 sys-utils/hwclock.c:848
+#: sys-utils/hwclock.c:855 sys-utils/hwclock.c:951
msgid "Must be superuser to set system clock."
msgstr "只能以超级用户身份来设置系统时钟。"
-#: sys-utils/hwclock.c:755 sys-utils/hwclock.c:851
+#: sys-utils/hwclock.c:858 sys-utils/hwclock.c:954
msgid "settimeofday() failed"
msgstr "settimeofday() 失败"
-#: sys-utils/hwclock.c:791
+#: sys-utils/hwclock.c:894
#, c-format
msgid "Current system time: %ld = %s\n"
msgstr "当前系统时间:%ld = %s\n"
-#: sys-utils/hwclock.c:817
+#: sys-utils/hwclock.c:920
#, c-format
msgid "\tUTC: %s\n"
msgstr "\tUTC:%s\n"
-#: sys-utils/hwclock.c:880
+#: sys-utils/hwclock.c:983
#, c-format
msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
msgstr "将不调整漂移系数,因为之前硬件时钟包含垃圾内容。\n"
-#: sys-utils/hwclock.c:885
+#: sys-utils/hwclock.c:988
#, c-format
msgid ""
"Not adjusting drift factor because last calibration time is zero,\n"
@@ -11803,34 +11110,41 @@ msgstr ""
"将不调整漂移系数,因为上次校准时间为零,\n"
"历史有问题;需要启动校准。\n"
-#: sys-utils/hwclock.c:891
+#: 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"
msgstr "将不调整漂移系数,因为从上次校准还不到一天。\n"
-#: sys-utils/hwclock.c:939
+#: sys-utils/hwclock.c:1047
+#, c-format
+msgid ""
+"Clock drift factor was calculated as %f seconds/day.\n"
+"It is far too much. Resetting to zero.\n"
+msgstr ""
+
+#: sys-utils/hwclock.c:1054
#, c-format
msgid ""
"Clock drifted %.1f seconds in the past %d seconds 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:985
+#: sys-utils/hwclock.c:1101
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "时间自上次调整过去了 %d 秒\n"
-#: sys-utils/hwclock.c:987
+#: sys-utils/hwclock.c:1103
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr "需要插入 %d 秒并将时间往回指 %.6f 秒\n"
-#: sys-utils/hwclock.c:1017
+#: sys-utils/hwclock.c:1133
#, c-format
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "将不更新 adjtime 文件,因为正以测试方式运行。\n"
-#: sys-utils/hwclock.c:1018
+#: sys-utils/hwclock.c:1134
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -11839,55 +11153,55 @@ msgstr ""
"若执行,将向 %s 写入以下内容:\n"
"%s"
-#: sys-utils/hwclock.c:1027
+#: sys-utils/hwclock.c:1143
#, c-format
msgid "Could not open file with the clock adjustment parameters in it (%s) for writing"
msgstr "无法打开包含时钟调整参数(%s)的文件来写入"
-#: sys-utils/hwclock.c:1033 sys-utils/hwclock.c:1040
+#: sys-utils/hwclock.c:1149 sys-utils/hwclock.c:1156
#, c-format
msgid "Could not update file with the clock adjustment parameters (%s) in it"
msgstr "无法更新包含时钟调整参数(%s)的文件"
-#: sys-utils/hwclock.c:1048
+#: sys-utils/hwclock.c:1164
msgid "Drift adjustment parameters not updated."
msgstr "漂移调整参数未更新。"
-#: sys-utils/hwclock.c:1087
+#: sys-utils/hwclock.c:1203
msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it."
msgstr "硬件时间不包含有效时间,程序无法调整它。"
-#: sys-utils/hwclock.c:1096
-#, c-format
-msgid "Not setting clock because last adjustment time is zero, so history is bad."
+#: sys-utils/hwclock.c:1211
+#, fuzzy, c-format
+msgid "Not setting clock because last adjustment time is zero, so history is bad.\n"
msgstr "将不设置时钟,因为上次调整时间为零,历史有误。"
-#: sys-utils/hwclock.c:1118
+#: sys-utils/hwclock.c:1215
+#, fuzzy, c-format
+msgid "Not setting clock because drift factor %f is far too high.\n"
+msgstr "将不设置时钟,因为上次调整时间为零,历史有误。"
+
+#: sys-utils/hwclock.c:1237
#, c-format
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr "需要的调整不到一秒,将不设置时钟。\n"
-#: sys-utils/hwclock.c:1143
-#, c-format
-msgid "Using %s.\n"
-msgstr "将使用 %s。\n"
-
-#: sys-utils/hwclock.c:1145
+#: sys-utils/hwclock.c:1264
#, c-format
msgid "No usable clock interface found.\n"
msgstr "未找到可用的时钟接口。\n"
-#: sys-utils/hwclock.c:1274 sys-utils/hwclock.c:1280
+#: sys-utils/hwclock.c:1393 sys-utils/hwclock.c:1399
#, c-format
msgid "Unable to set system clock.\n"
msgstr "无法设置系统时钟。\n"
-#: sys-utils/hwclock.c:1293
+#: sys-utils/hwclock.c:1412
#, 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:1322
+#: sys-utils/hwclock.c:1441
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"
@@ -11897,34 +11211,34 @@ msgstr ""
"这版 hwclock 程序不是为 Alpha 计算机编译的(因此目前也不打算在 Alpha\n"
" 计算机上运行)。未执行任何操作。"
-#: sys-utils/hwclock.c:1339
+#: sys-utils/hwclock.c:1458
msgid "Unable to get the epoch value from the kernel."
msgstr "无法从内核获取纪元(epoch)值。"
-#: sys-utils/hwclock.c:1341
+#: sys-utils/hwclock.c:1460
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "内核假设纪元(epoch)值为 %lu\n"
-#: sys-utils/hwclock.c:1346
+#: sys-utils/hwclock.c:1465
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:1350
+#: sys-utils/hwclock.c:1469
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "不会将纪元(epoch)设置为 %d - 纯测试。\n"
-#: sys-utils/hwclock.c:1354
+#: sys-utils/hwclock.c:1473
#, c-format
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "无法设置内核中的纪元(epoch)值。\n"
-#: sys-utils/hwclock.c:1443
+#: sys-utils/hwclock.c:1562
msgid " hwclock [function] [option...]\n"
msgstr " hwclock [功能] [选项...]\n"
-#: sys-utils/hwclock.c:1445
+#: sys-utils/hwclock.c:1564
msgid ""
"\n"
"Functions:\n"
@@ -11932,7 +11246,7 @@ msgstr ""
"\n"
"功能:\n"
-#: sys-utils/hwclock.c:1446
+#: sys-utils/hwclock.c:1565
msgid ""
" -h, --help show this help text and exit\n"
" -r, --show read hardware clock and print result\n"
@@ -11942,7 +11256,7 @@ msgstr ""
" -r, --show 读取硬件时钟并打印结果\n"
" --set 将 RTC 设置为 --date 指定的时间\n"
-#: sys-utils/hwclock.c:1449
+#: sys-utils/hwclock.c:1568
msgid ""
" -s, --hctosys set the system time from the hardware clock\n"
" -w, --systohc set the hardware clock from the current system time\n"
@@ -11956,11 +11270,11 @@ msgstr ""
" --adjust 根据自上次时钟设置或调整后的系统漂移\n"
" 来调整 RTC\n"
-#: sys-utils/hwclock.c:1454
+#: sys-utils/hwclock.c:1573
msgid " -c, --compare periodically compare the system clock with the CMOS clock\n"
msgstr " -c, --compare 定期将系统时钟与 CMOS 时钟相比较\n"
-#: sys-utils/hwclock.c:1456
+#: sys-utils/hwclock.c:1575
msgid ""
" --getepoch print out the kernel's hardware clock epoch value\n"
" --setepoch set the kernel's hardware clock epoch value to the \n"
@@ -11970,7 +11284,7 @@ msgstr ""
" --setepoch 将内核的硬件时钟纪元(epoch)值设置为\n"
" --epoch 选项指定的值\n"
-#: sys-utils/hwclock.c:1460
+#: sys-utils/hwclock.c:1579
msgid ""
" --predict predict RTC reading at time given with --date\n"
" -V, --version display version information and exit\n"
@@ -11978,7 +11292,7 @@ msgstr ""
" --predict 预测 --date 选项所指定时刻读取到的 RTC 值\n"
" -V, --version 显示版本信息并退出\n"
-#: sys-utils/hwclock.c:1464
+#: sys-utils/hwclock.c:1583
msgid ""
" -u, --utc the hardware clock is kept in UTC\n"
" --localtime the hardware clock is kept in local time\n"
@@ -11986,11 +11300,11 @@ msgstr ""
" -u, --utc 硬件时钟保持为 UTC 时间\n"
" --localtime 硬件时钟保持为本地时间\n"
-#: sys-utils/hwclock.c:1467
+#: sys-utils/hwclock.c:1586
msgid " -f, --rtc <file> special /dev/... file to use instead of default\n"
msgstr " -f, --rtc <文件> 代替默认文件的特殊 /dev/... 文件\n"
-#: sys-utils/hwclock.c:1470
+#: sys-utils/hwclock.c:1589
#, c-format
msgid ""
" --directisa access the ISA bus directly instead of %s\n"
@@ -12004,7 +11318,7 @@ msgstr ""
" --date <时间> 指定要设置的硬件时钟时间\n"
" --epoch <年> 指定作为硬件纪元(epoch)值起始的年份\n"
-#: sys-utils/hwclock.c:1476
+#: sys-utils/hwclock.c:1595
#, c-format
msgid ""
" --noadjfile do not access %s; this requires the use of\n"
@@ -12016,7 +11330,7 @@ msgstr ""
" --adjfile <文件> 指定调整文件的路径;\n"
" 默认为 %s\n"
-#: sys-utils/hwclock.c:1480
+#: sys-utils/hwclock.c:1599
msgid ""
" --test do not update anything, just show what would happen\n"
" -D, --debug debugging mode\n"
@@ -12026,7 +11340,7 @@ msgstr ""
" -D, --debug 调试模式\n"
"\n"
-#: sys-utils/hwclock.c:1483
+#: sys-utils/hwclock.c:1602
msgid ""
" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
" tell hwclock the type of Alpha you have (see hwclock(8))\n"
@@ -12036,44 +11350,44 @@ msgstr ""
" 告知 hwclock 您使用的 Alpha 类型(参阅 hwclock(8))\n"
"\n"
-#: sys-utils/hwclock.c:1606
+#: sys-utils/hwclock.c:1725
msgid "Unable to connect to audit system"
msgstr "无法连接到审计系统"
-#: sys-utils/hwclock.c:1704
+#: sys-utils/hwclock.c:1823
msgid "invalid epoch argument"
msgstr "无效的纪元(epoch)参数"
-#: sys-utils/hwclock.c:1743
+#: sys-utils/hwclock.c:1862
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr "%s 不接受无选项的参数。您提供了 %d。\n"
-#: sys-utils/hwclock.c:1752
+#: sys-utils/hwclock.c:1871
msgid "With --noadjfile, you must specify either --utc or --localtime"
msgstr "指定 --noadjfile 时,您必须指定 --utc 或 --localtime"
-#: sys-utils/hwclock.c:1765
+#: sys-utils/hwclock.c:1884
msgid "No usable set-to time. Cannot set clock."
msgstr "无可用的待设置时间。无法设置时钟。"
-#: sys-utils/hwclock.c:1780
+#: sys-utils/hwclock.c:1899
msgid "Sorry, only the superuser can change the Hardware Clock."
msgstr "抱歉,只有超级用户才能设置硬件时钟。"
-#: sys-utils/hwclock.c:1784
+#: sys-utils/hwclock.c:1903
msgid "Sorry, only the superuser can change the System Clock."
msgstr "抱歉,只有超级用户才能设置系统时钟。"
-#: sys-utils/hwclock.c:1788
+#: sys-utils/hwclock.c:1907
msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
msgstr "抱歉,只有超级用户才能更改内核中的硬件时钟纪元(epoch)。"
-#: sys-utils/hwclock.c:1811
+#: sys-utils/hwclock.c:1930
msgid "Cannot access the Hardware Clock via any known method."
msgstr "无法通过已知的任何方式访问硬件时钟。"
-#: sys-utils/hwclock.c:1814
+#: sys-utils/hwclock.c:1933
msgid "Use the --debug option to see the details of our search for an access method."
msgstr "请使用 --debug 选项来观察程序搜索访问方法的详情。"
@@ -12134,6 +11448,10 @@ msgstr "无法访问 I/O 端口:iopl(3) 调用失败。"
msgid "Probably you need root privileges.\n"
msgstr "您可能需要 root 用户权限。\n"
+#: sys-utils/hwclock-cmos.c:652
+msgid "Using direct I/O instructions to ISA clock."
+msgstr ""
+
#: sys-utils/hwclock-kd.c:47
#, c-format
msgid "Waiting in loop for time from KDGHWCLK to change\n"
@@ -12160,6 +11478,10 @@ msgstr "ioctl() 从 %s 读取时间失败"
msgid "ioctl KDSHWCLK failed"
msgstr "ioctl KDSHWCLK 失败"
+#: sys-utils/hwclock-kd.c:146
+msgid "Using the KDGHWCLK interface to m68k clock."
+msgstr ""
+
#: sys-utils/hwclock-kd.c:170
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "打不开 /dev/tty1 或 /dev/vc/1"
@@ -12218,6 +11540,10 @@ msgstr "对 %2$s ioctl(%1$s) 以设置时间失败。"
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) 成功。\n"
+#: sys-utils/hwclock-rtc.c:400
+msgid "Using the /dev interface to the clock."
+msgstr ""
+
#: sys-utils/hwclock-rtc.c:430 sys-utils/hwclock-rtc.c:477
#, c-format
msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s. This file does not exist on this system."
@@ -12269,7 +11595,7 @@ msgstr " -Q, --queue 创建消息队列\n"
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:558
+#: sys-utils/ipcmk.c:106 sys-utils/losetup.c:552
msgid "failed to parse size"
msgstr "解析大小失败"
@@ -12305,7 +11631,8 @@ msgid "Semaphore id: %d\n"
msgstr "信号量 id:%d\n"
#: sys-utils/ipcrm.c:53
-msgid " -m, --shmem-id <id> remove shared memory segment by shmid\n"
+#, fuzzy
+msgid " -m, --shmem-id <id> remove shared memory segment by id\n"
msgstr " -m, --shmem-id <id> 按 id 号移除共享内存段\n"
#: sys-utils/ipcrm.c:54
@@ -12329,7 +11656,8 @@ msgid " -S, --semaphore-key <key> remove semaphore by key\n"
msgstr " -S, --semaphore-key <键> 按键值移除信号量\n"
#: sys-utils/ipcrm.c:59
-msgid " -a, --all[=<shm|msg|sem>] remove all\n"
+#, fuzzy
+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
@@ -12416,7 +11744,8 @@ msgid "unknown argument: %s"
msgstr "未知参数:%s"
#: sys-utils/ipcs.c:56
-msgid " -i, --id <id> print details on resource identified by id\n"
+#, fuzzy
+msgid " -i, --id <id> print details on resource identified by <id>\n"
msgstr " -i, --id <id> 打印由 id 标识的资源的详细信息\n"
#: sys-utils/ipcs.c:60
@@ -12448,7 +11777,8 @@ msgid " -t, --time show attach, detach and change times\n"
msgstr " -t, --time 显示附加、脱离和更改时间\n"
#: sys-utils/ipcs.c:68
-msgid " -p, --pid show creator and last operations PIDs\n"
+#, fuzzy
+msgid " -p, --pid show PIDs of creator and last operator\n"
msgstr " -p, --pid 显示 PID 的创建者和最后操作\n"
#: sys-utils/ipcs.c:69
@@ -12464,7 +11794,8 @@ msgid " -u, --summary show status summary\n"
msgstr " -u, --summary 显示状态摘要\n"
#: sys-utils/ipcs.c:72
-msgid " --human show sizes in human readable format\n"
+#, fuzzy
+msgid " --human show sizes in human-readable format\n"
msgstr " --human 以易读格式显示大小\n"
#: sys-utils/ipcs.c:73
@@ -12602,8 +11933,8 @@ msgstr "键"
msgid "size"
msgstr "大小"
-#: sys-utils/ipcs.c:271 sys-utils/prlimit.c:70 sys-utils/prlimit.c:73
-#: sys-utils/prlimit.c:76 sys-utils/prlimit.c:77 sys-utils/prlimit.c:85
+#: sys-utils/ipcs.c:271 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 "字节"
@@ -12957,18 +12288,18 @@ msgstr "zcount"
msgid "pid"
msgstr "pid"
-#: sys-utils/ipcutils.c:231 sys-utils/ipcutils.c:235 sys-utils/ipcutils.c:239
-#: sys-utils/ipcutils.c:243
+#: sys-utils/ipcutils.c:224 sys-utils/ipcutils.c:228 sys-utils/ipcutils.c:232
+#: sys-utils/ipcutils.c:236
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: sys-utils/ipcutils.c:521
+#: sys-utils/ipcutils.c:501
#, c-format
msgid "%s (bytes) = "
msgstr "%s (字节) = "
-#: sys-utils/ipcutils.c:523
+#: sys-utils/ipcutils.c:503
#, c-format
msgid "%s (kbytes) = "
msgstr "%s (千字节) = "
@@ -13078,63 +12409,69 @@ msgstr "无法设置行规则"
msgid "cannot daemonize"
msgstr "无法转为守护进程"
-#: sys-utils/losetup.c:61
+#: sys-utils/losetup.c:64
msgid "autoclear flag set"
msgstr "已设置 自动清除 标志"
-#: sys-utils/losetup.c:62
+#: sys-utils/losetup.c:65
msgid "device backing file"
msgstr "设备后备文件"
-#: sys-utils/losetup.c:63
+#: sys-utils/losetup.c:66
msgid "backing file inode number"
msgstr "后备文件 inode 号"
-#: sys-utils/losetup.c:64
+#: sys-utils/losetup.c:67
msgid "backing file major:minor device number"
msgstr "后备文件 主:次 设备号"
-#: sys-utils/losetup.c:65
+#: sys-utils/losetup.c:68
msgid "loop device name"
msgstr "回环设备名"
-#: sys-utils/losetup.c:66
+#: sys-utils/losetup.c:69
msgid "offset from the beginning"
msgstr "起始位置偏移"
-#: sys-utils/losetup.c:67
+#: sys-utils/losetup.c:70
msgid "partscan flag set"
msgstr "已设置 partscan 标志"
-#: sys-utils/losetup.c:69
+#: sys-utils/losetup.c:72
msgid "size limit of the file in bytes"
msgstr "文件的大小限制(字节数)"
-#: sys-utils/losetup.c:70
+#: sys-utils/losetup.c:73
msgid "loop device major:minor number"
msgstr "回环设备 主:次 设备号"
-#: sys-utils/losetup.c:130 sys-utils/losetup.c:142
+#: sys-utils/losetup.c:132 sys-utils/losetup.c:144
#, c-format
msgid ", offset %ju"
msgstr ",偏移 %ju"
-#: sys-utils/losetup.c:133 sys-utils/losetup.c:145
+#: sys-utils/losetup.c:135 sys-utils/losetup.c:147
#, c-format
msgid ", sizelimit %ju"
msgstr ",大小限制 %ju"
-#: sys-utils/losetup.c:153
+#: sys-utils/losetup.c:155
#, c-format
msgid ", encryption %s (type %u)"
msgstr ",加密 %s(类型 %u)"
-#: sys-utils/losetup.c:195
+#: sys-utils/losetup.c:196
#, c-format
msgid "%s: detach failed"
msgstr "%s:断开失败"
-#: sys-utils/losetup.c:366
+#: sys-utils/losetup.c:318 sys-utils/lscpu.c:1426 sys-utils/prlimit.c:225
+#: sys-utils/swapon.c:151 sys-utils/wdctl.c:214
+#, fuzzy
+msgid "failed to initialize output line"
+msgstr "初始化输出表失败"
+
+#: sys-utils/losetup.c:370
#, c-format
msgid ""
" %1$s [options] [<loopdev>]\n"
@@ -13143,71 +12480,77 @@ msgstr ""
" %1$s [选项] [<回环设备>]\n"
" %1$s [选项] -f | <回环设备> <文件>\n"
-#: sys-utils/losetup.c:371
+#: sys-utils/losetup.c:375
msgid " -a, --all list all used devices\n"
msgstr " -a, --all 列出所有使用的设备\n"
-#: sys-utils/losetup.c:372
-msgid " -d, --detach <loopdev> [...] detach one or more devices\n"
+#: sys-utils/losetup.c:376
+#, fuzzy
+msgid " -d, --detach <loopdev>... detach one or more devices\n"
msgstr " -d, --detach <回环设备> [...] 断开一台或多台设备\n"
-#: sys-utils/losetup.c:373
+#: sys-utils/losetup.c:377
msgid " -D, --detach-all detach all used devices\n"
msgstr " -D, --detach-all 断开所有使用的设备\n"
-#: sys-utils/losetup.c:374
+#: sys-utils/losetup.c:378
msgid " -f, --find find first unused device\n"
msgstr " -f, --find 查找第一个未使用的设备\n"
-#: sys-utils/losetup.c:375
-msgid " -c, --set-capacity <loopdev> resize device\n"
+#: sys-utils/losetup.c:379
+#, fuzzy
+msgid " -c, --set-capacity <loopdev> resize the device\n"
msgstr " -c, --set-capacity <回环设备> 改变设备大小\n"
-#: sys-utils/losetup.c:376
+#: sys-utils/losetup.c:380
msgid " -j, --associated <file> list all devices associated with <file>\n"
msgstr " -j, --associated <文件> 列出所有与 <文件> 相关的设备\n"
-#: sys-utils/losetup.c:380
+#: sys-utils/losetup.c:384
msgid " -o, --offset <num> start at offset <num> into file\n"
msgstr " -o, --offset <数字> 在文件偏移量 <数字> 处开始\n"
-#: sys-utils/losetup.c:381
-msgid " --sizelimit <num> device limited to <num> bytes of the file\n"
+#: sys-utils/losetup.c:385
+#, fuzzy
+msgid " --sizelimit <num> device is limited to <num> bytes of the file\n"
msgstr " --sizelimit <数字> 设备限制为文件的 <数字> 个字节\n"
-#: sys-utils/losetup.c:382
-msgid " -P, --partscan create partitioned loop device\n"
+#: sys-utils/losetup.c:386
+#, fuzzy
+msgid " -P, --partscan create a partitioned loop device\n"
msgstr " -P, --partscan 创建分区的回环设备\n"
-#: sys-utils/losetup.c:383
-msgid " -r, --read-only setup read-only loop device\n"
+#: sys-utils/losetup.c:387
+#, fuzzy
+msgid " -r, --read-only set up a read-only loop device\n"
msgstr " -r, --read-only 设置只读回环设备\n"
-#: sys-utils/losetup.c:384
+#: sys-utils/losetup.c:388
msgid " --show print device name after setup (with -f)\n"
msgstr " --show 设置后打印设备名(加 -f 选项)\n"
-#: sys-utils/losetup.c:385
+#: sys-utils/losetup.c:389
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: sys-utils/losetup.c:389
-msgid " -l, --list list info about all or specified\n"
+#: sys-utils/losetup.c:393
+#, fuzzy
+msgid " -l, --list list info about all or specified (default)\n"
msgstr " -l, --list 列出所有或指定设备的信息\n"
-#: sys-utils/losetup.c:390
+#: 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:391
+#: 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:392
+#: sys-utils/losetup.c:396
msgid " --raw use raw --list output format\n"
msgstr " --raw 使用原生 --list 输出格式\n"
-#: sys-utils/losetup.c:398
+#: sys-utils/losetup.c:402
msgid ""
"\n"
"Available --list columns:\n"
@@ -13215,145 +12558,160 @@ msgstr ""
"\n"
"可用的 --list 列:\n"
-#: sys-utils/losetup.c:418
+#: 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:422
+#: 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:495 sys-utils/losetup.c:505 sys-utils/losetup.c:603
-#: sys-utils/losetup.c:617 sys-utils/losetup.c:693
+#: 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:614
+#: sys-utils/losetup.c:608
msgid "no loop device specified"
msgstr "未指定回环设备"
-#: sys-utils/losetup.c:622
+#: sys-utils/losetup.c:616
msgid "no file specified"
msgstr "未指定文件"
-#: sys-utils/losetup.c:629
+#: sys-utils/losetup.c:623
#, c-format
msgid "the options %s are allowed during loop device setup only"
msgstr "选项 %s 只允许在设置回环设备时使用"
-#: sys-utils/losetup.c:634
+#: sys-utils/losetup.c:628
msgid "the option --offset is not allowed in this context"
msgstr "此环境下不允许使用 --offset 选项"
-#: sys-utils/losetup.c:654 sys-utils/losetup.c:704
+#: sys-utils/losetup.c:648 sys-utils/losetup.c:699
msgid "cannot find an unused loop device"
msgstr "找不到未使用的回环设备"
-#: sys-utils/losetup.c:664
+#: sys-utils/losetup.c:658
#, c-format
msgid "%s: failed to use backing file"
msgstr "%s:使用后备文件失败"
-#: sys-utils/losetup.c:725
+#: sys-utils/losetup.c:720
#, c-format
msgid "%s: set capacity failed"
msgstr "%s:设置容量失败"
-#: sys-utils/lscpu.c:71
+#: sys-utils/lscpu.c:89
msgid "none"
msgstr "无"
-#: sys-utils/lscpu.c:72
+#: sys-utils/lscpu.c:90
msgid "para"
msgstr "半"
-#: sys-utils/lscpu.c:73
+#: sys-utils/lscpu.c:91
msgid "full"
msgstr "完全"
-#: sys-utils/lscpu.c:74
+#: sys-utils/lscpu.c:92
msgid "container"
msgstr "容器"
-#: sys-utils/lscpu.c:113
+#: sys-utils/lscpu.c:152
msgid "horizontal"
msgstr "水平"
-#: sys-utils/lscpu.c:114
+#: sys-utils/lscpu.c:153
msgid "vertical"
msgstr "竖直"
-#: sys-utils/lscpu.c:250
+#: sys-utils/lscpu.c:302
msgid "logical CPU number"
msgstr "逻辑 CPU 数量"
-#: sys-utils/lscpu.c:251
+#: sys-utils/lscpu.c:303
msgid "logical core number"
msgstr "逻辑核心数量"
-#: sys-utils/lscpu.c:252
+#: sys-utils/lscpu.c:304
msgid "logical socket number"
msgstr "逻辑(CPU)座数量"
-#: sys-utils/lscpu.c:253
+#: sys-utils/lscpu.c:305
msgid "logical NUMA node number"
msgstr "逻辑 NUMA 节点数量"
-#: sys-utils/lscpu.c:254
+#: sys-utils/lscpu.c:306
msgid "logical book number"
msgstr "逻辑 book 数"
-#: sys-utils/lscpu.c:255
+#: sys-utils/lscpu.c:307
msgid "shows how caches are shared between CPUs"
msgstr "显示 CPU 间是如何共享缓存的"
-#: sys-utils/lscpu.c:256
+#: sys-utils/lscpu.c:308
msgid "CPU dispatching mode on virtual hardware"
msgstr "虚拟硬件上的 CPU 调度模式"
-#: sys-utils/lscpu.c:257
+#: sys-utils/lscpu.c:309
msgid "physical address of a CPU"
msgstr "CPU 的物理地址"
-#: sys-utils/lscpu.c:258
+#: sys-utils/lscpu.c:310
msgid "shows if the hypervisor has allocated the CPU"
msgstr "显示超级监督(hypervisor)是否分配了 CPU"
-#: sys-utils/lscpu.c:259
+#: sys-utils/lscpu.c:311
msgid "shows if Linux currently makes use of the CPU"
msgstr "显示 Linux 当前是否在使用该 CPU"
-#: sys-utils/lscpu.c:260
+#: sys-utils/lscpu.c:312
msgid "shows the maximum MHz of the CPU"
msgstr "显示 CPU 的最大 MHz"
-#: sys-utils/lscpu.c:261
+#: sys-utils/lscpu.c:313
msgid "shows the minimum MHz of the CPU"
msgstr "显示 CPU 的最小 MHz"
-#: sys-utils/lscpu.c:356
+#: sys-utils/lscpu.c:408
msgid "error: uname failed"
msgstr "错误:uname 失败"
-#: sys-utils/lscpu.c:423
+#: sys-utils/lscpu.c:483
#, c-format
msgid "failed to determine number of CPUs: %s"
msgstr "确定 CPU 数 失败:%s"
-#: sys-utils/lscpu.c:983 sys-utils/lscpu.c:993
+#: sys-utils/lscpu.c:698
+#, fuzzy
+msgid "error: can not set signal handler"
+msgstr "无法设置信号处理函数"
+
+#: sys-utils/lscpu.c:703
+#, fuzzy
+msgid "error: can not restore signal handler"
+msgstr "无法设置信号处理函数"
+
+#: sys-utils/lscpu.c:1138
+#, fuzzy
+msgid "Failed to extract the node number"
+msgstr "%s:获取分区号失败"
+
+#: sys-utils/lscpu.c:1230 sys-utils/lscpu.c:1240
#, c-format
msgid "Y"
msgstr "Y"
-#: sys-utils/lscpu.c:983 sys-utils/lscpu.c:993
+#: sys-utils/lscpu.c:1230 sys-utils/lscpu.c:1240
#, c-format
msgid "N"
msgstr "N"
-#: sys-utils/lscpu.c:1075
+#: sys-utils/lscpu.c:1322
#, c-format
msgid ""
"# The following is the parsable format, which can be fed to other\n"
@@ -13363,157 +12721,157 @@ msgstr ""
"# 以下是可解析格式,可以输给其他程序。每列中的各个不同项有一个惟一\n"
"# 的从 0 开始的 ID。\n"
-#: sys-utils/lscpu.c:1215
+#: sys-utils/lscpu.c:1472
msgid "Architecture:"
msgstr "架构:"
-#: sys-utils/lscpu.c:1229
+#: sys-utils/lscpu.c:1486
msgid "CPU op-mode(s):"
msgstr "CPU 运行模式:"
-#: sys-utils/lscpu.c:1232 sys-utils/lscpu.c:1234
+#: sys-utils/lscpu.c:1489 sys-utils/lscpu.c:1491
msgid "Byte Order:"
msgstr "字节序:"
-#: sys-utils/lscpu.c:1236
+#: sys-utils/lscpu.c:1493
msgid "CPU(s):"
msgstr "CPU(s):"
-#: sys-utils/lscpu.c:1239
+#: sys-utils/lscpu.c:1496
msgid "On-line CPU(s) mask:"
msgstr "在线 CPU 掩码:"
-#: sys-utils/lscpu.c:1240
+#: sys-utils/lscpu.c:1497
msgid "On-line CPU(s) list:"
msgstr "在线 CPU 列表:"
-#: sys-utils/lscpu.c:1258
+#: sys-utils/lscpu.c:1516
msgid "Off-line CPU(s) mask:"
msgstr "离线 CPU 掩码:"
-#: sys-utils/lscpu.c:1259
+#: sys-utils/lscpu.c:1517
msgid "Off-line CPU(s) list:"
msgstr "离线 CPU 列表:"
-#: sys-utils/lscpu.c:1290
+#: sys-utils/lscpu.c:1548
msgid "Thread(s) per core:"
msgstr "每个核的线程数:"
-#: sys-utils/lscpu.c:1291
+#: sys-utils/lscpu.c:1549
msgid "Core(s) per socket:"
msgstr "每个座的核数:"
-#: sys-utils/lscpu.c:1294
+#: sys-utils/lscpu.c:1552
msgid "Socket(s) per book:"
msgstr "每个 book 的座数:"
-#: sys-utils/lscpu.c:1296
+#: sys-utils/lscpu.c:1554
msgid "Book(s):"
msgstr "Book:"
-#: sys-utils/lscpu.c:1298
+#: sys-utils/lscpu.c:1556
msgid "Socket(s):"
msgstr "座:"
-#: sys-utils/lscpu.c:1302
+#: sys-utils/lscpu.c:1560
msgid "NUMA node(s):"
msgstr "NUMA 节点:"
-#: sys-utils/lscpu.c:1304
+#: sys-utils/lscpu.c:1562
msgid "Vendor ID:"
msgstr "厂商 ID:"
-#: sys-utils/lscpu.c:1306
+#: sys-utils/lscpu.c:1564
msgid "CPU family:"
msgstr "CPU 系列:"
-#: sys-utils/lscpu.c:1308
+#: sys-utils/lscpu.c:1566
msgid "Model:"
msgstr "型号:"
-#: sys-utils/lscpu.c:1310
+#: sys-utils/lscpu.c:1568
msgid "Model name:"
msgstr "型号名称:"
-#: sys-utils/lscpu.c:1312
+#: sys-utils/lscpu.c:1570
msgid "Stepping:"
msgstr "步进:"
-#: sys-utils/lscpu.c:1314
+#: sys-utils/lscpu.c:1572
msgid "CPU MHz:"
msgstr "CPU MHz:"
-#: sys-utils/lscpu.c:1316
+#: sys-utils/lscpu.c:1574
msgid "CPU max MHz:"
msgstr "CPU 最大 MHz:"
-#: sys-utils/lscpu.c:1318
+#: sys-utils/lscpu.c:1576
msgid "CPU min MHz:"
msgstr "CPU 最小 MHz:"
-#: sys-utils/lscpu.c:1320
+#: sys-utils/lscpu.c:1578
msgid "BogoMIPS:"
msgstr "BogoMIPS:"
-#: sys-utils/lscpu.c:1323 sys-utils/lscpu.c:1325
+#: sys-utils/lscpu.c:1581 sys-utils/lscpu.c:1583
msgid "Virtualization:"
msgstr "虚拟化:"
-#: sys-utils/lscpu.c:1328
+#: sys-utils/lscpu.c:1586
msgid "Hypervisor:"
msgstr "超管理器:"
-#: sys-utils/lscpu.c:1330
+#: sys-utils/lscpu.c:1588
msgid "Hypervisor vendor:"
msgstr "超管理器厂商:"
-#: sys-utils/lscpu.c:1331
+#: sys-utils/lscpu.c:1589
msgid "Virtualization type:"
msgstr "虚拟化类型:"
-#: sys-utils/lscpu.c:1334
+#: sys-utils/lscpu.c:1592
msgid "Dispatching mode:"
msgstr "分派模式:"
-#: sys-utils/lscpu.c:1340
+#: sys-utils/lscpu.c:1598
#, c-format
msgid "%s cache:"
msgstr "%s 缓存:"
-#: sys-utils/lscpu.c:1346
+#: sys-utils/lscpu.c:1604
#, c-format
msgid "NUMA node%d CPU(s):"
msgstr "NUMA 节点%d CPU:"
-#: sys-utils/lscpu.c:1359
+#: sys-utils/lscpu.c:1617
msgid " -a, --all print both online and offline CPUs (default for -e)\n"
msgstr " -a, --all 同时打印在线和离线 CPU (-e 选项默认值)\n"
-#: sys-utils/lscpu.c:1360
+#: sys-utils/lscpu.c:1618
msgid " -b, --online print online CPUs only (default for -p)\n"
msgstr " -b, --online 只打印在线 CPU (-p 选项默认值)\n"
-#: sys-utils/lscpu.c:1361
+#: sys-utils/lscpu.c:1619
msgid " -c, --offline print offline CPUs only\n"
msgstr " -c, --offline 只打印离线 CPU\n"
-#: sys-utils/lscpu.c:1362
+#: sys-utils/lscpu.c:1620
msgid " -e, --extended[=<list>] print out an extended readable format\n"
msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
-#: sys-utils/lscpu.c:1363
+#: sys-utils/lscpu.c:1621
msgid " -p, --parse[=<list>] print out a parsable format\n"
msgstr " -p, --parse[=<列表>] 打印可解析格式\n"
-#: sys-utils/lscpu.c:1364
+#: sys-utils/lscpu.c:1622
msgid " -s, --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: sys-utils/lscpu.c:1365
+#: sys-utils/lscpu.c:1623
msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n"
msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n"
-#: sys-utils/lscpu.c:1375
+#: sys-utils/lscpu.c:1633
#, c-format
msgid ""
"\n"
@@ -13522,7 +12880,7 @@ msgstr ""
"\n"
"更多信息请参阅 lscpu(1)。\n"
-#: sys-utils/lscpu.c:1463
+#: sys-utils/lscpu.c:1721
#, 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"
@@ -13570,56 +12928,70 @@ msgstr "%-25s:已忽略\n"
msgid "%-25s: already mounted\n"
msgstr "%-25s:已经挂载\n"
-#: sys-utils/mount.c:248
+#: sys-utils/mount.c:250
#, c-format
msgid "%s: %s moved to %s.\n"
msgstr "%s:%s 已移到 %s。\n"
-#: sys-utils/mount.c:250
+#: sys-utils/mount.c:252
#, c-format
msgid "%s: %s bound on %s.\n"
msgstr "%s:%s 已绑定到 %s 。\n"
-#: sys-utils/mount.c:253 sys-utils/mount.c:257
+#: sys-utils/mount.c:255 sys-utils/mount.c:259
#, c-format
msgid "%s: %s mounted on %s.\n"
msgstr "%s:%s 已挂臷到 %s。\n"
-#: sys-utils/mount.c:255
+#: sys-utils/mount.c:257
#, c-format
msgid "%s: %s propagation flags changed.\n"
msgstr "%s:%s 传播标志已更改。\n"
-#: sys-utils/mount.c:377
+#: sys-utils/mount.c:311
+#, c-format
+msgid ""
+"mount: %s does not contain SELinux labels.\n"
+" You just mounted an file system that supports labels which does not\n"
+" contain labels, onto an SELinux box. It is likely that confined\n"
+" applications will generate AVC messages and not be allowed access to\n"
+" this file system. For more details see restorecon(8) and mount(8).\n"
+msgstr ""
+"mount:%s 不包含 SELinux 标志\n"
+" 您刚将一个支持标签但未包含标签的文件系统挂载到了 SELinux 机器上。\n"
+" 受限制的应用程序可能会生成 AVC 消息,并被阻止访问该文件系统。\n"
+" 更多详细信息请参阅 restorecon(8) 和 mount(8)。\n"
+
+#: sys-utils/mount.c:379
msgid "WARNING: failed to apply propagation flags"
msgstr "警告:应用传播标志失败"
-#: sys-utils/mount.c:399
+#: sys-utils/mount.c:401
#, c-format
msgid "only root can mount %s on %s"
msgstr "只有 root 能将 %s 挂载到 %s"
-#: sys-utils/mount.c:402
+#: sys-utils/mount.c:404
#, c-format
msgid "%s is already mounted"
msgstr "%s 已经挂载"
-#: sys-utils/mount.c:406
+#: sys-utils/mount.c:408
#, c-format
msgid "can't find %s in %s"
msgstr "在 %2$s 中找不到 %1$s"
-#: sys-utils/mount.c:413
+#: sys-utils/mount.c:415
#, c-format
msgid "can't find mountpoint %s in %s"
msgstr "在 %2$s 中找不到挂载点 %1$s"
-#: sys-utils/mount.c:416
+#: sys-utils/mount.c:418
#, c-format
msgid "can't find mount source %s in %s"
msgstr "在 %2$s 中找不到挂载源 %1$s"
-#: sys-utils/mount.c:420
+#: sys-utils/mount.c:422
#, c-format
msgid ""
"%s: more filesystems detected. This should not happen,\n"
@@ -13630,108 +13002,108 @@ msgstr ""
" 请使用 -t <类型> 指明文件系统类型或\n"
" 使用 wipefs(8) 清理该设备。"
-#: sys-utils/mount.c:426
+#: sys-utils/mount.c:428
msgid "I could not determine the filesystem type, and none was specified"
msgstr "程序无法检测文件系统类型,并且您未指定类型"
-#: sys-utils/mount.c:429
+#: sys-utils/mount.c:431
msgid "you must specify the filesystem type"
msgstr "您必须指明文件系统类型"
-#: sys-utils/mount.c:433
+#: sys-utils/mount.c:437
#, c-format
msgid "can't find %s"
msgstr "找不到 %s"
-#: sys-utils/mount.c:435
+#: sys-utils/mount.c:439
msgid "mount source not defined"
msgstr "未定义挂臷源"
-#: sys-utils/mount.c:439 sys-utils/mount.c:441
+#: sys-utils/mount.c:443 sys-utils/mount.c:445
msgid "failed to parse mount options"
msgstr "解析挂臷选项失败"
-#: sys-utils/mount.c:444
+#: sys-utils/mount.c:448
#, c-format
msgid "%s: failed to setup loop device"
msgstr "%s:设置回环设备失败"
-#: sys-utils/mount.c:447
+#: sys-utils/mount.c:451
#, c-format
msgid "%s: mount failed"
msgstr "%s:挂载失败"
-#: sys-utils/mount.c:457
+#: sys-utils/mount.c:461
#, c-format
msgid "%s: filesystem mounted, but mount(8) failed"
msgstr "%s:文件系统已挂载,但 mount(8) 失败"
-#: sys-utils/mount.c:474 sys-utils/mount.c:526
+#: sys-utils/mount.c:478 sys-utils/mount.c:530
#, c-format
msgid "mount point %s is not a directory"
msgstr "挂载点 %s 不是目录"
-#: sys-utils/mount.c:478
+#: sys-utils/mount.c:482
msgid "must be superuser to use mount"
msgstr "必须以超级用户身份使用 mount"
-#: sys-utils/mount.c:486
+#: sys-utils/mount.c:490
#, c-format
msgid "%s is busy"
msgstr "%s 忙"
-#: sys-utils/mount.c:490
+#: sys-utils/mount.c:494
#, c-format
msgid "%s is already mounted or %s busy"
msgstr "%s 已经挂载或 %s 忙"
-#: sys-utils/mount.c:502
+#: sys-utils/mount.c:506
#, c-format
msgid " %s is already mounted on %s\n"
msgstr " %s 已经挂载到 %s 上\n"
-#: sys-utils/mount.c:510
+#: sys-utils/mount.c:514
#, c-format
msgid "mount point %s does not exist"
msgstr "挂载点 %s 不存在"
-#: sys-utils/mount.c:512
+#: sys-utils/mount.c:516
#, c-format
msgid "mount point %s is a symbolic link to nowhere"
msgstr "挂载点 %s 是一个没有目标的符号链接"
-#: sys-utils/mount.c:517
+#: sys-utils/mount.c:521
#, c-format
msgid "special device %s does not exist"
msgstr "特殊设备 %s 不存在"
-#: sys-utils/mount.c:520 sys-utils/mount.c:535
+#: sys-utils/mount.c:524 sys-utils/mount.c:539
msgid "mount(2) failed"
msgstr "mount(2) 失败"
-#: sys-utils/mount.c:531
+#: sys-utils/mount.c:535
#, c-format
msgid "special device %s does not exist (a path prefix is not a directory)"
msgstr "特殊设备 %s 不存在(路径前缀不是目录)"
-#: sys-utils/mount.c:541
+#: sys-utils/mount.c:545
#, c-format
msgid "%s not mounted or bad option"
msgstr "%s 未挂载或选项有误"
-#: sys-utils/mount.c:543
+#: sys-utils/mount.c:547
#, c-format
msgid "%s is not mountpoint or bad option"
msgstr "%s 不是一个挂载点或选项有误"
-#: sys-utils/mount.c:545
+#: sys-utils/mount.c:549
#, fuzzy
msgid ""
"bad option. Note that moving a mount residing under a shared\n"
" mount is unsupported."
msgstr "选项错误。注意,不支持移动位于共享挂载内的挂载。"
-#: sys-utils/mount.c:548
+#: sys-utils/mount.c:552
#, c-format
msgid ""
"wrong fs type, bad option, bad superblock on %s,\n"
@@ -13740,7 +13112,7 @@ msgstr ""
"文件系统类型错误、选项错误、%s 上有坏超级块、\n"
" 缺少代码页或助手程序,或其他错误"
-#: sys-utils/mount.c:554
+#: sys-utils/mount.c:558
#, c-format
msgid ""
" (for several filesystems (e.g. nfs, cifs) you might\n"
@@ -13749,7 +13121,7 @@ msgstr ""
" (对某些文件系统(如 nfs、cifs) 您可能需要\n"
" 一款 /sbin/mount.<类型> 助手程序)\n"
-#: sys-utils/mount.c:557
+#: sys-utils/mount.c:561
#, c-format
msgid ""
"\n"
@@ -13761,22 +13133,26 @@ msgstr ""
" dmesg | tail 这样的命令看看。\n"
#: sys-utils/mount.c:567
+msgid "mount table full"
+msgstr "挂载表满"
+
+#: sys-utils/mount.c:571
#, c-format
msgid "%s: can't read superblock"
msgstr "%s:不能读超级块"
# fuzzy
-#: sys-utils/mount.c:571
+#: sys-utils/mount.c:575
#, c-format
msgid "unknown filesystem type '%s'"
msgstr "未知的文件系统类型“%s”"
-#: sys-utils/mount.c:579
+#: sys-utils/mount.c:583
#, c-format
msgid "%s is not a block device, and stat(2) fails?"
msgstr "%s 不是块设备,而且 stat(2) 失败?"
-#: sys-utils/mount.c:581
+#: sys-utils/mount.c:585
#, c-format
msgid ""
"the kernel does not recognize %s as a block device\n"
@@ -13785,67 +13161,67 @@ msgstr ""
"内核无法将 %s 识别为块设备\n"
" (试试“modprobe driver”?)"
-#: sys-utils/mount.c:584
+#: sys-utils/mount.c:588
#, c-format
msgid "%s is not a block device (maybe try `-o loop'?)"
msgstr "%s 不是块设备(用 `-o loop' 试试?)"
-#: sys-utils/mount.c:586
+#: sys-utils/mount.c:590
#, c-format
msgid " %s is not a block device"
msgstr "%s 不是一个块设备"
-#: sys-utils/mount.c:593
+#: sys-utils/mount.c:597
#, c-format
msgid "%s is not a valid block device"
msgstr "%s 不是一个有效的块设备"
-#: sys-utils/mount.c:599
+#: sys-utils/mount.c:603
#, c-format
msgid "cannot mount %s read-only"
msgstr "无法以只读方式挂载 %s"
-#: sys-utils/mount.c:602
+#: sys-utils/mount.c:606
#, c-format
msgid "%s is write-protected but explicit `-w' flag given"
msgstr "%s 是写保护的,但指明了“-w”标志"
-#: sys-utils/mount.c:605
+#: sys-utils/mount.c:609
#, c-format
msgid "cannot remount %s read-write, is write-protected"
msgstr "无法以读写方式重新挂载 %s,它是写保护的"
-#: sys-utils/mount.c:608
+#: sys-utils/mount.c:612
#, c-format
msgid "%s is write-protected, mounting read-only"
msgstr "%s 写保护,将以只读方式挂载"
-#: sys-utils/mount.c:621
+#: sys-utils/mount.c:625
#, c-format
msgid "no medium found on %s"
msgstr "在 %s 上找不到媒体"
-#: sys-utils/mount.c:625
+#: sys-utils/mount.c:629
#, c-format
msgid "mount %s on %s failed"
msgstr "将 %s 挂载到 %s 失败"
-#: sys-utils/mount.c:649
+#: sys-utils/mount.c:653
#, c-format
msgid "%s: failed to parse"
msgstr "%s:解析失败"
-#: sys-utils/mount.c:688
+#: sys-utils/mount.c:692
#, c-format
msgid "unsupported option format: %s"
msgstr "不支持的参数格式:%s"
-#: sys-utils/mount.c:690
+#: sys-utils/mount.c:694
#, c-format
msgid "failed to append option '%s'"
msgstr "追加选项“%s”失败"
-#: sys-utils/mount.c:697
+#: sys-utils/mount.c:701
#, c-format
msgid ""
" %1$s [-lhV]\n"
@@ -13860,7 +13236,7 @@ msgstr ""
" %1$s [选项] <源> <目录>\n"
" %1$s <操作> <挂载点> [<目标>]\n"
-#: sys-utils/mount.c:706
+#: sys-utils/mount.c:710
#, c-format
msgid ""
" -a, --all mount all filesystems mentioned in fstab\n"
@@ -13875,7 +13251,7 @@ msgstr ""
" -F, --fork 对每个设备禁用 fork(和 -a 选项一起使用)\n"
" -T, --fstab <路径> /etc/fstab 的替代文件\n"
-#: sys-utils/mount.c:712
+#: sys-utils/mount.c:716
#, c-format
msgid ""
" -h, --help display this help text and exit\n"
@@ -13888,7 +13264,7 @@ msgstr ""
" -l, --show-labels 列出所有带有指定标签的挂载\n"
" -n, --no-mtab 不写 /etc/mtab\n"
-#: sys-utils/mount.c:717
+#: sys-utils/mount.c:721
#, c-format
msgid ""
" -o, --options <list> comma-separated list of mount options\n"
@@ -13901,7 +13277,7 @@ msgstr ""
" -r, --read-only 以只读方式挂载文件系统(同 -o ro)\n"
" -t, --types <列表> 限制文件系统类型集合\n"
-#: sys-utils/mount.c:722
+#: sys-utils/mount.c:726
#, c-format
msgid ""
" --source <src> explicitly specifies source (path, label, uuid)\n"
@@ -13910,7 +13286,7 @@ msgstr ""
" --source <源> 指明源(路径、标签、uuid)\n"
" --target <目标> 指明挂载点\n"
-#: sys-utils/mount.c:725
+#: sys-utils/mount.c:729
#, c-format
msgid ""
" -v, --verbose say what is being done\n"
@@ -13921,7 +13297,7 @@ msgstr ""
" -V, --version 显示版本信息并退出\n"
" -w, --rw, --read-write 以读写方式挂载文件系统(默认)\n"
-#: sys-utils/mount.c:734
+#: sys-utils/mount.c:738
#, c-format
msgid ""
"\n"
@@ -13942,7 +13318,7 @@ msgstr ""
" PARTLABEL=<标签> 按分区标签指定设备\n"
" PARTUUID=<uuid> 按分区 UUID 指定设备\n"
-#: sys-utils/mount.c:743
+#: sys-utils/mount.c:747
#, c-format
msgid ""
" <device> specifies device by path\n"
@@ -13953,7 +13329,7 @@ msgstr ""
" <目录> 绑定挂载的挂载点(参阅 --bind/rbind)\n"
" <文件> 用于设置回环设备的常规文件\n"
-#: sys-utils/mount.c:748
+#: sys-utils/mount.c:752
#, c-format
msgid ""
"\n"
@@ -13968,7 +13344,7 @@ msgstr ""
" -M, --move 将子树移动到其他位置\n"
" -R, --rbind 挂载其他位置的子树及其包含的所有挂载\n"
-#: sys-utils/mount.c:753
+#: sys-utils/mount.c:757
#, c-format
msgid ""
" --make-shared mark a subtree as shared\n"
@@ -13981,7 +13357,7 @@ msgstr ""
" --make-private 将子树标记为 私有\n"
" --make-unbindable 将子树标记为 不可绑定\n"
-#: sys-utils/mount.c:758
+#: sys-utils/mount.c:762
#, c-format
msgid ""
" --make-rshared recursively mark a whole subtree as shared\n"
@@ -13994,14 +13370,19 @@ msgstr ""
" --make-rprivate 递归地将整个子树标记为 私有\n"
" --make-runbindable 递归地将整个子树标记为 不可绑定\n"
-#: sys-utils/mount.c:845 sys-utils/umount.c:539
+#: sys-utils/mount.c:848 sys-utils/umount.c:543
msgid "libmount context allocation failed"
msgstr "libmount 环境分配失败"
-#: sys-utils/mount.c:902 sys-utils/umount.c:592
+#: sys-utils/mount.c:905 sys-utils/umount.c:596
msgid "failed to set options pattern"
msgstr "设置选项模式失败"
+#: sys-utils/mount.c:1058
+#, fuzzy
+msgid "source specified more than once"
+msgstr "您指定了超过磁盘适合值的柱面数"
+
#: sys-utils/mountpoint.c:119
#, c-format
msgid ""
@@ -14031,93 +13412,97 @@ msgstr "%s 不是一个挂载点\n"
msgid "%s is a mountpoint\n"
msgstr "%s 是一个挂载点\n"
-#: sys-utils/nsenter.c:64 sys-utils/setpriv.c:93 sys-utils/unshare.c:42
+#: 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:68
+#: sys-utils/nsenter.c:69
msgid " -t, --target <pid> target process to get namespaces from\n"
msgstr " -t, --target <pid> 要获取名字空间的目标进程\n"
-#: sys-utils/nsenter.c:69
+#: sys-utils/nsenter.c:70
msgid " -m, --mount [=<file>] enter mount namespace\n"
msgstr " -m, --mount [=<文件>] 进入挂臷名字空间\n"
-#: sys-utils/nsenter.c:70
+#: sys-utils/nsenter.c:71
msgid " -u, --uts [=<file>] enter UTS namespace (hostname etc)\n"
msgstr " -u, --uts [=<文件>] 进入 UTS 名字空间(主机名等)\n"
-#: sys-utils/nsenter.c:71
+#: sys-utils/nsenter.c:72
msgid " -i, --ipc [=<file>] enter System V IPC namespace\n"
msgstr " -i, --ipc [=<文件>] 进入系统 V IPC 名字空间\n"
-#: sys-utils/nsenter.c:72
+#: sys-utils/nsenter.c:73
msgid " -n, --net [=<file>] enter network namespace\n"
msgstr " -n, --net [=<文件>] 进入网络名字空间\n"
-#: sys-utils/nsenter.c:73
+#: sys-utils/nsenter.c:74
msgid " -p, --pid [=<file>] enter pid namespace\n"
msgstr " -p, --pid [=<文件>] 进入 pid 名字空间\n"
-#: sys-utils/nsenter.c:74
+#: sys-utils/nsenter.c:75
msgid " -U, --user [=<file>] enter user namespace\n"
msgstr " -U, --user [=<文件>] 进入用户名字空间\n"
-#: sys-utils/nsenter.c:75
+#: sys-utils/nsenter.c:76
msgid " -S, --setuid <uid> set uid in user namespace\n"
msgstr " -S, --setuid <uid> 在用户名字空间中设置 uid\n"
-#: sys-utils/nsenter.c:76
+#: sys-utils/nsenter.c:77
msgid " -G, --setgid <gid> set gid in user namespace\n"
msgstr " -G, --setgid <gid> 在用户名字空间中设置 gid\n"
-#: sys-utils/nsenter.c:77
+#: sys-utils/nsenter.c:78
msgid " -r, --root [=<dir>] set the root directory\n"
msgstr " -r, --root [=<目录>] 设置根目录\n"
-#: sys-utils/nsenter.c:78
+#: sys-utils/nsenter.c:79
msgid " -w, --wd [=<dir>] set the working directory\n"
msgstr " -w, --wd [=<目录>] 设置工作目录\n"
-#: sys-utils/nsenter.c:79
+#: sys-utils/nsenter.c:80
msgid " -F, --no-fork do not fork before exec'ing <program>\n"
msgstr " -F, --no-fork 执行 <程序> 前不 fork\n"
-#: sys-utils/nsenter.c:104
+#: sys-utils/nsenter.c:105
#, c-format
msgid "neither filename nor target pid supplied for %s"
msgstr "未为 %s 提供文件名或目标 pid"
-#: sys-utils/nsenter.c:244
+#: sys-utils/nsenter.c:245
msgid "failed to parse uid"
msgstr "解析 uid 失败"
-#: sys-utils/nsenter.c:247
+#: sys-utils/nsenter.c:248
msgid "failed to parse gid"
msgstr "解析 gid 失败"
-#: sys-utils/nsenter.c:290
+#: sys-utils/nsenter.c:291
#, c-format
msgid "reassociate to namespace '%s' failed"
msgstr "重新关联到名字空间“%s”失败"
-#: sys-utils/nsenter.c:301
+#: sys-utils/nsenter.c:302
msgid "cannot open current working directory"
msgstr "打不开当前工作目录"
-#: sys-utils/nsenter.c:308
+#: sys-utils/nsenter.c:309
msgid "change directory by root file descriptor failed"
msgstr "根据 root 文件描述符 更改目录失败"
-#: sys-utils/nsenter.c:311
+#: sys-utils/nsenter.c:312
msgid "chroot failed"
msgstr "chroot 失败"
-#: sys-utils/nsenter.c:321
+#: sys-utils/nsenter.c:322
msgid "change directory by working directory file descriptor failed"
msgstr "按工作目录文件描述符更改目录失败"
+#: sys-utils/nsenter.c:333 sys-utils/setpriv.c:808 sys-utils/setpriv.c:812
+msgid "setgroups failed"
+msgstr "setgroups 失败"
+
#: sys-utils/pivot_root.c:33
#, c-format
msgid " %s [options] new_root put_old\n"
@@ -14128,117 +13513,117 @@ msgstr " %s [选项] 新根目录 旧根目录更名\n"
msgid "failed to change root from `%s' to `%s'"
msgstr "将根目录从“%s”更改为“%s”失败"
-#: sys-utils/prlimit.c:70
+#: sys-utils/prlimit.c:75
msgid "address space limit"
msgstr "地址空间限制"
-#: sys-utils/prlimit.c:71
+#: sys-utils/prlimit.c:76
msgid "max core file size"
msgstr "最大核心文件尺寸"
-#: sys-utils/prlimit.c:71 sys-utils/prlimit.c:74
+#: sys-utils/prlimit.c:76 sys-utils/prlimit.c:79
msgid "blocks"
msgstr "块"
-#: sys-utils/prlimit.c:72
+#: sys-utils/prlimit.c:77
msgid "CPU time"
msgstr "CPU 时间"
-#: sys-utils/prlimit.c:72
+#: sys-utils/prlimit.c:77
msgid "seconds"
msgstr "秒数"
-#: sys-utils/prlimit.c:73
+#: sys-utils/prlimit.c:78
msgid "max data size"
msgstr "最大数据尺寸"
-#: sys-utils/prlimit.c:74
+#: sys-utils/prlimit.c:79
msgid "max file size"
msgstr "最大文件尺寸"
-#: sys-utils/prlimit.c:75
+#: sys-utils/prlimit.c:80
msgid "max number of file locks held"
msgstr "最大文件锁保持数量"
-#: sys-utils/prlimit.c:76
+#: sys-utils/prlimit.c:81
msgid "max locked-in-memory address space"
msgstr "最大内存锁定(locked-in-memory)地址空间"
-#: sys-utils/prlimit.c:77
+#: sys-utils/prlimit.c:82
msgid "max bytes in POSIX mqueues"
msgstr "POSIX 消息队列中的最大字节数"
-#: sys-utils/prlimit.c:78
+#: sys-utils/prlimit.c:83
msgid "max nice prio allowed to raise"
msgstr "允许提升的最大 nice 优先级"
-#: sys-utils/prlimit.c:79
+#: sys-utils/prlimit.c:84
msgid "max number of open files"
msgstr "打开文件的最大数量"
-#: sys-utils/prlimit.c:80
+#: sys-utils/prlimit.c:85
msgid "max number of processes"
msgstr "最大进程数"
-#: sys-utils/prlimit.c:81
+#: sys-utils/prlimit.c:86
msgid "max resident set size"
msgstr "最大驻留集尺寸"
-#: sys-utils/prlimit.c:81
+#: sys-utils/prlimit.c:86
msgid "pages"
msgstr "页数"
-#: sys-utils/prlimit.c:82
+#: sys-utils/prlimit.c:87
msgid "max real-time priority"
msgstr "最大实时优先级"
-#: sys-utils/prlimit.c:83
+#: sys-utils/prlimit.c:88
msgid "timeout for real-time tasks"
msgstr "实时任务超时"
-#: sys-utils/prlimit.c:83
+#: sys-utils/prlimit.c:88
msgid "microsecs"
msgstr "毫秒数"
-#: sys-utils/prlimit.c:84
+#: sys-utils/prlimit.c:89
msgid "max number of pending signals"
msgstr "挂起(pending)信号的最大数量"
-#: sys-utils/prlimit.c:85
+#: sys-utils/prlimit.c:90
msgid "max stack size"
msgstr "最大栈(stack)尺寸"
-#: sys-utils/prlimit.c:116
+#: sys-utils/prlimit.c:121
msgid "resource name"
msgstr "资源名称"
-#: sys-utils/prlimit.c:117
+#: sys-utils/prlimit.c:122
msgid "resource description"
msgstr "资源描述"
-#: sys-utils/prlimit.c:118
+#: sys-utils/prlimit.c:123
msgid "soft limit"
msgstr "软限制"
-#: sys-utils/prlimit.c:119
+#: sys-utils/prlimit.c:124
msgid "hard limit (ceiling)"
msgstr "硬限制(触顶)"
-#: sys-utils/prlimit.c:120
+#: sys-utils/prlimit.c:125
msgid "units"
msgstr "单位"
-#: sys-utils/prlimit.c:154
+#: sys-utils/prlimit.c:159
#, c-format
msgid " %s [options] [-p PID]\n"
msgstr " %s [选项] [-p PID]\n"
-#: sys-utils/prlimit.c:156
+#: sys-utils/prlimit.c:161
#, c-format
msgid " %s [options] COMMAND\n"
msgstr " %s [选项] 命令\n"
-#: sys-utils/prlimit.c:158
+#: sys-utils/prlimit.c:163
msgid ""
"\n"
"General Options:\n"
@@ -14246,7 +13631,7 @@ msgstr ""
"\n"
"常规选项:\n"
-#: sys-utils/prlimit.c:159
+#: sys-utils/prlimit.c:164
msgid ""
" -p, --pid <pid> process id\n"
" -o, --output <list> define which output columns to use\n"
@@ -14264,7 +13649,7 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
" -V, --version 输出版本信息并退出\n"
-#: sys-utils/prlimit.c:167
+#: sys-utils/prlimit.c:172
msgid ""
"\n"
"Resources Options:\n"
@@ -14272,7 +13657,7 @@ msgstr ""
"\n"
"资源选项:\n"
-#: sys-utils/prlimit.c:168
+#: sys-utils/prlimit.c:173
msgid ""
" -c, --core maximum size of core files created\n"
" -d, --data maximum size of a process's data segment\n"
@@ -14310,46 +13695,46 @@ msgstr ""
" -y, --rttime 实时调度时进程调度的 CPU\n"
" (间隔)时间(毫秒)\n"
-#: sys-utils/prlimit.c:236 sys-utils/prlimit.c:242 sys-utils/prlimit.c:360
-#: sys-utils/prlimit.c:365
+#: sys-utils/prlimit.c:239 sys-utils/prlimit.c:245 sys-utils/prlimit.c:361
+#: sys-utils/prlimit.c:366
msgid "unlimited"
msgstr "无限制"
-#: sys-utils/prlimit.c:327
+#: sys-utils/prlimit.c:328
#, c-format
msgid "failed to get old %s limit"
msgstr "获取旧的 %s 限制失败"
-#: sys-utils/prlimit.c:351
+#: sys-utils/prlimit.c:352
#, c-format
msgid "the soft limit %s cannot exceed the hard limit"
msgstr "软限制 %s 不能超过硬限制"
-#: sys-utils/prlimit.c:358
+#: sys-utils/prlimit.c:359
#, c-format
msgid "New %s limit: "
msgstr "新的 %s 限制:"
-#: sys-utils/prlimit.c:372
+#: sys-utils/prlimit.c:373
#, c-format
msgid "failed to set the %s resource limit"
msgstr "设置 %s 资源限制失败"
-#: sys-utils/prlimit.c:373
+#: sys-utils/prlimit.c:374
#, c-format
msgid "failed to get the %s resource limit"
msgstr "获取 %s 资源限制失败"
-#: sys-utils/prlimit.c:450
+#: sys-utils/prlimit.c:451
#, c-format
msgid "failed to parse %s limit"
msgstr "解析 %s 限制失败"
-#: sys-utils/prlimit.c:579
+#: sys-utils/prlimit.c:580
msgid "option --pid may be specified only once"
msgstr "--pid 选项只能指定一次"
-#: sys-utils/prlimit.c:610
+#: sys-utils/prlimit.c:611
msgid "options --pid and COMMAND are mutually exclusive"
msgstr "--pid 和 命令 互相排斥"
@@ -14483,10 +13868,6 @@ msgstr "错误值 %s"
msgid "process ID"
msgstr "进程 ID"
-#: sys-utils/renice.c:164
-msgid "user ID"
-msgstr "用户 ID"
-
#: sys-utils/renice.c:166
msgid "process group ID"
msgstr "进程组 ID"
@@ -14774,16 +14155,16 @@ msgstr ""
msgid "Try `%s --help' for more information."
msgstr "请使用“%s --help”了解更多信息。"
-#: sys-utils/setarch.c:212 sys-utils/setarch.c:227
+#: sys-utils/setarch.c:235 sys-utils/setarch.c:250
#, c-format
msgid "%s: Unrecognized architecture"
msgstr "%s:未识别的架构"
-#: sys-utils/setarch.c:268 sys-utils/setarch.c:274
+#: sys-utils/setarch.c:291 sys-utils/setarch.c:297
msgid "Not enough arguments"
msgstr "参数不够"
-#: sys-utils/setarch.c:290 sys-utils/setarch.c:351
+#: sys-utils/setarch.c:313 sys-utils/setarch.c:374
#, c-format
msgid "Failed to set personality to %s"
msgstr "无法将人格(personality)设置为 %s"
@@ -14846,11 +14227,12 @@ msgstr " --securebits <位> 设置安全位\n"
#: sys-utils/setpriv.c:109
#, fuzzy
-msgid " --selinux-label <label> set SELinux label (requires process:transition)\n"
+msgid " --selinux-label <label> set SELinux label\n"
msgstr " --selinux-label <标签> 设置 SELinux 标签(需要 process:transition)\n"
#: sys-utils/setpriv.c:110
-msgid " --apparmor-profile <pr> set AppArmor profile (requires onexec permission)\n"
+#, fuzzy
+msgid " --apparmor-profile <pr> set AppArmor profile\n"
msgstr " --apparmor-profile <pr> 设置 AppArmor 配置文件(需要 onexec 权限)\n"
#: sys-utils/setpriv.c:115
@@ -14992,6 +14374,11 @@ msgstr "无法识别的安全位"
msgid "SELinux is not running"
msgstr "SELinux 没有运行"
+#: sys-utils/setpriv.c:531
+#, fuzzy, c-format
+msgid "close failed: %s"
+msgstr "定位失败:%s"
+
#: sys-utils/setpriv.c:539
msgid "AppArmor is not running"
msgstr "AppArmor 没有运行"
@@ -15117,10 +14504,6 @@ msgstr "激活权能"
msgid "reactivate capabilities"
msgstr "重新激活权能"
-#: sys-utils/setpriv.c:808 sys-utils/setpriv.c:812
-msgid "setgroups failed"
-msgstr "setgroups 失败"
-
#: sys-utils/setpriv.c:817
#, fuzzy
msgid "set process securebits failed"
@@ -15183,7 +14566,7 @@ msgstr "非超级用户。"
msgid "%s: swapoff failed"
msgstr "%s:swapoff 失败"
-#: sys-utils/swapoff.c:68 sys-utils/swapon.c:683
+#: sys-utils/swapoff.c:68 sys-utils/swapon.c:678
#, c-format
msgid " %s [options] [<spec>]\n"
msgstr " %s [选项] [<指定>]\n"
@@ -15216,23 +14599,23 @@ msgstr ""
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:100
+#: sys-utils/swapon.c:102
msgid "device file or partition path"
msgstr "设备文件或分区路径"
-#: sys-utils/swapon.c:101
+#: sys-utils/swapon.c:103
msgid "type of the device"
msgstr "设备的类型"
-#: sys-utils/swapon.c:102
+#: sys-utils/swapon.c:104
msgid "size of the swap area"
msgstr "交换区大小"
-#: sys-utils/swapon.c:103
+#: sys-utils/swapon.c:105
msgid "bytes in use"
msgstr "已使用字节数"
-#: sys-utils/swapon.c:104
+#: sys-utils/swapon.c:106
msgid "swap priority"
msgstr "交换优先级"
@@ -15245,100 +14628,95 @@ msgstr "%s\t\t\t\t类型\t\t大小\t已用\t权限\n"
msgid "Filename"
msgstr "文件名"
-#: sys-utils/swapon.c:275
+#: sys-utils/swapon.c:273
#, c-format
msgid "%s: reinitializing the swap."
msgstr "%s:正在重新初始化交换区。"
-#: sys-utils/swapon.c:327
+#: sys-utils/swapon.c:325
#, c-format
msgid "%s: lseek failed"
msgstr "%s:lseek 失败"
-#: sys-utils/swapon.c:333
+#: sys-utils/swapon.c:331
#, c-format
msgid "%s: write signature failed"
msgstr "%s:写签名失败"
-#: sys-utils/swapon.c:420
-#, c-format
-msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
+#: sys-utils/swapon.c:415
+#, fuzzy, c-format
+msgid "%s: found swap signature: version %ud, page-size %d, %s byte order"
msgstr "%s:找到交换区签名:版本为 %d,页面大小为 %d,%s 字节顺序"
-#: sys-utils/swapon.c:425
+#: sys-utils/swapon.c:420
msgid "different"
msgstr "不同"
-#: sys-utils/swapon.c:425
+#: sys-utils/swapon.c:420
msgid "same"
msgstr "相同"
-#: sys-utils/swapon.c:468
+#: sys-utils/swapon.c:463
#, c-format
msgid "%s: insecure permissions %04o, %04o suggested."
msgstr "%s:不安全的权限 %04o,建议使用 %04o。"
-#: sys-utils/swapon.c:473
+#: sys-utils/swapon.c:468
#, c-format
msgid "%s: insecure file owner %d, 0 (root) suggested."
msgstr "%s:不安全的文件拥有者 %d,建议使用 0(root)。"
-#: sys-utils/swapon.c:479
+#: sys-utils/swapon.c:474
#, c-format
msgid "%s: skipping - it appears to have holes."
msgstr "%s:将跳过 - 它似乎有空洞。"
-#: sys-utils/swapon.c:493
+#: sys-utils/swapon.c:488
#, c-format
msgid "%s: get size failed"
msgstr "%s:获取大小失败"
-#: sys-utils/swapon.c:499
+#: sys-utils/swapon.c:494
#, c-format
msgid "%s: read swap header failed"
msgstr "%s:读交换区头失败"
-#: sys-utils/swapon.c:509
+#: sys-utils/swapon.c:504
#, c-format
msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
msgstr "%s:页大小=%d,交换区大小=%llu,设备大小=%llu"
-#: sys-utils/swapon.c:514
+#: sys-utils/swapon.c:509
#, c-format
msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
msgstr "%s:末页 0x%08llx 大于交换空间的实际大小"
-#: sys-utils/swapon.c:524
+#: sys-utils/swapon.c:519
#, c-format
msgid "%s: swap format pagesize does not match."
msgstr "%s:交换格式页大小不匹配。"
-#: sys-utils/swapon.c:532
+#: sys-utils/swapon.c:527
#, c-format
msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
msgstr "%s:交换格式页大小不匹配。(使用 --fixpgsz 来重新对它初始化。)"
-#: sys-utils/swapon.c:541
+#: sys-utils/swapon.c:536
#, c-format
msgid "%s: software suspend data detected. Rewriting the swap signature."
msgstr "%s:检测到软件挂起数据。将重新写交换区签名。"
-#: sys-utils/swapon.c:566
+#: sys-utils/swapon.c:561
#, c-format
msgid "swapon %s\n"
msgstr "swapon %s\n"
-#: sys-utils/swapon.c:605
+#: sys-utils/swapon.c:600
#, c-format
msgid "%s: swapon failed"
msgstr "%s:swapon 失败"
-#: sys-utils/swapon.c:632 sys-utils/umount.c:325
-#, c-format
-msgid "failed to parse %s"
-msgstr "解析 %s 失败"
-
-#: sys-utils/swapon.c:686
+#: sys-utils/swapon.c:681
#, fuzzy
msgid ""
" -a, --all enable all swaps from /etc/fstab\n"
@@ -15365,7 +14743,7 @@ msgstr ""
" --bytes 在 --show 选项输出中以字节显示交换区大小\n"
" -v, --verbose 详尽模式\n"
-#: sys-utils/swapon.c:702
+#: sys-utils/swapon.c:697
msgid ""
"\n"
"The <spec> parameter:\n"
@@ -15389,7 +14767,7 @@ msgstr ""
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:712
+#: sys-utils/swapon.c:707
msgid ""
"\n"
"Available discard policy types (for --discard):\n"
@@ -15403,7 +14781,7 @@ msgstr ""
" pages\t :对释放的页在重新使用前丢弃\n"
" * 如果未选择策略,则两者都将启用。(默认)\n"
-#: sys-utils/swapon.c:717
+#: sys-utils/swapon.c:712
msgid ""
"\n"
"Available columns (for --show):\n"
@@ -15411,11 +14789,11 @@ msgstr ""
"\n"
"可用列(用于 --show):\n"
-#: sys-utils/swapon.c:775
+#: sys-utils/swapon.c:770
msgid "failed to parse priority"
msgstr "解析优先级失败"
-#: sys-utils/swapon.c:794
+#: sys-utils/swapon.c:789
#, c-format
msgid "unsupported discard policy: %s"
msgstr "不支持的丢弃策略:%s"
@@ -15425,61 +14803,61 @@ msgstr "不支持的丢弃策略:%s"
msgid "cannot find the device for %s"
msgstr "找不到对应 %s 的设备"
-#: sys-utils/switch_root.c:57
+#: sys-utils/switch_root.c:59
msgid "failed to open directory"
msgstr "打开目录失败"
-#: sys-utils/switch_root.c:65 term-utils/wall.c:297
+#: sys-utils/switch_root.c:67 term-utils/wall.c:298
msgid "stat failed"
msgstr "stat 失败"
-#: sys-utils/switch_root.c:75
+#: sys-utils/switch_root.c:78
msgid "failed to read directory"
msgstr "读目录失败"
-#: sys-utils/switch_root.c:107
+#: sys-utils/switch_root.c:112
#, c-format
msgid "failed to unlink %s"
msgstr "unlink %s 失败"
-#: sys-utils/switch_root.c:144
+#: sys-utils/switch_root.c:149
#, c-format
msgid "failed to mount moving %s to %s"
msgstr "将 %s 挂载移动到 %s 失败"
-#: sys-utils/switch_root.c:146
+#: sys-utils/switch_root.c:151
#, c-format
msgid "forcing unmount of %s"
msgstr "正在强制卸载 %s"
-#: sys-utils/switch_root.c:152
+#: sys-utils/switch_root.c:157
#, c-format
msgid "failed to change directory to %s"
msgstr "将目录更改到 %s 失败"
-#: sys-utils/switch_root.c:164
+#: sys-utils/switch_root.c:169
#, c-format
msgid "failed to mount moving %s to /"
msgstr "将 %s 挂载移动到 / 失败"
-#: sys-utils/switch_root.c:170
+#: sys-utils/switch_root.c:175
msgid "failed to change root"
msgstr "更改 root 失败"
-#: sys-utils/switch_root.c:181
+#: sys-utils/switch_root.c:188
msgid "old root filesystem is not an initramfs"
msgstr "旧根文件系统不是 initramfs 格式"
-#: sys-utils/switch_root.c:195
+#: sys-utils/switch_root.c:201
#, c-format
msgid " %s [options] <newrootdir> <init> <args to init>\n"
msgstr " %s [选项] <新根目录> <init 程序> <init 程序参数>\n"
-#: sys-utils/switch_root.c:227
+#: sys-utils/switch_root.c:233
msgid "failed. Sorry."
msgstr "失败了。抱歉。"
-#: sys-utils/switch_root.c:230
+#: sys-utils/switch_root.c:236
#, c-format
msgid "cannot access %s"
msgstr "无法访问 %s"
@@ -15610,7 +14988,7 @@ msgstr " -a, --all 卸载所有文件系统\n"
#: sys-utils/umount.c:83
#, fuzzy
msgid ""
-" -A, --all-targets unmount all mountpoins for the given device in the\n"
+" -A, --all-targets unmount all mountpoints for the given device in the\n"
" current namespace\n"
msgstr ""
" -A, --all-targets 卸载当前名字空间内指定设备\n"
@@ -15726,148 +15104,162 @@ msgstr "%s:必须以超级用户身份卸载"
msgid "%s: block devices are not permitted on filesystem"
msgstr "%s:文件系统不允许块设备"
-#: sys-utils/umount.c:303
+#: sys-utils/umount.c:305
msgid "failed to set umount target"
msgstr "设置卸载目标失败"
-#: sys-utils/umount.c:319
+#: sys-utils/umount.c:321
msgid "libmount table allocation failed"
msgstr "libmount 表分配失败"
-#: sys-utils/umount.c:362 sys-utils/umount.c:440
+#: sys-utils/umount.c:364 sys-utils/umount.c:444
msgid "libmount iterator allocation failed"
msgstr "分配 libmount 迭代器失败!"
-#: sys-utils/umount.c:368
+#: sys-utils/umount.c:370
#, c-format
msgid "failed to get child fs of %s"
msgstr "获取 %s 的子文件系统失败"
-#: sys-utils/umount.c:436
+#: sys-utils/umount.c:408 sys-utils/umount.c:431
+#, c-format
+msgid "%s: not found"
+msgstr "%s:找不到"
+
+#: sys-utils/umount.c:438
#, c-format
-msgid "%s: failed to determine source"
-msgstr "%s:确定源失败"
+msgid "%s: failed to determine source (--all-targets is unsupported on systems with regular mtab file)."
+msgstr ""
+
+#: sys-utils/unshare.c:53
+#, c-format
+msgid "write failed %s"
+msgstr "写失败:%s"
-#: sys-utils/unshare.c:45
+#: sys-utils/unshare.c:67
msgid " -m, --mount unshare mounts namespace\n"
msgstr " -m, --mount 取消共享挂载名字空间\n"
-#: sys-utils/unshare.c:46
+#: sys-utils/unshare.c:68
msgid " -u, --uts unshare UTS namespace (hostname etc)\n"
msgstr " -u, --uts 取消共享 UTS 名字空间(主机名等)\n"
-#: sys-utils/unshare.c:47
+#: sys-utils/unshare.c:69
msgid " -i, --ipc unshare System V IPC namespace\n"
msgstr " -i, --ipc 取消共享 System V IPC 名字空间\n"
-#: sys-utils/unshare.c:48
+#: sys-utils/unshare.c:70
msgid " -n, --net unshare network namespace\n"
msgstr " -n, --net 取消共享网络名字空间\n"
-#: sys-utils/unshare.c:49
+#: sys-utils/unshare.c:71
msgid " -p, --pid unshare pid namespace\n"
msgstr " -p, --pid 取消共享 pid 名字空间\n"
-#: sys-utils/unshare.c:50
+#: sys-utils/unshare.c:72
msgid " -U, --user unshare user namespace\n"
msgstr " -U, --user 取消共享用户名字空间\n"
-#: sys-utils/unshare.c:51
+#: sys-utils/unshare.c:73
msgid " -f, --fork fork before launching <program>\n"
msgstr " -f, --fork 在启动<程序>前 fork\n"
-#: sys-utils/unshare.c:52
+#: sys-utils/unshare.c:74
msgid " --mount-proc[=<dir>] mount proc filesystem first (implies --mount)\n"
msgstr " --mount-proc[=<dir>] 先挂载 proc 文件系统(连带打开 --mount)\n"
-#: sys-utils/unshare.c:128
+#: sys-utils/unshare.c:75
+msgid " -r, --map-root-user map current user to root (implies --user)\n"
+msgstr ""
+
+#: sys-utils/unshare.c:158
msgid "unshare failed"
msgstr "unshare 失败"
-#: sys-utils/unshare.c:146
+#: sys-utils/unshare.c:176
msgid "child exit failed"
msgstr "子进程退出失败"
-#: sys-utils/unshare.c:153
+#: sys-utils/unshare.c:188
#, c-format
msgid "mount %s failed"
msgstr "挂载 %s 失败"
-#: sys-utils/wdctl.c:67
+#: sys-utils/wdctl.c:73
#, fuzzy
msgid "Card previously reset the CPU"
msgstr "卡曾经重置 CPU"
-#: sys-utils/wdctl.c:68
+#: sys-utils/wdctl.c:74
msgid "External relay 1"
msgstr "外部中继 1"
-#: sys-utils/wdctl.c:69
+#: sys-utils/wdctl.c:75
msgid "External relay 2"
msgstr "外部中继 2"
-#: sys-utils/wdctl.c:70
+#: sys-utils/wdctl.c:76
msgid "Fan failed"
msgstr "风扇失败"
-#: sys-utils/wdctl.c:71
+#: sys-utils/wdctl.c:77
msgid "Keep alive ping reply"
msgstr "保持活动 ping 回应"
-#: sys-utils/wdctl.c:72
+#: sys-utils/wdctl.c:78
msgid "Supports magic close char"
msgstr "支持 magic close 字符"
-#: sys-utils/wdctl.c:73
+#: sys-utils/wdctl.c:79
msgid "Reset due to CPU overheat"
msgstr "因 CPU 过热重置"
-#: sys-utils/wdctl.c:74
+#: sys-utils/wdctl.c:80
msgid "Power over voltage"
msgstr "供电电压过高"
-#: sys-utils/wdctl.c:75
+#: sys-utils/wdctl.c:81
msgid "Power bad/power fault"
msgstr "供电问题/供电故障"
-#: sys-utils/wdctl.c:76
+#: sys-utils/wdctl.c:82
msgid "Pretimeout (in seconds)"
msgstr "预超时(秒)"
-#: sys-utils/wdctl.c:77
+#: sys-utils/wdctl.c:83
msgid "Set timeout (in seconds)"
msgstr "设置超时(秒)"
-#: sys-utils/wdctl.c:78
+#: sys-utils/wdctl.c:84
msgid "Not trigger reboot"
msgstr "不触发重启"
-#: sys-utils/wdctl.c:94
+#: sys-utils/wdctl.c:100
msgid "flag name"
msgstr "标志名称"
-#: sys-utils/wdctl.c:95
+#: sys-utils/wdctl.c:101
msgid "flag description"
msgstr "标志描述"
-#: sys-utils/wdctl.c:96
+#: sys-utils/wdctl.c:102
msgid "flag status"
msgstr "标志状态"
-#: sys-utils/wdctl.c:97
+#: sys-utils/wdctl.c:103
msgid "flag boot status"
msgstr "标志启动状态"
-#: sys-utils/wdctl.c:98
+#: sys-utils/wdctl.c:104
msgid "watchdog device name"
msgstr "看门狗设备名称"
-#: sys-utils/wdctl.c:132
+#: sys-utils/wdctl.c:138
#, c-format
msgid "unknown flag: %s"
msgstr "未知标志:%s"
-#: sys-utils/wdctl.c:173
+#: sys-utils/wdctl.c:179
msgid ""
" -f, --flags <list> print selected flags only\n"
" -F, --noflags don't print information about flags\n"
@@ -15891,198 +15283,203 @@ msgstr ""
" -s, --settimeout <秒> 设置看门狗超时\n"
" -x, --flags-only 只打印标志表格(同 -I -T)\n"
-#: sys-utils/wdctl.c:189
+#: sys-utils/wdctl.c:195
#, c-format
msgid "The default device is %s.\n"
msgstr "默认设备为 %s。\n"
-#: sys-utils/wdctl.c:192
+#: sys-utils/wdctl.c:198
msgid "Available columns:\n"
msgstr "可用的列:\n"
-#: sys-utils/wdctl.c:278
+#: sys-utils/wdctl.c:288
#, c-format
msgid "%s: unknown flags 0x%x\n"
msgstr "%s:未知标志 0x%x\n"
-#: sys-utils/wdctl.c:308 sys-utils/wdctl.c:364
+#: sys-utils/wdctl.c:318 sys-utils/wdctl.c:374
#, c-format
msgid "%s: watchdog already in use, terminating."
msgstr "%s:看门狗正在使用,将终止。"
-#: sys-utils/wdctl.c:322 sys-utils/wdctl.c:392
+#: sys-utils/wdctl.c:332 sys-utils/wdctl.c:402
#, c-format
msgid "%s: failed to disarm watchdog"
msgstr "%s:喂看门狗失败"
-#: sys-utils/wdctl.c:331
+#: sys-utils/wdctl.c:341
#, c-format
msgid "cannot set timeout for %s"
msgstr "无法设置 %s 的超时"
-#: sys-utils/wdctl.c:337
+#: sys-utils/wdctl.c:347
#, 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:371
+#: sys-utils/wdctl.c:381
#, c-format
msgid "%s: failed to get information about watchdog"
msgstr "%s:获取看门狗信息失败"
-#: sys-utils/wdctl.c:453 sys-utils/wdctl.c:456 sys-utils/wdctl.c:459
+#: sys-utils/wdctl.c:463 sys-utils/wdctl.c:466 sys-utils/wdctl.c:469
#, c-format
msgid "%-14s %2i second\n"
msgid_plural "%-14s %2i seconds\n"
msgstr[0] "%-14s %2i 秒\n"
-#: sys-utils/wdctl.c:454
+#: sys-utils/wdctl.c:464
msgid "Timeout:"
msgstr "超时:"
-#: sys-utils/wdctl.c:457
+#: sys-utils/wdctl.c:467
msgid "Pre-timeout:"
msgstr "预超时:"
-#: sys-utils/wdctl.c:460
+#: sys-utils/wdctl.c:470
msgid "Timeleft:"
msgstr "剩余时间:"
-#: sys-utils/wdctl.c:594
+#: sys-utils/wdctl.c:604
msgid "Device:"
msgstr "设备:"
-#: sys-utils/wdctl.c:596
+#: sys-utils/wdctl.c:606
msgid "Identity:"
msgstr "标识:"
-#: sys-utils/wdctl.c:598
+#: sys-utils/wdctl.c:608
msgid "version"
msgstr "版本:"
-#: term-utils/agetty.c:402
+#: term-utils/agetty.c:416
#, c-format
msgid "%s%s (automatic login)\n"
msgstr "%s%s (自动登录)\n"
-#: term-utils/agetty.c:456
+#: term-utils/agetty.c:470
#, c-format
msgid "%s: can't change root directory %s: %m"
msgstr "%s:无法更改根目录 %s:%m"
-#: term-utils/agetty.c:461
+#: term-utils/agetty.c:475
#, c-format
msgid "%s: can't change working directory %s: %m"
msgstr "%s:无法更改工作目录 %s:%m"
-#: term-utils/agetty.c:466
+#: term-utils/agetty.c:480
#, c-format
msgid "%s: can't change process priority: %m"
msgstr "%s:无法更改进程优先级:%m"
-#: term-utils/agetty.c:479
+#: term-utils/agetty.c:491
#, c-format
msgid "%s: can't exec %s: %m"
msgstr "%s:无法执行 %s:%m"
-#: term-utils/agetty.c:510 term-utils/agetty.c:788 term-utils/agetty.c:800
-#: term-utils/agetty.c:1292 term-utils/agetty.c:1310 term-utils/agetty.c:1342
-#: term-utils/agetty.c:1352 term-utils/agetty.c:1390 term-utils/agetty.c:1666
-#: term-utils/agetty.c:2153
+#: term-utils/agetty.c:522 term-utils/agetty.c:805 term-utils/agetty.c:817
+#: term-utils/agetty.c:1348 term-utils/agetty.c:1366 term-utils/agetty.c:1398
+#: term-utils/agetty.c:1408 term-utils/agetty.c:1445 term-utils/agetty.c:1721
+#: term-utils/agetty.c:2234
#, c-format
msgid "failed to allocate memory: %m"
msgstr "分配内存失败:%m"
-#: term-utils/agetty.c:670
+#: term-utils/agetty.c:684
msgid "invalid argument of --local-line"
msgstr "--local-line 选项参数无效"
-#: term-utils/agetty.c:699
+#: term-utils/agetty.c:716
#, c-format
msgid "bad timeout value: %s"
msgstr "超时值有误:%s"
-#: term-utils/agetty.c:818
+#: term-utils/agetty.c:835
#, c-format
msgid "bad speed: %s"
msgstr "速度有误:%s"
-#: term-utils/agetty.c:820
+#: term-utils/agetty.c:837
msgid "too many alternate speeds"
msgstr "备选速度过多"
-#: term-utils/agetty.c:945 term-utils/agetty.c:962 term-utils/agetty.c:1002
+#: term-utils/agetty.c:962 term-utils/agetty.c:979 term-utils/agetty.c:1019
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr "/dev/%s:无法以标准输入打开:%m"
-#: term-utils/agetty.c:966 term-utils/agetty.c:970
+#: term-utils/agetty.c:985
#, c-format
msgid "/dev/%s: not a character device"
msgstr "/dev/%s:不是字符设备"
-#: term-utils/agetty.c:974 term-utils/agetty.c:1006
+#: term-utils/agetty.c:987
+#, fuzzy, c-format
+msgid "/dev/%s: not a tty"
+msgstr "/dev/%s:不是字符设备"
+
+#: term-utils/agetty.c:991 term-utils/agetty.c:1023
#, c-format
msgid "/dev/%s: cannot get controlling tty: %m"
msgstr "/dev/%s:无法获取控制 tty:%m"
-#: term-utils/agetty.c:996
+#: term-utils/agetty.c:1013
#, c-format
msgid "/dev/%s: vhangup() failed: %m"
msgstr "/dev/%s:vhangup() 失败:%m"
-#: term-utils/agetty.c:1017
+#: term-utils/agetty.c:1034
#, c-format
msgid "%s: not open for read/write"
msgstr "%s:未打开(就)读/写"
-#: term-utils/agetty.c:1022
+#: term-utils/agetty.c:1039
#, c-format
msgid "/dev/%s: cannot set process group: %m"
msgstr "/dev/%s:无法设置进程组:%m"
-#: term-utils/agetty.c:1036
+#: term-utils/agetty.c:1053
#, c-format
msgid "%s: dup problem: %m"
msgstr "%s:dup 问题:%m"
-#: term-utils/agetty.c:1053
+#: term-utils/agetty.c:1070
#, c-format
msgid "%s: failed to get terminal attributes: %m"
msgstr "%s:获取终端属性失败:%m"
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1254 term-utils/agetty.c:1274
#, c-format
msgid "setting terminal attributes failed: %m"
msgstr "设置终端属性失败:%m"
-#: term-utils/agetty.c:1333
+#: term-utils/agetty.c:1389
#, c-format
msgid "cannot open: %s: %m"
msgstr "无法打开 %s:%m"
-#: term-utils/agetty.c:1440
+#: term-utils/agetty.c:1495
msgid "[press ENTER to login]"
msgstr "[按 ENTER 键登录]"
-#: term-utils/agetty.c:1456
+#: term-utils/agetty.c:1511
msgid "Num Lock off"
msgstr "Num Lock 关"
-#: term-utils/agetty.c:1459
+#: term-utils/agetty.c:1514
msgid "Num Lock on"
msgstr "Num Lock 开"
-#: term-utils/agetty.c:1462
+#: term-utils/agetty.c:1517
msgid "Caps Lock on"
msgstr "Caps Lock 开"
-#: term-utils/agetty.c:1465
+#: term-utils/agetty.c:1520
msgid "Scroll Lock on"
msgstr "Scroll Lock 开"
-#: term-utils/agetty.c:1468
+#: term-utils/agetty.c:1523
#, c-format
msgid ""
"Hint: %s\n"
@@ -16091,32 +15488,32 @@ msgstr ""
"提示:%s\n"
"\n"
-#: term-utils/agetty.c:1587
+#: term-utils/agetty.c:1642
#, c-format
msgid "%s: read: %m"
msgstr "%s:read:%m"
-#: term-utils/agetty.c:1646
+#: term-utils/agetty.c:1701
#, c-format
msgid "%s: input overrun"
msgstr "%s:输入过载"
-#: term-utils/agetty.c:1662 term-utils/agetty.c:1670
+#: term-utils/agetty.c:1717 term-utils/agetty.c:1725
#, c-format
msgid "%s: invalid character conversion for login name"
msgstr "%s:登录名字符转换无效"
-#: term-utils/agetty.c:1676
+#: term-utils/agetty.c:1731
#, c-format
msgid "%s: invalid character 0x%x in login name"
msgstr "%s:登录名中的字符 0x%x 无效"
-#: term-utils/agetty.c:1761
+#: term-utils/agetty.c:1816
#, c-format
msgid "%s: failed to set terminal attributes: %m"
msgstr "%s:设置终端属性失败:%m"
-#: term-utils/agetty.c:1797
+#: term-utils/agetty.c:1852
#, c-format
msgid ""
" %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n"
@@ -16125,133 +15522,149 @@ msgstr ""
" %1$s [选项] <线路> [<波特率>,...] [<终端类型>]\n"
" %1$s [选项] <波特率>,... <线路> [<终端类型>]\n"
-#: term-utils/agetty.c:1800
+#: term-utils/agetty.c:1855
msgid " -8, --8bits assume 8-bit tty\n"
msgstr " -8, --8bits 采用 8 位 tty\n"
-#: term-utils/agetty.c:1801
+#: term-utils/agetty.c:1856
msgid " -a, --autologin <user> login the specified user automatically\n"
msgstr " -a, --autologin <用户> 以指定用户自动登录\n"
-#: term-utils/agetty.c:1802
+#: term-utils/agetty.c:1857
msgid " -c, --noreset do not reset control mode\n"
msgstr " -c, --noreset 不重置控制模式\n"
-#: term-utils/agetty.c:1803
+#: term-utils/agetty.c:1858
msgid " -E, --remote use -r <hostname> for login(1)\n"
msgstr " -E, --remote 使用 -r <主机名> 选项调用 login(1)\n"
-#: term-utils/agetty.c:1804
+#: term-utils/agetty.c:1859
msgid " -f, --issue-file <file> display issue file\n"
msgstr " -f, --issue-file <文件> 指定要显示的预登录消息(issue)文件\n"
-#: term-utils/agetty.c:1805
+#: term-utils/agetty.c:1860
msgid " -h, --flow-control enable hardware flow control\n"
msgstr " -h, --flow-control 启用硬件流控制\n"
-#: term-utils/agetty.c:1806
+#: term-utils/agetty.c:1861
msgid " -H, --host <hostname> specify login host\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: term-utils/agetty.c:1807
+#: term-utils/agetty.c:1862
msgid " -i, --noissue do not display issue file\n"
msgstr " -i, --noissue 不显示预登录消息(issue)文件\n"
-#: term-utils/agetty.c:1808
+#: term-utils/agetty.c:1863
msgid " -I, --init-string <string> set init string\n"
msgstr " -I, --init-string <字符串> 设置初始字符串\n"
-#: term-utils/agetty.c:1809
+#: term-utils/agetty.c:1864
+#, fuzzy
+msgid " -J --noclear do not clear the screen before prompt\n"
+msgstr " --noclear 提示登录名之前不清屏\n"
+
+#: term-utils/agetty.c:1865
msgid " -l, --login-program <file> specify login program\n"
msgstr " -l, --login-program <文件> 指定登录程序\n"
-#: term-utils/agetty.c:1810
+#: term-utils/agetty.c:1866
msgid " -L, --local-line[=<mode>] control the local line flag\n"
msgstr " -L, --local-line[=<模式>] 控制本地线路标志\n"
-#: term-utils/agetty.c:1811
+#: term-utils/agetty.c:1867
msgid " -m, --extract-baud extract baud rate during connect\n"
msgstr " -m, --extract-baud 连接过程中提取波特率\n"
-#: term-utils/agetty.c:1812
+#: term-utils/agetty.c:1868
msgid " -n, --skip-login do not prompt for login\n"
msgstr " -n, --skip-login 不提示登录\n"
-#: term-utils/agetty.c:1813
+#: term-utils/agetty.c:1869
+#, fuzzy
+msgid " -N --nonewline do not print a newline before issue\n"
+msgstr " --nonewline 在显示预登录消息(issue)前不打印换行(newline)\n"
+
+#: term-utils/agetty.c:1870
msgid " -o, --login-options <opts> options that are passed to login\n"
msgstr " -o, --login-options <选项> 传递给登录程序的选项\n"
-#: term-utils/agetty.c:1814
+#: term-utils/agetty.c:1871
msgid " -p, --login-pause wait for any key before the login\n"
msgstr " -p, --login-pause 登录前等待按下任意键来继续\n"
-#: term-utils/agetty.c:1815
+#: term-utils/agetty.c:1872
msgid " -r, --chroot <dir> change root to the directory\n"
msgstr " -r, --chroot <目录> 将根目录更改为指定目录\n"
-#: term-utils/agetty.c:1816
+#: term-utils/agetty.c:1873
msgid " -R, --hangup do virtually hangup on the tty\n"
msgstr " -R, --hangup 对 tty 执行虚拟挂起(virtual hangup)\n"
-#: term-utils/agetty.c:1817
+#: term-utils/agetty.c:1874
msgid " -s, --keep-baud try to keep baud rate after break\n"
msgstr " -s, --keep-baud 中断(break)后尝试保持波特率\n"
-#: term-utils/agetty.c:1818
+#: term-utils/agetty.c:1875
msgid " -t, --timeout <number> login process timeout\n"
msgstr " -t, --timeout <数字> 登录进程超时(秒)\n"
-#: term-utils/agetty.c:1819
+#: term-utils/agetty.c:1876
msgid " -U, --detect-case detect uppercase terminal\n"
msgstr " -U, --detect-case 检测纯大写终端\n"
-#: term-utils/agetty.c:1820
+#: term-utils/agetty.c:1877
msgid " -w, --wait-cr wait carriage-return\n"
msgstr " -w, --wait-cr 等待回车\n"
-#: term-utils/agetty.c:1821
-msgid " --noclear do not clear the screen before prompt\n"
-msgstr " --noclear 提示登录名之前不清屏\n"
-
-#: term-utils/agetty.c:1822
+#: term-utils/agetty.c:1878
msgid " --nohints do not print hints\n"
msgstr " --nohints 不打印提示信息\n"
-#: term-utils/agetty.c:1823
-msgid " --nonewline do not print a newline before issue\n"
-msgstr " --nonewline 在显示预登录消息(issue)前不打印换行(newline)\n"
-
-#: term-utils/agetty.c:1824
+#: term-utils/agetty.c:1879
msgid " --nohostname no hostname at all will be shown\n"
msgstr " --nohostname 将完全不显示主机名\n"
-#: term-utils/agetty.c:1825
+#: term-utils/agetty.c:1880
msgid " --long-hostname show full qualified hostname\n"
msgstr " --long-hostname 显示完全限定主机名\n"
-#: term-utils/agetty.c:1826
+#: term-utils/agetty.c:1881
msgid " --erase-chars <string> additional backspace chars\n"
msgstr " --erase-chars <字符串> 附加的退格字符\n"
-#: term-utils/agetty.c:1827
+#: term-utils/agetty.c:1882
msgid " --kill-chars <string> additional kill chars\n"
msgstr " --kill-chars <字符串> 附加的杀死(kill)字符\n"
-#: term-utils/agetty.c:1828
+#: term-utils/agetty.c:1883
+msgid " --chdir <directory> chdir before the login\n"
+msgstr ""
+
+#: term-utils/agetty.c:1884
+#, fuzzy
+msgid " --delay <number> sleep seconds before prompt\n"
+msgstr " --noclear 提示登录名之前不清屏\n"
+
+#: term-utils/agetty.c:1885
+#, fuzzy
+msgid " --nice <number> run login with this priority\n"
+msgstr " -t, --tag <标志> 用此标志标记每一行\n"
+
+#: term-utils/agetty.c:1886
msgid " --help display this help and exit\n"
msgstr " --help 显示此帮助并退出\n"
-#: term-utils/agetty.c:1829
+#: term-utils/agetty.c:1887
msgid " --version output version information and exit\n"
msgstr " --version 输出版本信息并退出\n"
-#: term-utils/agetty.c:2118
+#: term-utils/agetty.c:2198
#, c-format
msgid "%d user"
msgid_plural "%d users"
msgstr[0] "%d 位用户"
-#: term-utils/agetty.c:2241
+#: term-utils/agetty.c:2322
#, c-format
msgid "checkname failed: %m"
msgstr "checkname 失败:%m"
@@ -16295,7 +15708,7 @@ msgstr "拒绝了写您的终端"
msgid "invalid argument: %s"
msgstr "无效参数:%s"
-#: term-utils/script.c:122
+#: term-utils/script.c:133
#, c-format
msgid ""
"output file `%s' is a link\n"
@@ -16306,12 +15719,12 @@ msgstr ""
"如果真想用它,使用 --force 选项。\n"
"程序没有启动。"
-#: term-utils/script.c:132
+#: term-utils/script.c:143
#, c-format
msgid " %s [options] [file]\n"
msgstr " %s [选项] [文件]\n"
-#: term-utils/script.c:135
+#: term-utils/script.c:146
msgid ""
" -a, --append append the output\n"
" -c, --command <command> run command rather than interactive shell\n"
@@ -16335,21 +15748,21 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: term-utils/script.c:243
+#: term-utils/script.c:252
#, c-format
msgid "Script started, file is %s\n"
msgstr "脚本已启动,文件为 %s\n"
-#: term-utils/script.c:367
+#: term-utils/script.c:440
#, c-format
msgid "Script started on %s"
msgstr "脚本启动于 %s"
-#: term-utils/script.c:403
+#: term-utils/script.c:481
msgid "cannot write script file"
msgstr "无法写脚本文件"
-#: term-utils/script.c:489
+#: term-utils/script.c:580
#, c-format
msgid ""
"\n"
@@ -16358,16 +15771,21 @@ msgstr ""
"\n"
"脚本完成,于 %s"
-#: term-utils/script.c:499
+#: term-utils/script.c:597
#, c-format
msgid "Script done, file is %s\n"
msgstr "脚本完成,文件为 %s\n"
-#: term-utils/script.c:521
+#: term-utils/script.c:623
+#, fuzzy
+msgid "failed to get terminal attributes"
+msgstr "%s:获取终端属性失败:%m"
+
+#: term-utils/script.c:630
msgid "openpty failed"
msgstr "openpty 失败"
-#: term-utils/script.c:557
+#: term-utils/script.c:670
msgid "out of pty's"
msgstr "pty 的输出"
@@ -16377,10 +15795,12 @@ msgid " %s [-t] timingfile [typescript] [divisor]\n"
msgstr " %s [-t] timingfile [typescript] [divisor]\n"
#: term-utils/scriptreplay.c:46
+#, fuzzy
msgid ""
" -t, --timing <file> script timing output file\n"
" -s, --typescript <file> script terminal session output file\n"
" -d, --divisor <num> speed up or slow down execution with time divisor\n"
+" -m, --maxdelay <num> wait at most this many seconds between updates\n"
" -V, --version output version information and exit\n"
" -h, --help display this help and exit\n"
"\n"
@@ -16392,308 +15812,362 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: term-utils/scriptreplay.c:65
+#: term-utils/scriptreplay.c:66
#, c-format
msgid "expected a number, but got '%s'"
msgstr "应为数字,但收到了“%s”"
-#: term-utils/scriptreplay.c:68 term-utils/scriptreplay.c:72
+#: term-utils/scriptreplay.c:69 term-utils/scriptreplay.c:73
#, c-format
msgid "divisor '%s'"
msgstr "除数“%s”"
-#: term-utils/scriptreplay.c:116
+#: term-utils/scriptreplay.c:117
msgid "write to stdout failed"
msgstr "写 stdout 失败"
-#: term-utils/scriptreplay.c:122
+#: term-utils/scriptreplay.c:123
#, c-format
msgid "unexpected end of file on %s"
msgstr "%s 上的文件结尾异常"
-#: term-utils/scriptreplay.c:124
+#: term-utils/scriptreplay.c:125
#, c-format
msgid "failed to read typescript file %s"
msgstr "读 typescript 文件 %s 失败"
-#: term-utils/scriptreplay.c:185
+#: term-utils/scriptreplay.c:190
msgid "wrong number of arguments"
msgstr "参数个数不正确"
-#: term-utils/scriptreplay.c:215
+#: term-utils/scriptreplay.c:221
#, c-format
msgid "failed to read timing file %s"
msgstr "读时序文件 %s 失败"
-#: term-utils/scriptreplay.c:217
+#: term-utils/scriptreplay.c:223
#, c-format
msgid "timings file %s: %lu: unexpected format"
msgstr "时序文件 %s:%lu:格式异常"
-#: term-utils/setterm.c:675
-msgid "Argument error."
+#: 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
+#, fuzzy, c-format
+msgid "argument error: %s"
msgstr "参数出错。"
-#: term-utils/setterm.c:682
-msgid " -term <terminal_name>\n"
-msgstr " -term <终端名>\n"
+#: 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
+#, fuzzy
+msgid "argument error"
+msgstr "参数出错。"
-#: term-utils/setterm.c:683
-msgid " -reset\n"
-msgstr " -reset\n"
+#: term-utils/setterm.c:260
+#, fuzzy, c-format
+msgid "argument error: bright %s is not supported"
+msgstr "不支持交换空间版本 %d"
-#: term-utils/setterm.c:684
-msgid " -initialize\n"
-msgstr " -initialize\n"
+#: term-utils/setterm.c:351
+#, fuzzy
+msgid "too many tabs"
+msgstr "参数过多"
-#: term-utils/setterm.c:685
-msgid " -cursor <on|off>\n"
-msgstr " -cursor <on|off>\n"
+#: term-utils/setterm.c:405
+#, fuzzy
+msgid " --term <terminal_name> override TERM environment variable\n"
+msgstr " -t, -T, --terminal TERMINAL 用 TERMINAL 覆盖 TERM 环境变量的值\n"
-#: term-utils/setterm.c:686
-msgid " -repeat <on|off>\n"
-msgstr " -repeat <on|off>\n"
+#: term-utils/setterm.c:406
+#, fuzzy
+msgid " --reset reset terminal to power on state\n"
+msgstr " -r, --reset 重置端口\n"
-#: term-utils/setterm.c:687
-msgid " -appcursorkeys <on|off>\n"
-msgstr " -appcursorkeys <on|off>\n"
+#: term-utils/setterm.c:407
+#, fuzzy
+msgid " --initialize display init string, and use default settings\n"
+msgstr " -q, --stats 显示 tty 统计信息\n"
-#: term-utils/setterm.c:688
-msgid " -linewrap <on|off>\n"
-msgstr " -linewrap <on|off>\n"
+#: term-utils/setterm.c:408
+#, fuzzy
+msgid " --default use default terminal settings\n"
+msgstr " -a, --all 列出所有使用的设备\n"
-#: term-utils/setterm.c:689
-msgid " -default\n"
-msgstr " -default\n"
+#: term-utils/setterm.c:409
+#, fuzzy
+msgid " --store save current terminal settings as default\n"
+msgstr " -q, --stats 显示 tty 统计信息\n"
-#: term-utils/setterm.c:690
-msgid " -foreground <default|black|blue|cyan|green|magenta|red|white|yellow>\n"
-msgstr " -foreground <default|black|blue|cyan|green|magenta|red|white|yellow>\n"
+#: term-utils/setterm.c:410
+#, fuzzy
+msgid " --cursor [on|off] display cursor\n"
+msgstr " -g, --get-threshold 显示当前阈值\n"
-#: term-utils/setterm.c:691
-msgid " -background <default|black|blue|cyan|green|magenta|red|white|yellow>\n"
-msgstr " -background <default|black|blue|cyan|green|magenta|red|white|yellow>\n"
+#: term-utils/setterm.c:411
+#, fuzzy
+msgid " --repeat [on|off] keyboard repeat\n"
+msgstr " -r, --reset 重置端口\n"
-#: term-utils/setterm.c:692 term-utils/setterm.c:693
-msgid " -ulcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"
-msgstr " -ulcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"
+#: term-utils/setterm.c:412
+msgid " --appcursorkeys [on|off] cursor key application mode\n"
+msgstr ""
-#: term-utils/setterm.c:694 term-utils/setterm.c:695
-msgid " -hbcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"
-msgstr " -hbcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"
+#: term-utils/setterm.c:413
+#, fuzzy
+msgid " --linewrap [on|off] continue on a new line when a line is full\n"
+msgstr " -, -l, --login 使 shell 成为登录 shell\n"
-#: term-utils/setterm.c:696
-msgid " -inversescreen <on|off>\n"
-msgstr " -inversescreen <on|off>\n"
+#: term-utils/setterm.c:414
+msgid " --inversescreen [on|off] swap colors for the whole screen\n"
+msgstr ""
-#: term-utils/setterm.c:697
-msgid " -bold <on|off>\n"
-msgstr " -bold <on|off>\n"
+#: term-utils/setterm.c:415
+msgid " --foreground [default|color] set foreground color\n"
+msgstr ""
-#: term-utils/setterm.c:698
-msgid " -half-bright <on|off>\n"
-msgstr " -half-bright <on|off>\n"
+#: term-utils/setterm.c:416
+msgid " --background [default|color] set background color\n"
+msgstr ""
-#: term-utils/setterm.c:699
-msgid " -blink <on|off>\n"
-msgstr " -blink <on|off>\n"
+#: term-utils/setterm.c:417
+msgid " --ulcolor [bright] [color] set underlined text color\n"
+msgstr ""
-#: term-utils/setterm.c:700
-msgid " -reverse <on|off>\n"
-msgstr " -reverse <on|off>\n"
+#: term-utils/setterm.c:418
+msgid " --hbcolor [bright] [color] set bold text color\n"
+msgstr ""
-#: term-utils/setterm.c:701
-msgid " -underline <on|off>\n"
-msgstr " -underline <on|off>\n"
+#: term-utils/setterm.c:419
+#, fuzzy
+msgid " [color]: black blue cyan green grey magenta red white yellow\n"
+msgstr " -ulcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"
-#: term-utils/setterm.c:702
-msgid " -store\n"
-msgstr " -store\n"
+#: term-utils/setterm.c:420
+#, fuzzy
+msgid " --bold [on|off] bold\n"
+msgstr " -v, --verbose 详尽模式\n"
-#: term-utils/setterm.c:703
-msgid " -clear <all|rest>\n"
-msgstr " -clear <all|rest>\n"
+#: term-utils/setterm.c:421
+#, fuzzy
+msgid " --half-bright [on|off] dim\n"
+msgstr " -half-bright <on|off>\n"
-#: term-utils/setterm.c:704
-msgid " -tabs <tab1 tab2 tab3 ...> (tabn = 1-160)\n"
-msgstr " -tabs <tab1 tab2 tab3 ...> (tabn = 1-160)\n"
+#: term-utils/setterm.c:422
+msgid " --blink [on|off] blink\n"
+msgstr ""
-#: term-utils/setterm.c:705
-msgid " -clrtabs <tab1 tab2 tab3 ...> (tabn = 1-160)\n"
-msgstr " -clrtabs <tab1 tab2 tab3 ...> (tabn = 1-160)\n"
+#: term-utils/setterm.c:423
+#, fuzzy
+msgid " --underline [on|off] underline\n"
+msgstr " -u, --user <用户> 用户名\n"
-#: term-utils/setterm.c:706
-msgid " -regtabs <1-160>\n"
-msgstr " -regtabs <1-160>\n"
+#: term-utils/setterm.c:424
+msgid " --reverse [on|off] swap foreground and background colors\n"
+msgstr ""
-#: term-utils/setterm.c:707
-msgid " -blank <0-60|force|poke>\n"
-msgstr " -blank <0-60|force|poke>\n"
+#: term-utils/setterm.c:425
+#, fuzzy
+msgid " --clear [all|rest] clear screen and set cursor position\n"
+msgstr " --noclear 提示登录名之前不清屏\n"
-#: term-utils/setterm.c:708
-msgid " -dump <1-NR_CONSOLES>\n"
-msgstr " -dump <1-NR_CONSOLES>\n"
+#: term-utils/setterm.c:426
+#, fuzzy
+msgid " --tabs <number ...> set tab stop positions\n"
+msgstr " -T, --test 测试 getopt(1) 版本\n"
-#: term-utils/setterm.c:709
-msgid " -append <1-NR_CONSOLES>\n"
-msgstr " -append <1-NR_CONSOLES>\n"
+#: term-utils/setterm.c:427
+msgid " --clrtabs <number ...> clear tab stop positions\n"
+msgstr ""
-#: term-utils/setterm.c:710
-msgid " -file dumpfilename\n"
-msgstr " -file dumpfilename\n"
+#: term-utils/setterm.c:428
+#, fuzzy
+msgid " --regtabs [1-160] set default tab stop position\n"
+msgstr " -r, --reset 重置端口\n"
-#: term-utils/setterm.c:711
-msgid " -msg <on|off>\n"
-msgstr " -msg <on|off>\n"
+#: term-utils/setterm.c:429
+msgid " --blank [0-60|force|poke] set inactivity interval\n"
+msgstr ""
-#: term-utils/setterm.c:712
-msgid " -msglevel <0-8>\n"
-msgstr " -msglevel <0-8>\n"
+#: term-utils/setterm.c:430
+msgid " --dump <number> write vcsa<number> console dump to file\n"
+msgstr ""
-#: term-utils/setterm.c:713
-msgid " -powersave <on|vsync|hsync|powerdown|off>\n"
+#: term-utils/setterm.c:431
+msgid " --append <number> append vcsa<number> console dump\n"
+msgstr ""
+
+#: term-utils/setterm.c:432
+msgid " --file <file> path to vcsa<number> dump file\n"
+msgstr ""
+
+#: term-utils/setterm.c:433
+#, fuzzy
+msgid " --msg [on|off] kernel messages to console\n"
+msgstr " -D, --console-off 禁止向终端打印消息\n"
+
+#: term-utils/setterm.c:434
+#, fuzzy
+msgid " --msglevel [0-8] kernel console log level\n"
+msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n"
+
+#: term-utils/setterm.c:435
+#, fuzzy
+msgid " --powersave [on|vsync|hsync|powerdown|off]\n"
msgstr " -powersave <on|vsync|hsync|powerdown|off>\n"
-#: term-utils/setterm.c:714
-msgid " -powerdown <0-60>\n"
-msgstr " -powerdown <0-60>\n"
+#: term-utils/setterm.c:436
+#, fuzzy
+msgid " set vesa powersaving features\n"
+msgstr " “%s”)\n"
-#: term-utils/setterm.c:715
-msgid " -blength <0-2000>\n"
-msgstr " -blength <0-2000>\n"
+#: term-utils/setterm.c:437
+msgid " --powerdown [0-60] set vesa powerdown interval in minutes\n"
+msgstr ""
-#: term-utils/setterm.c:716
-msgid " -bfreq freqnumber\n"
-msgstr " -bfreq freqnumber\n"
+#: term-utils/setterm.c:438
+#, fuzzy
+msgid " --blength [0-2000] duration of the bell in milliseconds\n"
+msgstr " -t, --time <毫秒数> 驱动等待时间(毫秒)\n"
-#: term-utils/setterm.c:717
-msgid " -version\n"
+#: term-utils/setterm.c:439
+msgid " --bfreq <number> bell frequency in Hertz\n"
+msgstr ""
+
+#: term-utils/setterm.c:440
+#, fuzzy
+msgid " --version\n"
msgstr " -version\n"
-#: term-utils/setterm.c:718
-msgid " -help\n"
+#: term-utils/setterm.c:441
+#, fuzzy
+msgid " --help\n"
msgstr " -help\n"
-#: term-utils/setterm.c:1073
+#: term-utils/setterm.c:449
+#, fuzzy
+msgid "duplicate use of an option"
+msgstr "复制 --groups 选项"
+
+#: term-utils/setterm.c:743
msgid "cannot force blank"
msgstr "无法强制清空(blank)"
-#: term-utils/setterm.c:1077
+#: term-utils/setterm.c:748
msgid "cannot force unblank"
msgstr "无法强制反清空(unblank)"
-#: term-utils/setterm.c:1083
+#: term-utils/setterm.c:754
msgid "cannot get blank status"
msgstr "无法获取空白状态"
-#: term-utils/setterm.c:1095
-msgid "cannot (un)set powersave mode"
-msgstr "无法设置(取消)节能模式"
-
-#: term-utils/setterm.c:1115
+#: term-utils/setterm.c:781
#, c-format
msgid "can not open dump file %s for output"
msgstr "无法打开转储文件 %s 进行输出"
-#: term-utils/setterm.c:1132 term-utils/setterm.c:1140
-msgid "klogctl error"
-msgstr "klogctl 出错"
-
-#: term-utils/setterm.c:1208
-msgid "Error writing screendump"
-msgstr "写屏幕转储失败"
+#: term-utils/setterm.c:824
+#, fuzzy, c-format
+msgid "terminal %s does not support %s"
+msgstr "用户 %s 不存在"
-#: term-utils/setterm.c:1218
-#, c-format
-msgid "Couldn't read %s"
-msgstr "无法读 %s"
+#: term-utils/setterm.c:1000
+msgid "cannot (un)set powersave mode"
+msgstr "无法设置(取消)节能模式"
-#: term-utils/setterm.c:1220
-msgid "Couldn't read neither /dev/vcsa0 nor /dev/vcsa"
-msgstr "无法读 /dev/vcsa0 或 /dev/vcsa"
+#: term-utils/setterm.c:1019 term-utils/setterm.c:1028
+msgid "klogctl error"
+msgstr "klogctl 出错"
-#: term-utils/setterm.c:1277
+#: term-utils/setterm.c:1049
msgid "$TERM is not defined."
msgstr "$TERM 未定义。"
-#: term-utils/setterm.c:1285
+#: term-utils/setterm.c:1056
msgid "terminfo database cannot be found"
msgstr "找不到 terminfo 数据库"
-#: term-utils/setterm.c:1287
+#: term-utils/setterm.c:1058
#, c-format
msgid "%s: unknown terminal type"
msgstr "%s:未知终端类型"
-#: term-utils/setterm.c:1289
+#: term-utils/setterm.c:1060
msgid "terminal is hardcopy"
msgstr "终端为硬拷贝(hardcopy)"
-#: term-utils/ttymsg.c:78
+#: term-utils/ttymsg.c:81
+#, c-format
msgid "internal error: too many iov's"
msgstr "内部错误:iov 过多"
-#: term-utils/ttymsg.c:88
+#: term-utils/ttymsg.c:94
#, c-format
msgid "excessively long line arg"
msgstr "参数行超长"
-#: term-utils/ttymsg.c:143
-#, c-format
-msgid "cannot fork"
-msgstr "无法 fork"
+#: term-utils/ttymsg.c:108
+#, fuzzy, c-format
+msgid "open failed"
+msgstr "打开失败:%s"
#: term-utils/ttymsg.c:147
-#, c-format
-msgid "fork: %s"
+#, fuzzy, c-format
+msgid "fork: %m"
msgstr "fork:%s"
-#: term-utils/ttymsg.c:178
+#: term-utils/ttymsg.c:149
+#, c-format
+msgid "cannot fork"
+msgstr "无法 fork"
+
+#: term-utils/ttymsg.c:182
#, c-format
msgid "%s: BAD ERROR, message is far too long"
msgstr "%s:严重错误,消息太长太长了"
-#: term-utils/wall.c:82
+#: term-utils/wall.c:83
#, c-format
msgid " %s [options] [<file> | <message>]\n"
msgstr " %s [选项] [<文件> | <消息>]\n"
-#: term-utils/wall.c:84
+#: term-utils/wall.c:85
msgid " -n, --nobanner do not print banner, works only for root\n"
msgstr " -n, --nobanner 不打印欢迎消息,只对 root 用户生效\n"
-#: term-utils/wall.c:85
+#: term-utils/wall.c:86
msgid " -t, --timeout <timeout> write timeout in seconds\n"
msgstr " -t, --timeout <超时> 写超时(秒)\n"
-#: term-utils/wall.c:127
+#: term-utils/wall.c:128
msgid "--nobanner is available only for root"
msgstr "--nobanner 只有 root 能用"
-#: term-utils/wall.c:132
+#: term-utils/wall.c:133
#, c-format
msgid "invalid timeout argument: %s"
msgstr "无效的超时参数:%s"
-#: term-utils/wall.c:206
+#: term-utils/wall.c:207
msgid "cannot get passwd uid"
msgstr "无法获取 passwd uid"
-#: term-utils/wall.c:211
+#: term-utils/wall.c:212
msgid "cannot get tty name"
msgstr "无法获得 tty 名称"
-#: term-utils/wall.c:229
+#: term-utils/wall.c:230
#, c-format
msgid "Broadcast message from %s@%s (%s) (%s):"
msgstr "来自 %s@%s (%s) (%s) 的广播消息:"
-#: term-utils/wall.c:264
+#: term-utils/wall.c:265
#, c-format
msgid "will not read %s - use stdin."
msgstr "将不读 %s - 使用 stdin。"
-#: term-utils/wall.c:303
+#: term-utils/wall.c:304
msgid "fread failed"
msgstr "fread 失败"
@@ -16910,112 +16384,154 @@ msgstr " -x, --fillrows 先填充行,再填充列\n"
msgid "invalid columns argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:386
+#: text-utils/column.c:392
#, c-format
msgid "line %d is too long, output will be truncated"
msgstr "第 %d 行过长,输出将截短"
-#: text-utils/display.c:263
-msgid "all input file arguments failed"
-msgstr "所有输入文件参数失败"
-
-#: text-utils/hexdump.c:66
-msgid "calling hexdump as od has been deprecated in favour to GNU coreutils od."
-msgstr "将 hexdump 作为 od 调用的方式已废弃,请转用 GNU coreutils 的 od。"
-
-#: text-utils/hexsyntax.c:142
+#: text-utils/hexdump.c:155 text-utils/more.c:319
#, c-format
msgid " %s [options] <file>...\n"
msgstr " %s [选项] <文件>...\n"
-#: text-utils/hexsyntax.c:144
+#: text-utils/hexdump.c:157
msgid " -b, --one-byte-octal one-byte octal display\n"
msgstr " -b, --one-byte-octal 单字节八进制显示\n"
-#: text-utils/hexsyntax.c:145
+#: text-utils/hexdump.c:158
msgid " -c, --one-byte-char one-byte character display\n"
msgstr " -c, --one-byte-char 单字节字符显示\n"
-#: text-utils/hexsyntax.c:146
+#: text-utils/hexdump.c:159
msgid " -C, --canonical canonical hex+ASCII display\n"
msgstr " -C, --canonical 规范化 hex+ASCII 显示\n"
-#: text-utils/hexsyntax.c:147
+#: text-utils/hexdump.c:160
msgid " -d, --two-bytes-decimal two-byte decimal display\n"
msgstr " -d, --two-bytes-decimal 双字节十进制显示\n"
-#: text-utils/hexsyntax.c:148
+#: text-utils/hexdump.c:161
msgid " -o, --two-bytes-octal two-byte octal display\n"
msgstr " -o, --two-bytes-octal 双字节八进制显示\n"
-#: text-utils/hexsyntax.c:149
+#: text-utils/hexdump.c:162
msgid " -x, --two-bytes-hex two-byte hexadecimal display\n"
msgstr " -x, --two-bytes-hex 双字节十六进制显示\n"
-#: text-utils/hexsyntax.c:150
+#: text-utils/hexdump.c:163
+msgid " -L, --color[=<mode>] interpret color formatting specifiers\n"
+msgstr ""
+
+#: text-utils/hexdump.c:164
msgid " -e, --format <format> format string to be used for displaying data\n"
msgstr " -e, --format <格式> 用于显示数据的格式化字符串\n"
-#: text-utils/hexsyntax.c:151
+#: text-utils/hexdump.c:165
msgid " -f, --format-file <file> file that contains format strings\n"
msgstr " -f, --format-file <文件> 包含格式字符串的文件\n"
-#: text-utils/hexsyntax.c:152
+#: text-utils/hexdump.c:166
msgid " -n, --length <length> interpret only length bytes of input\n"
msgstr " -n, --length <长度> 只解释规定字节长度的输入\n"
-#: text-utils/hexsyntax.c:153
+#: text-utils/hexdump.c:167
msgid " -s, --skip <offset> skip offset bytes from the beginning\n"
msgstr " -s, --skip <偏移> 跳过开头的指定字节偏移\n"
-#: text-utils/hexsyntax.c:154
+#: text-utils/hexdump.c:168
msgid " -v, --no-squeezing output identical lines\n"
msgstr " -v, --no-squeezing 输出相同的行\n"
-#: text-utils/more.c:319
+#: text-utils/hexdump.c:196
+msgid "calling hexdump as od has been deprecated in favour to GNU coreutils od."
+msgstr "将 hexdump 作为 od 调用的方式已废弃,请转用 GNU coreutils 的 od。"
+
+#: text-utils/hexdump-display.c:365
+msgid "all input file arguments failed"
+msgstr "所有输入文件参数失败"
+
+#: text-utils/hexdump-parse.c:55
#, c-format
-msgid ""
-"Usage: %s [options] file...\n"
-"\n"
-msgstr ""
-"用法:%s [选项] 文件...\n"
-"\n"
+msgid "bad byte count for conversion character %s"
+msgstr "转换字符 %s 的转换字符计数错误"
-#: text-utils/more.c:322
+#: text-utils/hexdump-parse.c:60
#, c-format
-msgid ""
-"Options:\n"
-" -d display help instead of ring bell\n"
-" -f count logical, rather than screen lines\n"
-" -l suppress pause after form feed\n"
-" -p do not scroll, clean screen and display text\n"
-" -c do not scroll, display text and clean line ends\n"
-" -u suppress underlining\n"
-" -s squeeze multiple blank lines into one\n"
-" -NUM specify the number of lines per screenful\n"
-" +NUM display file beginning from line number NUM\n"
-" +/STRING display file beginning from search string match\n"
-" -V output version information and exit\n"
+msgid "%%s requires a precision or a byte count"
+msgstr "%%s 需要指定精度或字符计数"
+
+#: text-utils/hexdump-parse.c:65
+#, c-format
+msgid "bad format {%s}"
+msgstr "格式损坏 {%s}"
+
+#: text-utils/hexdump-parse.c:70
+#, c-format
+msgid "bad conversion character %%%s"
+msgstr "转换字符 %%%s 有误"
+
+#: text-utils/hexdump-parse.c:434
+msgid "byte count with multiple conversion characters"
+msgstr "对字符计数使用了多个转换字符"
+
+#: text-utils/more.c:321
+#, fuzzy
+msgid " -d display help instead of ringing bell\n"
+msgstr " -? 显示此帮助并退出\n"
+
+#: text-utils/more.c:322
+#, fuzzy
+msgid " -f count logical rather than screen lines\n"
+msgstr " -f 不分割长行\n"
+
+#: text-utils/more.c:323
+#, fuzzy
+msgid " -l suppress pause after form feed\n"
+msgstr " -e 不在文件末尾暂停\n"
+
+#: text-utils/more.c:324
+#, fuzzy
+msgid " -c do not scroll, display text and clean line ends\n"
+msgstr " -f 不分割长行\n"
+
+#: text-utils/more.c:325
+#, fuzzy
+msgid " -p do not scroll, clean screen and display text\n"
+msgstr " -c 显示前清屏\n"
+
+#: text-utils/more.c:326
+#, fuzzy
+msgid " -s squeeze multiple blank lines into one\n"
+msgstr " -V 解释正在进行的操作\n"
+
+#: text-utils/more.c:327
+msgid " -u suppress underlining\n"
msgstr ""
-"选项:\n"
-" -d 显示帮助,而不是响铃\n"
-" -f 统计逻辑行数而不是屏幕行数\n"
-" -l 抑制换页(form feed)后的暂停\n"
-" -p 不滚屏,清屏并显示文本\n"
-" -c 不滚屏,显示文本并清理行尾\n"
-" -u 抑制下划线\n"
-" -s 将多个空行压缩为一行\n"
-" -NUM 指定每屏显示的行数为 NUM\n"
-" +NUM 从文件第 NUM 行开始显示\n"
-" +/STRING 从匹配搜索字符串 STRING 的文件位置开始显示\n"
-" -V 输出版本信息并退出\n"
-
-#: text-utils/more.c:575
+
+#: text-utils/more.c:328
+#, fuzzy
+msgid " -<number> the number of lines per screenful\n"
+msgstr " -C <数字> 指定柱面数\n"
+
+#: text-utils/more.c:329
+msgid " +<number> display file beginning from line number\n"
+msgstr ""
+
+#: text-utils/more.c:330
+msgid " +/<string> display file beginning from search string match\n"
+msgstr ""
+
+#: text-utils/more.c:331
+#, fuzzy
+msgid " -V display version information and exit\n"
+msgstr " -V 输出版本信息并退出\n"
+
+#: text-utils/more.c:574
#, c-format
msgid "unknown option -%s"
msgstr "未知选项 -%s"
-#: text-utils/more.c:599
+#: text-utils/more.c:598
#, c-format
msgid ""
"\n"
@@ -17026,7 +16542,7 @@ msgstr ""
"*** %s:目录 ***\n"
"\n"
-#: text-utils/more.c:639
+#: text-utils/more.c:640
#, c-format
msgid ""
"\n"
@@ -17208,34 +16724,6 @@ msgstr "行过长"
msgid "No previous command to substitute for"
msgstr "没有要替换的前一命令"
-#: text-utils/parse.c:67
-msgid "line too long"
-msgstr "行过长"
-
-#: text-utils/parse.c:400
-msgid "byte count with multiple conversion characters"
-msgstr "对字符计数使用了多个转换字符"
-
-#: text-utils/parse.c:481
-#, c-format
-msgid "bad byte count for conversion character %s"
-msgstr "转换字符 %s 的转换字符计数错误"
-
-#: text-utils/parse.c:486
-#, c-format
-msgid "%%s requires a precision or a byte count"
-msgstr "%%s 需要指定精度或字符计数"
-
-#: text-utils/parse.c:491
-#, c-format
-msgid "bad format {%s}"
-msgstr "格式损坏 {%s}"
-
-#: text-utils/parse.c:496
-#, c-format
-msgid "bad conversion character %%%s"
-msgstr "转换字符 %%%s 有误"
-
#: text-utils/pg.c:136
msgid ""
"-------------------------------------------------------\n"
@@ -17521,6 +17009,1495 @@ msgstr "输入中有未知转义序列:%o,%o"
msgid "Input line too long."
msgstr "输入行过长。"
+#~ msgid "waidpid failed"
+#~ msgstr "waidpid 失败"
+
+#~ msgid " -x, --destination <dir> extract into directory\n"
+#~ msgstr " -x, --destination <目录> 提取到目录\n"
+
+#~ msgid "compiled without -x support"
+#~ msgstr "编译时未带有 -x 支持"
+
+#~ msgid "%s: Out of memory!\n"
+#~ msgstr "%s:内存不足!\n"
+
+#~ msgid "Unusable"
+#~ msgstr "不可用"
+
+#~ msgid "write failed\n"
+#~ msgstr "写失败\n"
+
+#~ msgid "Disk has been changed.\n"
+#~ msgstr "磁盘已经更改。\n"
+
+#~ msgid "Reboot the system to ensure the partition table is correctly updated.\n"
+#~ msgstr "请重启系统来确保分区表正确更新。\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "WARNING: If you have created or modified any\n"
+#~ "DOS 6.x partitions, please see the cfdisk manual\n"
+#~ "page for additional information.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "警告:如果您创建或修改了 DOS 6.x 分区,请\n"
+#~ "查阅 cfdisk 手册页面了解其他信息。\n"
+
+#~ msgid "FATAL ERROR"
+#~ msgstr "致使错误"
+
+#~ msgid "Press any key to exit cfdisk"
+#~ msgstr "按任意键退出 cfdisk"
+
+#~ msgid "Cannot seek on disk drive"
+#~ msgstr "在磁盘设备上无法定位"
+
+#~ msgid "Cannot read disk drive"
+#~ msgstr "无法读磁盘驱动器"
+
+#~ msgid "Cannot write disk drive"
+#~ msgstr "无法写磁盘驱动器"
+
+#~ msgid "Too many partitions"
+#~ msgstr "分区过多"
+
+#~ msgid "Partition begins before sector 0"
+#~ msgstr "分区起始于扇区 0 之前"
+
+#~ msgid "Partition ends before sector 0"
+#~ msgstr "分区终止于扇区 0 之前"
+
+#~ msgid "Partition begins after end-of-disk"
+#~ msgstr "分区起始于磁盘终点之后"
+
+#~ msgid "Partition ends after end-of-disk"
+#~ msgstr "分区终止于磁盘终点之后"
+
+#~ msgid "logical partitions not in disk order"
+#~ msgstr "逻辑分区没有按磁盘顺序"
+
+#~ msgid "logical partitions overlap"
+#~ msgstr "逻辑分区重叠"
+
+#~ msgid "enlarged logical partitions overlap"
+#~ msgstr "扩大的(enlarged)逻辑分区重叠"
+
+#~ msgid "!!!! Internal error creating logical drive with no extended partition !!!!"
+#~ msgstr "!!! 内部错误,在没有扩展分区的情况下创建逻辑分区 !!!"
+
+#~ msgid "Cannot create logical drive here -- would create two extended partitions"
+#~ msgstr "无法在此创建逻辑分区 -- 将创建两个扩展分区"
+
+#~ msgid "Menu item too long. Menu may look odd."
+#~ msgstr "菜单项过长。菜单可能显示异常。"
+
+#~ msgid "Illegal key"
+#~ msgstr "非法的键"
+
+#~ msgid "Create a new primary partition"
+#~ msgstr "创建新的主分区"
+
+#~ msgid "Create a new logical partition"
+#~ msgstr "创建新的逻辑分区"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Don't create a partition"
+#~ msgstr "不创建分区"
+
+#~ msgid "!!! Internal error !!!"
+#~ msgstr "!!! 内部错误 !!!"
+
+#~ msgid "Size (in MB): "
+#~ msgstr "大小(MB):"
+
+#~ msgid "Beginning"
+#~ msgstr "开头"
+
+#~ msgid "Add partition at beginning of free space"
+#~ msgstr "在剩余空间的开头添加分区"
+
+#~ msgid "Add partition at end of free space"
+#~ 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 "无分区表。将以空表启动。"
+
+#~ msgid "Bad signature on partition table"
+#~ msgstr "分区表签名有误"
+
+#~ msgid "Unknown partition table type"
+#~ msgstr "未知的分区表类型"
+
+#~ msgid "Do you wish to start with a zero table [y/N] ?"
+#~ msgstr "您想以空表开始吗[y/N]?"
+
+#~ msgid "Cannot open disk drive"
+#~ msgstr "无法打开磁盘驱动器"
+
+#~ msgid "Opened disk read-only - you have no permission to write"
+#~ msgstr "已用只读方式打开磁盘 - 您没有写权限"
+
+#~ msgid "Cannot get disk size"
+#~ msgstr "无法获得磁盘大小"
+
+#~ msgid "Bad primary partition"
+#~ msgstr "主分区损坏"
+
+#~ msgid "Warning!! This may destroy data on your disk!"
+#~ msgstr "警告!这可能毁坏您磁盘上的数据!"
+
+#~ msgid "Please enter `yes' or `no'"
+#~ msgstr "请输入“是”或“否”"
+
+#~ msgid "Writing partition table to disk..."
+#~ msgstr "正在将分区表写入磁盘..."
+
+#~ msgid "Wrote partition table to disk"
+#~ msgstr "已将分区表写入磁盘"
+
+#~ msgid "Wrote partition table, but re-read table failed. Run partprobe(8), kpartx(8) or reboot to update table."
+#~ msgstr "已写入分区表,但重新读分区表失败。请运行 partprobe(8)、kpartx(8) 或重启来更新分区表。"
+
+#~ msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
+#~ msgstr "没有标记为 可启动 的主分区。DOS MBR 无法启动它。"
+
+#~ msgid "More than one primary partition is marked bootable. DOS MBR cannot boot this."
+#~ msgstr "超过一个主分区被标记为 可启动。DOS MBR 无法启动它。"
+
+#~ msgid "Enter filename or press RETURN to display on screen: "
+#~ msgstr "输入文件名或按 回车 来显示在屏幕上:"
+
+#~ msgid "Disk Drive: %s\n"
+#~ msgstr "磁盘驱动器:%s\n"
+
+#~ msgid "Sector 0:\n"
+#~ msgstr "扇区 0:\n"
+
+#~ msgid "Sector %d:\n"
+#~ msgstr "扇区 %d:\n"
+
+#~ msgid " None "
+#~ msgstr " 无 "
+
+#~ msgid " Pri/Log"
+#~ msgstr " 主/逻辑"
+
+#~ msgid " Primary"
+#~ msgstr " 主分区"
+
+#~ msgid " Logical"
+#~ msgstr " 逻辑分区"
+
+#~ msgid "(%02X)"
+#~ msgstr "(%02X)"
+
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgid "Partition Table for %s\n"
+#~ msgstr "%s 分区表\n"
+
+# 以下三条打印表格的标题行,注意对齐
+#~ msgid " First Last\n"
+#~ msgstr " 起始 终止\n"
+
+#~ msgid " # Type Sector Sector Offset Length Filesystem Type (ID) Flag\n"
+#~ msgstr " # 类型 扇区 扇区 偏移 长度 文件系统类型 (ID) 标志\n"
+
+#~ msgid "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
+#~ msgstr "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
+
+# 以下三条打印表格的标题行,注意对齐
+#~ msgid " ---Starting---- ----Ending----- Start Number of\n"
+#~ msgstr " -----开始------ -----结束------ 起点 扇区\n"
+
+#~ msgid " # Flags Head Sect Cyl ID Head Sect Cyl Sector Sectors\n"
+#~ msgstr " # 标志 磁头 扇区 柱面 ID 磁头 扇区 柱面 扇区 数量\n"
+
+#~ msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
+#~ msgstr "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
+
+#~ msgid "Raw"
+#~ msgstr "原生"
+
+#~ msgid "Print the table using raw data format"
+#~ msgstr "以原生数据格式打印该表"
+
+#~ msgid "Print the table ordered by sectors"
+#~ msgstr "按扇区顺序打印表"
+
+#~ msgid "Table"
+#~ msgstr "表"
+
+#~ msgid "Just print the partition table"
+#~ msgstr "直接打印分区表"
+
+#~ msgid "Don't print the table"
+#~ msgstr "不打印表"
+
+#~ msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+#~ msgstr "版权所有 (C) 1994-1999 Kevin E. Martin & aeb"
+
+#~ msgid " g Change cylinders, heads, sectors-per-track parameters"
+#~ msgstr " g 更改柱面、磁头、每个磁道扇区数等参数"
+
+#~ msgid " WARNING: This option should only be used by people who"
+#~ msgstr " 警告:不要使用此选项,除非您"
+
+#~ msgid " know what they are doing."
+#~ msgstr " 清楚这样做的后果。"
+
+#~ msgid " m Maximize disk usage of the current partition"
+#~ msgstr " m 使当前分区的磁盘使用最大化"
+
+#~ msgid " Note: This may make the partition incompatible with"
+#~ msgstr " 注:这可能使该分区与以下系统不兼容"
+
+#~ msgid " DOS, OS/2, ..."
+#~ msgstr " DOS, OS/2, ..."
+
+#~ msgid " p Print partition table to the screen or to a file"
+#~ msgstr " p 打印分区表到屏幕或文件"
+
+#~ msgid " There are several different formats for the partition"
+#~ msgstr " 有几种不同的分区格式"
+
+#~ msgid " that you can choose from:"
+#~ msgstr " 供您选择:"
+
+#~ msgid " r - Raw data (exactly what would be written to disk)"
+#~ msgstr " r - 原生(raw)数据(数据会原样写入磁盘)"
+
+#~ msgid " s - Table ordered by sectors"
+#~ msgstr " s - 按扇区排序的表"
+
+#~ msgid " t - Table in raw format"
+#~ msgstr " t - 原生格式的表"
+
+#~ msgid " u Change units of the partition size display"
+#~ msgstr " u 更改分区大小的显示单位"
+
+#~ msgid " Rotates through MB, sectors and cylinders"
+#~ msgstr " 在 MB、扇区数、柱面数之间循环"
+
+#~ msgid "CTRL-L Redraws the screen"
+#~ msgstr "CTRL-L 重绘屏幕"
+
+#~ msgid " ? Print this screen"
+#~ msgstr " ? 打印此屏幕"
+
+#~ msgid "Change cylinder geometry"
+#~ msgstr "更改柱面几何属性"
+
+#~ msgid "Change head geometry"
+#~ msgstr "更改磁头几何属性"
+
+#~ msgid "Change sector geometry"
+#~ msgstr "更改扇区几何属性"
+
+#~ msgid "Done with changing geometry"
+#~ msgstr "更改几何属性完成"
+
+#~ msgid "Enter the number of cylinders: "
+#~ msgstr "请输入柱面数:"
+
+#~ msgid "Illegal cylinders value"
+#~ msgstr "柱面数值不合法"
+
+#~ msgid "Enter the number of heads: "
+#~ msgstr "请输入磁头数:"
+
+#~ msgid "Illegal heads value"
+#~ msgstr "磁头数值不合法"
+
+#~ msgid "Enter the number of sectors per track: "
+#~ msgstr "请输入每个磁道的扇区数:"
+
+#~ msgid "Illegal sectors value"
+#~ msgstr "扇区数值不合法"
+
+#~ msgid "Enter filesystem type: "
+#~ msgstr "请输入文件系统类型:"
+
+#~ msgid "Cannot change FS Type to empty"
+#~ msgstr "无法将文件系统类型更改为空值"
+
+#~ msgid "Cannot change FS Type to extended"
+#~ msgstr "无法将文件系统类型更改为扩展"
+
+#~ msgid "Unk(%02X)"
+#~ msgstr "未知(%02X)"
+
+#~ msgid ", NC"
+#~ msgstr ",不可用"
+
+#~ msgid "NC"
+#~ msgstr "不可用"
+
+#~ msgid "Pri/Log"
+#~ msgstr "主/逻辑"
+
+#~ msgid "Unknown (%02X)"
+#~ msgstr "未知 (%02X)"
+
+#~ msgid "Disk Drive: %s"
+#~ msgstr "磁盘驱动器:%s"
+
+#~ msgid "Size: %lld bytes, %lld MB"
+#~ msgstr "大小:%lld 字节,%lld MB"
+
+#~ msgid "Size: %lld bytes, %lld.%lld GB"
+#~ msgstr "大小:%lld 字节,%lld.%lld GB"
+
+#~ msgid "Heads: %d Sectors per Track: %d Cylinders: %lld"
+#~ msgstr "磁头数:%d 每磁道扇区数:%d 柱面数:%lld"
+
+#~ msgid "Part Type"
+#~ msgstr "分区类型"
+
+#~ msgid "FS Type"
+#~ msgstr "文件系统"
+
+#~ msgid "[Label]"
+#~ msgstr "[标签]"
+
+#~ msgid " Sectors"
+#~ msgstr " 扇区"
+
+#~ msgid " Cylinders"
+#~ msgstr " 柱面"
+
+#~ msgid " Size (MB)"
+#~ msgstr " 大小 (MB)"
+
+#~ msgid " Size (GB)"
+#~ msgstr " 大小 (GB)"
+
+#~ msgid "No more partitions"
+#~ msgstr "没有更多分区"
+
+#~ msgid "Change disk geometry (experts only)"
+#~ msgstr "更改磁盘的几何属性(仅限专业人员)"
+
+#~ msgid "Maximize"
+#~ msgstr "最大化"
+
+#~ msgid "Maximize disk usage of the current partition (experts only)"
+#~ 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 等)"
+
+#~ msgid "Units"
+#~ msgstr "单位"
+
+#~ msgid "Change units of the partition size display (MB, sect, cyl)"
+#~ msgstr "更改分区大小的单位(MB、扇区,柱面)"
+
+#~ msgid "Cannot make this partition bootable"
+#~ msgstr "无法将此分区标记为 可启动"
+
+#~ msgid "Cannot delete an empty partition"
+#~ msgstr "无法删除空分区"
+
+#~ msgid "Cannot maximize this partition"
+#~ msgstr "无法最大化此分区"
+
+#~ msgid "This partition is unusable"
+#~ msgstr "此分区无法使用"
+
+#~ msgid "This partition is already in use"
+#~ msgstr "此分区已在使用中"
+
+#~ msgid "Cannot change the type of an empty partition"
+#~ msgstr "无法更改空分区的类型"
+
+#~ msgid "Illegal command"
+#~ msgstr "非法命令"
+
+#~ msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
+#~ msgstr "版权所有 (C) 1994-2002 Kevin E. Martin & aeb\n"
+
+#~ 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"
+
+#~ msgid " -P, --print <r|s|t> print partition table in specified format\n"
+#~ msgstr " -P, --print <r|s|t> 以指定的格式打印分区表\n"
+
+#~ msgid " -z, --zero start with zeroed partition table\n"
+#~ msgstr " -z, --zero 以空分区表开始\n"
+
+#~ 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 "无法解析柱面数"
+
+#~ msgid "cannot parse number of heads"
+#~ msgstr "无法解析磁头数"
+
+#~ msgid "cannot parse number of sectors"
+#~ msgstr "无法解析扇区数"
+
+#~ msgid ": "
+#~ msgstr ":"
+
+#~ msgid "list extended partitions"
+#~ msgstr "列出扩展分区"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "fsize"
+#~ msgstr "fsize"
+
+#~ msgid "bsize"
+#~ msgstr "bsize"
+
+#~ msgid "Partition %d is already defined. Delete it before re-adding it."
+#~ msgstr "分区 %d 已经定义。请删除它再重新添加。"
+
+#~ msgid ""
+#~ "Partition type:\n"
+#~ " p primary (%zd primary, %d extended, %zd free)\n"
+#~ "%s\n"
+#~ "Select (default %c)"
+#~ msgstr ""
+#~ "分区类型:\n"
+#~ " p 主分区(%zd 个主分区,%d 个扩展分区,%zd 空闲)\n"
+#~ "%s\n"
+#~ "请选择(默认为 %c):"
+
+#~ msgid " e extended"
+#~ msgstr " e 扩展分区"
+
+#~ msgid "Nr"
+#~ msgstr "Nr"
+
+#~ msgid "AF"
+#~ msgstr "AF"
+
+#~ msgid "Hd"
+#~ msgstr "Hd"
+
+#~ msgid "Sec"
+#~ msgstr "Sec"
+
+#~ msgid "Cyl"
+#~ msgstr "Cyl"
+
+#~ msgid "This doesn't look like a partition table. Probably you selected the wrong device."
+#~ msgstr "这似乎不是分区表。您可能选错了设备。"
+
+#~ msgid "Blocks "
+#~ msgstr "块 "
+
+#~ msgid "System"
+#~ msgstr "系统"
+
+#~ msgid "BIOS boot partition"
+#~ msgstr "BIOS 启动分区"
+
+#~ msgid "Partition %zd is already defined. Delete it before re-adding it."
+#~ msgstr "分区 %zd 已定义。请删除它再重新添加。"
+
+#~ msgid "Pt#"
+#~ msgstr "Pt#"
+
+#~ msgid "Info"
+#~ msgstr "信息"
+
+#~ msgid "Sector"
+#~ msgstr "扇区"
+
+#~ msgid "You will get a partition overlap on the disk. Fix it first!"
+#~ msgstr "磁盘上将产生重叠分区。请先修复它!"
+
+#~ msgid "Warning: 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.8GB 的设备这个值可能会截短。"
+
+#~ msgid "Flag"
+#~ msgstr "标志"
+
+#~ msgid ""
+#~ " %1$s [options] LABEL=<label>\n"
+#~ " %1$s [options] UUID=<uuid>\n"
+#~ msgstr ""
+#~ " %1$s [选项] LABEL=<label>\n"
+#~ " %1$s [选项] UUID=<uuid>\n"
+
+#~ msgid ""
+#~ " -A, --all disable all built-in filters, print all filesystems\n"
+#~ " -a, --ascii use ASCII chars for tree formatting\n"
+#~ " -c, --canonicalize canonicalize printed paths\n"
+#~ " -D, --df imitate the output of df(1)\n"
+#~ " -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+#~ " -e, --evaluate convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n"
+#~ " to device names\n"
+#~ " -F, --tab-file <path> alternative file for --fstab, --mtab or --kernel options\n"
+#~ " -f, --first-only print the first found filesystem only\n"
+#~ msgstr ""
+#~ " -A, --all 禁用所有内建过滤器,打印所有文件系统\n"
+#~ " -a, --ascii 使用 ASCII 进行树格式化\n"
+#~ " -c, --canonicalize 规范输出路径\n"
+#~ " -D, --df 仿照 df(1) 形式输出\n"
+#~ " -d, --direction <词> 搜索方向,“forward”或“backward”\n"
+#~ " -e, --evaluate 将标志(LABEL,UUID,PARTUUID,PARTLABEL)\n"
+#~ " 转换为设备名\n"
+#~ " -F, --tab-file <路径> --fstab、--mtab 或 --kernel 选项的备选文件\n"
+#~ " -f, --first-only 只打印找到的第一个文件系统\n"
+
+#~ msgid ""
+#~ " -i, --invert invert the sense of matching\n"
+#~ " -l, --list use list format output\n"
+#~ " -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n"
+#~ " -n, --noheadings don't print column headings\n"
+#~ " -u, --notruncate don't truncate text in columns\n"
+#~ msgstr ""
+#~ " -i, --invert 反转匹配规则\n"
+#~ " -l, --list 使用列表格式的输出\n"
+#~ " -N, --task <tid> 使用备选名字空间(/proc/<tid>/mountinfo 文件)\n"
+#~ " -n, --noheadings 不打印列标题\n"
+#~ " -u, --notruncate 不截短列中的文本\n"
+
+#~ msgid ""
+#~ " -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n"
+#~ " -R, --submounts print all submounts for the matching filesystems\n"
+#~ " -S, --source <string> the device to mount (by name, maj:min, \n"
+#~ " LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
+#~ " -T, --target <string> the mountpoint to use\n"
+#~ msgstr ""
+#~ " -v, --nofsroot bind 或 btrfs 挂臷时不打印 [/dir]\n"
+#~ " -R, --submounts 打印匹配文件系统的所有子挂臷\n"
+#~ " -S, --source <字符串> 要挂臷的设备(按名称、主设备号:次设备号、\n"
+#~ " LABEL=、UUID=、ARTUUID=、ARTLABEL=)\n"
+#~ " -T, --target <字符串> 要使用的挂臷点\n"
+
+#~ msgid ""
+#~ " -f, --file <file> use file as a cookie seed\n"
+#~ " -v, --verbose explain what is being done\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -h, --help display this help and exit\n"
+#~ "\n"
+#~ msgstr ""
+#~ " -f, --file <文件> 使用指定文件作为 cookie seed\n"
+#~ " -v, --verbose 解释正在进行的操作\n"
+#~ " -V, --version 输出版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+#~ "\n"
+
+#~ msgid "Both --pid and --no-pid specified. Ignoring --no-pid."
+#~ msgstr "同时指定了 --pid 和 --no-pid。将忽略 --no-pid。"
+
+#~ msgid "warning: error reading %s: %s"
+#~ msgstr "警告:读取 %s 出错:%s"
+
+#~ msgid "warning: can't open %s: %s"
+#~ msgstr "警告:打不开 %s:%s"
+
+#~ msgid "mount: could not open %s - using %s instead\n"
+#~ msgstr "挂载:打不开 %s - 将转用 %s\n"
+
+#~ msgid "can't create lock file %s: %s (use -n flag to override)"
+#~ msgstr "无法创建锁文件 %s:%s (可使用 -n 标志覆盖)"
+
+#~ msgid "can't link lock file %s: %s (use -n flag to override)"
+#~ msgstr "无法链接锁文件 %s:%s (可使用 -n 标志覆盖)"
+
+#~ msgid "can't open lock file %s: %s (use -n flag to override)"
+#~ msgstr "打不开锁文件 %s:%s (可使用 -n 标志覆盖)"
+
+#~ msgid "Can't lock lock file %s: %s\n"
+#~ msgstr "无法锁定锁文件 %s:%s\n"
+
+#~ msgid "can't lock lock file %s: %s"
+#~ msgstr "无法锁定锁文件 %s:%s"
+
+#~ msgid "timed out"
+#~ msgstr "已超时"
+
+#~ msgid ""
+#~ "Cannot create link %s\n"
+#~ "Perhaps there is a stale lock file?\n"
+#~ msgstr ""
+#~ "无法创建链接 %s\n"
+#~ "有一个过期的锁文件吗?\n"
+
+#~ msgid "cannot open %s (%s) - mtab not updated"
+#~ msgstr "无法打开 %s (%s) - mtab 未更新"
+
+#~ msgid "error writing %s: %s"
+#~ msgstr "写 %s 出错:%s"
+
+#~ msgid "%s: cannot fflush changes: %s"
+#~ msgstr "%s:无法 fflush 更改:%s"
+
+#~ msgid "error changing mode of %s: %s\n"
+#~ msgstr "更改 %s 的模式出错:%s\n"
+
+#~ msgid "error changing owner of %s: %s\n"
+#~ msgstr "更改 %s 的所有者失败:%s\n"
+
+#~ msgid "can't rename %s to %s: %s\n"
+#~ msgstr "无法将 %s 改名为 %s:%s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+#~ " It's possible that information reported by mount(8) is not\n"
+#~ " up to date. For actual information about system mount points\n"
+#~ " check the /proc/mounts file.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "mount:/etc/mtab 不可写(比如是只读文件系统)。\n"
+#~ " mount(8) 报告的信息可能不是最新的。\n"
+#~ " 有关系统挂载点的实际信息请检查\n"
+#~ " /proc/mounts 获取。\n"
+#~ "\n"
+
+#~ msgid "mount: improperly quoted option string '%s'"
+#~ msgstr "mount:选项字符串“%s”引号没有正确闭合"
+
+#~ msgid "mount: translated %s '%s' to '%s'\n"
+#~ msgstr "mount:已将 %s “%s”转换为“%s”\n"
+
+#~ msgid "mount: SELinux *context= options are ignore on remount.\n"
+#~ msgstr "mount:SELinux *context= 选项重新挂载会时忽略。\n"
+
+#~ msgid "mount: according to mtab, %s is already mounted on %s"
+#~ msgstr "mount:根据 mtab,%s 已挂载于 %s"
+
+#~ msgid "mount: according to mtab, %s is mounted on %s"
+#~ msgstr "mount:根据 mtab,%s 挂载于 %s"
+
+#~ msgid "mount: can't open %s for writing: %s"
+#~ msgstr "mount:无法打开 %s 进行写入:%s"
+
+#~ msgid "mount: error writing %s: %s"
+#~ msgstr "mount:写 %s 出错:%s"
+
+#~ msgid "mount: error changing mode of %s: %s"
+#~ msgstr "mount:更改 %s 的模式出错:%s"
+
+#~ msgid "mount: cannot set group id: %m"
+#~ msgstr "mount:无法设置组 id:%m"
+
+#~ msgid "mount: cannot set user id: %m"
+#~ msgstr "mount:无法设置用户 id:%m"
+
+#~ msgid "mount: cannot fork: %s"
+#~ msgstr "mount:无法 fork:%s"
+
+#~ msgid "Trying %s\n"
+#~ msgstr "正在尝试 %s\n"
+
+#~ msgid "mount: you didn't specify a filesystem type for %s\n"
+#~ msgstr "mount:您没有指定 %s 的文件系统类型\n"
+
+#~ msgid " I will try all types mentioned in %s or %s\n"
+#~ msgstr " 程序将尝试 %s 或 %s 中提到的所有类型\n"
+
+#~ msgid " and it looks like this is swapspace\n"
+#~ msgstr " 这似乎是交换空间\n"
+
+#~ msgid " I will try type %s\n"
+#~ msgstr " 程序将尝试 %s 类型\n"
+
+#~ msgid "%s looks like swapspace - not mounted"
+#~ msgstr "%s 似乎是交换空间 - 未挂载"
+
+#~ msgid ""
+#~ "mount: %s: more filesystems detected. This should not happen,\n"
+#~ " use -t <type> to explicitly specify the filesystem type or\n"
+#~ " use wipefs(8) to clean up the device.\n"
+#~ msgstr ""
+#~ "mount:%s:检测到了更多文件系统。这不应该发生, \n"
+#~ " 请使用 -t <类型> 来明确指定文件系统类型或\n"
+#~ " 使用 wipefs(8) 来清理设备。\n"
+
+#~ msgid "mount failed"
+#~ msgstr "挂载失败"
+
+#~ msgid "mount: only root can mount %s on %s"
+#~ msgstr "mount:只有 root 才能将 %s 挂载于 %s"
+
+#~ msgid "mount: loop device specified twice"
+#~ msgstr "mount:回环设备指定了两次"
+
+#~ msgid "mount: type specified twice"
+#~ msgstr "mount:类型指定了两次"
+
+#~ msgid "mount: skipping the setup of a loop device\n"
+#~ msgstr "mount:将跳过回环设备的设置\n"
+
+#~ msgid "mount: enabling autoclear loopdev flag\n"
+#~ msgstr "mount:将启用 自动清除 环回设备标志\n"
+
+#~ msgid "mount: invalid offset '%s' specified"
+#~ msgstr "mount:指定了无效的偏移“%s”"
+
+#~ msgid "mount: invalid sizelimit '%s' specified"
+#~ msgstr "mount:指定了无效的大小限制“%s”"
+
+#~ msgid "mount: according to mtab %s is already mounted on %s as loop"
+#~ msgstr "mount:根据 mtab,%s 已作为回环设备挂载于 %s"
+
+#~ msgid "encryption not supported, use cryptsetup(8) instead"
+#~ msgstr "不支持加密,请改用 cryptsetup(8)"
+
+#~ msgid "mount: failed to initialize loopdev context"
+#~ msgstr "mount:初始化 loopdev 环境失败"
+
+#~ msgid "mount: failed to use %s device"
+#~ msgstr "mount:使用 %s 设备失败"
+
+#~ msgid "mount: failed to found free loop device"
+#~ msgstr "mount:查找空闲的回环设备失败"
+
+#~ msgid "mount: going to use the loop device %s\n"
+#~ msgstr "mount:将使用回环设备 %s\n"
+
+#~ msgid "mount: %s: failed to set loopdev attributes"
+#~ msgstr "mount:%s:设置回环设备属性失败"
+
+#~ msgid "mount: %s: failed setting up loop device: %m"
+#~ msgstr "挂臷:%s:设置回环设备失败:%m"
+
+#~ msgid "mount: stolen loop=%s ...trying again\n"
+#~ msgstr "mount:被挪用回环=%s ...将重试\n"
+
+#~ msgid "mount: stolen loop=%s"
+#~ msgstr "挂载:被挪用回环=%s"
+
+#~ msgid "mount: setup loop device successfully\n"
+#~ msgstr "mount:设置回环设备成功\n"
+
+#~ msgid "mount: no %s found - creating it..\n"
+#~ msgstr "mount:未找到 %s - 将创建它...\n"
+
+#~ msgid "mount: cannot open %s for setting speed"
+#~ msgstr "mount:无法打开 %s 来设置速度"
+
+#~ msgid "mount: cannot set speed: %m"
+#~ msgstr "mount:无法设置速度:%m"
+
+#~ msgid "mount: according to mtab, %s is already mounted on %s\n"
+#~ msgstr "mount:根据 mtab,%s 已挂载于 %s\n"
+
+#~ msgid "mount: warning: %s seems to be mounted read-write.\n"
+#~ msgstr "mounted:警告:%s 似乎是以读写方式挂载的。\n"
+
+#~ msgid "mount: warning: %s seems to be mounted read-only.\n"
+#~ msgstr "挂载:警告:%s 似乎是以只读方式挂载的。\n"
+
+#~ msgid "mount: I could not determine the filesystem type, and none was specified"
+#~ msgstr "mount:程序无法确定文件系统类型,并且没有指定"
+
+#~ msgid "mount: you must specify the filesystem type"
+#~ msgstr "mount:您必须指定文件系统类型"
+
+#~ msgid "mount: mount failed"
+#~ msgstr "mount:挂载失败"
+
+#~ msgid "mount: mount point %s is not a directory"
+#~ msgstr "mount:挂载点 %s 不是一个目录"
+
+#~ msgid "mount: permission denied"
+#~ msgstr "mount:权限不足"
+
+#~ msgid "mount: must be superuser to use mount"
+#~ msgstr "mount:必须是超级用户才能使用 mount"
+
+#~ msgid "mount: %s is busy"
+#~ msgstr "mount:%s 忙"
+
+#~ msgid "mount: proc already mounted"
+#~ msgstr "mount:proc 已挂载"
+
+#~ msgid "mount: %s already mounted or %s busy"
+#~ msgstr "mount:%s 已挂载或 %s 忙"
+
+#~ msgid "mount: mount point %s does not exist"
+#~ msgstr "mount:挂载点 %s 不存在"
+
+#~ msgid "mount: mount point %s is a symbolic link to nowhere"
+#~ msgstr "mount:挂载点 %s 是一个没有目标位置的符号链接"
+
+#~ msgid "mount: special device %s does not exist"
+#~ msgstr "mount:特殊设备 %s 不存在"
+
+#~ msgid ""
+#~ "mount: special device %s does not exist\n"
+#~ " (a path prefix is not a directory)\n"
+#~ msgstr ""
+#~ "mount:特殊设备 %s 不存在\n"
+#~ " (路径前缀不是目录)\n"
+
+#~ msgid "mount: %s not mounted or bad option"
+#~ msgstr "mount:%s 未挂载或选项错误"
+
+#~ msgid ""
+#~ "mount: wrong fs type, bad option, bad superblock on %s,\n"
+#~ " missing codepage or helper program, or other error"
+#~ msgstr ""
+#~ "mount:文件系统类型错误、选项错误、%s 有坏超级块,\n"
+#~ " 缺少代码页或助手程序,或其他错误"
+
+#~ msgid ""
+#~ " (for several filesystems (e.g. nfs, cifs) you might\n"
+#~ " need a /sbin/mount.<type> helper program)"
+#~ msgstr ""
+#~ " (对某些文件系统(如 nfs、cifs) 您可能需要\n"
+#~ " 一款 /sbin/mount.<类型> 助手程序)"
+
+#~ msgid ""
+#~ " (could this be the IDE device where you in fact use\n"
+#~ " ide-scsi so that sr0 or sda or so is needed?)"
+#~ msgstr ""
+#~ " (这是不是一台通过 ide-scsi 方式使用的 IDE 设备,\n"
+#~ " 因而需要 sr0 或 sda 或 so?)"
+
+#~ msgid ""
+#~ " (aren't you trying to mount an extended partition,\n"
+#~ " instead of some logical partition inside?)"
+#~ msgstr ""
+#~ " (您不是要试图挂载一个扩展分区,而非扩展分区中的\n"
+#~ " 一些逻辑分区吧?)"
+
+#~ msgid ""
+#~ " In some cases useful info is found in syslog - try\n"
+#~ " dmesg | tail or so\n"
+#~ msgstr ""
+#~ " 有些情况下在 syslog 中可以找到一些有用信息- 请尝试\n"
+#~ " dmesg | tail 这样的命令看看。\n"
+
+#~ msgid "mount: %s: can't read superblock"
+#~ msgstr "mount:%s:无法读取超级块"
+
+#~ msgid "mount: %s: unknown device"
+#~ msgstr "mount:%s:未知设备"
+
+#~ msgid "mount: unknown filesystem type '%s'"
+#~ msgstr "mount:未知文件系统类型“%s”"
+
+#~ msgid "mount: probably you meant %s"
+#~ msgstr "mount:您可能指的是 %s"
+
+#~ msgid "mount: maybe you meant 'iso9660'?"
+#~ msgstr "mount:可能您指的是“iso9660”?"
+
+#~ msgid "mount: maybe you meant 'vfat'?"
+#~ msgstr "mount:可能您指的是“vfat”?"
+
+#~ msgid "mount: %s has wrong device number or fs type %s not supported"
+#~ msgstr "mount:%s 设备号错误或不支持文件系统 %s"
+
+#~ msgid "mount: %s is not a block device, and stat fails?"
+#~ msgstr "mount:%s 不是块设备,且 stat 命令失败?"
+
+#~ msgid ""
+#~ "mount: the kernel does not recognize %s as a block device\n"
+#~ " (maybe `modprobe driver'?)"
+#~ msgstr ""
+#~ "mount:内核无法将 %s 识别为块设备\n"
+#~ " (试试“modprobe driver”?)"
+
+#~ msgid "mount: %s is not a block device (maybe try `-o loop'?)"
+#~ msgstr "mount:%s 不是块设备(要不试试“-o loop”?)"
+
+#~ msgid "mount: %s is not a block device"
+#~ msgstr "mount:%s 不是块设备"
+
+#~ msgid "mount: %s is not a valid block device"
+#~ msgstr "mount:%s 不是有效的块设备"
+
+#~ msgid "block device "
+#~ msgstr "块设备 "
+
+#~ msgid "mount: cannot mount %s%s read-only"
+#~ msgstr "mount:无法以只读方式挂载 %s%s"
+
+#~ msgid "mount: %s%s is write-protected but explicit `-w' flag given"
+#~ msgstr "mount:%s%s 是写保护的,但指明了“-w”标志"
+
+#~ msgid "mount: cannot remount %s%s read-write, is write-protected"
+#~ msgstr "mount:无法以读写方式重新挂载 %s%s,它是写保护的"
+
+#~ msgid "mount: %s%s is write-protected, mounting read-only"
+#~ msgstr "mount:%s%s 写保护,将以只读方式挂载"
+
+#~ msgid "mount: no medium found on %s"
+#~ msgstr "mount:在 %s 上找不到媒体"
+
+#~ msgid "mount: no type was given - I'll assume nfs because of the colon\n"
+#~ msgstr "mount:没有指定类型 - 程序将根据冒号假定为 nfs\n"
+
+#~ msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
+#~ msgstr "mount:没有指定类型 - 程序将根据 // 前缀假定为 cifs\n"
+
+#~ msgid "mount: ignore %s (unparsable offset= option)\n"
+#~ msgstr "mount:忽略 %s(无法解析的 offset= 选项)\n"
+
+#~ msgid "mount: %s already mounted on %s\n"
+#~ msgstr "mount:%s 已挂载于 %s\n"
+
+#~ msgid ""
+#~ "Usage: mount -V : print version\n"
+#~ " mount -h : print this help\n"
+#~ " mount : list mounted filesystems\n"
+#~ " mount -l : idem, including volume labels\n"
+#~ "So far the informational part. Next the mounting.\n"
+#~ "The command is `mount [-t fstype] something somewhere'.\n"
+#~ "Details found in /etc/fstab may be omitted.\n"
+#~ " mount -a [-t|-O] ... : mount all stuff from /etc/fstab\n"
+#~ " mount device : mount device at the known place\n"
+#~ " mount directory : mount known device here\n"
+#~ " mount -t type dev dir : ordinary mount command\n"
+#~ "Note that one does not really mount a device, one mounts\n"
+#~ "a filesystem (of the given type) found on the device.\n"
+#~ "One can also mount an already visible directory tree elsewhere:\n"
+#~ " mount --bind olddir newdir\n"
+#~ "or move a subtree:\n"
+#~ " mount --move olddir newdir\n"
+#~ "One can change the type of mount containing the directory dir:\n"
+#~ " mount --make-shared dir\n"
+#~ " mount --make-slave dir\n"
+#~ " mount --make-private dir\n"
+#~ " mount --make-unbindable dir\n"
+#~ "One can change the type of all the mounts in a mount subtree\n"
+#~ "containing the directory dir:\n"
+#~ " mount --make-rshared dir\n"
+#~ " mount --make-rslave dir\n"
+#~ " mount --make-rprivate dir\n"
+#~ " mount --make-runbindable dir\n"
+#~ "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+#~ "or by label, using -L label or by uuid, using -U uuid .\n"
+#~ "Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
+#~ "For many more details, say man 8 mount .\n"
+#~ msgstr ""
+#~ "用法: mount -V : 打印版本\n"
+#~ " mount -h : 打印此帮助\n"
+#~ " mount : 列出已挂臷的文件系统\n"
+#~ " mount -l : 同上,包含卷标\n"
+#~ "以上为信息部分。以下是挂臷。\n"
+#~ "挂臷命令为“mount [-t 文件系统类型] 待挂臷项 挂臷位置”。\n"
+#~ "在 /etc/fstab 中列出的细节可以忽略。\n"
+#~ " mount -a [-t|-O] ... : 挂臷 /etc/fstab 中的所有项\n"
+#~ " mount 设备 : 挂臷未知位置的设备\n"
+#~ " mount 目录 : 将已知设备挂臷到此处\n"
+#~ " mount -t 类型 设备 目录 : 正常挂臷命令\n"
+#~ "注意,挂臷设备其实是(以指定类型)挂臷设备上的文件系统。\n"
+#~ "\n"
+#~ "也可以将已经可见的目录树挂臷到别处:\n"
+#~ " mount --bind 旧目录 新目录\n"
+#~ "或移动子树:\n"
+#~ " mount --move 旧目录 新目录\n"
+#~ "可以改变包含 dir 目录的挂臷的类型:\n"
+#~ " mount --make-shared dir\n"
+#~ " mount --make-slave dir\n"
+#~ " mount --make-private dir\n"
+#~ " mount --make-unbindable dir\n"
+#~ "可以指定包含 dir 目录的已挂臷子树中\n"
+#~ "所有挂臷的类型:\n"
+#~ " mount --make-rshared dir\n"
+#~ " mount --make-rslave dir\n"
+#~ " mount --make-rprivate dir\n"
+#~ " mount --make-runbindable dir\n"
+#~ "可以通过名称指定设备,如 /dev/hda1 或 /dev/cdrom,\n"
+#~ "或使用 -L 标签 按标签指定设备,或者使用 -U uuid 按 uuid 指定。\n"
+#~ "其他选项:[-nfFrsvw] [-o 选项] [-p 密码文件描述符].\n"
+#~ "更多细节,请输入 man 8 mount 了解。\n"
+
+#~ msgid "--pass-fd is no longer supported"
+#~ msgstr "--pass-fd 已不再支持"
+
+#~ msgid "mount: only root can do that (effective UID is %u)"
+#~ msgstr "挂臷:只有 root 用户才能执行(有效 UID 为 %u)"
+
+#~ msgid "mount: only root can do that"
+#~ msgstr "挂臷:只有 root 用户才能执行"
+
+#~ msgid "nothing was mounted"
+#~ msgstr "未挂臷任何项目"
+
+#~ msgid "mount: no such partition found"
+#~ msgstr "挂臷:没有找到该分区"
+
+#~ msgid "mount: can't find %s in %s or %s"
+#~ msgstr "mount:在 %2$s 或 %3$s 中找不到 %1$s"
+
+#~ msgid "[mntent]: warning: no final newline at the end of %s\n"
+#~ msgstr "[mntent]:警告:%s 末尾没有以空行结束\n"
+
+#~ msgid "[mntent]: line %d in %s is bad%s\n"
+#~ msgstr "[mntent]:%2$s 中的第 %1$d 行有误%3$s\n"
+
+#~ msgid "; rest of file ignored"
+#~ msgstr ";文件的其余部分被忽略"
+
+#~ msgid "not enough memory"
+#~ msgstr "内存不足"
+
+#~ msgid "umount: compiled without support for -f\n"
+#~ msgstr "umount:编译时未添加 -f 支持\n"
+
+#~ msgid "umount: cannot set group id: %m"
+#~ msgstr "umount:无法设置组 id:%m"
+
+#~ msgid "umount: cannot set user id: %m"
+#~ msgstr "umount:无法设置用户 id:%m"
+
+#~ msgid "umount: cannot fork: %s"
+#~ msgstr "umount:无法 fork:%s"
+
+#~ msgid "umount: %s: invalid block device"
+#~ msgstr "umount:%s:无效的块设备"
+
+#~ msgid "umount: %s: not mounted"
+#~ msgstr "umount:%s:未挂载"
+
+#~ msgid "umount: %s: can't write superblock"
+#~ msgstr "umount:%s:无法写超级块"
+
+#~ msgid ""
+#~ "umount: %s: device is busy.\n"
+#~ " (In some cases useful info about processes that use\n"
+#~ " the device is found by lsof(8) or fuser(1))"
+#~ msgstr ""
+#~ "umount:%s:设备忙。\n"
+#~ " (有些情况下在 lsof(8) 或 fuser(1)) 中可以找到\n"
+#~ " 有关使用该设备的进程的有用信息"
+
+#~ msgid "umount: %s: not found"
+#~ msgstr "umount:%s:未找到"
+
+#~ msgid "umount: %s: must be superuser to umount"
+#~ msgstr "umount:%s:只有超级用户才能卸载"
+
+#~ msgid "umount: %s: block devices not permitted on fs"
+#~ msgstr "umount:%s:文件系统上不允许块设备"
+
+#~ msgid "umount: %s: %s"
+#~ msgstr "umount:%s:%s"
+
+#~ msgid "umount: internal error: invalid abs path: %s"
+#~ msgstr "umount:内部错误:无效的绝对路径:%s"
+
+#~ msgid "umount: failed to chdir to %s: %m"
+#~ msgstr "umount:更改目录到 %s 失败:%m"
+
+#~ msgid "umount: failed to obtain current directory: %m"
+#~ msgstr "umount:获取当前目录失败:%m"
+
+#~ msgid "umount: mountpoint moved (%s -> %s)"
+#~ msgstr "umount:挂载点已移动(%s -> %s)"
+
+#~ msgid "current directory moved to %s\n"
+#~ msgstr "当前目录已移动到 %s\n"
+
+#~ msgid "no umount2, trying umount...\n"
+#~ msgstr "无 umount2,将尝试 umount...\n"
+
+#~ msgid "umount: %s busy - remounted read-only\n"
+#~ msgstr "umount:%s 忙 - 已重新挂载为只读\n"
+
+#~ msgid "umount: could not remount %s read-only\n"
+#~ msgstr "umount:无法以只读方式重新挂载 %s\n"
+
+#~ msgid "%s has been unmounted\n"
+#~ msgstr "%s 已经卸载\n"
+
+#~ msgid "umount: cannot find list of filesystems to unmount"
+#~ msgstr "umount:找不到要卸载的文件系统列表"
+
+#~ msgid ""
+#~ "Usage: umount -h | -V\n"
+#~ " umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+#~ " umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
+#~ msgstr ""
+#~ "用法:umount -h | -V\n"
+#~ " umount -a [-d] [-f] [-r] [-n] [-v] [-t 文件系统类型] [-O 选项]\n"
+#~ " umount [-d] [-f] [-r] [-n] [-v] 特殊 | 节点...\n"
+
+#~ msgid "failed to parse 'offset=%s' options\n"
+#~ msgstr "解析 'offset=%s' 选项失败\n"
+
+#~ msgid "device %s is associated with %s\n"
+#~ msgstr "设备 %s 与 %s 关联\n"
+
+#~ msgid "device %s is not associated with %s\n"
+#~ msgstr "设备 %s 未与 %s 关联\n"
+
+#~ msgid "Cannot unmount \"\"\n"
+#~ msgstr "无法卸载 \"\"\n"
+
+#~ msgid "Trying to unmount %s\n"
+#~ msgstr "正在尝试卸载 %s\n"
+
+#~ msgid "umount: confused when analyzing mtab"
+#~ msgstr "umount:分析 mtab 时出现混乱"
+
+#, fuzzy
+#~ msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
+#~ msgstr "unmount:无法卸载 %s -- %s 已在同一挂载点上挂载替换了它"
+
+#~ msgid "Could not find %s in mtab\n"
+#~ msgstr "在 mtab 中找不到 %s\n"
+
+#~ msgid "%s is associated with %s\n"
+#~ msgstr "%s 与 %s 关联\n"
+
+#~ msgid "umount: warning: %s is associated with more than one loop device\n"
+#~ msgstr "umount:警告:%s 与超过一个回环设备关联\n"
+
+#~ msgid "umount: %s is not mounted (according to mtab)"
+#~ msgstr "umount:%s 未挂载(从 mtab 得知)"
+
+#~ msgid "umount: it seems %s is mounted multiple times"
+#~ msgstr "umount:似乎 %s 挂载了多次"
+
+#~ msgid "umount: %s is not in the fstab (and you are not root)"
+#~ msgstr "umount:%s 不在 fstab 中(并且您不是 root 用户)"
+
+#~ msgid "umount: %s mount disagrees with the fstab"
+#~ msgstr "umount:%s 挂载与 fstab 不一致"
+
+#~ msgid "umount: only %s can unmount %s from %s"
+#~ msgstr "umount:只有 %s 可以从 %s 上卸载 %s"
+
+#~ msgid "umount: only root can do that"
+#~ msgstr "umount:只有 root 能执行该操作"
+
+#~ msgid ""
+#~ "\n"
+#~ "%1$s - sets or gets process io scheduling class and priority.\n"
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s [OPTION] -p PID [PID...]\n"
+#~ " %1$s [OPTION] COMMAND\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -c, --class <class> scheduling class name or number\n"
+#~ " 0: none, 1: realtime, 2: best-effort, 3: idle\n"
+#~ " -n, --classdata <num> scheduling class data\n"
+#~ " 0-7 for realtime and best-effort classes\n"
+#~ " -p, --pid=PID view or modify already running process\n"
+#~ " -t, --ignore ignore failures\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -h, --help display this help and exit\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%1$s - 设置或获取进程 io 调度类别和优先级。\n"
+#~ "\n"
+#~ "用法:\n"
+#~ " %1$s [选项] -p PID [PID...]\n"
+#~ " %1$s [选项] 命令\n"
+#~ "\n"
+#~ "选项:\n"
+#~ " -c, --class <类> 调度类别名或数字\n"
+#~ " 0:无,1:实时,2:尽量(best-effort),3:空闲\n"
+#~ " -n, --classdata <数字> 调度类别数据\n"
+#~ " 0-7,针对 实时 和 尽量 调度类别\n"
+#~ " -p, --pid=PID 查看或修改已运行的进程\n"
+#~ " -t, --ignore 忽略失败\n"
+#~ " -V, --version 输出版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+#~ "\n"
+
+#~ msgid " %s [options] <tty> [...]\n"
+#~ msgstr " %s [选项] <tty> [...]\n"
+
+#~ msgid " -s, --set-threshold <num> set interruption threshold value\n"
+#~ msgstr " -s, --set-threshold <数字> 设置中断阈值\n"
+
+#~ msgid " -S, --set-default-threshold <num> set default threshold value\n"
+#~ msgstr " -S, --set-default-threshold <数字> 设置默认阈值\n"
+
+#~ msgid " -t, --set-flush <num> set flush timeout to value\n"
+#~ msgstr " -t, --set-flush <数字> 设置冲刷(flush)超时值\n"
+
+#~ msgid " -G, --get-flush display default flush timeout value\n"
+#~ msgstr " -G, --get-glush 显示默认冲刷超时\n"
+
+#~ msgid " -T, --set-default-flush <num> set the default flush timeout to value\n"
+#~ msgstr " -T, --set-default-flush <数字> 设置默认冲刷超时\n"
+
+#~ msgid " -i, --interval <seconds> gather statistics every <seconds> interval\n"
+#~ msgstr " -i, --interval <秒数> 每隔这些 <秒数> 收集一次统计\n"
+
+#~ msgid ""
+#~ "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
+#~ "and the maximum transfer rate in characters/second was %f"
+#~ msgstr ""
+#~ "文件 %s,对应阈值 %lu,fifo 中的最大字符数为 %d,\n"
+#~ "最大传输速度(字节/秒)为 %f"
+
+#~ msgid ""
+#~ "File %s, For threshold value %lu and timeout value %lu, Maximum characters in fifo were %d,\n"
+#~ "and the maximum transfer rate in characters/second was %f"
+#~ msgstr ""
+#~ "文件 %s,对应阈值 %lu 和超时 %lu,fifo 中的最大字符数为 %d,\n"
+#~ "最大传输速度(字节/秒)为 %f"
+
+#~ msgid "cannot issue CYGETMON on %s"
+#~ msgstr "无法对 %s 实施 CYGETMON 命令"
+
+#~ msgid "cannot get threshold for %s"
+#~ msgstr "无法获取 %s 的阈值"
+
+#~ msgid "cannot get timeout for %s"
+#~ msgstr "无法获取 %s 的超时"
+
+#~ msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+#~ msgstr "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+
+#~ msgid " %f int/sec; %f rec, %f send (char/sec)\n"
+#~ msgstr " %f int/秒; %f rec, %f 发送 (char/秒)\n"
+
+#~ msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+#~ msgstr "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+
+#~ msgid " %f int/sec; %f rec (char/sec)\n"
+#~ msgstr " %f int/秒; %f rec (char/秒)\n"
+
+#~ msgid "Invalid interval value"
+#~ msgstr "无效的间隔值"
+
+#~ msgid "Invalid interval value: %d"
+#~ msgstr "无效的间隔值:%d"
+
+#~ msgid "Invalid set value"
+#~ msgstr "无效的设置值"
+
+#~ msgid "Invalid set value: %d"
+#~ msgstr "无效的设置值:%d"
+
+#~ msgid "Invalid default value"
+#~ msgstr "无效的默认值"
+
+#~ msgid "Invalid default value: %d"
+#~ msgstr "无效的默认值:%d"
+
+#~ msgid "Invalid set time value"
+#~ msgstr "无效的设置时间值"
+
+#~ msgid "Invalid set time value: %d"
+#~ msgstr "无效的设置时间值:%d"
+
+#~ msgid "Invalid default time value"
+#~ msgstr "无效的默认时间值"
+
+#~ msgid "Invalid default time value: %d"
+#~ msgstr "无效的默认时间值:%d"
+
+#~ msgid "cannot set %s to threshold %d"
+#~ msgstr "无法将 %s 设置为阈值 %d"
+
+#~ msgid "cannot set %s to time threshold %d"
+#~ msgstr "无法将 %s 设置为时间阈值 %d"
+
+#~ msgid "%s: %ld current threshold and %ld current timeout\n"
+#~ msgstr "%s:%ld 的当前阈值和 %ld 的当前超时\n"
+
+#~ msgid "%s: %ld default threshold and %ld default timeout\n"
+#~ msgstr "%s:%ld 的默认阈值和 %ld 的默认超时\n"
+
+#~ msgid ""
+#~ " -n, --keep-size don't modify the length of the file\n"
+#~ " -p, --punch-hole punch holes in the file\n"
+#~ " -o, --offset <num> offset of the allocation, in bytes\n"
+#~ " -l, --length <num> length of the allocation, in bytes\n"
+#~ msgstr ""
+#~ " -n, --keep-size 不修改文件长度\n"
+#~ " -p, --punch-hole 在文件中留出空洞\n"
+#~ " -o, --offset <数字> 分配的偏移(字节数)\n"
+#~ " -l, --length <数字> 分配的长度(字节数)\n"
+
+#~ msgid ""
+#~ " -o, --offset <num> offset in bytes to discard from\n"
+#~ " -l, --length <num> length of bytes to discard from the offset\n"
+#~ " -m, --minimum <num> minimum extent length to discard\n"
+#~ " -v, --verbose print number of discarded bytes\n"
+#~ msgstr ""
+#~ " -o, --offset <数字> 要丢弃内容的起始偏移量\n"
+#~ " -l, --length <数字> 从偏移量开始的丢弃长度\n"
+#~ " -m, --minimum <数字> 要丢弃的最小范围长度\n"
+#~ " -v, --verbose 打印丢弃字节的长度\n"
+
+#~ msgid ""
+#~ "Time elapsed since reference time has been %.6f seconds.\n"
+#~ "Delaying further to reach the new time.\n"
+#~ msgstr ""
+#~ "时间从参考时刻起已流逝 %.6f 秒。\n"
+#~ "将延迟更长时间来到达新时间。\n"
+
+#~ msgid "%s: failed to determine source"
+#~ msgstr "%s:确定源失败"
+
+#~ msgid " -term <terminal_name>\n"
+#~ msgstr " -term <终端名>\n"
+
+#~ msgid " -reset\n"
+#~ msgstr " -reset\n"
+
+#~ msgid " -initialize\n"
+#~ msgstr " -initialize\n"
+
+#~ msgid " -cursor <on|off>\n"
+#~ msgstr " -cursor <on|off>\n"
+
+#~ msgid " -repeat <on|off>\n"
+#~ msgstr " -repeat <on|off>\n"
+
+#~ msgid " -appcursorkeys <on|off>\n"
+#~ msgstr " -appcursorkeys <on|off>\n"
+
+#~ msgid " -linewrap <on|off>\n"
+#~ msgstr " -linewrap <on|off>\n"
+
+#~ msgid " -default\n"
+#~ msgstr " -default\n"
+
+#~ msgid " -foreground <default|black|blue|cyan|green|magenta|red|white|yellow>\n"
+#~ msgstr " -foreground <default|black|blue|cyan|green|magenta|red|white|yellow>\n"
+
+#~ msgid " -background <default|black|blue|cyan|green|magenta|red|white|yellow>\n"
+#~ msgstr " -background <default|black|blue|cyan|green|magenta|red|white|yellow>\n"
+
+#~ msgid " -hbcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"
+#~ msgstr " -hbcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"
+
+#~ msgid " -inversescreen <on|off>\n"
+#~ msgstr " -inversescreen <on|off>\n"
+
+#~ msgid " -bold <on|off>\n"
+#~ msgstr " -bold <on|off>\n"
+
+#~ msgid " -blink <on|off>\n"
+#~ msgstr " -blink <on|off>\n"
+
+#~ msgid " -reverse <on|off>\n"
+#~ msgstr " -reverse <on|off>\n"
+
+#~ msgid " -underline <on|off>\n"
+#~ msgstr " -underline <on|off>\n"
+
+#~ msgid " -store\n"
+#~ msgstr " -store\n"
+
+#~ msgid " -clear <all|rest>\n"
+#~ msgstr " -clear <all|rest>\n"
+
+#~ msgid " -tabs <tab1 tab2 tab3 ...> (tabn = 1-160)\n"
+#~ msgstr " -tabs <tab1 tab2 tab3 ...> (tabn = 1-160)\n"
+
+#~ msgid " -clrtabs <tab1 tab2 tab3 ...> (tabn = 1-160)\n"
+#~ msgstr " -clrtabs <tab1 tab2 tab3 ...> (tabn = 1-160)\n"
+
+#~ msgid " -regtabs <1-160>\n"
+#~ msgstr " -regtabs <1-160>\n"
+
+#~ msgid " -blank <0-60|force|poke>\n"
+#~ msgstr " -blank <0-60|force|poke>\n"
+
+#~ msgid " -dump <1-NR_CONSOLES>\n"
+#~ msgstr " -dump <1-NR_CONSOLES>\n"
+
+#~ msgid " -append <1-NR_CONSOLES>\n"
+#~ msgstr " -append <1-NR_CONSOLES>\n"
+
+#~ msgid " -file dumpfilename\n"
+#~ msgstr " -file dumpfilename\n"
+
+#~ msgid " -msg <on|off>\n"
+#~ msgstr " -msg <on|off>\n"
+
+#~ msgid " -msglevel <0-8>\n"
+#~ msgstr " -msglevel <0-8>\n"
+
+#~ msgid " -powerdown <0-60>\n"
+#~ msgstr " -powerdown <0-60>\n"
+
+#~ msgid " -blength <0-2000>\n"
+#~ msgstr " -blength <0-2000>\n"
+
+#~ msgid " -bfreq freqnumber\n"
+#~ msgstr " -bfreq freqnumber\n"
+
+#~ msgid "Error writing screendump"
+#~ msgstr "写屏幕转储失败"
+
+#~ msgid "Couldn't read %s"
+#~ msgstr "无法读 %s"
+
+#~ msgid "Couldn't read neither /dev/vcsa0 nor /dev/vcsa"
+#~ msgstr "无法读 /dev/vcsa0 或 /dev/vcsa"
+
+#~ msgid ""
+#~ "Usage: %s [options] file...\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法:%s [选项] 文件...\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ " -d display help instead of ring bell\n"
+#~ " -f count logical, rather than screen lines\n"
+#~ " -l suppress pause after form feed\n"
+#~ " -p do not scroll, clean screen and display text\n"
+#~ " -c do not scroll, display text and clean line ends\n"
+#~ " -u suppress underlining\n"
+#~ " -s squeeze multiple blank lines into one\n"
+#~ " -NUM specify the number of lines per screenful\n"
+#~ " +NUM display file beginning from line number NUM\n"
+#~ " +/STRING display file beginning from search string match\n"
+#~ " -V output version information and exit\n"
+#~ msgstr ""
+#~ "选项:\n"
+#~ " -d 显示帮助,而不是响铃\n"
+#~ " -f 统计逻辑行数而不是屏幕行数\n"
+#~ " -l 抑制换页(form feed)后的暂停\n"
+#~ " -p 不滚屏,清屏并显示文本\n"
+#~ " -c 不滚屏,显示文本并清理行尾\n"
+#~ " -u 抑制下划线\n"
+#~ " -s 将多个空行压缩为一行\n"
+#~ " -NUM 指定每屏显示的行数为 NUM\n"
+#~ " +NUM 从文件第 NUM 行开始显示\n"
+#~ " +/STRING 从匹配搜索字符串 STRING 的文件位置开始显示\n"
+#~ " -V 输出版本信息并退出\n"
+
+#~ msgid "line too long"
+#~ msgstr "行过长"
+
#~ msgid "set blocksize"
#~ msgstr "设置块大小"
@@ -17530,9 +18507,6 @@ msgstr "输入行过长。"
#~ msgid "read failed: %s"
#~ msgstr "读失败:%s"
-#~ msgid "seek failed: %s"
-#~ msgstr "定位失败:%s"
-
#~ msgid "one bad block\n"
#~ msgstr "一个坏块\n"
@@ -17542,18 +18516,12 @@ msgstr "输入行过长。"
#~ msgid " %s [options] device\n"
#~ msgstr " %s [选项] 设备\n"
-#~ msgid "open failed %s"
-#~ msgstr "打开失败:%s"
-
#~ msgid "read failed %s"
#~ msgstr "读失败:%s"
#~ msgid "seek failed %s"
#~ msgstr "定位失败:%s"
-#~ msgid "write failed %s"
-#~ msgstr "写失败:%s"
-
#~ msgid "seek failed: %d"
#~ msgstr "定位失败:%d"
@@ -17566,9 +18534,6 @@ msgstr "输入行过长。"
#~ msgid "No partitions defined"
#~ msgstr "未定义分区"
-#~ msgid "%s: read failed"
-#~ msgstr "%s:read 失败"
-
#~ msgid ""
#~ " -a, --all list all used devices\n"
#~ " -d, --detach <loopdev> [...] detach one or more devices\n"
@@ -17590,9 +18555,6 @@ msgstr "输入行过长。"
#~ msgid "unssuported --local-line mode argument"
#~ msgstr "不支持的 --local-line 模式参数"
-#~ msgid " %s [options] file...\n"
-#~ msgstr " %s [选项] 文件...\n"
-
#~ msgid "usage:\n"
#~ msgstr "用法:\n"
@@ -17898,9 +18860,6 @@ msgstr "输入行过长。"
#~ msgid " %s [options] [-] [USER [arg]...]\n"
#~ msgstr " %s [选项] [-] [USER [参数]...]\n"
-#~ msgid " and do not create a new session\n"
-#~ msgstr " 而不创建新会话\n"
-
#~ msgid ""
#~ " -1, --one show only current month (default)\n"
#~ " -3, --three show previous, current and next month\n"
@@ -18046,9 +19005,6 @@ msgstr "输入行过长。"
#~ " -V 显示此帮助并退出\n"
#~ "\n"
-#~ msgid " -V output version information and exit\n"
-#~ msgstr " -V 输出版本信息并退出\n"
-
#~ msgid "crypt failed: %m\n"
#~ msgstr "加密失败:%m\n"