summaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1762
1 files changed, 905 insertions, 857 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2cba81fc2..2e7edd1de 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: util-linux-2.25.1-rc1\n"
"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2015-01-14 11:00+0100\n"
+"POT-Creation-Date: 2015-02-04 11:38+0100\n"
"PO-Revision-Date: 2014-11-29 21:39+0800\n"
"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -32,24 +32,25 @@ msgid "Tell the kernel about the existence of a specified partition.\n"
msgstr ""
#: disk-utils/addpart.c:56 disk-utils/blockdev.c:276 disk-utils/blockdev.c:420
-#: disk-utils/blockdev.c:447 disk-utils/cfdisk.c:2245 disk-utils/delpart.c:57
-#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:622 disk-utils/fdisk.c:856
+#: disk-utils/blockdev.c:447 disk-utils/cfdisk.c:2272 disk-utils/delpart.c:57
+#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:624 disk-utils/fdisk.c:867
#: disk-utils/fdisk-list.c:205 disk-utils/fdisk-list.c:245
-#: disk-utils/fsck.c:1426 disk-utils/fsck.cramfs.c:150
+#: disk-utils/fsck.c:1430 disk-utils/fsck.cramfs.c:150
#: disk-utils/fsck.cramfs.c:507 disk-utils/isosize.c:134
#: disk-utils/mkfs.bfs.c:192 disk-utils/mkfs.cramfs.c:164
#: disk-utils/mkfs.cramfs.c:664 disk-utils/mkfs.cramfs.c:791
#: disk-utils/mkfs.minix.c:757 disk-utils/mkswap.c:216 disk-utils/mkswap.c:255
-#: disk-utils/partx.c:952 disk-utils/resizepart.c:101 disk-utils/sfdisk.c:552
-#: disk-utils/sfdisk.c:619 disk-utils/sfdisk.c:651 disk-utils/sfdisk.c:1098
-#: disk-utils/swaplabel.c:60 libfdisk/src/bsd.c:582 lib/path.c:73
-#: lib/path.c:85 login-utils/islocal.c:87 login-utils/last.c:659
+#: disk-utils/partx.c:952 disk-utils/resizepart.c:101 disk-utils/sfdisk.c:383
+#: disk-utils/sfdisk.c:439 disk-utils/sfdisk.c:493 disk-utils/sfdisk.c:552
+#: disk-utils/sfdisk.c:619 disk-utils/sfdisk.c:651 disk-utils/sfdisk.c:1099
+#: disk-utils/swaplabel.c:60 libfdisk/src/bsd.c:582 lib/path.c:70
+#: lib/path.c:82 login-utils/islocal.c:87 login-utils/last.c:659
#: login-utils/last-deprecated.c:245 login-utils/sulogin.c:468
#: login-utils/sulogin.c:506 login-utils/utmpdump.c:126
#: login-utils/utmpdump.c:348 login-utils/utmpdump.c:370
-#: login-utils/vipw.c:256 login-utils/vipw.c:274 misc-utils/findmnt.c:1085
-#: misc-utils/logger.c:660 misc-utils/mcookie.c:115 misc-utils/uuidd.c:225
-#: sys-utils/blkdiscard.c:154 sys-utils/dmesg.c:519 sys-utils/eject.c:508
+#: login-utils/vipw.c:256 login-utils/vipw.c:274 misc-utils/findmnt.c:1091
+#: misc-utils/logger.c:667 misc-utils/mcookie.c:115 misc-utils/uuidd.c:225
+#: sys-utils/blkdiscard.c:154 sys-utils/dmesg.c:520 sys-utils/eject.c:508
#: sys-utils/eject.c:708 sys-utils/fallocate.c:374 sys-utils/fsfreeze.c:128
#: sys-utils/fstrim.c:72 sys-utils/hwclock.c:283 sys-utils/hwclock-cmos.c:633
#: sys-utils/hwclock-rtc.c:162 sys-utils/hwclock-rtc.c:256
@@ -59,8 +60,8 @@ msgstr ""
#: sys-utils/rtcwake.c:527 sys-utils/setpriv.c:230 sys-utils/setpriv.c:529
#: sys-utils/setpriv.c:552 sys-utils/swapon.c:345 sys-utils/swapon.c:508
#: sys-utils/switch_root.c:163 sys-utils/unshare.c:79 sys-utils/unshare.c:94
-#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/script.c:221
-#: term-utils/script.c:246 term-utils/script.c:693
+#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2499
+#: term-utils/script.c:221 term-utils/script.c:246 term-utils/script.c:693
#: term-utils/scriptreplay.c:206 term-utils/scriptreplay.c:209
#: term-utils/wall.c:276 text-utils/more.c:607 text-utils/rev.c:142
#: text-utils/tailf.c:61 text-utils/tailf.c:98 text-utils/ul.c:225
@@ -202,7 +203,7 @@ msgstr "未知命令: %s"
msgid "%s requires an argument"
msgstr "%s 需要一个参数"
-#: disk-utils/blockdev.c:368 disk-utils/blockdev.c:470
+#: disk-utils/blockdev.c:368 disk-utils/blockdev.c:473
#, c-format
msgid "ioctl error on %s"
msgstr "%s ioctl 出错"
@@ -217,418 +218,407 @@ msgstr "%s 失败.\n"
msgid "%s succeeded.\n"
msgstr "%s 成功.\n"
-#: disk-utils/blockdev.c:456 misc-utils/lsblk.c:1131 misc-utils/lsblk.c:1138
+#: disk-utils/blockdev.c:456 misc-utils/lsblk.c:1135 misc-utils/lsblk.c:1142
#, c-format
msgid "%s: failed to initialize sysfs handler"
msgstr "%s:初始化 sysfs 处理函数失败"
-#: disk-utils/blockdev.c:478
+#: disk-utils/blockdev.c:460
+#, fuzzy, c-format
+msgid "%s: failed to read partition start from sysfs"
+msgstr "%s:读取分区表失败"
+
+#: disk-utils/blockdev.c:481
#, c-format
msgid "RO RA SSZ BSZ StartSec Size Device\n"
msgstr "RO RA SSZ BSZ 开始段 大小 设备\n"
-#: disk-utils/cfdisk.c:168
+#: disk-utils/cfdisk.c:171
msgid "Bootable"
msgstr "可启动"
-#: disk-utils/cfdisk.c:168
+#: disk-utils/cfdisk.c:171
msgid "Toggle bootable flag of the current partition"
msgstr "开关当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:169
+#: disk-utils/cfdisk.c:172
msgid "Delete"
msgstr "删除"
-#: disk-utils/cfdisk.c:169
+#: disk-utils/cfdisk.c:172
msgid "Delete the current partition"
msgstr "删除当前分区"
-#: disk-utils/cfdisk.c:170
+#: disk-utils/cfdisk.c:173
msgid "New"
msgstr "新建"
-#: disk-utils/cfdisk.c:170
+#: disk-utils/cfdisk.c:173
msgid "Create new partition from free space"
msgstr "在剩余空间上创建新分区"
-#: disk-utils/cfdisk.c:171
+#: disk-utils/cfdisk.c:174
msgid "Quit"
msgstr "退出"
-#: disk-utils/cfdisk.c:171
+#: disk-utils/cfdisk.c:174
msgid "Quit program without writing partition table"
msgstr "退出程序而不写入分区表"
-#: disk-utils/cfdisk.c:172 libfdisk/src/bsd.c:957 libfdisk/src/dos.c:2238
-#: libfdisk/src/gpt.c:2550 libfdisk/src/sgi.c:1139 libfdisk/src/sun.c:1083
+#: disk-utils/cfdisk.c:175 libfdisk/src/bsd.c:957 libfdisk/src/dos.c:2267
+#: libfdisk/src/gpt.c:2557 libfdisk/src/sgi.c:1139 libfdisk/src/sun.c:1083
msgid "Type"
msgstr "类型"
-#: disk-utils/cfdisk.c:172
+#: disk-utils/cfdisk.c:175
msgid "Change the partition type"
msgstr "更改分区类型"
-#: disk-utils/cfdisk.c:173
+#: disk-utils/cfdisk.c:176
msgid "Help"
msgstr "帮助"
-#: disk-utils/cfdisk.c:173
+#: disk-utils/cfdisk.c:176
msgid "Print help screen"
msgstr "打印帮助界面"
-#: disk-utils/cfdisk.c:174
+#: disk-utils/cfdisk.c:177
msgid "Sort"
msgstr "排序"
-#: disk-utils/cfdisk.c:174
+#: disk-utils/cfdisk.c:177
msgid "Fix partitions order"
msgstr "修复分区顺序"
-#: disk-utils/cfdisk.c:175
+#: disk-utils/cfdisk.c:178
msgid "Write"
msgstr "写入"
-#: disk-utils/cfdisk.c:175
+#: disk-utils/cfdisk.c:178
msgid "Write partition table to disk (this might destroy data)"
msgstr "将分区表写入磁盘(可能损坏数据)"
-#: disk-utils/cfdisk.c:176
+#: disk-utils/cfdisk.c:179
msgid "Dump"
msgstr ""
-#: disk-utils/cfdisk.c:176
+#: disk-utils/cfdisk.c:179
#, fuzzy
msgid "Dump partition table to sfdisk compatible script file"
msgstr "向屏幕或文件打印分区表"
-#: disk-utils/cfdisk.c:557 disk-utils/fdisk.c:367
+#: disk-utils/cfdisk.c:560 disk-utils/fdisk.c:369
#, c-format
msgid "internal error: unsupported dialog type %d"
msgstr "内部错误:不支持的对话类型 %d"
-#: disk-utils/cfdisk.c:1356
+#: disk-utils/cfdisk.c:1375
#, c-format
msgid "Disk: %s"
msgstr "磁盘:%s"
-#: disk-utils/cfdisk.c:1358
+#: disk-utils/cfdisk.c:1377
#, c-format
msgid "Size: %s, %ju bytes, %ju sectors"
msgstr "尺寸:%s,%ju 字节,%ju 个扇区"
-#: disk-utils/cfdisk.c:1361
+#: disk-utils/cfdisk.c:1380
#, c-format
msgid "Label: %s, identifier: %s"
msgstr "标签:%s,标识符:%s"
-#: disk-utils/cfdisk.c:1364
+#: disk-utils/cfdisk.c:1383
#, c-format
msgid "Label: %s"
msgstr "标签:%s"
-#: disk-utils/cfdisk.c:1508
-msgid "May be followed by {M,B,G,T}iB (the \"iB\" is optional) or S for sectors."
+#: disk-utils/cfdisk.c:1537
+#, fuzzy
+msgid "May be followed by M for MiB, G for GiB, T for TiB, or S for sectors."
msgstr "后面可以加 {M,B,G,T}iB (“iB”为可选)或 S(扇区)。"
-#: disk-utils/cfdisk.c:1512
+#: disk-utils/cfdisk.c:1543
msgid "Please, specify size."
msgstr "请指定文件大小。"
-#: disk-utils/cfdisk.c:1534
-#, c-format
-msgid "Minimal size is %ju"
-msgstr "最小为 %ju"
+#: disk-utils/cfdisk.c:1565
+#, fuzzy, c-format
+msgid "Minimum size is %ju bytes."
+msgstr "最大尺寸为 %ju 字节。"
-#: disk-utils/cfdisk.c:1543
-#, c-format
-msgid "Maximal size is %ju bytes."
+#: disk-utils/cfdisk.c:1574
+#, fuzzy, c-format
+msgid "Maximum size is %ju bytes."
msgstr "最大尺寸为 %ju 字节。"
-#: disk-utils/cfdisk.c:1550
+#: disk-utils/cfdisk.c:1581
msgid "Failed to parse size."
msgstr "解析大小失败。"
-#: disk-utils/cfdisk.c:1608
+#: disk-utils/cfdisk.c:1639
msgid "Select partition type"
msgstr "选择分区类型"
-#: disk-utils/cfdisk.c:1653 disk-utils/cfdisk.c:1682
+#: disk-utils/cfdisk.c:1684 disk-utils/cfdisk.c:1713
#, fuzzy
msgid "Enter script file name: "
msgstr "无法写脚本文件"
-#: disk-utils/cfdisk.c:1654
+#: disk-utils/cfdisk.c:1685
msgid "The script file will be applied to in-memory partition table."
msgstr ""
-#: disk-utils/cfdisk.c:1663 disk-utils/cfdisk.c:1704
-#: disk-utils/fdisk-menu.c:462 disk-utils/fdisk-menu.c:500
+#: disk-utils/cfdisk.c:1694 disk-utils/cfdisk.c:1735
+#: disk-utils/fdisk-menu.c:463 disk-utils/fdisk-menu.c:501
#, fuzzy, c-format
-msgid "Cannot open: %s"
+msgid "Cannot open %s"
msgstr "打不开 %s"
-#: disk-utils/cfdisk.c:1665 disk-utils/fdisk-menu.c:464
+#: disk-utils/cfdisk.c:1696 disk-utils/fdisk-menu.c:465
#, fuzzy, c-format
msgid "Failed to parse script file %s"
msgstr "读 typescript 文件 %s 失败"
-#: disk-utils/cfdisk.c:1667 disk-utils/fdisk-menu.c:466
+#: disk-utils/cfdisk.c:1698 disk-utils/fdisk-menu.c:467
#, fuzzy, c-format
msgid "Failed to apply script %s"
msgstr "读 typescript 文件 %s 失败"
-#: disk-utils/cfdisk.c:1683
+#: disk-utils/cfdisk.c:1714
msgid "The current in-memory partition table will be dumped to the file."
msgstr ""
-#: disk-utils/cfdisk.c:1691 disk-utils/fdisk-menu.c:488
+#: disk-utils/cfdisk.c:1722 disk-utils/fdisk-menu.c:489
#, fuzzy
msgid "Failed to allocate script handler"
msgstr "分配 GPT 头失败"
-#: disk-utils/cfdisk.c:1697 disk-utils/fdisk-menu.c:494
+#: disk-utils/cfdisk.c:1728
#, fuzzy
msgid "Failed to read disk layout into script."
msgstr "向输出添加行出错"
-#: disk-utils/cfdisk.c:1711
+#: disk-utils/cfdisk.c:1742
msgid "Disk layout successfully dumped."
msgstr ""
-#: disk-utils/cfdisk.c:1714 disk-utils/fdisk-menu.c:506
+#: disk-utils/cfdisk.c:1745 disk-utils/fdisk-menu.c:507
#, fuzzy, c-format
msgid "Failed to write script %s"
msgstr "读 typescript 文件 %s 失败"
-#: disk-utils/cfdisk.c:1747 disk-utils/fdisk.c:861
+#: disk-utils/cfdisk.c:1778 disk-utils/fdisk.c:872
msgid "Device does not contain a recognized partition table."
msgstr "设备不包含可识别的分区表。"
-#: disk-utils/cfdisk.c:1749
+#: disk-utils/cfdisk.c:1780
msgid "Select a type to create a new label or press 'L' to load script file."
msgstr ""
-#: disk-utils/cfdisk.c:1754
+#: disk-utils/cfdisk.c:1785
msgid "Select label type"
msgstr "选择标签类型"
-#: disk-utils/cfdisk.c:1800
-msgid "Help Screen for cfdisk"
-msgstr "cfdisk 帮助页面"
-
# 以下三句连贯,一起翻译
-#: disk-utils/cfdisk.c:1802
-msgid "This is cfdisk, a curses based disk partitioning program, which"
+#: disk-utils/cfdisk.c:1831
+#, fuzzy
+msgid "This is cfdisk, a curses-based disk partitioning program."
msgstr "这是 cfdisk,一款基于 curses 的磁盘分区程序,"
-#: disk-utils/cfdisk.c:1803
-msgid "allows you to create, delete and modify partitions on your hard"
+#: disk-utils/cfdisk.c:1832
+#, fuzzy
+msgid "It lets you create, delete, and modify partitions on a block device."
msgstr "您可以通过它创建、删除和修改您硬盘驱动器上的"
-#: disk-utils/cfdisk.c:1804
-msgid "disk drive."
-msgstr "分区。"
-
-#: disk-utils/cfdisk.c:1806
-msgid "Copyright (C) 2014 Karel Zak <kzak@redhat.com> "
-msgstr "Copyright (C) 2014 Karel Zak <kzak@redhat.com> "
-
-#: disk-utils/cfdisk.c:1807
-msgid "Based on the original cfdisk from Kevin E. Martin & aeb."
-msgstr "基于由 Kevin E. Martin & aeb 编写的原 cfdisk。"
-
# 以下两条注意对齐
-#: disk-utils/cfdisk.c:1809
+#: disk-utils/cfdisk.c:1834
msgid "Command Meaning"
msgstr "命令 意义"
-#: disk-utils/cfdisk.c:1810
+#: disk-utils/cfdisk.c:1835
msgid "------- -------"
msgstr "------- -------"
-#: disk-utils/cfdisk.c:1811
+#: disk-utils/cfdisk.c:1836
msgid " b Toggle bootable flag of the current partition"
msgstr " b 切换当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:1812
+#: disk-utils/cfdisk.c:1837
msgid " d Delete the current partition"
msgstr " d 删除当前分区"
-#: disk-utils/cfdisk.c:1813
+#: disk-utils/cfdisk.c:1838
msgid " h Print this screen"
msgstr " h 打印此屏幕"
-#: disk-utils/cfdisk.c:1814
+#: disk-utils/cfdisk.c:1839
msgid " n Create new partition from free space"
msgstr " n 从空闲空间创建新分区"
-#: disk-utils/cfdisk.c:1815
+#: disk-utils/cfdisk.c:1840
msgid " q Quit program without writing partition table"
msgstr " q 退出程序但不写入分区表"
-#: disk-utils/cfdisk.c:1816
-msgid " t Change the partition type"
-msgstr " t 更改分区类型"
-
-#: disk-utils/cfdisk.c:1817
+#: disk-utils/cfdisk.c:1841
msgid " s Fix partitions order (only when in disarray)"
msgstr " s 修复分区顺序(仅磁盘阵列)"
-#: disk-utils/cfdisk.c:1818
+#: disk-utils/cfdisk.c:1842
+msgid " t Change the partition type"
+msgstr " t 更改分区类型"
+
+#: disk-utils/cfdisk.c:1843
msgid " u Dump disk layout to sfdisk compatible script file"
msgstr ""
-#: disk-utils/cfdisk.c:1819
-msgid " W Write partition table to disk (must enter upper case W)"
+#: disk-utils/cfdisk.c:1844
+#, fuzzy
+msgid " W Write partition table to disk (you must enter uppercase W);"
msgstr " W 将分区表写入磁盘(必须输入大写 W)"
-#: disk-utils/cfdisk.c:1820
-msgid " Since this might destroy data on the disk, you must"
+#: disk-utils/cfdisk.c:1845
+#, fuzzy
+msgid " since this might destroy data on the disk, you must either"
msgstr " 由于这可能破坏磁盘上的数据,您必须"
-#: disk-utils/cfdisk.c:1821
-msgid " either confirm or deny the write by entering `yes' or"
+#: disk-utils/cfdisk.c:1846
+#, fuzzy
+msgid " confirm or deny the write by entering 'yes' or 'no'"
msgstr " 通过输入“yes”或“no”来确实或拒绝"
-#: disk-utils/cfdisk.c:1822
-msgid " `no'"
-msgstr " 写入"
-
-#: disk-utils/cfdisk.c:1823
+#: disk-utils/cfdisk.c:1847
msgid "Up Arrow Move cursor to the previous partition"
msgstr "上箭头 光标移到上一分区"
-#: disk-utils/cfdisk.c:1824
+#: disk-utils/cfdisk.c:1848
msgid "Down Arrow Move cursor to the next partition"
msgstr "下箭头 光标移到下一分区"
-#: disk-utils/cfdisk.c:1825
+#: disk-utils/cfdisk.c:1849
msgid "Left Arrow Move cursor to the previous menu item"
msgstr "上箭头 光标移到上一菜单项"
-#: disk-utils/cfdisk.c:1826
+#: disk-utils/cfdisk.c:1850
msgid "Right Arrow Move cursor to the next menu item"
msgstr "下箭头 光标移到下一菜单项"
-#: disk-utils/cfdisk.c:1829
+#: disk-utils/cfdisk.c:1852
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "注:所有命令均可以大写或小写"
-#: disk-utils/cfdisk.c:1830
-msgid "case letters (except for Writes)."
+#: disk-utils/cfdisk.c:1853
+#, fuzzy
+msgid "case letters (except for Write)."
msgstr "字母输入(写入命令除外)。"
-#: disk-utils/cfdisk.c:1832
+#: disk-utils/cfdisk.c:1855
msgid "Use lsblk(8) or partx(8) to see more details about the device."
msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。"
-#: disk-utils/cfdisk.c:1839
+#: disk-utils/cfdisk.c:1862
msgid "Press a key to continue."
msgstr "按下一个键继续。"
-#: disk-utils/cfdisk.c:1915
+#: disk-utils/cfdisk.c:1943
msgid "Could not toggle the flag."
msgstr "无法切换标志。"
-#: disk-utils/cfdisk.c:1925
+#: disk-utils/cfdisk.c:1953
#, c-format
msgid "Could not delete partition %zu."
msgstr "无法删除分区 %zu。"
-#: disk-utils/cfdisk.c:1927 disk-utils/fdisk-menu.c:589
+#: disk-utils/cfdisk.c:1955 disk-utils/fdisk-menu.c:590
#, c-format
msgid "Partition %zu has been deleted."
msgstr "分区 %zu 已删除。"
-#: disk-utils/cfdisk.c:1948
+#: disk-utils/cfdisk.c:1976
msgid "Partition size: "
msgstr "分区大小:"
-#: disk-utils/cfdisk.c:1954
-#, fuzzy
-msgid "Too small partition size specified."
-msgstr "未定义分区。"
-
-#: disk-utils/cfdisk.c:1992
+#: disk-utils/cfdisk.c:2017
#, c-format
msgid "Changed type of partition %zu."
msgstr "已更改分区 %zu 的类型。"
-#: disk-utils/cfdisk.c:1994
+#: disk-utils/cfdisk.c:2019
#, c-format
msgid "The type of partition %zu is unchanged."
msgstr "分区 %zu 的类型未更改。"
-#: disk-utils/cfdisk.c:2011
-msgid "Device open in read-only mode"
-msgstr "设备以只读方式打开"
+#: disk-utils/cfdisk.c:2036
+#, fuzzy
+msgid "Device is open in read-only mode."
+msgstr "设备以只读方式打开。"
-#: disk-utils/cfdisk.c:2016
+#: disk-utils/cfdisk.c:2041
msgid "Are you sure you want to write the partition table to disk? "
msgstr "您确定想将分区表写入磁盘吗?"
-#: disk-utils/cfdisk.c:2018
+#: disk-utils/cfdisk.c:2043
msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
msgstr "输入“yes”或“no”或按 ESC 取消对话框。"
-#: disk-utils/cfdisk.c:2023 login-utils/lslogins.c:210 sys-utils/lscpu.c:1249
+#: disk-utils/cfdisk.c:2048 login-utils/lslogins.c:210 sys-utils/lscpu.c:1249
#: sys-utils/lscpu.c:1259
-#, c-format
msgid "yes"
msgstr "是"
-#: disk-utils/cfdisk.c:2024
-msgid "Did not write partition table to disk"
+#: disk-utils/cfdisk.c:2049
+#, fuzzy
+msgid "Did not write partition table to disk."
msgstr "不将分区表写入磁盘"
-#: disk-utils/cfdisk.c:2029
-msgid "Failed to write disklabel"
+#: disk-utils/cfdisk.c:2054
+#, fuzzy
+msgid "Failed to write disklabel."
msgstr "写磁盘标签失败"
-#: disk-utils/cfdisk.c:2032 disk-utils/fdisk-menu.c:544
+#: disk-utils/cfdisk.c:2057 disk-utils/fdisk-menu.c:545
msgid "The partition table has been altered."
msgstr "分区表已调整。"
-#: disk-utils/cfdisk.c:2054
+#: disk-utils/cfdisk.c:2079 disk-utils/cfdisk.c:2124
msgid "Note that partition table entries are not in disk order now."
msgstr "注意,现在分区表记录没有按磁盘顺序。"
-#: disk-utils/cfdisk.c:2079
+#: disk-utils/cfdisk.c:2104
msgid "failed to create a new disklabel"
msgstr "创建新磁盘标签失败"
-#: disk-utils/cfdisk.c:2087
+#: disk-utils/cfdisk.c:2112
msgid "failed to read partitions"
msgstr "读分区失败"
-#: disk-utils/cfdisk.c:2097 disk-utils/fdisk.c:853 disk-utils/fdisk-menu.c:536
+#: disk-utils/cfdisk.c:2122 disk-utils/fdisk.c:864 disk-utils/fdisk-menu.c:537
msgid "Device open in read-only mode."
msgstr "设备以只读方式打开。"
-#: disk-utils/cfdisk.c:2167
+#: disk-utils/cfdisk.c:2194
#, c-format
msgid " %1$s [options] <disk>\n"
msgstr " %1$s [选项] <磁盘>\n"
-#: disk-utils/cfdisk.c:2170 disk-utils/fdisk.c:640 disk-utils/sfdisk.c:1314
+#: disk-utils/cfdisk.c:2197 disk-utils/fdisk.c:642 disk-utils/sfdisk.c:1315
#, fuzzy
msgid "Display or manipulate a disk partition table.\n"
msgstr "%s:读取分区表失败"
-#: disk-utils/cfdisk.c:2173
+#: disk-utils/cfdisk.c:2200
msgid " -L --color[=<when>] colorize output (auto, always or never)\n"
msgstr " -L --color[=<何时>] 彩色输出(auto自动,always总是或never从不)\n"
-#: disk-utils/cfdisk.c:2174
+#: disk-utils/cfdisk.c:2201
msgid " -z --zero start with zeroed partition table\n"
msgstr " -z, --zero 以空分区表开始\n"
-#: disk-utils/cfdisk.c:2213 disk-utils/fdisk.c:766 misc-utils/cal.c:373
-#: sys-utils/dmesg.c:1302 text-utils/hexdump.c:114
+#: disk-utils/cfdisk.c:2240 disk-utils/fdisk.c:774 misc-utils/cal.c:373
+#: sys-utils/dmesg.c:1318 text-utils/hexdump.c:114
msgid "unsupported color mode"
msgstr "不支持的颜色模式"
-#: disk-utils/cfdisk.c:2231 disk-utils/fdisk.c:706 disk-utils/sfdisk.c:192
+#: disk-utils/cfdisk.c:2258 disk-utils/fdisk.c:714 disk-utils/sfdisk.c:192
msgid "failed to allocate libfdisk context"
msgstr "分配 libfdisk 环境(context)失败"
@@ -679,7 +669,7 @@ msgstr ""
"继续 ... "
#: disk-utils/fdformat.c:143 disk-utils/fsck.minix.c:196
-#: disk-utils/swaplabel.c:117 misc-utils/wipefs.c:453
+#: disk-utils/swaplabel.c:117 misc-utils/wipefs.c:452
#: sys-utils/blkdiscard.c:63 sys-utils/tunelp.c:89
#, c-format
msgid " %s [options] <device>\n"
@@ -728,16 +718,17 @@ msgstr "无效参数:%s"
#: disk-utils/mkfs.bfs.c:185 disk-utils/mkfs.cramfs.c:331
#: disk-utils/mkfs.cramfs.c:751 disk-utils/mkfs.cramfs.c:788
#: disk-utils/mkfs.minix.c:750 disk-utils/mkswap.c:242 disk-utils/partx.c:891
-#: login-utils/last.c:673 misc-utils/namei.c:231 sys-utils/blkdiscard.c:157
-#: sys-utils/dmesg.c:521 sys-utils/fallocate.c:198 sys-utils/fsfreeze.c:131
-#: sys-utils/fstrim.c:76 sys-utils/swapon.c:482 sys-utils/switch_root.c:93
+#: login-utils/last.c:673 login-utils/utmpdump.c:129 misc-utils/namei.c:231
+#: misc-utils/rename.c:63 sys-utils/blkdiscard.c:157 sys-utils/dmesg.c:522
+#: sys-utils/fallocate.c:198 sys-utils/fsfreeze.c:131 sys-utils/fstrim.c:76
+#: sys-utils/swapon.c:482 sys-utils/switch_root.c:93
#: sys-utils/switch_root.c:133 term-utils/mesg.c:128 text-utils/more.c:598
#: text-utils/tailf.c:101 text-utils/tailf.c:281
-#, c-format
-msgid "stat failed %s"
-msgstr "stat 失败:%s"
+#, fuzzy, c-format
+msgid "stat of %s failed"
+msgstr "stat 失败"
-#: disk-utils/fdformat.c:223 disk-utils/partx.c:949 misc-utils/lsblk.c:1394
+#: disk-utils/fdformat.c:223 disk-utils/partx.c:949 misc-utils/lsblk.c:1397
#: sys-utils/blkdiscard.c:159 sys-utils/mountpoint.c:107
#, c-format
msgid "%s: not a block device"
@@ -778,7 +769,7 @@ msgstr ""
msgid "user defined start track exceeds the user defined end track"
msgstr ""
-#: disk-utils/fdformat.c:253 misc-utils/logger.c:505
+#: disk-utils/fdformat.c:253 misc-utils/logger.c:512
#, fuzzy
msgid "close failed"
msgstr "关闭失败:%s"
@@ -797,85 +788,85 @@ msgstr ""
msgid "Select (default %c): "
msgstr "选择 (默认 %c):"
-#: disk-utils/fdisk.c:122
+#: disk-utils/fdisk.c:124
#, c-format
msgid "Using default response %c."
msgstr "将使用默认回应 %c。"
-#: disk-utils/fdisk.c:135 disk-utils/fdisk.c:208 disk-utils/fdisk.c:279
+#: disk-utils/fdisk.c:137 disk-utils/fdisk.c:210 disk-utils/fdisk.c:281
msgid "Value out of range."
msgstr "值超出范围。"
-#: disk-utils/fdisk.c:164
+#: disk-utils/fdisk.c:166
#, c-format
msgid "%s (%s, default %c): "
msgstr "%s (%s,默认 %c):"
-#: disk-utils/fdisk.c:167 disk-utils/fdisk.c:233
+#: disk-utils/fdisk.c:169 disk-utils/fdisk.c:235
#, c-format
msgid "%s (%s, default %ju): "
msgstr "%s (%s,默认 %ju):"
-#: disk-utils/fdisk.c:172
+#: disk-utils/fdisk.c:174
#, c-format
msgid "%s (%c-%c, default %c): "
msgstr "%s (%c-%c,默认为 %c):"
-#: disk-utils/fdisk.c:175 disk-utils/fdisk.c:235
+#: disk-utils/fdisk.c:177 disk-utils/fdisk.c:237
#, c-format
msgid "%s (%ju-%ju, default %ju): "
msgstr "%s (%ju-%ju,默认 %ju):"
-#: disk-utils/fdisk.c:178
+#: disk-utils/fdisk.c:180
#, c-format
msgid "%s (%c-%c): "
msgstr "%s (%c-%c):"
-#: disk-utils/fdisk.c:181 disk-utils/fdisk.c:237
+#: disk-utils/fdisk.c:183 disk-utils/fdisk.c:239
#, c-format
msgid "%s (%ju-%ju): "
msgstr "%s (%ju-%ju): "
-#: disk-utils/fdisk.c:344 disk-utils/sfdisk.c:165
+#: disk-utils/fdisk.c:346 disk-utils/sfdisk.c:165
msgid " [Y]es/[N]o: "
msgstr "是[Y]/否[N]:"
-#: disk-utils/fdisk.c:385
+#: disk-utils/fdisk.c:387
msgid "Partition type (type L to list all types): "
msgstr "分区类型(输入 L 列出所有类型):"
-#: disk-utils/fdisk.c:386
+#: disk-utils/fdisk.c:388
msgid "Hex code (type L to list all codes): "
msgstr "Hex 代码(输入 L 列出所有代码):"
-#: disk-utils/fdisk.c:483
+#: disk-utils/fdisk.c:485
msgid "DOS Compatibility flag is set (DEPRECATED!)"
msgstr "已设置 DOS 兼容性标志(已废弃!)"
-#: disk-utils/fdisk.c:484
+#: disk-utils/fdisk.c:486
msgid "DOS Compatibility flag is not set"
msgstr "DOS 兼容性标志未设置"
-#: disk-utils/fdisk.c:505
+#: disk-utils/fdisk.c:507
#, c-format
msgid "Partition %zu does not exist yet!"
msgstr "分区 %zu 还不存在!"
-#: disk-utils/fdisk.c:510 disk-utils/fdisk.c:519 libfdisk/src/ask.c:999
+#: disk-utils/fdisk.c:512 disk-utils/fdisk.c:521 libfdisk/src/ask.c:999
msgid "Unknown"
msgstr "未知"
-#: disk-utils/fdisk.c:518
+#: disk-utils/fdisk.c:520
#, c-format
msgid "Changed type of partition '%s' to '%s'."
msgstr "已将分区“%s”的类型更改为“%s”。"
-#: disk-utils/fdisk.c:522
+#: disk-utils/fdisk.c:524
#, c-format
msgid "Type of partition %zu is unchanged: %s."
msgstr "分区 %zu 的类型未更改:%s。"
-#: disk-utils/fdisk.c:575
+#: disk-utils/fdisk.c:577
#, c-format
msgid ""
"\n"
@@ -884,25 +875,25 @@ msgstr ""
"\n"
"%s: 偏移 = %ju, 大小 = %zu 字节。"
-#: disk-utils/fdisk.c:581
+#: disk-utils/fdisk.c:583
msgid "cannot seek"
msgstr "无法 seek"
-#: disk-utils/fdisk.c:586
+#: disk-utils/fdisk.c:588
msgid "cannot read"
msgstr "不能读"
-#: disk-utils/fdisk.c:599 libfdisk/src/bsd.c:260 libfdisk/src/dos.c:935
-#: libfdisk/src/gpt.c:2040
+#: disk-utils/fdisk.c:601 libfdisk/src/bsd.c:260 libfdisk/src/dos.c:946
+#: libfdisk/src/gpt.c:2044
msgid "First sector"
msgstr "第一个扇区"
-#: disk-utils/fdisk.c:626
+#: disk-utils/fdisk.c:628
#, c-format
msgid "BLKGETSIZE ioctl failed on %s"
msgstr "对 %s 进行 BLKGETSIZE ioctl 失败"
-#: disk-utils/fdisk.c:635
+#: disk-utils/fdisk.c:637
#, c-format
msgid ""
" %1$s [options] <disk> change partition table\n"
@@ -911,86 +902,96 @@ msgstr ""
" %1$s [选项] <磁盘> 更改分区表\n"
" %1$s [选项] -l <磁盘> 列出分区表\n"
-#: disk-utils/fdisk.c:643
+#: disk-utils/fdisk.c:645
msgid " -b, --sector-size <size> physical and logical sector size\n"
msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n"
-#: disk-utils/fdisk.c:644
+#: disk-utils/fdisk.c:646
msgid " -c, --compatibility[=<mode>] mode is 'dos' or 'nondos' (default)\n"
msgstr " -c, --compatibility[=<模式>] 模式,为“dos”或“nondos”(默认)\n"
-#: disk-utils/fdisk.c:645
+#: disk-utils/fdisk.c:647
msgid " -L, --color[=<when>] colorize output (auto, always or never)\n"
msgstr " -L, --color[=<时机>] 彩色输出(auto, always 或 never)\n"
-#: disk-utils/fdisk.c:646
+#: disk-utils/fdisk.c:648
msgid " -l, --list display partitions end exit\n"
msgstr " -l, --list 显示分区信息并退出\n"
-#: disk-utils/fdisk.c:647
+#: disk-utils/fdisk.c:649
+#, fuzzy
+msgid " -o, --output <list> output columns\n"
+msgstr " -o, --output <列表> 输出列\n"
+
+#: disk-utils/fdisk.c:650
msgid " -t, --type <type> recognize specified partition table type only\n"
msgstr " -t, --type <类型> 只识别指定的分区表类型\n"
-#: disk-utils/fdisk.c:648
+#: disk-utils/fdisk.c:651
msgid " -u, --units[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"
msgstr " -u, --units[=<单位>] 显示单位,“cylinders”柱面或“sectors”扇区(默认)\n"
-#: disk-utils/fdisk.c:649
+#: disk-utils/fdisk.c:652
msgid " -s, --getsz display device size in 512-byte sectors [DEPRECATED]\n"
msgstr " -s, --getsz 以 512-字节扇区显示设备大小[已废弃]\n"
-#: disk-utils/fdisk.c:652
+#: disk-utils/fdisk.c:653
+#, fuzzy
+msgid " --bytes print SIZE in bytes rather than in human readable format\n"
+msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
+
+#: disk-utils/fdisk.c:656
msgid " -C, --cylinders <number> specify the number of cylinders\n"
msgstr " -C, --cylinders <数字> 指定柱面数\n"
-#: disk-utils/fdisk.c:653
+#: disk-utils/fdisk.c:657
msgid " -H, --heads <number> specify the number of heads\n"
msgstr " -H, --heads <数字> 指定磁头数\n"
-#: disk-utils/fdisk.c:654
+#: disk-utils/fdisk.c:658
msgid " -S, --sectors <number> specify the number of sectors per track\n"
msgstr " -S, --sectors <数字> 指定每条磁道的扇区数\n"
-#: disk-utils/fdisk.c:716
+#: disk-utils/fdisk.c:724
msgid "invalid sector size argument"
msgstr "无效的 扇区大小 参数"
-#: disk-utils/fdisk.c:725
+#: disk-utils/fdisk.c:733
msgid "invalid cylinders argument"
msgstr "无效的 柱面数 参数"
-#: disk-utils/fdisk.c:737
+#: disk-utils/fdisk.c:745
msgid "not found DOS label driver"
msgstr "未找到 DOS 标签驱动"
-#: disk-utils/fdisk.c:743
+#: disk-utils/fdisk.c:751
#, c-format
msgid "unknown compatibility mode '%s'"
msgstr "未知兼容模式“%s”"
-#: disk-utils/fdisk.c:752
+#: disk-utils/fdisk.c:760
msgid "invalid heads argument"
msgstr "无效的 磁头数 参数"
-#: disk-utils/fdisk.c:758
+#: disk-utils/fdisk.c:766
msgid "invalid sectors argument"
msgstr "无效的 扇区数 参数"
-#: disk-utils/fdisk.c:783
+#: disk-utils/fdisk.c:791
#, c-format
msgid "unsupported disklabel: %s"
msgstr "不支持的磁盘标签:%s"
-#: disk-utils/fdisk.c:805
+#: disk-utils/fdisk.c:816
msgid "The device properties (sector size and geometry) should be used with one specified device only."
msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。"
-#: disk-utils/fdisk.c:844
+#: disk-utils/fdisk.c:855
#, c-format
msgid "Welcome to fdisk (%s)."
msgstr "欢迎使用 fdisk (%s)。"
-#: disk-utils/fdisk.c:846 disk-utils/sfdisk.c:1135
+#: disk-utils/fdisk.c:857 disk-utils/sfdisk.c:1136
msgid ""
"Changes will remain in memory only, until you decide to write them.\n"
"Be careful before using the write command.\n"
@@ -998,7 +999,7 @@ msgstr ""
"更改将停留在内存中,直到您决定将更改写入磁盘。\n"
"使用写入命令前请三思。\n"
-#: disk-utils/fdisk.c:866
+#: disk-utils/fdisk.c:877
msgid "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert command 'M')."
msgstr "检测到混合 GPT。您需要手动同步混合 MBR (用专家命令“M”)"
@@ -1042,19 +1043,18 @@ msgstr "磁盘标签类型:%s"
msgid "Disk identifier: %s"
msgstr "磁盘标识符:%s"
-#: disk-utils/fdisk-list.c:107
-#, fuzzy
-msgid "faild to allocate iterator"
+#: disk-utils/fdisk-list.c:107 disk-utils/fsck.c:1228
+msgid "failed to allocate iterator"
msgstr "分配迭代器失败"
#: disk-utils/fdisk-list.c:113
#, fuzzy
-msgid "faild to allocate output table"
+msgid "failed to allocate output table"
msgstr "初始化输出表失败"
#: disk-utils/fdisk-list.c:154
#, fuzzy
-msgid "faild to allocate output line"
+msgid "failed to allocate output line"
msgstr "初始化输出行失败"
#: disk-utils/fdisk-list.c:181
@@ -1348,7 +1348,7 @@ msgstr "显示完整磁盘标签"
msgid "link BSD partition to non-BSD partition"
msgstr "将 BSD 分区链接到非 BSD 分区"
-#: disk-utils/fdisk-menu.c:365
+#: disk-utils/fdisk-menu.c:366
#, c-format
msgid ""
"\n"
@@ -1357,7 +1357,7 @@ msgstr ""
"\n"
"帮助 (专业命令):\n"
-#: disk-utils/fdisk-menu.c:367 disk-utils/sfdisk.c:928
+#: disk-utils/fdisk-menu.c:368 disk-utils/sfdisk.c:928
#, c-format
msgid ""
"\n"
@@ -1366,83 +1366,88 @@ msgstr ""
"\n"
"帮助:\n"
-#: disk-utils/fdisk-menu.c:387
+#: disk-utils/fdisk-menu.c:388
#, c-format
msgid "You're editing nested '%s' partition table, primary partition table is '%s'."
msgstr "您正在编辑嵌套的“%s”分区表,主分区表为“%s”。"
-#: disk-utils/fdisk-menu.c:417
+#: disk-utils/fdisk-menu.c:418
msgid "Expert command (m for help): "
msgstr "专家命令(输入 m 显示帮助):"
-#: disk-utils/fdisk-menu.c:419
+#: disk-utils/fdisk-menu.c:420
msgid "Command (m for help): "
msgstr "命令(输入 m 获取帮助):"
-#: disk-utils/fdisk-menu.c:429
+#: disk-utils/fdisk-menu.c:430
#, c-format
msgid "%c: unknown command"
msgstr "%c:未知命令"
-#: disk-utils/fdisk-menu.c:455 disk-utils/fdisk-menu.c:482
+#: disk-utils/fdisk-menu.c:456 disk-utils/fdisk-menu.c:483
#, fuzzy
msgid "Enter script file name"
msgstr "无法写脚本文件"
-#: disk-utils/fdisk-menu.c:468
+#: disk-utils/fdisk-menu.c:469
msgid "Script successfully applied."
msgstr ""
-#: disk-utils/fdisk-menu.c:508
+#: disk-utils/fdisk-menu.c:495
+#, fuzzy
+msgid "Failed to transform disk layout into script"
+msgstr "向输出添加行出错"
+
+#: disk-utils/fdisk-menu.c:509
msgid "Script successfully saved."
msgstr ""
-#: disk-utils/fdisk-menu.c:541
+#: disk-utils/fdisk-menu.c:542
msgid "failed to write disklabel"
msgstr "写磁盘标签失败"
-#: disk-utils/fdisk-menu.c:587
+#: disk-utils/fdisk-menu.c:588
#, c-format
msgid "Could not delete partition %zu"
msgstr "无法删除分区 %zu"
-#: disk-utils/fdisk-menu.c:611
+#: disk-utils/fdisk-menu.c:612
msgid "Changing display/entry units to cylinders (DEPRECATED!)."
msgstr "将显示/记录单位更改为柱面(已废弃!)。"
-#: disk-utils/fdisk-menu.c:613
+#: disk-utils/fdisk-menu.c:614
msgid "Changing display/entry units to sectors."
msgstr "将显示/记录单位更改为盲区。"
-#: disk-utils/fdisk-menu.c:623 disk-utils/fdisk-menu.c:787
+#: disk-utils/fdisk-menu.c:624 disk-utils/fdisk-menu.c:788
msgid "Leaving nested disklabel."
msgstr "离开嵌套的磁盘标签。"
-#: disk-utils/fdisk-menu.c:664
+#: disk-utils/fdisk-menu.c:665
msgid "Entering protective/hybrid MBR disklabel."
msgstr "进入 保护/混合 MBR 磁盘标签。"
-#: disk-utils/fdisk-menu.c:680
+#: disk-utils/fdisk-menu.c:681
msgid "New UUID (in 8-4-4-4-12 format)"
msgstr "新 UUID (以 8-4-4-4-12 格式)"
-#: disk-utils/fdisk-menu.c:695
+#: disk-utils/fdisk-menu.c:696
msgid "New name"
msgstr "新名称"
-#: disk-utils/fdisk-menu.c:758
+#: disk-utils/fdisk-menu.c:759
msgid "Entering nested BSD disklabel."
msgstr "进入嵌套的 BSD 磁盘标签。"
-#: disk-utils/fdisk-menu.c:944
+#: disk-utils/fdisk-menu.c:945
msgid "Number of cylinders"
msgstr "柱面数"
-#: disk-utils/fdisk-menu.c:948
+#: disk-utils/fdisk-menu.c:949
msgid "Number of heads"
msgstr "磁头数"
-#: disk-utils/fdisk-menu.c:952
+#: disk-utils/fdisk-menu.c:953
msgid "Number of sectors"
msgstr "扇区数"
@@ -1459,7 +1464,7 @@ msgstr "%s 未挂载\n"
#: disk-utils/fsck.c:323 disk-utils/fsck.cramfs.c:169
#: disk-utils/fsck.cramfs.c:176 disk-utils/fsck.cramfs.c:230
#: disk-utils/fsck.cramfs.c:248 disk-utils/sfdisk.c:249 libfdisk/src/bsd.c:587
-#: lib/path.c:113 lib/path.c:134 lib/path.c:155 lib/path.c:203
+#: lib/path.c:110 lib/path.c:131 lib/path.c:152 lib/path.c:200
#: login-utils/last.c:196 login-utils/last.c:233 login-utils/sulogin.c:675
#: sys-utils/setpriv.c:239 term-utils/setterm.c:731 term-utils/setterm.c:788
#: term-utils/setterm.c:792 term-utils/setterm.c:799
@@ -1467,7 +1472,7 @@ msgstr "%s 未挂载\n"
msgid "cannot read %s"
msgstr "不能读 %s"
-#: disk-utils/fsck.c:325 lib/path.c:136 lib/path.c:157
+#: disk-utils/fsck.c:325 lib/path.c:133 lib/path.c:154
#, c-format
msgid "parse error: %s"
msgstr "解析错误:%s"
@@ -1506,153 +1511,149 @@ msgstr "正在解锁 %s。\n"
msgid "failed to setup description for %s"
msgstr "设置 %s 描述 失败"
-#: disk-utils/fsck.c:463
+#: disk-utils/fsck.c:467
#, c-format
msgid "%s: parse error at line %d -- ignore"
msgstr "%s:第 %d 行解析出错 -- 忽略"
-#: disk-utils/fsck.c:495 disk-utils/fsck.c:497
+#: disk-utils/fsck.c:499 disk-utils/fsck.c:501
#, c-format
msgid "%s: failed to parse fstab"
msgstr "%s:解析 fstab 失败"
-#: disk-utils/fsck.c:659 login-utils/login.c:979 login-utils/sulogin.c:1041
+#: disk-utils/fsck.c:663 login-utils/login.c:979 login-utils/sulogin.c:1041
#: login-utils/vipw.c:204 sys-utils/flock.c:295 sys-utils/nsenter.c:142
#: sys-utils/swapon.c:302 sys-utils/unshare.c:221 term-utils/script.c:277
#: term-utils/script.c:287
msgid "fork failed"
msgstr "fork 失败"
-#: disk-utils/fsck.c:666
+#: disk-utils/fsck.c:670
#, c-format
msgid "%s: execute failed"
msgstr "%s:执行失败"
-#: disk-utils/fsck.c:754
+#: disk-utils/fsck.c:758
msgid "wait: no more child process?!?"
msgstr "等待:没有剩余子进程了?!?"
-#: disk-utils/fsck.c:757 sys-utils/flock.c:312 sys-utils/swapon.c:326
+#: disk-utils/fsck.c:761 sys-utils/flock.c:312 sys-utils/swapon.c:326
#: sys-utils/unshare.c:226
msgid "waitpid failed"
msgstr "waitpid 失败"
-#: disk-utils/fsck.c:775
+#: disk-utils/fsck.c:779
#, c-format
msgid "Warning... %s for device %s exited with signal %d."
msgstr "警告... 对设备 %2$s 的 %1$s 以信号 %3$d 退出。"
-#: disk-utils/fsck.c:781
+#: disk-utils/fsck.c:785
#, c-format
msgid "%s %s: status is %x, should never happen."
msgstr "%s %s:状态为 %x,这不应该发生。"
-#: disk-utils/fsck.c:827
+#: disk-utils/fsck.c:831
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "以 %s 结束(退出状态为 %d)\n"
-#: disk-utils/fsck.c:905
+#: disk-utils/fsck.c:909
#, c-format
msgid "error %d (%m) while executing fsck.%s for %s"
msgstr "对 %3$s 执行 fsck.%2$s 时出现错误 %1$d (%m)"
-#: disk-utils/fsck.c:971
+#: disk-utils/fsck.c:975
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:1087
+#: disk-utils/fsck.c:1091
#, c-format
msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
msgstr "%s:将跳过 /etc/fstab 中的错误行:fsck 通过次数非零的绑定式挂载"
-#: disk-utils/fsck.c:1099
+#: disk-utils/fsck.c:1103
#, c-format
msgid "%s: skipping nonexistent device\n"
msgstr "%s:将跳过不存在的设备\n"
-#: disk-utils/fsck.c:1104
+#: disk-utils/fsck.c:1108
#, c-format
msgid "%s: nonexistent device (\"nofail\" fstab option may be used to skip this device)\n"
msgstr "%s:设备不存在(可以使用fstab 选项“nofail”来跳过此设备)\n"
-#: disk-utils/fsck.c:1121
+#: disk-utils/fsck.c:1125
#, c-format
msgid "%s: skipping unknown filesystem type\n"
msgstr "%s:跳过未知的文件系统类型\n"
-#: disk-utils/fsck.c:1135
+#: disk-utils/fsck.c:1139
#, c-format
msgid "cannot check %s: fsck.%s not found"
msgstr "无法检查 %s:找不到 fsck.%s"
-#: disk-utils/fsck.c:1224
-msgid "failed to allocate iterator"
-msgstr "分配迭代器失败"
-
-#: disk-utils/fsck.c:1239
+#: disk-utils/fsck.c:1243
msgid "Checking all file systems.\n"
msgstr "正在检查所有文件系统。\n"
# pass number 是fstab中定义的,不为0则每次检测
-#: disk-utils/fsck.c:1330
+#: disk-utils/fsck.c:1334
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--等待中-- (第 %d 遍)\n"
-#: disk-utils/fsck.c:1355
+#: disk-utils/fsck.c:1359
#, c-format
msgid " %s [options] -- [fs-options] [<filesystem> ...]\n"
msgstr " %s [选项] -- [文件系统选项] [<文件系统> ...]\n"
-#: disk-utils/fsck.c:1359
+#: disk-utils/fsck.c:1363
#, fuzzy
msgid "Check and repair a Linux filesystem.\n"
msgstr "正在检查所有文件系统。\n"
-#: disk-utils/fsck.c:1362
+#: disk-utils/fsck.c:1366
msgid " -A check all filesystems\n"
msgstr " -A 检查所有文件系统\n"
-#: disk-utils/fsck.c:1363
+#: disk-utils/fsck.c:1367
msgid " -C [<fd>] display progress bar; file descriptor is for GUIs\n"
msgstr " -C [<fd>] 显示进度条;文件描述符 fd 用于图形用户界面\n"
-#: disk-utils/fsck.c:1364
+#: disk-utils/fsck.c:1368
msgid " -l lock the device to guarantee exclusive access\n"
msgstr " -l 锁定设备以确保独占访问\n"
-#: disk-utils/fsck.c:1365
+#: disk-utils/fsck.c:1369
msgid " -M do not check mounted filesystems\n"
msgstr " -M 不检查已挂臷的文件系统\n"
-#: disk-utils/fsck.c:1366
+#: disk-utils/fsck.c:1370
msgid " -N do not execute, just show what would be done\n"
msgstr " -N 不执行,只显示将执行的操作\n"
-#: disk-utils/fsck.c:1367
+#: disk-utils/fsck.c:1371
msgid " -P check filesystems in parallel, including root\n"
msgstr " -P 并行检查文件系统,包括 root\n"
-#: disk-utils/fsck.c:1368
+#: disk-utils/fsck.c:1372
msgid " -R skip root filesystem; useful only with '-A'\n"
msgstr " -R 跳过根文件系统;只在指定 '-A' 时有用\n"
-#: disk-utils/fsck.c:1369
+#: disk-utils/fsck.c:1373
msgid " -r report statistics for each device checked\n"
msgstr " -r 报告对每个已检查设备的统计\n"
-#: disk-utils/fsck.c:1370
+#: disk-utils/fsck.c:1374
msgid " -s serialize the checking operations\n"
msgstr " -s 串行化检查操作\n"
-#: disk-utils/fsck.c:1371
+#: disk-utils/fsck.c:1375
msgid " -T do not show the title on startup\n"
msgstr " -T 启动时不显示标题\n"
-#: disk-utils/fsck.c:1372
+#: disk-utils/fsck.c:1376
msgid ""
" -t <type> specify filesystem types to be checked;\n"
" <type> is allowed to be a comma-separated list\n"
@@ -1660,46 +1661,46 @@ msgstr ""
" -t <类型> 指定要检查的文件系统类型;\n"
" <类型> 可以是以英文逗号分隔的列表\n"
-#: disk-utils/fsck.c:1374
+#: disk-utils/fsck.c:1378
msgid " -V explain what is being done\n"
msgstr " -V 解释正在进行的操作\n"
-#: disk-utils/fsck.c:1375
+#: disk-utils/fsck.c:1379
msgid " -? display this help and exit\n"
msgstr " -? 显示此帮助并退出\n"
-#: disk-utils/fsck.c:1378
+#: disk-utils/fsck.c:1382
msgid "See the specific fsck.* commands for available fs-options."
msgstr "参见特定的 fsck.* 命令了解可用的文件系统选项。"
-#: disk-utils/fsck.c:1416
+#: disk-utils/fsck.c:1420
msgid "too many devices"
msgstr "设备过多"
-#: disk-utils/fsck.c:1428
+#: disk-utils/fsck.c:1432
msgid "Is /proc mounted?"
msgstr "/proc 挂载了吗?"
-#: disk-utils/fsck.c:1436
+#: disk-utils/fsck.c:1440
#, c-format
msgid "must be root to scan for matching filesystems: %s"
msgstr "必须以 root 用户进行匹配文件系统扫描:%s"
-#: disk-utils/fsck.c:1440
+#: disk-utils/fsck.c:1444
#, c-format
msgid "couldn't find matching filesystem: %s"
msgstr "找不到匹配的文件系统:%s"
-#: disk-utils/fsck.c:1448 disk-utils/fsck.c:1536 misc-utils/kill.c:367
+#: disk-utils/fsck.c:1452 disk-utils/fsck.c:1540 misc-utils/kill.c:367
#: sys-utils/eject.c:287
msgid "too many arguments"
msgstr "参数过多"
-#: disk-utils/fsck.c:1588
+#: disk-utils/fsck.c:1592
msgid "the -l option can be used with one device only -- ignore"
msgstr "-l 选项只能用于一个设备 -- 忽略"
-#: disk-utils/fsck.cramfs.c:108 misc-utils/whereis.c:188
+#: disk-utils/fsck.cramfs.c:108 misc-utils/whereis.c:189
#, c-format
msgid " %s [options] <file>\n"
msgstr " %s [选项] <文件>\n"
@@ -2395,8 +2396,8 @@ msgstr ""
#: disk-utils/fsck.minix.c:1400 disk-utils/mkfs.minix.c:808
#: disk-utils/mkswap.c:540 disk-utils/partx.c:1004 disk-utils/resizepart.c:112
-#: login-utils/utmpdump.c:388 misc-utils/logger.c:316 misc-utils/logger.c:382
-#: misc-utils/logger.c:431 sys-utils/dmesg.c:649 sys-utils/wdctl.c:346
+#: login-utils/utmpdump.c:388 misc-utils/logger.c:319 misc-utils/logger.c:389
+#: misc-utils/logger.c:438 sys-utils/dmesg.c:660 sys-utils/wdctl.c:346
#: sys-utils/wdctl.c:411 term-utils/script.c:341 term-utils/script.c:382
#: term-utils/script.c:501 text-utils/pg.c:1249
msgid "write failed"
@@ -2645,9 +2646,9 @@ msgid " -h, --help display this help text and exit\n"
msgstr " -h, --help 显示此帮助并退出\n"
#: disk-utils/mkfs.c:154 lib/exec_shell.c:45 login-utils/newgrp.c:233
-#: login-utils/su-common.c:649 login-utils/su-common.c:978
+#: login-utils/su-common.c:651 login-utils/su-common.c:980
#: login-utils/sulogin.c:811 login-utils/sulogin.c:815 schedutils/chrt.c:332
-#: schedutils/ionice.c:262 schedutils/taskset.c:239 sys-utils/flock.c:301
+#: schedutils/ionice.c:260 schedutils/taskset.c:239 sys-utils/flock.c:301
#: sys-utils/nsenter.c:375 sys-utils/prlimit.c:643 sys-utils/rtcwake.c:589
#: sys-utils/setarch.c:314 sys-utils/setarch.c:389 sys-utils/setsid.c:117
#: sys-utils/swapon.c:318 sys-utils/switch_root.c:243 sys-utils/unshare.c:258
@@ -3249,7 +3250,7 @@ msgstr "易读形式的大小"
msgid "partition name"
msgstr "分区名"
-#: disk-utils/partx.c:93 misc-utils/findmnt.c:130 misc-utils/lsblk.c:150
+#: disk-utils/partx.c:93 misc-utils/findmnt.c:130 misc-utils/lsblk.c:154
msgid "partition UUID"
msgstr "分区 UUID"
@@ -3257,7 +3258,7 @@ msgstr "分区 UUID"
msgid "partition table type (dos, gpt, ...)"
msgstr "分区表类型(dos、gpt、...)"
-#: disk-utils/partx.c:95 misc-utils/lsblk.c:151
+#: disk-utils/partx.c:95 misc-utils/lsblk.c:155
msgid "partition flags"
msgstr "分区标志"
@@ -3289,8 +3290,8 @@ msgstr "%s:设置后备文件失败"
msgid "%s: failed to set up loop device"
msgstr "%s:设置回环设备失败"
-#: disk-utils/partx.c:161 login-utils/lslogins.c:324 misc-utils/findmnt.c:388
-#: misc-utils/lsblk.c:323 misc-utils/lslocks.c:340 sys-utils/losetup.c:101
+#: disk-utils/partx.c:161 login-utils/lslogins.c:324 misc-utils/findmnt.c:391
+#: misc-utils/lsblk.c:327 misc-utils/lslocks.c:340 sys-utils/losetup.c:101
#: sys-utils/lscpu.c:327 sys-utils/prlimit.c:277 sys-utils/swapon.c:135
#: sys-utils/wdctl.c:151 sys-utils/zramctl.c:113
#, c-format
@@ -3383,7 +3384,7 @@ 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:546 misc-utils/findmnt.c:697 misc-utils/findmnt.c:714
+#: disk-utils/partx.c:546 misc-utils/findmnt.c:703 misc-utils/findmnt.c:720
#: misc-utils/lslocks.c:402
msgid "failed to add line to output"
msgstr "向输出添加行出错"
@@ -3392,14 +3393,14 @@ msgstr "向输出添加行出错"
msgid "failed to add data to output table"
msgstr "向输出表添加数据出错"
-#: disk-utils/partx.c:632 login-utils/lslogins.c:899 misc-utils/findmnt.c:1530
-#: misc-utils/lsblk.c:1766 misc-utils/lslocks.c:461 sys-utils/losetup.c:300
+#: disk-utils/partx.c:632 login-utils/lslogins.c:899 misc-utils/findmnt.c:1536
+#: misc-utils/lsblk.c:1769 misc-utils/lslocks.c:461 sys-utils/losetup.c:300
#: sys-utils/lscpu.c:1420 sys-utils/prlimit.c:297 sys-utils/swapon.c:268
#: sys-utils/wdctl.c:259 sys-utils/zramctl.c:339
msgid "failed to initialize output table"
msgstr "初始化输出表失败"
-#: disk-utils/partx.c:643 misc-utils/findmnt.c:1552 misc-utils/lsblk.c:1782
+#: disk-utils/partx.c:643 misc-utils/findmnt.c:1558 misc-utils/lsblk.c:1785
#: misc-utils/lslocks.c:471 sys-utils/losetup.c:308 sys-utils/losetup.c:344
#: sys-utils/lscpu.c:1425 sys-utils/prlimit.c:306 sys-utils/swapon.c:277
#: sys-utils/wdctl.c:270 sys-utils/zramctl.c:348
@@ -3455,7 +3456,7 @@ msgstr ""
" -s, --show 列出分区\n"
"\n"
-#: disk-utils/partx.c:724 misc-utils/lsblk.c:1532
+#: disk-utils/partx.c:724 misc-utils/lsblk.c:1535
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
@@ -3471,11 +3472,11 @@ msgstr " -n, --nr <n:m> 指定分区范围(例如:--nr 2:4)\n"
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <列表> 定义使用哪个输出列\n"
-#: disk-utils/partx.c:728 misc-utils/lsblk.c:1545
+#: disk-utils/partx.c:728 misc-utils/lsblk.c:1548
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 key=“value” 输出格式\n"
-#: disk-utils/partx.c:729 misc-utils/lsblk.c:1546
+#: disk-utils/partx.c:729 misc-utils/lsblk.c:1549
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
@@ -3647,7 +3648,7 @@ msgstr ""
msgid "%s: failed to create a backup"
msgstr "%s:创建签名备份失败"
-#: disk-utils/sfdisk.c:285 misc-utils/wipefs.c:383
+#: disk-utils/sfdisk.c:285 misc-utils/wipefs.c:382
msgid "failed to create a signature backup, $HOME undefined"
msgstr "创建签名备份失败,未定义 $HOME"
@@ -3657,7 +3658,7 @@ msgstr ""
#: disk-utils/sfdisk.c:307
#, fuzzy
-msgid "The partition table unchanged (--no-act)."
+msgid "The partition table is unchanged (--no-act)."
msgstr "分区表已调整。"
#: disk-utils/sfdisk.c:311
@@ -3680,12 +3681,6 @@ msgstr ""
"Id 名称\n"
"\n"
-#: disk-utils/sfdisk.c:383 disk-utils/sfdisk.c:439 disk-utils/sfdisk.c:493
-#: term-utils/agetty.c:2499
-#, fuzzy, c-format
-msgid "cannot open: %s"
-msgstr "打不开 %s"
-
#: disk-utils/sfdisk.c:392
#, fuzzy
msgid "unrecognized partition table type"
@@ -3703,7 +3698,7 @@ msgstr "共计:%llu 个块\n"
#: disk-utils/sfdisk.c:544 disk-utils/sfdisk.c:615 disk-utils/sfdisk.c:677
#: disk-utils/sfdisk.c:741 disk-utils/sfdisk.c:796 disk-utils/sfdisk.c:852
-#: disk-utils/sfdisk.c:1094
+#: disk-utils/sfdisk.c:1095
#, fuzzy
msgid "no disk device specified"
msgstr "未指定设备"
@@ -3713,8 +3708,8 @@ msgid "toggle boot flags is supported for MBR only"
msgstr ""
#: disk-utils/sfdisk.c:586 disk-utils/sfdisk.c:682 disk-utils/sfdisk.c:746
-#: disk-utils/sfdisk.c:801 disk-utils/sfdisk.c:857 disk-utils/sfdisk.c:1092
-#: disk-utils/sfdisk.c:1476
+#: disk-utils/sfdisk.c:801 disk-utils/sfdisk.c:857 disk-utils/sfdisk.c:1093
+#: disk-utils/sfdisk.c:1481
#, fuzzy
msgid "failed to parse partition number"
msgstr "%s:获取分区号失败"
@@ -3741,12 +3736,12 @@ msgstr "无分区表。\n"
#: disk-utils/sfdisk.c:659
#, fuzzy, c-format
-msgid "%s: partition %zu: partition table contains %zu partitions only."
+msgid "%s: partition %zu: partition table contains only %zu partitions"
msgstr "%s:分区表中无分区"
#: disk-utils/sfdisk.c:662
#, fuzzy, c-format
-msgid "%s: partition %zu: partition unnused"
+msgid "%s: partition %zu: partition is unused"
msgstr "分区 %zu:与 分区 %zu 重叠。"
#: disk-utils/sfdisk.c:681 disk-utils/sfdisk.c:745 disk-utils/sfdisk.c:800
@@ -3758,7 +3753,7 @@ msgstr "分区号"
#: disk-utils/sfdisk.c:687 disk-utils/sfdisk.c:751 disk-utils/sfdisk.c:806
#: disk-utils/sfdisk.c:862
#, fuzzy
-msgid "uneexpected arguments"
+msgid "unexpected arguments"
msgstr "参数数量异常"
#: disk-utils/sfdisk.c:702
@@ -3817,7 +3812,7 @@ msgid " write write table to disk and exit\n"
msgstr "将分区表写入磁盘并退出"
#: disk-utils/sfdisk.c:935
-msgid " quit show new situation and wait for user's feedbadk before write\n"
+msgid " quit show new situation and wait for user's feedback before write\n"
msgstr ""
#: disk-utils/sfdisk.c:936
@@ -3844,89 +3839,90 @@ msgid " Input format:\n"
msgstr "输出格式:\n"
#: disk-utils/sfdisk.c:946
-msgid " <start>, <size>, <typy>, <bootable>\n"
+msgid " <start>, <size>, <type>, <bootable>\n"
msgstr ""
#: disk-utils/sfdisk.c:949
msgid ""
-" <start> begin of the partition in sectors. The default is the first\n"
-" free space.\n"
+" <start> begin of the partition in sectors or bytes if specified\n"
+" in format <number>{K,M,G,T,P,E,Z,Y}. The default is\n"
+" the first free space.\n"
msgstr ""
-#: disk-utils/sfdisk.c:953
+#: disk-utils/sfdisk.c:954
msgid ""
" <size> size of the partition in sectors if specified in format\n"
" <number>{K,M,G,T,P,E,Z,Y} then it's interpreted as size\n"
" in bytes. The default is all available space.\n"
msgstr ""
-#: disk-utils/sfdisk.c:958
+#: disk-utils/sfdisk.c:959
msgid " <type> partition type. The default is Linux data partition.\n"
msgstr ""
-#: disk-utils/sfdisk.c:959
+#: disk-utils/sfdisk.c:960
msgid " MBR: hex or L,S,E,X shortcuts.\n"
msgstr ""
-#: disk-utils/sfdisk.c:960
+#: disk-utils/sfdisk.c:961
msgid " GPT: uuid or L,S,H shortcuts.\n"
msgstr ""
-#: disk-utils/sfdisk.c:963
+#: disk-utils/sfdisk.c:964
msgid " <bootable> '*' to mark MBR partition as bootable. \n"
msgstr ""
-#: disk-utils/sfdisk.c:967
+#: disk-utils/sfdisk.c:968
msgid " Example:\n"
msgstr ""
-#: disk-utils/sfdisk.c:969
+#: disk-utils/sfdisk.c:970
#, fuzzy
msgid " , 4G creates 4GiB partition on default start offset.\n"
msgstr " n 从空闲空间创建新分区"
-#: disk-utils/sfdisk.c:1001 sys-utils/dmesg.c:1427
+#: disk-utils/sfdisk.c:1002 sys-utils/dmesg.c:1443
msgid "unsupported command"
msgstr "不支持的命令"
-#: disk-utils/sfdisk.c:1003
+#: disk-utils/sfdisk.c:1004
#, fuzzy, c-format
msgid "line %d: unsupported command"
msgstr "不支持的命令"
-#: disk-utils/sfdisk.c:1102
+#: disk-utils/sfdisk.c:1103
#, fuzzy
msgid "failed to allocate script handler"
msgstr "分配 GPT 头失败"
-#: disk-utils/sfdisk.c:1113
+#: disk-utils/sfdisk.c:1114
#, fuzzy, c-format
-msgid "%s: cannot modify partition %d, not found partition table."
+msgid "%s: cannot modify partition %d: no partition table was found"
msgstr "%s:读取分区表失败"
-#: disk-utils/sfdisk.c:1118
-#, c-format
-msgid "%s: cannot modify partition %d, partition table contains %zu partitions only."
-msgstr ""
+#: disk-utils/sfdisk.c:1119
+#, fuzzy, c-format
+msgid "%s: cannot modify partition %d: partition table contains only %zu partitions"
+msgstr "%s:分区表中无分区"
-#: disk-utils/sfdisk.c:1133
+#: disk-utils/sfdisk.c:1134
#, fuzzy, c-format
msgid ""
"\n"
"Welcome to sfdisk (%s)."
msgstr "欢迎使用 fdisk (%s)。"
-#: disk-utils/sfdisk.c:1141
+#: disk-utils/sfdisk.c:1142
msgid "Checking that no-one is using this disk right now ..."
msgstr "请检查现在是不是有人在使用此磁盘..."
-#: disk-utils/sfdisk.c:1143
+#: disk-utils/sfdisk.c:1144
msgid ""
" FAILED\n"
"\n"
msgstr ""
-#: disk-utils/sfdisk.c:1146
+#: disk-utils/sfdisk.c:1147
#, fuzzy
msgid ""
"This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -3938,25 +3934,25 @@ msgstr ""
"请卸载此磁盘上所有的文件系统,并关闭(swapoff)上面的交换分区。\n"
"可使用 --no-reread 标志阻止此检查。"
-#: disk-utils/sfdisk.c:1151
+#: disk-utils/sfdisk.c:1152
msgid "Use the --force flag to overrule all checks."
msgstr "使用 --force 标志否决所有检查。"
-#: disk-utils/sfdisk.c:1153
+#: disk-utils/sfdisk.c:1154
#, fuzzy
msgid ""
" OK\n"
"\n"
msgstr "%s:OK\n"
-#: disk-utils/sfdisk.c:1162
+#: disk-utils/sfdisk.c:1163
#, fuzzy
msgid ""
"\n"
"Old situation:"
msgstr "旧状况:\n"
-#: disk-utils/sfdisk.c:1179
+#: disk-utils/sfdisk.c:1180
#, c-format
msgid ""
"\n"
@@ -3965,63 +3961,63 @@ msgid ""
"to override the default."
msgstr ""
-#: disk-utils/sfdisk.c:1182
+#: disk-utils/sfdisk.c:1183
#, fuzzy
msgid ""
"\n"
"Type 'help' to get more information.\n"
msgstr "请尝试执行“%s --help”了解更多信息。\n"
-#: disk-utils/sfdisk.c:1200
+#: disk-utils/sfdisk.c:1201
#, fuzzy
msgid "All partitions used."
msgstr "未找到分区"
-#: disk-utils/sfdisk.c:1208
+#: disk-utils/sfdisk.c:1209
#, fuzzy
msgid "failed to allocate partition name"
msgstr "添加分区失败"
-#: disk-utils/sfdisk.c:1236
+#: disk-utils/sfdisk.c:1237
#, fuzzy, c-format
-msgid "Ignore partition %zu"
+msgid "Ignoring partition %zu."
msgstr "无法创建分区 %zu"
-#: disk-utils/sfdisk.c:1244
+#: disk-utils/sfdisk.c:1245
#, fuzzy
msgid "Failed to apply script headers, disk label not created."
msgstr "写磁盘标签失败"
-#: disk-utils/sfdisk.c:1256
+#: disk-utils/sfdisk.c:1257
#, fuzzy
msgid "Failed to add partition"
msgstr "添加分区失败"
-#: disk-utils/sfdisk.c:1267
+#: disk-utils/sfdisk.c:1268
msgid "Script header accepted."
msgstr ""
-#: disk-utils/sfdisk.c:1276
+#: disk-utils/sfdisk.c:1277
#, fuzzy
msgid ""
"\n"
"New situation:"
msgstr "新状况:\n"
-#: disk-utils/sfdisk.c:1285
+#: disk-utils/sfdisk.c:1286
#, fuzzy
msgid "Do you want to write this to disk?"
msgstr "您想把这些写入磁盘吗?[ynq] "
-#: disk-utils/sfdisk.c:1287
+#: disk-utils/sfdisk.c:1288
msgid "Leaving."
msgstr ""
-#: disk-utils/sfdisk.c:1297
+#: disk-utils/sfdisk.c:1298
msgid "Leaving.\n"
msgstr ""
-#: disk-utils/sfdisk.c:1310
+#: disk-utils/sfdisk.c:1311
#, fuzzy, c-format
msgid ""
" %1$s [options] <dev> [[-N] <part>]\n"
@@ -4030,162 +4026,167 @@ msgstr ""
" %1$s [选项] [<回环设备>]\n"
" %1$s [选项] -f | <回环设备> <文件>\n"
-#: disk-utils/sfdisk.c:1316
+#: disk-utils/sfdisk.c:1317
msgid ""
"\n"
"Commands:\n"
msgstr ""
-#: disk-utils/sfdisk.c:1317
+#: disk-utils/sfdisk.c:1318
msgid " -a, --activate <dev> [<part> ...] list or set bootable MBR partitions\n"
msgstr ""
-#: disk-utils/sfdisk.c:1318
+#: disk-utils/sfdisk.c:1319
#, fuzzy
msgid " -d, --dump <dev> dump partition table (usable for later input)\n"
msgstr " -H, --human 易读格式输出\n"
-#: disk-utils/sfdisk.c:1319
+#: disk-utils/sfdisk.c:1320
msgid " -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n"
msgstr ""
-#: disk-utils/sfdisk.c:1320
+#: disk-utils/sfdisk.c:1321
#, fuzzy
msgid " -l, --list [<dev> ...] list partitions of each device\n"
msgstr " -l, --list 显示分区信息并退出\n"
-#: disk-utils/sfdisk.c:1321
+#: disk-utils/sfdisk.c:1322
#, fuzzy
msgid " -s, --show-size [<dev> ...] list sizes of all or specified devices\n"
msgstr " -l, --list 列出所有或指定的信息(默认)\n"
-#: disk-utils/sfdisk.c:1322
+#: disk-utils/sfdisk.c:1323
#, fuzzy
msgid " -T, --list-types print the recognized types (see -X)\n"
msgstr " -r, --raw 打印原生消息缓冲区\n"
-#: disk-utils/sfdisk.c:1323
+#: disk-utils/sfdisk.c:1324
#, fuzzy
msgid " -V, --verify test whether partitions seem correct\n"
msgstr " -l, --list 显示分区信息并退出\n"
-#: disk-utils/sfdisk.c:1326
+#: disk-utils/sfdisk.c:1327
msgid " --part-label <dev> <part> [<str>] print or change partition label\n"
msgstr ""
-#: disk-utils/sfdisk.c:1327
+#: disk-utils/sfdisk.c:1328
msgid " --part-type <dev> <part> [<type>] print or change partition type\n"
msgstr ""
-#: disk-utils/sfdisk.c:1328
+#: disk-utils/sfdisk.c:1329
msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n"
msgstr ""
-#: disk-utils/sfdisk.c:1329
+#: disk-utils/sfdisk.c:1330
msgid " --part-attrs <dev> <part> [<str>] print or change partition attributes\n"
msgstr ""
-#: disk-utils/sfdisk.c:1332
+#: disk-utils/sfdisk.c:1333
#, fuzzy
msgid " <dev> device (usually disk) path\n"
msgstr " --help 显示此帮助并退出\n"
-#: disk-utils/sfdisk.c:1333
+#: disk-utils/sfdisk.c:1334
#, fuzzy
msgid " <part> partition number\n"
msgstr " -l, --list 显示分区信息并退出\n"
-#: disk-utils/sfdisk.c:1334
+#: disk-utils/sfdisk.c:1335
msgid " <type> partition type, GUID for GPT, hex for MBR\n"
msgstr ""
-#: disk-utils/sfdisk.c:1337
+#: disk-utils/sfdisk.c:1338
#, fuzzy
msgid " -A, --append append partitions to existing partition table\n"
msgstr " -z, --zero 以空分区表开始\n"
-#: disk-utils/sfdisk.c:1338
+#: disk-utils/sfdisk.c:1339
+#, fuzzy
+msgid " --bytes print SIZE in bytes rather than in human readable format\n"
+msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
+
+#: disk-utils/sfdisk.c:1340
#, fuzzy
msgid " -b, --backup backup partition table sectors (see -O)\n"
msgstr " -t, --type <类型> 只识别指定的分区表类型\n"
-#: disk-utils/sfdisk.c:1339
+#: disk-utils/sfdisk.c:1341
#, fuzzy
msgid " -f, --force disable all consistency checking\n"
msgstr " -r, --reset 重置所有计数(限 root 用户)\n"
-#: disk-utils/sfdisk.c:1340
+#: disk-utils/sfdisk.c:1342
#, fuzzy
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/sfdisk.c:1341
-msgid " -O, --backup-file <path> override default backout file name\n"
+#: disk-utils/sfdisk.c:1343
+msgid " -O, --backup-file <path> override default backup file name\n"
msgstr ""
-#: disk-utils/sfdisk.c:1342
+#: disk-utils/sfdisk.c:1344
#, fuzzy
msgid " -N, --partno <num> specify partition number\n"
msgstr " -H, --heads <数字> 指定磁头数\n"
-#: disk-utils/sfdisk.c:1343
+#: disk-utils/sfdisk.c:1345
#, fuzzy
msgid " -X, --label <name> specify label type (dos, gpt, ...)\n"
msgstr " -i, --irq <数字> 指定并口中断号\n"
-#: disk-utils/sfdisk.c:1344
+#: disk-utils/sfdisk.c:1346
#, fuzzy
msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n"
msgstr " -t, --type <类型> 指定分区类型(dos、bsd、solaris 等)\n"
-#: disk-utils/sfdisk.c:1345
+#: disk-utils/sfdisk.c:1347
#, fuzzy
msgid " -q, --quiet suppress extra info messages\n"
msgstr " -U, --user 取消共享用户名字空间\n"
-#: disk-utils/sfdisk.c:1346
+#: disk-utils/sfdisk.c:1348
#, fuzzy
msgid " -n, --no-act do everything except write to device\n"
msgstr " -n, --no-mtab 不写 /etc/mtab\n"
-#: disk-utils/sfdisk.c:1347
+#: disk-utils/sfdisk.c:1349
#, fuzzy
msgid " --no-reread do not check whether the device is in use\n"
msgstr " -J --noclear 提示之前不清屏\n"
-#: disk-utils/sfdisk.c:1349
+#: disk-utils/sfdisk.c:1351
#, fuzzy
msgid " -u, --unit S deprecated, only sector unit is supported\n"
msgstr " -i, --info 只打印有关采样步骤(sampling step)的信息\n"
-#: disk-utils/sfdisk.c:1350
+#: disk-utils/sfdisk.c:1352
#, fuzzy
-msgid " -L, --Linux deprecated, only for backward copatibility\n"
+msgid " -L, --Linux deprecated, only for backward compatibility\n"
msgstr " --4gb 忽略(纯为兼容)\n"
-#: disk-utils/sfdisk.c:1354 login-utils/chfn.c:103 login-utils/chsh.c:80
+#: disk-utils/sfdisk.c:1356 login-utils/chfn.c:103 login-utils/chsh.c:80
msgid " -v, --version output version information and exit\n"
msgstr " -v, --version 输出版本信息并退出\n"
-#: disk-utils/sfdisk.c:1440
+#: disk-utils/sfdisk.c:1444
#, c-format
-msgid "%s is deprecated in favour of ---part-type"
+msgid "%s is deprecated in favour of --part-type"
msgstr ""
-#: disk-utils/sfdisk.c:1444
-msgid "--id s deprecated in favour of ---part-type"
+#: disk-utils/sfdisk.c:1449
+msgid "--id is deprecated in favour of --part-type"
msgstr ""
-#: disk-utils/sfdisk.c:1463
+#: disk-utils/sfdisk.c:1468
msgid "--Linux option is unnecessary and deprecated"
msgstr ""
-#: disk-utils/sfdisk.c:1489
+#: disk-utils/sfdisk.c:1494
#, fuzzy, c-format
-msgid "unssupported unit '%c'"
+msgid "unsupported unit '%c'"
msgstr "不支持的参数:%s"
-#: disk-utils/sfdisk.c:1492 include/c.h:294
+#: disk-utils/sfdisk.c:1497 include/c.h:294
#, c-format
msgid "%s from %s\n"
msgstr "%s,来自 %s\n"
@@ -4699,15 +4700,15 @@ msgstr "分区 %zd:无效的起始扇区 0。"
msgid "There is no *BSD partition on %s."
msgstr "%s 上没有 *BSD 分区。"
-#: libfdisk/src/bsd.c:260 libfdisk/src/dos.c:935
+#: libfdisk/src/bsd.c:260 libfdisk/src/dos.c:946
msgid "First cylinder"
msgstr "第一个柱面"
-#: libfdisk/src/bsd.c:293 libfdisk/src/dos.c:1159
+#: libfdisk/src/bsd.c:293 libfdisk/src/dos.c:1168
msgid "Last cylinder, +cylinders or +size{K,M,G,T,P}"
msgstr "最后一个柱面, +cylinders 或 +size{K,M,G,T,P}"
-#: libfdisk/src/bsd.c:298 libfdisk/src/dos.c:1164 libfdisk/src/gpt.c:2080
+#: libfdisk/src/bsd.c:298 libfdisk/src/dos.c:1173 libfdisk/src/gpt.c:2087
msgid "Last sector, +sectors or +size{K,M,G,T,P}"
msgstr "上个扇区,+sectors 或 +size{K,M,G,T,P}"
@@ -4885,7 +4886,7 @@ msgstr "已在 %s 上安装引导程序。"
msgid "Disklabel written to %s."
msgstr "磁盘标签已写入 %s。"
-#: libfdisk/src/bsd.c:846 libfdisk/src/context.c:575
+#: libfdisk/src/bsd.c:846 libfdisk/src/context.c:580
msgid "Syncing disks."
msgstr "正在同步磁盘。"
@@ -4902,27 +4903,27 @@ msgstr "BSD 分区“%c”已链接到 DOS 分区 %zu。"
msgid "Slice"
msgstr "片"
-#: libfdisk/src/bsd.c:952 libfdisk/src/dos.c:2232 libfdisk/src/gpt.c:2546
+#: libfdisk/src/bsd.c:952 libfdisk/src/dos.c:2261 libfdisk/src/gpt.c:2553
#: libfdisk/src/sgi.c:1133 libfdisk/src/sun.c:1077
msgid "Start"
msgstr "起点"
-#: libfdisk/src/bsd.c:953 libfdisk/src/dos.c:2233 libfdisk/src/gpt.c:2547
+#: libfdisk/src/bsd.c:953 libfdisk/src/dos.c:2262 libfdisk/src/gpt.c:2554
#: libfdisk/src/sgi.c:1134 libfdisk/src/sun.c:1078
msgid "End"
msgstr "末尾"
-#: libfdisk/src/bsd.c:954 libfdisk/src/dos.c:2234 libfdisk/src/gpt.c:2548
+#: libfdisk/src/bsd.c:954 libfdisk/src/dos.c:2263 libfdisk/src/gpt.c:2555
#: libfdisk/src/sgi.c:1135 libfdisk/src/sun.c:1079
msgid "Sectors"
msgstr "扇区"
-#: libfdisk/src/bsd.c:955 libfdisk/src/dos.c:2235 libfdisk/src/sgi.c:1136
+#: libfdisk/src/bsd.c:955 libfdisk/src/dos.c:2264 libfdisk/src/sgi.c:1136
#: libfdisk/src/sun.c:196 libfdisk/src/sun.c:1080
msgid "Cylinders"
msgstr "柱面"
-#: libfdisk/src/bsd.c:956 libfdisk/src/dos.c:2236 libfdisk/src/gpt.c:2549
+#: libfdisk/src/bsd.c:956 libfdisk/src/dos.c:2265 libfdisk/src/gpt.c:2556
#: libfdisk/src/sgi.c:1137 libfdisk/src/sun.c:1081
msgid "Size"
msgstr "大小"
@@ -4939,27 +4940,27 @@ msgstr "Bsize"
msgid "Cpg"
msgstr "Cpg"
-#: libfdisk/src/context.c:446
+#: libfdisk/src/context.c:451
#, fuzzy, c-format
msgid "%s: device contains a valid '%s' signature; it is strongly recommended to wipe the device with wipefs(8) if this is unexpected, in order to avoid possible collisions"
msgstr "%s:设备包含有效的“%s”签名,如果发觉错误运行了本设置,强烈建议您使用 wipefs(8)来擦除该设备,以避免潜在的冲突。"
-#: libfdisk/src/context.c:569
+#: libfdisk/src/context.c:574
#, c-format
msgid "%s: close device failed"
msgstr "%s:关闭设备失败"
-#: libfdisk/src/context.c:736
+#: libfdisk/src/context.c:741
msgid "cylinder"
msgid_plural "cylinders"
msgstr[0] "柱面"
-#: libfdisk/src/context.c:737
+#: libfdisk/src/context.c:742
msgid "sector"
msgid_plural "sectors"
msgstr[0] "扇区"
-#: libfdisk/src/context.c:1013
+#: libfdisk/src/context.c:1047
msgid "Incomplete geometry setting."
msgstr "不完整的几何属性设置。"
@@ -4993,281 +4994,282 @@ msgstr "以柱面为显示单位的方式已废弃。"
msgid "The size of this disk is %s (%ju bytes). DOS partition table format can not be used on drives for volumes larger than %lu bytes for %lu-byte sectors. Use GUID partition table format (GPT)."
msgstr "该磁盘的大小为 %s (%ju 个字节)。DOS 分区表不能用于卷容量大于 %lu 字节,%lu 字节扇区的驱动器。请使用 GUID 分区表格式(GPT)。"
-#: libfdisk/src/dos.c:496
+#: libfdisk/src/dos.c:503
msgid "Bad offset in primary extended partition."
msgstr "主扩展分区中的偏移错误。"
-#: libfdisk/src/dos.c:512
+#: libfdisk/src/dos.c:519
#, c-format
msgid "Omitting partitions after #%zu. They will be deleted if you save this partition table."
msgstr "警告:将忽略 #%zu 后的扇区。如果您保存此分区表,它们会被删除。"
-#: libfdisk/src/dos.c:539
+#: libfdisk/src/dos.c:546
#, c-format
msgid "Extra link pointer in partition table %zu."
msgstr "在分区表 %zu 中有额外链接指针。"
-#: libfdisk/src/dos.c:547
+#: libfdisk/src/dos.c:554
#, c-format
msgid "Ignoring extra data in partition table %zu."
msgstr "将忽略分区表 %zu 中的额外数据。"
-#: libfdisk/src/dos.c:602
+#: libfdisk/src/dos.c:609
#, c-format
msgid "omitting empty partition (%zu)"
msgstr "将忽略空分区(%zu)"
-#: libfdisk/src/dos.c:666
+#: libfdisk/src/dos.c:677
#, fuzzy, c-format
msgid "Created a new DOS disklabel with disk identifier 0x%08x."
msgstr "使用磁盘标识符 0x%08x 创建新的 DOS 磁盘标签。\n"
-#: libfdisk/src/dos.c:687
+#: libfdisk/src/dos.c:698
msgid "Enter the new disk identifier"
msgstr "输入新磁盘标识符"
-#: libfdisk/src/dos.c:694
+#: libfdisk/src/dos.c:705
msgid "Incorrect value."
msgstr "无效的值。"
-#: libfdisk/src/dos.c:703
+#: libfdisk/src/dos.c:714
#, c-format
msgid "Disk identifier changed from 0x%08x to 0x%08x."
msgstr "磁盘标识从 0x%08x 改为 0x%08x。"
-#: libfdisk/src/dos.c:795
+#: libfdisk/src/dos.c:806
#, c-format
msgid "Ignoring extra extended partition %zu"
msgstr "将忽略额外的扩展分区 %zu"
-#: libfdisk/src/dos.c:808
+#: libfdisk/src/dos.c:819
#, c-format
msgid "Invalid flag 0x%02x%02x of EBR (for partition %zu) will be corrected by w(rite)."
msgstr "分区表 %3$zu 的无效标志 0x%1$02x%2$02x 将通过写入来更正"
-#: libfdisk/src/dos.c:922
+#: libfdisk/src/dos.c:933
#, c-format
msgid "Start sector %ju out of range."
msgstr "起始扇区 %ju 超出范围。"
-#: libfdisk/src/dos.c:1027 libfdisk/src/gpt.c:1968 libfdisk/src/sgi.c:814
+#: libfdisk/src/dos.c:1038 libfdisk/src/gpt.c:1970 libfdisk/src/sgi.c:814
#: libfdisk/src/sun.c:514
#, c-format
msgid "Partition %zu is already defined. Delete it before re-adding it."
msgstr "分区 %zu 已经定义过。请删除后再重新添加它。"
-#: libfdisk/src/dos.c:1097
+#: libfdisk/src/dos.c:1108
#, c-format
msgid "Sector %llu is already allocated."
msgstr "扇区 %llu 已经分配."
-#: libfdisk/src/dos.c:1134 libfdisk/src/gpt.c:1978
+#: libfdisk/src/dos.c:1145 libfdisk/src/gpt.c:1980
msgid "No free sectors available."
msgstr "无空闲扇区可用。"
-#: libfdisk/src/dos.c:1265
+#: libfdisk/src/dos.c:1285
#, c-format
msgid "Adding logical partition %zu"
msgstr "添加逻辑分区 %zu"
-#: libfdisk/src/dos.c:1296
+#: libfdisk/src/dos.c:1316
#, c-format
msgid "Partition %zu: contains sector 0"
msgstr "分区 %zu:包含扇区 0"
-#: libfdisk/src/dos.c:1298
+#: libfdisk/src/dos.c:1318
#, c-format
msgid "Partition %zu: head %d greater than maximum %d"
msgstr "分区 %zu:磁头 %d 大于最大值 %d"
-#: libfdisk/src/dos.c:1301
+#: libfdisk/src/dos.c:1321
#, c-format
msgid "Partition %zu: sector %d greater than maximum %llu"
msgstr "分区 %zu:扇区 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1304
+#: libfdisk/src/dos.c:1324
#, c-format
msgid "Partition %zu: cylinder %d greater than maximum %llu"
msgstr "分区 %zu:柱面 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1310
+#: libfdisk/src/dos.c:1330
#, c-format
msgid "Partition %zu: previous sectors %u disagrees with total %u"
msgstr "分区 %zu:之前的扇区数 %u 与总数 %u 不符"
-#: libfdisk/src/dos.c:1363
+#: libfdisk/src/dos.c:1383
#, c-format
msgid "Partition %zu: different physical/logical beginnings (non-Linux?): phys=(%d, %d, %d), logical=(%d, %d, %d)"
msgstr "分区 %zu 的物理/逻辑起点不同(非 Linux 分区?):物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
-#: libfdisk/src/dos.c:1374
+#: libfdisk/src/dos.c:1394
#, c-format
msgid "Partition %zu: different physical/logical endings: phys=(%d, %d, %d), logical=(%d, %d, %d)"
msgstr "分区 %zu 的物理/逻辑终点不同:物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
-#: libfdisk/src/dos.c:1383
+#: libfdisk/src/dos.c:1403
#, c-format
msgid "Partition %zu: does not end on cylinder boundary."
msgstr "分区 %zu 未结束在柱面边界上。"
-#: libfdisk/src/dos.c:1409
+#: libfdisk/src/dos.c:1429
#, c-format
msgid "Partition %zu: bad start-of-data."
msgstr "分区 %zu:数据起点错误。"
-#: libfdisk/src/dos.c:1422
+#: libfdisk/src/dos.c:1442
#, c-format
msgid "Partition %zu: overlaps partition %zu."
msgstr "分区 %zu:与 分区 %zu 重叠。"
-#: libfdisk/src/dos.c:1448
+#: libfdisk/src/dos.c:1468
#, c-format
msgid "Partition %zu: empty."
msgstr "分区 %zu:空分区。"
-#: libfdisk/src/dos.c:1453
+#: libfdisk/src/dos.c:1473
#, c-format
msgid "Logical partition %zu: not entirely in partition %zu."
msgstr "逻辑分区 %zu:没有完全在分区 %zu 中。"
-#: libfdisk/src/dos.c:1461
+#: libfdisk/src/dos.c:1481
#, c-format
msgid "Total allocated sectors %llu greater than the maximum %llu."
msgstr "分配的总扇区数 %llu 大于最大值 %llu。"
-#: libfdisk/src/dos.c:1464
+#: libfdisk/src/dos.c:1484
#, c-format
msgid "Remaining %lld unallocated %ld-byte sectors."
msgstr "剩余 %lld 未分配的 %ld字节 扇区。"
-#: libfdisk/src/dos.c:1512
+#: libfdisk/src/dos.c:1532
#, fuzzy
msgid "Extended partition already exists."
msgstr "扩展分区位置异常"
-#: libfdisk/src/dos.c:1555
+#: libfdisk/src/dos.c:1575
msgid "The maximum number of partitions has been created."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/dos.c:1566
+#: libfdisk/src/dos.c:1587
msgid "All primary partitions are in use."
msgstr "所有主分区都在使用中。"
-#: libfdisk/src/dos.c:1568
+#: libfdisk/src/dos.c:1589
#, fuzzy
msgid "All space for primary partitions is in use."
msgstr "所有主分区都在使用中。"
-#: libfdisk/src/dos.c:1573
+#. TRANSLATORS: Try to keep this within 80 characters.
+#: libfdisk/src/dos.c:1600
#, fuzzy
-msgid "Impossible to create another primary partition. If you want to create more partitions, you must replace a primary partition with an extended partition first."
+msgid "To create more partitions, first replace a primary with an extended partition."
msgstr "要想创建多于 4 个分区,您需要先将一个主分区替换为扩展分区。"
-#: libfdisk/src/dos.c:1580
+#: libfdisk/src/dos.c:1605
msgid "All logical partitions are in use. Adding a primary partition."
msgstr "所有逻辑分区都在使用中。将添加一个主分区。"
-#: libfdisk/src/dos.c:1602
+#: libfdisk/src/dos.c:1627
msgid "Partition type"
msgstr "分区类型"
-#: libfdisk/src/dos.c:1606
+#: libfdisk/src/dos.c:1631
#, c-format
msgid "%zu primary, %d extended, %zu free"
msgstr "%zu个主分区,%d个扩展分区,%zu空闲"
-#: libfdisk/src/dos.c:1611
+#: libfdisk/src/dos.c:1636
msgid "primary"
msgstr "主分区"
-#: libfdisk/src/dos.c:1613
+#: libfdisk/src/dos.c:1638
msgid "extended"
msgstr "扩展分区"
-#: libfdisk/src/dos.c:1613
+#: libfdisk/src/dos.c:1638
msgid "container for logical partitions"
msgstr "逻辑分区容器"
-#: libfdisk/src/dos.c:1615
+#: libfdisk/src/dos.c:1640
msgid "logical"
msgstr "逻辑分区"
-#: libfdisk/src/dos.c:1615
+#: libfdisk/src/dos.c:1640
msgid "numbered from 5"
msgstr "从 5 开始编号"
-#: libfdisk/src/dos.c:1653
+#: libfdisk/src/dos.c:1678
#, c-format
msgid "Invalid partition type `%c'."
msgstr "无效的分区类型“%c”。"
-#: libfdisk/src/dos.c:1671
+#: libfdisk/src/dos.c:1696
#, c-format
msgid "Cannot write sector %jd: seek failed"
msgstr "写扇区 %jd 失败:定位失败"
-#: libfdisk/src/dos.c:1882
+#: libfdisk/src/dos.c:1911
msgid "You cannot change a partition into an extended one or vice versa. Delete it first."
msgstr "您不能将分区更改为扩展分区或从扩展分区改回。请先删除该分区。"
-#: libfdisk/src/dos.c:1888
+#: libfdisk/src/dos.c:1917
msgid "Type 0 means free space to many systems. Having partitions of type 0 is probably unwise."
msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。"
-#: libfdisk/src/dos.c:2074
+#: libfdisk/src/dos.c:2103
msgid "Nothing to do. Ordering is correct already."
msgstr "无须操作。顺序已经是正确的了。"
-#: libfdisk/src/dos.c:2103 libfdisk/src/gpt.c:2464
+#: libfdisk/src/dos.c:2132 libfdisk/src/gpt.c:2471
msgid "Done."
msgstr "完成。"
-#: libfdisk/src/dos.c:2124
+#: libfdisk/src/dos.c:2153
#, c-format
msgid "Partition %zu: no data area."
msgstr "分区 %zu:无数据区。"
-#: libfdisk/src/dos.c:2154
+#: libfdisk/src/dos.c:2183
msgid "New beginning of data"
msgstr "新数据起点"
-#: libfdisk/src/dos.c:2210
+#: libfdisk/src/dos.c:2239
#, c-format
msgid "Partition %zu: is an extended partition."
msgstr "分区 %zu:是一个扩展分区。"
-#: libfdisk/src/dos.c:2216
+#: libfdisk/src/dos.c:2245
#, c-format
msgid "The bootable flag on partition %zu is enabled now."
msgstr "分区 %zu 的 可启动 标志已启用。"
-#: libfdisk/src/dos.c:2217
+#: libfdisk/src/dos.c:2246
#, c-format
msgid "The bootable flag on partition %zu is disabled now."
msgstr "分区 %zu 的 可启动 标志已禁用。"
-#: libfdisk/src/dos.c:2230 libfdisk/src/gpt.c:2545 libfdisk/src/sgi.c:1132
+#: libfdisk/src/dos.c:2259 libfdisk/src/gpt.c:2552 libfdisk/src/sgi.c:1132
#: libfdisk/src/sun.c:1076
msgid "Device"
msgstr "设备"
-#: libfdisk/src/dos.c:2231 libfdisk/src/sun.c:41
+#: libfdisk/src/dos.c:2260 libfdisk/src/sun.c:41
msgid "Boot"
msgstr "启动"
-#: libfdisk/src/dos.c:2237 libfdisk/src/sgi.c:1138 libfdisk/src/sun.c:1082
+#: libfdisk/src/dos.c:2266 libfdisk/src/sgi.c:1138 libfdisk/src/sun.c:1082
msgid "Id"
msgstr "Id"
-#: libfdisk/src/dos.c:2241
+#: libfdisk/src/dos.c:2270
msgid "Start-C/H/S"
msgstr "始-C/H/S"
-#: libfdisk/src/dos.c:2242
+#: libfdisk/src/dos.c:2271
msgid "End-C/H/S"
msgstr "终-C/H/S"
-#: libfdisk/src/dos.c:2243 libfdisk/src/gpt.c:2555 libfdisk/src/sgi.c:1140
+#: libfdisk/src/dos.c:2272 libfdisk/src/gpt.c:2562 libfdisk/src/sgi.c:1140
msgid "Attrs"
msgstr "属性"
@@ -5523,237 +5525,237 @@ msgstr "MidnightBSD ZFS"
msgid "MidnightBSD Vinum"
msgstr "MidnightBSD Vinum"
-#: libfdisk/src/gpt.c:491
+#: libfdisk/src/gpt.c:493
msgid "failed to allocate GPT header"
msgstr "分配 GPT 头失败"
-#: libfdisk/src/gpt.c:653
+#: libfdisk/src/gpt.c:655
#, 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:671
+#: libfdisk/src/gpt.c:673
msgid "gpt: stat() failed"
msgstr "gpt:stat() 失败"
-#: libfdisk/src/gpt.c:681
+#: libfdisk/src/gpt.c:683
#, c-format
msgid "gpt: cannot handle files with mode %o"
msgstr "gpt:无法操作模式为 %o 的文件"
-#: libfdisk/src/gpt.c:947
+#: libfdisk/src/gpt.c:949
msgid "GPT Header"
msgstr "GPT 头"
-#: libfdisk/src/gpt.c:952
+#: libfdisk/src/gpt.c:954
msgid "GPT Entries"
msgstr "GPT 记录项"
-#: libfdisk/src/gpt.c:1267
+#: libfdisk/src/gpt.c:1269
msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used."
msgstr "备份 GPT 表损坏,但主表似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1276
+#: libfdisk/src/gpt.c:1278
msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used."
msgstr "主 GPT 表损坏,但备份似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1450
+#: libfdisk/src/gpt.c:1452
#, fuzzy, c-format
-msgid "unssuported GPT attribute bit '%s'"
+msgid "unsupported GPT attribute bit '%s'"
msgstr "不支持的参数:%s"
-#: libfdisk/src/gpt.c:1545
+#: libfdisk/src/gpt.c:1547
#, c-format
msgid "Partition UUID changed from %s to %s."
msgstr "分区 UUID 已从 %s 更改为 %s。"
-#: libfdisk/src/gpt.c:1553
+#: libfdisk/src/gpt.c:1555
#, c-format
msgid "Partition name changed from '%s' to '%.*s'."
msgstr "分区名已由“%s”改为“%.*s”。"
-#: libfdisk/src/gpt.c:1611
+#: libfdisk/src/gpt.c:1613
#, c-format
msgid "First LBA: %ju"
msgstr "第一个 LBA:%ju"
-#: libfdisk/src/gpt.c:1612
+#: libfdisk/src/gpt.c:1614
#, c-format
msgid "Last LBA: %ju"
msgstr "上个 LBA: %ju"
#. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header.
-#: libfdisk/src/gpt.c:1614
+#: libfdisk/src/gpt.c:1616
#, c-format
msgid "Alternative LBA: %ju"
msgstr "替代 LBA:%ju"
#. TRANSLATORS: The start of the array of partition entries.
-#: libfdisk/src/gpt.c:1616
+#: libfdisk/src/gpt.c:1618
#, fuzzy, c-format
msgid "Partition entries LBA: %ju"
msgstr "分区记录项 LBA:%ju"
-#: libfdisk/src/gpt.c:1617
+#: libfdisk/src/gpt.c:1619
#, c-format
msgid "Allocated partition entries: %u"
msgstr "已分配的分区项:%u"
-#: libfdisk/src/gpt.c:1768
+#: libfdisk/src/gpt.c:1770
msgid "The device contains hybrid MBR -- writing GPT only. You have to sync the MBR manually."
msgstr "该设备包含混合 MBR -- 将只写入 GPT。您需要手动同步 MBR。"
-#: libfdisk/src/gpt.c:1803
+#: libfdisk/src/gpt.c:1805
msgid "Disk does not contain a valid backup header."
msgstr "磁盘不含有效的备用磁头。"
-#: libfdisk/src/gpt.c:1808
+#: libfdisk/src/gpt.c:1810
msgid "Invalid primary header CRC checksum."
msgstr "无效的主磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:1812
+#: libfdisk/src/gpt.c:1814
msgid "Invalid backup header CRC checksum."
msgstr "无效的备份磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:1817
+#: libfdisk/src/gpt.c:1819
msgid "Invalid partition entry checksum."
msgstr "无效的分区记录校验和。"
-#: libfdisk/src/gpt.c:1822
+#: libfdisk/src/gpt.c:1824
msgid "Invalid primary header LBA sanity checks."
msgstr "无效的主磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:1826
+#: libfdisk/src/gpt.c:1828
msgid "Invalid backup header LBA sanity checks."
msgstr "无效的备用磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:1831
+#: libfdisk/src/gpt.c:1833
msgid "MyLBA mismatch with real position at primary header."
msgstr "MyLBA 不匹配,真正位置在主磁头。"
-#: libfdisk/src/gpt.c:1835
+#: libfdisk/src/gpt.c:1837
msgid "MyLBA mismatch with real position at backup header."
msgstr "MyLBA 不匹配,真正位置在备份磁头。"
-#: libfdisk/src/gpt.c:1840
+#: libfdisk/src/gpt.c:1842
msgid "Disk is too small to hold all data."
msgstr "磁盘太小,放不下所有数据。"
-#: libfdisk/src/gpt.c:1850
+#: libfdisk/src/gpt.c:1852
msgid "Primary and backup header mismatch."
msgstr "主磁头和备份磁头不匹配。"
-#: libfdisk/src/gpt.c:1856
+#: libfdisk/src/gpt.c:1858
#, c-format
msgid "Partition %u overlaps with partition %u."
msgstr "分区 %u 与 %u 重叠。"
-#: libfdisk/src/gpt.c:1863
+#: libfdisk/src/gpt.c:1865
#, c-format
msgid "Partition %u is too big for the disk."
msgstr "分区 %u 对于该磁盘而言过大。"
-#: libfdisk/src/gpt.c:1870
+#: libfdisk/src/gpt.c:1872
#, c-format
msgid "Partition %u ends before it starts."
msgstr "分区 %u 结束于起点之前。"
-#: libfdisk/src/gpt.c:1879
+#: libfdisk/src/gpt.c:1881
msgid "No errors detected."
msgstr "未检测到错误。"
-#: libfdisk/src/gpt.c:1880
+#: libfdisk/src/gpt.c:1882
#, c-format
msgid "Header version: %s"
msgstr "磁头版本:%s"
-#: libfdisk/src/gpt.c:1881
+#: libfdisk/src/gpt.c:1883
#, c-format
msgid "Using %u out of %d partitions."
msgstr "使用着 %2$d 个分区中的 %1$u 个。"
-#: libfdisk/src/gpt.c:1892
+#: libfdisk/src/gpt.c:1894
#, c-format
msgid "A total of %ju free sectors is available in %u segment."
msgid_plural "A total of %ju free sectors is available in %u segments (the largest is %s)."
msgstr[0] "%2$u 个片段中共有 %1$ju 个空闲扇区(最大的是 %3$s)。"
-#: libfdisk/src/gpt.c:1900
+#: libfdisk/src/gpt.c:1902
#, c-format
msgid "%d error detected."
msgid_plural "%d errors detected."
msgstr[0] "检测到 %d 个错误。"
-#: libfdisk/src/gpt.c:1974
+#: libfdisk/src/gpt.c:1976
msgid "All partitions are already in use."
msgstr "所有分区均已占用。"
-#: libfdisk/src/gpt.c:2027 libfdisk/src/gpt.c:2052
+#: libfdisk/src/gpt.c:2031 libfdisk/src/gpt.c:2056
#, c-format
msgid "Sector %ju already used."
msgstr "扇区 %ju 已使用。"
-#: libfdisk/src/gpt.c:2109
+#: libfdisk/src/gpt.c:2116
#, c-format
msgid "Could not create partition %zu"
msgstr "无法创建分区 %zu"
-#: libfdisk/src/gpt.c:2240
+#: libfdisk/src/gpt.c:2247
#, c-format
msgid "Created a new GPT disklabel (GUID: %s)."
msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
-#: libfdisk/src/gpt.c:2277
+#: libfdisk/src/gpt.c:2284
msgid "Enter new disk UUID (in 8-4-4-4-12 format)"
msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)"
-#: libfdisk/src/gpt.c:2284
+#: libfdisk/src/gpt.c:2291
msgid "Failed to parse your UUID."
msgstr "解析您的 UUID 失败。"
-#: libfdisk/src/gpt.c:2298
+#: libfdisk/src/gpt.c:2305
#, c-format
msgid "Disk identifier changed from %s to %s."
msgstr "将磁盘标识从 %s 更改为 %s 失败。"
-#: libfdisk/src/gpt.c:2384
+#: libfdisk/src/gpt.c:2391
msgid "Enter GUID specific bit"
msgstr "输入 GUID 特定位"
-#: libfdisk/src/gpt.c:2399
+#: libfdisk/src/gpt.c:2406
#, c-format
msgid "failed to toggle unsupported bit %lu"
msgstr "开/关不支持的位 %lu 失败"
-#: libfdisk/src/gpt.c:2412
+#: libfdisk/src/gpt.c:2419
#, c-format
msgid "The GUID specific bit %d on partition %zu is enabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。"
-#: libfdisk/src/gpt.c:2413
+#: libfdisk/src/gpt.c:2420
#, c-format
msgid "The GUID specific bit %d on partition %zu is disabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。"
-#: libfdisk/src/gpt.c:2417
+#: libfdisk/src/gpt.c:2424
#, c-format
msgid "The %s flag on partition %zu is enabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已启用。"
-#: libfdisk/src/gpt.c:2418
+#: libfdisk/src/gpt.c:2425
#, c-format
msgid "The %s flag on partition %zu is disabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。"
-#: libfdisk/src/gpt.c:2552
+#: libfdisk/src/gpt.c:2559
msgid "Type-UUID"
msgstr "类型-UUID"
-#: libfdisk/src/gpt.c:2553
+#: libfdisk/src/gpt.c:2560
msgid "UUID"
msgstr "UUID"
-#: libfdisk/src/gpt.c:2554 login-utils/chfn.c:151 login-utils/chfn.c:153
+#: libfdisk/src/gpt.c:2561 login-utils/chfn.c:151 login-utils/chfn.c:153
#: login-utils/chfn.c:308
msgid "Name"
msgstr "名称"
@@ -5762,7 +5764,7 @@ msgstr "名称"
msgid "Free space"
msgstr "剩余空间"
-#: libfdisk/src/parttype.c:259 misc-utils/findmnt.c:664 schedutils/ionice.c:79
+#: libfdisk/src/parttype.c:259 misc-utils/findmnt.c:670 schedutils/ionice.c:79
#: sys-utils/hwclock.c:335
msgid "unknown"
msgstr "未知"
@@ -6199,16 +6201,16 @@ msgstr "sysinfo 失败"
msgid "waitpid failed (%s)"
msgstr "waitpid 失败(%s)"
-#: lib/path.c:212 sys-utils/lscpu.c:1525
+#: lib/path.c:209 sys-utils/lscpu.c:1525
msgid "failed to callocate cpu set"
msgstr "分配(callocate) CPU 组 失败"
-#: lib/path.c:216
+#: lib/path.c:213
#, c-format
msgid "failed to parse CPU list %s"
msgstr "解析 CPU 列表 %s 失败"
-#: lib/path.c:219
+#: lib/path.c:216
#, c-format
msgid "failed to parse CPU mask %s"
msgstr "解析 CPU 掩码 %s 失败"
@@ -6455,7 +6457,7 @@ msgstr "shell 已更改。\n"
msgid "Usage: %s <passwordfile> <username>...\n"
msgstr "用法:%s <密码文件> <用户名>...\n"
-#: login-utils/last.c:156 login-utils/lslogins.c:1197 sys-utils/dmesg.c:1181
+#: login-utils/last.c:156 login-utils/lslogins.c:1197 sys-utils/dmesg.c:1196
#, c-format
msgid "unknown time format: %s"
msgstr "未知时间格式: %s"
@@ -6736,7 +6738,7 @@ msgstr ""
"\n"
"登录不正确\n"
-#: login-utils/login.c:893 login-utils/login.c:1235 login-utils/login.c:1258
+#: login-utils/login.c:893 login-utils/login.c:1237 login-utils/login.c:1260
msgid ""
"\n"
"Session setup problem, abort."
@@ -6754,64 +6756,64 @@ msgstr "%s:%d 中是空(NULL)用户名。中止。"
msgid "TIOCSCTTY failed: %m"
msgstr "TIOCSCTTY 失败:%m"
-#: login-utils/login.c:1177
+#: login-utils/login.c:1179
#, c-format
msgid "login: -h is for superuser only\n"
msgstr "login:-h 是超级用户专用选项\n"
-#: login-utils/login.c:1192
+#: login-utils/login.c:1194
#, c-format
msgid "Usage: login [-p] [-h <host>] [-H] [[-f] <username>]\n"
msgstr "用法:login [-p] [-h <主机>] [-H] [[-f] <用户名>]\n"
-#: login-utils/login.c:1194
+#: login-utils/login.c:1196
#, fuzzy
msgid "Begin a session on the system.\n"
msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n"
-#: login-utils/login.c:1236
+#: login-utils/login.c:1238
#, c-format
msgid "Invalid user name \"%s\" in %s:%d. Abort."
msgstr "%2$s:%3$d 中是无效用户名“%1$s”。中止。"
-#: login-utils/login.c:1257
+#: login-utils/login.c:1259
#, c-format
msgid "groups initialization failed: %m"
msgstr "组初始化失败:%m"
-#: login-utils/login.c:1282
+#: login-utils/login.c:1284
msgid "setgid() failed"
msgstr "setgid() 失败"
-#: login-utils/login.c:1312
+#: login-utils/login.c:1314
#, c-format
msgid "You have new mail.\n"
msgstr "有您的新邮件。\n"
-#: login-utils/login.c:1314
+#: login-utils/login.c:1316
#, c-format
msgid "You have mail.\n"
msgstr "有您的邮件。\n"
-#: login-utils/login.c:1328
+#: login-utils/login.c:1330
msgid "setuid() failed"
msgstr "setuid() 失败"
-#: login-utils/login.c:1334 login-utils/sulogin.c:749
+#: login-utils/login.c:1336 login-utils/sulogin.c:749
#, c-format
msgid "%s: change directory failed"
msgstr "%s:更改目录失败"
-#: login-utils/login.c:1341 login-utils/sulogin.c:750
+#: login-utils/login.c:1343 login-utils/sulogin.c:750
#, c-format
msgid "Logging in with home = \"/\".\n"
msgstr "以 home = “/” 登录。\n"
-#: login-utils/login.c:1370
+#: login-utils/login.c:1372
msgid "couldn't exec shell script"
msgstr "无法执行(exec) shell 脚本"
-#: login-utils/login.c:1372
+#: login-utils/login.c:1374
msgid "no shell"
msgstr "无 shell"
@@ -6825,11 +6827,10 @@ msgid "hush login status: restore original IDs failed"
msgstr "静默(hush)登录状态:恢复原 ID 失败"
#: login-utils/lslogins.c:209 sys-utils/lscpu.c:1249 sys-utils/lscpu.c:1259
-#, c-format
msgid "no"
msgstr "否"
-#: login-utils/lslogins.c:218 misc-utils/lsblk.c:163
+#: login-utils/lslogins.c:218 misc-utils/lsblk.c:167
msgid "user name"
msgstr "用户名"
@@ -7031,7 +7032,7 @@ msgstr "用户运行的进程数"
msgid "Running processes"
msgstr "运行中的进程"
-#: login-utils/lslogins.c:289 misc-utils/findmnt.c:158 misc-utils/lsblk.c:212
+#: login-utils/lslogins.c:289 misc-utils/findmnt.c:158 misc-utils/lsblk.c:216
#, c-format
msgid "too many columns specified, the limit is %zu columns"
msgstr "指定了过多的列,限制是 %zu 列"
@@ -7063,7 +7064,7 @@ msgstr ""
#: login-utils/lslogins.c:1205 login-utils/nologin.c:25
#: misc-utils/lslocks.c:507 misc-utils/mcookie.c:82 misc-utils/uuidd.c:73
-#: misc-utils/uuidgen.c:33 sys-utils/dmesg.c:263 sys-utils/ipcmk.c:66
+#: misc-utils/uuidgen.c:33 sys-utils/dmesg.c:264 sys-utils/ipcmk.c:66
#: sys-utils/lscpu.c:1630 sys-utils/readprofile.c:104 sys-utils/rtcwake.c:72
#: term-utils/setterm.c:404 text-utils/line.c:30
#, c-format
@@ -7159,7 +7160,7 @@ msgstr " --wtmp-file <路径> 设置 wtmp 的可选路径\n"
msgid " --btmp-file <path> set an alternate path for btmp\n"
msgstr " --btmp-file <路径> 设置 btmp 的可选路径\n"
-#: login-utils/lslogins.c:1236 misc-utils/findmnt.c:1224
+#: login-utils/lslogins.c:1236 misc-utils/findmnt.c:1230
#: sys-utils/lscpu.c:1647
#, c-format
msgid ""
@@ -7287,29 +7288,29 @@ msgstr "密码错误"
msgid "failed to set PATH"
msgstr "设置 PATH 失败"
-#: login-utils/su-common.c:590
+#: login-utils/su-common.c:592
msgid "cannot set groups"
msgstr "无法设置 组"
-#: login-utils/su-common.c:605 sys-utils/eject.c:673
+#: login-utils/su-common.c:607 sys-utils/eject.c:673
msgid "cannot set group id"
msgstr "无法设置 组 id"
-#: login-utils/su-common.c:607 sys-utils/eject.c:676
+#: login-utils/su-common.c:609 sys-utils/eject.c:676
msgid "cannot set user id"
msgstr "无法设置 用户 id"
-#: login-utils/su-common.c:680
+#: login-utils/su-common.c:682
#, c-format
msgid " %s [options] -u <user> <command>\n"
msgstr " %s [选项] -u <用户> <命令>\n"
-#: login-utils/su-common.c:681 login-utils/su-common.c:693
+#: login-utils/su-common.c:683 login-utils/su-common.c:695
#, c-format
msgid " %s [options] [-] [<user> [<argument>...]]\n"
msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
-#: login-utils/su-common.c:682
+#: login-utils/su-common.c:684
msgid ""
"\n"
"Run <command> with the effective user ID and group ID of <user>. If -u is\n"
@@ -7321,11 +7322,11 @@ msgstr ""
"将退而使用与 su(1) 兼容的语法并执行标准 shell。\n"
"选项 -c、-f、-l 及 -s 与 -u 相互排斥。\n"
-#: login-utils/su-common.c:689
+#: login-utils/su-common.c:691
msgid " -u, --user <user> username\n"
msgstr " -u, --user <用户> 用户名\n"
-#: login-utils/su-common.c:694
+#: login-utils/su-common.c:696
msgid ""
"\n"
"Change the effective user ID and group ID to that of <user>.\n"
@@ -7335,15 +7336,15 @@ msgstr ""
"将有效用户 id 和组 id 更改为<用户>的 id。\n"
"单个 - 视为 -l。如果未指定<用户>,将假定为 root。\n"
-#: login-utils/su-common.c:701
+#: login-utils/su-common.c:703
msgid " -m, -p, --preserve-environment do not reset environment variables\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: login-utils/su-common.c:702
+#: login-utils/su-common.c:704
msgid " -g, --group <group> specify the primary group\n"
msgstr " -g, --group <组> 指定主组\n"
-#: login-utils/su-common.c:703
+#: login-utils/su-common.c:705
msgid ""
" -G, --supp-group <group> specify a supplemental group\n"
"\n"
@@ -7351,15 +7352,15 @@ msgstr ""
" -G, --supp-group <组> 指定一个辅助组\n"
"\n"
-#: login-utils/su-common.c:705
+#: login-utils/su-common.c:707
msgid " -, -l, --login make the shell a login shell\n"
msgstr " -, -l, --login 使 shell 成为登录 shell\n"
-#: login-utils/su-common.c:706
+#: login-utils/su-common.c:708
msgid " -c, --command <command> pass a single command to the shell with -c\n"
msgstr " -c, --command <命令> 使用 -c 向 shell 传递一条命令\n"
-#: login-utils/su-common.c:707
+#: login-utils/su-common.c:709
msgid ""
" --session-command <command> pass a single command to the shell with -c\n"
" and do not create a new session\n"
@@ -7367,52 +7368,52 @@ msgstr ""
" --session-command <命令> 使用 -c 向 shell 传递一条命令\n"
" 而不创建新会话\n"
-#: login-utils/su-common.c:709
+#: login-utils/su-common.c:711
msgid " -f, --fast pass -f to the shell (for csh or tcsh)\n"
msgstr " -f, --fast 向shell 传递 -f 选项(csh 或 tcsh)\n"
-#: login-utils/su-common.c:710
+#: login-utils/su-common.c:712
msgid " -s, --shell <shell> run <shell> if /etc/shells allows it\n"
msgstr " -s, --shell <shell> 若 /etc/shells 允许,运行<shell>\n"
-#: login-utils/su-common.c:807 login-utils/su-common.c:822
+#: login-utils/su-common.c:809 login-utils/su-common.c:824
#, c-format
msgid "group %s does not exist"
msgstr "组 %s 不存在"
-#: login-utils/su-common.c:816
+#: login-utils/su-common.c:818
#, c-format
msgid "specifying more than %d supplemental group is not possible"
msgid_plural "specifying more than %d supplemental groups is not possible"
msgstr[0] "不能指定多于 %d 个补充组"
-#: login-utils/su-common.c:866
+#: login-utils/su-common.c:868
msgid "ignoring --preserve-environment, it's mutually exclusive with --login"
msgstr "将忽略 --preserve-environment,它与 --login 互斥。"
-#: login-utils/su-common.c:877
+#: login-utils/su-common.c:879
msgid "options --{shell,fast,command,session-command,login} and --user are mutually exclusive"
msgstr "选项 --{shell,fast,command,session-command,login} 和 --user 互斥"
-#: login-utils/su-common.c:881
+#: login-utils/su-common.c:883
msgid "no command was specified"
msgstr "没有指定命令"
-#: login-utils/su-common.c:895
+#: login-utils/su-common.c:897
msgid "only root can specify alternative groups"
msgstr "只有 root 用户能指定替代组"
-#: login-utils/su-common.c:902
+#: login-utils/su-common.c:904
#, c-format
msgid "user %s does not exist"
msgstr "用户 %s 不存在"
-#: login-utils/su-common.c:948
+#: login-utils/su-common.c:950
#, c-format
msgid "using restricted shell %s"
msgstr "将使用受限 shell %s"
-#: login-utils/su-common.c:972
+#: login-utils/su-common.c:974
#, c-format
msgid "warning: cannot change directory to %s"
msgstr "警告:无法更改到 %s 目录"
@@ -7492,7 +7493,7 @@ msgstr ""
" -t, --timeout <秒数> 等待密码的最大时间(默认:无限制)\n"
" -e, --force 如果 getpwnam(3) 失败,直接检查密码文件\n"
-#: login-utils/sulogin.c:879 misc-utils/findmnt.c:1422 sys-utils/wdctl.c:523
+#: login-utils/sulogin.c:879 misc-utils/findmnt.c:1428 sys-utils/wdctl.c:523
#: term-utils/wall.c:135
msgid "invalid timeout argument"
msgstr "无效的 timeout 超时参数"
@@ -7526,11 +7527,6 @@ msgstr ""
"超时\n"
"\n"
-#: login-utils/utmpdump.c:129
-#, c-format
-msgid "%s: stat failed"
-msgstr "%s:stat 失败"
-
#: login-utils/utmpdump.c:166 text-utils/tailf.c:164
#, c-format
msgid "%s: cannot add inotify watch."
@@ -7754,7 +7750,7 @@ msgstr "源设备"
msgid "mountpoint"
msgstr "挂载点"
-#: misc-utils/findmnt.c:123 misc-utils/lsblk.c:143
+#: misc-utils/findmnt.c:123 misc-utils/lsblk.c:147
msgid "filesystem type"
msgstr "文件系统类型"
@@ -7774,7 +7770,7 @@ msgstr "FS 的特定挂载选项"
msgid "filesystem label"
msgstr "文件系统标签"
-#: misc-utils/findmnt.c:128 misc-utils/lsblk.c:146
+#: misc-utils/findmnt.c:128 misc-utils/lsblk.c:150
msgid "filesystem UUID"
msgstr "文件系统 UUID"
@@ -7782,7 +7778,7 @@ msgstr "文件系统 UUID"
msgid "partition label"
msgstr "分区标签"
-#: misc-utils/findmnt.c:131 misc-utils/lsblk.c:142
+#: misc-utils/findmnt.c:131 misc-utils/lsblk.c:146
msgid "major:minor device number"
msgstr "主:次 设备号"
@@ -7842,58 +7838,58 @@ msgstr "dump(8) 周期(天数) [仅 fstab]"
msgid "pass number on parallel fsck(8) [fstab only]"
msgstr "并行 fsck(8) 的遍数(pass number) [仅 fstab]"
-#: misc-utils/findmnt.c:345
+#: misc-utils/findmnt.c:348
#, c-format
msgid "unknown action: %s"
msgstr "未知操作: %s"
-#: misc-utils/findmnt.c:652
+#: misc-utils/findmnt.c:658
msgid "mount"
msgstr "挂载"
-#: misc-utils/findmnt.c:655
+#: misc-utils/findmnt.c:661
msgid "umount"
msgstr "卸载"
-#: misc-utils/findmnt.c:658
+#: misc-utils/findmnt.c:664
msgid "remount"
msgstr "重新挂载"
-#: misc-utils/findmnt.c:661
+#: misc-utils/findmnt.c:667
msgid "move"
msgstr "移动"
-#: misc-utils/findmnt.c:791
+#: misc-utils/findmnt.c:797
#, c-format
msgid "%s: parse error at line %d"
msgstr "%s:第 %d 行解析出错"
-#: misc-utils/findmnt.c:820 misc-utils/findmnt.c:1063 sys-utils/eject.c:727
+#: misc-utils/findmnt.c:826 misc-utils/findmnt.c:1069 sys-utils/eject.c:727
#: sys-utils/mount.c:647
msgid "failed to initialize libmount table"
msgstr "初始化 libmount table 失败"
-#: misc-utils/findmnt.c:847 text-utils/hexdump-parse.c:84
+#: misc-utils/findmnt.c:853 text-utils/hexdump-parse.c:84
#, c-format
msgid "can't read %s"
msgstr "不能读 %s"
-#: misc-utils/findmnt.c:1003 misc-utils/findmnt.c:1069 sys-utils/fstrim.c:169
+#: misc-utils/findmnt.c:1009 misc-utils/findmnt.c:1075 sys-utils/fstrim.c:169
#: sys-utils/mount.c:135 sys-utils/mount.c:183 sys-utils/swapoff.c:56
#: sys-utils/swapoff.c:152 sys-utils/swapon.c:232 sys-utils/swapon.c:262
#: sys-utils/swapon.c:692 sys-utils/umount.c:275
msgid "failed to initialize libmount iterator"
msgstr "无法初始化 libmount 迭代器"
-#: misc-utils/findmnt.c:1075
+#: misc-utils/findmnt.c:1081
msgid "failed to initialize libmount tabdiff"
msgstr "初始化 libmount tabdiff 失败"
-#: misc-utils/findmnt.c:1103
+#: misc-utils/findmnt.c:1109
msgid "poll() failed"
msgstr "poll() 失败"
-#: misc-utils/findmnt.c:1173
+#: misc-utils/findmnt.c:1179
#, c-format
msgid ""
" %1$s [options]\n"
@@ -7906,20 +7902,20 @@ msgstr ""
" %1$s [选项] <设备> <挂臷点>\n"
" %1$s [选项] [--source <设备>] [--target <挂臷点>]\n"
-#: misc-utils/findmnt.c:1180
+#: misc-utils/findmnt.c:1186
#, fuzzy
msgid "Find a (mounted) filesystem.\n"
msgstr "Linux 文件系统"
-#: misc-utils/findmnt.c:1183
+#: misc-utils/findmnt.c:1189
msgid " -s, --fstab search in static table of filesystems\n"
msgstr " -s, --fstab 在文件系统表态表中搜索\n"
-#: misc-utils/findmnt.c:1184
+#: misc-utils/findmnt.c:1190
msgid " -m, --mtab search in table of mounted filesystems\n"
msgstr " -m, --mtab 在已挂载文件系统表中搜索\n"
-#: misc-utils/findmnt.c:1185
+#: misc-utils/findmnt.c:1191
msgid ""
" -k, --kernel search in kernel table of mounted\n"
" filesystems (default)\n"
@@ -7927,43 +7923,43 @@ msgstr ""
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/findmnt.c:1188
+#: misc-utils/findmnt.c:1194
msgid " -p, --poll[=<list>] monitor changes in table of mounted filesystems\n"
msgstr " -p, --poll[=<列表>] 监测已挂臷文件系统表的改变\n"
-#: misc-utils/findmnt.c:1189
+#: misc-utils/findmnt.c:1195
msgid " -w, --timeout <num> upper limit in milliseconds that --poll will block\n"
msgstr " -w, --timeout <数字> --poll 阻塞的时间上限(毫秒)\n"
-#: misc-utils/findmnt.c:1192
+#: misc-utils/findmnt.c:1198
msgid " -A, --all disable all built-in filters, print all filesystems\n"
msgstr " -A, --all 禁用所有内置过滤器,打印所有文件系统\n"
-#: misc-utils/findmnt.c:1193
+#: misc-utils/findmnt.c:1199
msgid " -a, --ascii use ASCII chars for tree formatting\n"
msgstr " -a, --ascii 用 ASCII 字符格式化树\n"
-#: misc-utils/findmnt.c:1194
+#: misc-utils/findmnt.c:1200
msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
-#: misc-utils/findmnt.c:1195
+#: misc-utils/findmnt.c:1201
msgid " -C, --nocanonicalize don't canonicalize when comparing paths\n"
msgstr " -c, --no-canonicalize 在比较路径时不对路径规范化\n"
-#: misc-utils/findmnt.c:1196
+#: misc-utils/findmnt.c:1202
msgid " -c, --canonicalize canonicalize printed paths\n"
msgstr " -c, --no-canonicalize 对打印的路径规范化\n"
-#: misc-utils/findmnt.c:1197
+#: misc-utils/findmnt.c:1203
msgid " -D, --df imitate the output of df(1)\n"
msgstr " -D, --df 仿照 df(1) 输出\n"
-#: misc-utils/findmnt.c:1198
+#: misc-utils/findmnt.c:1204
msgid " -d, --direction <word> direction of search, 'forward' or 'backward'\n"
msgstr " -d, --direction <单词> 搜索方向,“forward”(往前)或“backward”(往回)\n"
-#: misc-utils/findmnt.c:1199
+#: misc-utils/findmnt.c:1205
msgid ""
" -e, --evaluate convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n"
" to device names\n"
@@ -7971,51 +7967,51 @@ msgstr ""
" -e, --evaluate 将标签(LABEL,UUID,PARTUUID,PARTLABEL) 转换为\n"
" 设备名\n"
-#: misc-utils/findmnt.c:1201
+#: misc-utils/findmnt.c:1207
msgid " -F, --tab-file <path> alternative file for -s, -m or -k options\n"
msgstr " -F, --tab-file <路径> -s, -m 或 -k 选项的替代文件\n"
-#: misc-utils/findmnt.c:1202
+#: misc-utils/findmnt.c:1208
msgid " -f, --first-only print the first found filesystem only\n"
msgstr " -f, --first-only 只打印找到的第一个文件系统\n"
-#: misc-utils/findmnt.c:1203
+#: misc-utils/findmnt.c:1209
msgid " -i, --invert invert the sense of matching\n"
msgstr " -i, --invert 反转搜索的匹配\n"
-#: misc-utils/findmnt.c:1204
+#: misc-utils/findmnt.c:1210
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/findmnt.c:1205
+#: misc-utils/findmnt.c:1211
msgid " -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n"
msgstr " -N, --task <tid> 使用替代的名字空间(/proc/<tid>/mountinfo 文件)\n"
-#: misc-utils/findmnt.c:1206
+#: misc-utils/findmnt.c:1212
msgid " -n, --noheadings don't print column headings\n"
msgstr " -n, --noheadings 不打印列标题\n"
-#: misc-utils/findmnt.c:1207
+#: misc-utils/findmnt.c:1213
msgid " -O, --options <list> limit the set of filesystems by mount options\n"
msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n"
-#: misc-utils/findmnt.c:1208
+#: misc-utils/findmnt.c:1214
msgid " -o, --output <list> the output columns to be shown\n"
msgstr " -o, --output <列表> 要显示的列\n"
-#: misc-utils/findmnt.c:1209
+#: misc-utils/findmnt.c:1215
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 键=“值”的输出格式\n"
-#: misc-utils/findmnt.c:1210
+#: misc-utils/findmnt.c:1216
msgid " -R, --submounts print all submounts for the matching filesystems\n"
msgstr " -R, --submounts 打印匹配文件系统的所有子挂载(submount)\n"
-#: misc-utils/findmnt.c:1211
+#: misc-utils/findmnt.c:1217
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/findmnt.c:1212
+#: misc-utils/findmnt.c:1218
msgid ""
" -S, --source <string> the device to mount (by name, maj:min, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
@@ -8023,48 +8019,48 @@ msgstr ""
" -S, --source <字符串> 要挂载的设备(按 名称, 主:次设备号, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
-#: misc-utils/findmnt.c:1214
+#: misc-utils/findmnt.c:1220
msgid " -T, --target <string> the mountpoint to use\n"
msgstr " -T, --target <字符串> 要使用的挂载点\n"
-#: misc-utils/findmnt.c:1215
+#: misc-utils/findmnt.c:1221
msgid " -t, --types <list> limit the set of filesystems by FS types\n"
msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
-#: misc-utils/findmnt.c:1216
+#: misc-utils/findmnt.c:1222
msgid " -U, --uniq ignore filesystems with duplicate target\n"
msgstr " -U, --uniq 忽略目标重复的文件系统\n"
-#: misc-utils/findmnt.c:1217
+#: misc-utils/findmnt.c:1223
msgid " -u, --notruncate don't truncate text in columns\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
-#: misc-utils/findmnt.c:1218
+#: misc-utils/findmnt.c:1224
msgid " -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n"
msgstr " -v, --nofsroot 对绑定式或 btrfs 挂载不打印[/dir]\n"
-#: misc-utils/findmnt.c:1333
+#: misc-utils/findmnt.c:1339
#, c-format
msgid "unknown direction '%s'"
msgstr "未知方向“%s”"
-#: misc-utils/findmnt.c:1402
+#: misc-utils/findmnt.c:1408
msgid "invalid TID argument"
msgstr "无效的 TID 参数"
-#: misc-utils/findmnt.c:1462
+#: misc-utils/findmnt.c:1468
msgid "--poll accepts only one file, but more specified by --tab-file"
msgstr "--poll 只接受一个文件,但用 --tab-file 指定了多个"
-#: misc-utils/findmnt.c:1466
+#: misc-utils/findmnt.c:1472
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:1513
+#: misc-utils/findmnt.c:1519
msgid "failed to initialize libmount cache"
msgstr "初始化 libmount 缓存失败"
-#: misc-utils/findmnt.c:1546
+#: misc-utils/findmnt.c:1552
#, c-format
msgid "%s column is requested, but --poll is not enabled"
msgstr "请示了 %s 列,但未启用 --poll"
@@ -8249,149 +8245,157 @@ msgstr "将“kill --pid”选项当作命令的做法已经废弃"
msgid "cannot find process \"%s\""
msgstr "找不到进程“%s”"
-#: misc-utils/logger.c:155
+#: misc-utils/logger.c:158
#, c-format
msgid "unknown facility name: %s"
msgstr "未知设施名称:%s"
-#: misc-utils/logger.c:161
+#: misc-utils/logger.c:164
#, c-format
msgid "unknown priority name: %s"
msgstr "未知优先级名称:%s"
-#: misc-utils/logger.c:171
+#: misc-utils/logger.c:174
#, c-format
msgid "openlog %s: pathname too long"
msgstr "openlog %s:路径名过长"
-#: misc-utils/logger.c:193
+#: misc-utils/logger.c:196
#, c-format
msgid "socket %s"
msgstr "套接字 %s"
-#: misc-utils/logger.c:222
+#: misc-utils/logger.c:225
#, c-format
msgid "failed to resolve name %s port %s: %s"
msgstr "解析名称 %s 端口 %s 失败:%s"
-#: misc-utils/logger.c:239
+#: misc-utils/logger.c:242
#, c-format
msgid "failed to connect to %s port %s"
msgstr "连接 %s 端口 %s 失败"
-#: misc-utils/logger.c:266
+#: misc-utils/logger.c:269
#, c-format
msgid "maximum input lines (%d) exceeded"
msgstr "超过了最大输入行数(%d)"
-#: misc-utils/logger.c:346
+#: misc-utils/logger.c:351
#, fuzzy
msgid "localtime() failed"
msgstr "fallocate 失败"
-#: misc-utils/logger.c:354
+#: misc-utils/logger.c:359
#, fuzzy, c-format
msgid "hostname '%s' is too long"
msgstr "字段 %s 过长"
-#: misc-utils/logger.c:361
+#: misc-utils/logger.c:366
#, fuzzy, c-format
msgid "tag '%s' is too long"
msgstr "字段 %s 过长"
-#: misc-utils/logger.c:406
+#: misc-utils/logger.c:413
#, fuzzy, c-format
msgid "ignoring unknown option argument: %s"
msgstr "未知参数:%s"
-#: misc-utils/logger.c:511
+#: misc-utils/logger.c:518
#, c-format
msgid " %s [options] [<message>]\n"
msgstr " %s [选项] [<消息>]\n"
-#: misc-utils/logger.c:514
+#: misc-utils/logger.c:521
#, fuzzy
msgid "Enter messages into the system log.\n"
msgstr "无法设置系统时钟。\n"
-#: misc-utils/logger.c:517
+#: misc-utils/logger.c:524
#, fuzzy
-msgid " -i, --id[=<id>] log <id> (default is PID)\n"
+msgid " -i, --id[=<id>] log <id> (default is PID)\n"
msgstr " -a, --all 全部(默认)\n"
-#: misc-utils/logger.c:518
-msgid " -f, --file <file> log the contents of this file\n"
+#: misc-utils/logger.c:525
+#, fuzzy
+msgid " -f, --file <file> log the contents of this file\n"
msgstr " -f, --file <文件> 记录此文件的内容\n"
-#: misc-utils/logger.c:519
-msgid " -p, --priority <prio> mark given message with this priority\n"
+#: misc-utils/logger.c:526
+#, fuzzy
+msgid " -p, --priority <prio> mark given message with this priority\n"
msgstr " -p, --priority <级别> 将指定消息标记为此优先级\n"
-#: misc-utils/logger.c:520
-msgid " --prio-prefix look for a prefix on every line read from stdin\n"
+#: misc-utils/logger.c:527
+#, fuzzy
+msgid " --prio-prefix look for a prefix on every line read from stdin\n"
msgstr " --prio-prefix 在从 stdin 读取的每一行上查找前缀\n"
-#: misc-utils/logger.c:521
-msgid " -s, --stderr output message to standard error as well\n"
+#: misc-utils/logger.c:528
+#, fuzzy
+msgid " -s, --stderr output message to standard error as well\n"
msgstr " -s, --stderr 也向标准错误输出消息\n"
-#: misc-utils/logger.c:522
-msgid " -t, --tag <tag> mark every line with this tag\n"
+#: misc-utils/logger.c:529
+#, fuzzy
+msgid " -t, --tag <tag> mark every line with this tag\n"
msgstr " -t, --tag <标志> 用此标志标记每一行\n"
-#: misc-utils/logger.c:523
-msgid " -n, --server <name> write to this remote syslog server\n"
+#: misc-utils/logger.c:530
+#, fuzzy
+msgid " -n, --server <name> write to this remote syslog server\n"
msgstr " -n, --server <名称> 写入此远程 syslog 服务器\n"
-#: misc-utils/logger.c:524
-msgid " -P, --port <number> use this UDP port\n"
+#: misc-utils/logger.c:531
+#, fuzzy
+msgid " -P, --port <number> use this UDP port\n"
msgstr " -P, --port <数字> 使用此 UDP 端口\n"
-#: misc-utils/logger.c:525
-msgid " -T, --tcp use TCP only\n"
+#: misc-utils/logger.c:532
+#, fuzzy
+msgid " -T, --tcp use TCP only\n"
msgstr " -T, --tcp 只使用 TCP\n"
-#: misc-utils/logger.c:526
-msgid " -d, --udp use UDP only\n"
+#: misc-utils/logger.c:533
+#, fuzzy
+msgid " -d, --udp use UDP only\n"
msgstr " -d, --udp 只使用 UDP\n"
-#: misc-utils/logger.c:527
-msgid " --rfc3164 use the obsolete BSD syslog protocol\n"
-msgstr ""
+#: misc-utils/logger.c:534
+#, fuzzy
+msgid " --rfc3164 use the obsolete BSD syslog protocol\n"
+msgstr " -l, --list 列出所有或指定的信息(默认)\n"
-#: misc-utils/logger.c:528
-msgid " --rfc5424[=<notime,notq,nohost>]\n"
+#: misc-utils/logger.c:535
+msgid ""
+" --rfc5424[=<snip>] use the syslog protocol (the default);\n"
+" <snip> can be notime, or notq, and/or nohost\n"
msgstr ""
-#: misc-utils/logger.c:529
+#: misc-utils/logger.c:537
#, fuzzy
-msgid " use the syslog protocol (default)\n"
-msgstr " -l, --list 列出所有或指定的信息(默认)\n"
-
-#: misc-utils/logger.c:530
-msgid " -u, --socket <socket> write to this Unix socket\n"
+msgid " -u, --socket <socket> write to this Unix socket\n"
msgstr " -u, --socket <套接字> 写入此 Unix 套接字\n"
-#: misc-utils/logger.c:532
+#: misc-utils/logger.c:539
msgid " --journald[=<file>] write journald entry\n"
msgstr " --journald[=<文件>] 写 journald 记录\n"
-#: misc-utils/logger.c:602
+#: misc-utils/logger.c:609
#, c-format
msgid "file %s"
msgstr "文件 %s"
-#: misc-utils/logger.c:611
+#: misc-utils/logger.c:618
#, fuzzy
msgid "failed to parse id"
msgstr "解析 pid 失败"
-#: misc-utils/logger.c:674
+#: misc-utils/logger.c:681
msgid "--file <file> and <message> are mutually exclusive, message is ignored"
msgstr ""
-#: misc-utils/logger.c:681
-msgid "journald entry could not be wrote"
+#: misc-utils/logger.c:688
+msgid "journald entry could not be written"
msgstr ""
#: misc-utils/look.c:357
@@ -8422,294 +8426,294 @@ msgstr " -s, --inverse 反向依赖\n"
msgid " -t, --terminate <char> define the string-termination character\n"
msgstr ""
-#: misc-utils/lsblk.c:139
+#: misc-utils/lsblk.c:143
msgid "device name"
msgstr "设备名"
-#: misc-utils/lsblk.c:140
+#: misc-utils/lsblk.c:144
msgid "internal kernel device name"
msgstr "内部内核设备名称"
-#: misc-utils/lsblk.c:141
+#: misc-utils/lsblk.c:145
msgid "internal parent kernel device name"
msgstr "内部上级内核设备名称"
-#: misc-utils/lsblk.c:144 sys-utils/zramctl.c:75
+#: misc-utils/lsblk.c:148 sys-utils/zramctl.c:75
msgid "where the device is mounted"
msgstr "设备挂载位置"
-#: misc-utils/lsblk.c:145
+#: misc-utils/lsblk.c:149
msgid "filesystem LABEL"
msgstr "文件系统标签"
-#: misc-utils/lsblk.c:148
+#: misc-utils/lsblk.c:152
msgid "partition type UUID"
msgstr "分区类型 UUID"
-#: misc-utils/lsblk.c:149
+#: misc-utils/lsblk.c:153
msgid "partition LABEL"
msgstr "分区 LABEL"
-#: misc-utils/lsblk.c:153
+#: misc-utils/lsblk.c:157
msgid "read-ahead of the device"
msgstr "该设备的预读(read-ahead)"
-#: misc-utils/lsblk.c:154 sys-utils/losetup.c:71
+#: misc-utils/lsblk.c:158 sys-utils/losetup.c:71
msgid "read-only device"
msgstr "只读设备"
-#: misc-utils/lsblk.c:155
+#: misc-utils/lsblk.c:159
msgid "removable device"
msgstr "可移动设备"
-#: misc-utils/lsblk.c:156
+#: misc-utils/lsblk.c:160
msgid "removable or hotplug device (usb, pcmcia, ...)"
msgstr ""
-#: misc-utils/lsblk.c:157
+#: misc-utils/lsblk.c:161
msgid "rotational device"
msgstr "转动设备"
-#: misc-utils/lsblk.c:158
+#: misc-utils/lsblk.c:162
msgid "adds randomness"
msgstr "添加随机性"
-#: misc-utils/lsblk.c:159
+#: misc-utils/lsblk.c:163
msgid "device identifier"
msgstr "设备标识符"
-#: misc-utils/lsblk.c:160
+#: misc-utils/lsblk.c:164
msgid "disk serial number"
msgstr "磁盘序列号"
-#: misc-utils/lsblk.c:161
+#: misc-utils/lsblk.c:165
msgid "size of the device"
msgstr "磁盘容量"
-#: misc-utils/lsblk.c:162
+#: misc-utils/lsblk.c:166
msgid "state of the device"
msgstr "设备的状态"
-#: misc-utils/lsblk.c:164
+#: misc-utils/lsblk.c:168
msgid "group name"
msgstr "组名"
-#: misc-utils/lsblk.c:165
+#: misc-utils/lsblk.c:169
msgid "device node permissions"
msgstr "设备节点权限"
-#: misc-utils/lsblk.c:166
+#: misc-utils/lsblk.c:170
msgid "alignment offset"
msgstr "对齐偏移量"
-#: misc-utils/lsblk.c:167
+#: misc-utils/lsblk.c:171
msgid "minimum I/O size"
msgstr "最小 I/O 大小"
-#: misc-utils/lsblk.c:168
+#: misc-utils/lsblk.c:172
msgid "optimal I/O size"
msgstr "最优 I/O 大小"
-#: misc-utils/lsblk.c:169
+#: misc-utils/lsblk.c:173
msgid "physical sector size"
msgstr "物理扇区大小"
-#: misc-utils/lsblk.c:170
+#: misc-utils/lsblk.c:174
msgid "logical sector size"
msgstr "逻辑扇区大小"
-#: misc-utils/lsblk.c:171
+#: misc-utils/lsblk.c:175
msgid "I/O scheduler name"
msgstr "I/O 调度器名称"
-#: misc-utils/lsblk.c:172
+#: misc-utils/lsblk.c:176
msgid "request queue size"
msgstr "请求队列大小"
-#: misc-utils/lsblk.c:173
+#: misc-utils/lsblk.c:177
msgid "device type"
msgstr "设备类型"
-#: misc-utils/lsblk.c:174
+#: misc-utils/lsblk.c:178
msgid "discard alignment offset"
msgstr "忽略对齐偏移量"
-#: misc-utils/lsblk.c:175
+#: misc-utils/lsblk.c:179
msgid "discard granularity"
msgstr "忽略粒度"
-#: misc-utils/lsblk.c:176
+#: misc-utils/lsblk.c:180
msgid "discard max bytes"
msgstr "忽略最大字节数"
-#: misc-utils/lsblk.c:177
+#: misc-utils/lsblk.c:181
msgid "discard zeroes data"
msgstr "忽略零数据"
-#: misc-utils/lsblk.c:178
+#: misc-utils/lsblk.c:182
msgid "write same max bytes"
msgstr "写相同的最大字节数"
-#: misc-utils/lsblk.c:179
+#: misc-utils/lsblk.c:183
msgid "unique storage identifier"
msgstr "惟一存储标识符"
-#: misc-utils/lsblk.c:180
+#: misc-utils/lsblk.c:184
msgid "Host:Channel:Target:Lun for SCSI"
msgstr "SCSI 的 Host:Channel:Target:Lun"
-#: misc-utils/lsblk.c:181
+#: misc-utils/lsblk.c:185
msgid "device transport type"
msgstr "设备传输类型"
-#: misc-utils/lsblk.c:182
+#: misc-utils/lsblk.c:186
msgid "de-duplicated chain of subsystems"
msgstr ""
-#: misc-utils/lsblk.c:183
+#: misc-utils/lsblk.c:187
msgid "device revision"
msgstr "设备修订版本"
-#: misc-utils/lsblk.c:184
+#: misc-utils/lsblk.c:188
msgid "device vendor"
msgstr "设备制造商"
-#: misc-utils/lsblk.c:1118
+#: misc-utils/lsblk.c:1122
#, c-format
msgid "%s: failed to get device path"
msgstr "%s:获取设备路径失败"
-#: misc-utils/lsblk.c:1125
+#: misc-utils/lsblk.c:1129
#, c-format
msgid "%s: unknown device name"
msgstr "%s:未知设备名称"
-#: misc-utils/lsblk.c:1161
+#: misc-utils/lsblk.c:1165
#, c-format
msgid "%s: failed to get dm name"
msgstr "%s:获取 dm 名称失败"
-#: misc-utils/lsblk.c:1202
+#: misc-utils/lsblk.c:1206
msgid "failed to open device directory in sysfs"
msgstr "打开 sysfs 中的设备目录失败"
-#: misc-utils/lsblk.c:1370
+#: misc-utils/lsblk.c:1374
#, c-format
msgid "%s: failed to compose sysfs path"
msgstr "%s:组成 sysfs 路径失败"
-#: misc-utils/lsblk.c:1376
+#: misc-utils/lsblk.c:1380
#, c-format
msgid "%s: failed to read link"
msgstr "%s:读链接失败"
-#: misc-utils/lsblk.c:1399
+#: misc-utils/lsblk.c:1402
#, c-format
msgid "%s: failed to get sysfs name"
msgstr "%s:获取 sysfs 名称失败"
-#: misc-utils/lsblk.c:1408
+#: misc-utils/lsblk.c:1411
#, c-format
msgid "%s: failed to get whole-disk device number"
msgstr "%s:获取 整盘 设备号失败"
-#: misc-utils/lsblk.c:1460 misc-utils/lsblk.c:1462 misc-utils/lsblk.c:1487
-#: misc-utils/lsblk.c:1489
+#: misc-utils/lsblk.c:1463 misc-utils/lsblk.c:1465 misc-utils/lsblk.c:1490
+#: misc-utils/lsblk.c:1492
#, c-format
msgid "failed to parse list '%s'"
msgstr "解析列表“%s”失败"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1467
+#: misc-utils/lsblk.c:1470
#, 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:1494
+#: misc-utils/lsblk.c:1497
#, c-format
msgid "the list of included devices is too large (limit is %d devices)"
msgstr "包含设备列表过大(限制为 %d 台设备)"
-#: misc-utils/lsblk.c:1525 sys-utils/wdctl.c:174
+#: misc-utils/lsblk.c:1528 sys-utils/wdctl.c:174
#, c-format
msgid " %s [options] [<device> ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: misc-utils/lsblk.c:1528
+#: misc-utils/lsblk.c:1531
#, fuzzy
msgid "List information about block devices.\n"
msgstr "%s:不是一个块设备"
-#: misc-utils/lsblk.c:1531
+#: misc-utils/lsblk.c:1534
msgid " -a, --all print all devices\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/lsblk.c:1533
+#: misc-utils/lsblk.c:1536
msgid " -d, --nodeps don't print slaves or holders\n"
msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
-#: misc-utils/lsblk.c:1534
+#: misc-utils/lsblk.c:1537
msgid " -D, --discard print discard capabilities\n"
msgstr " -D, --discard 打印时丢弃能力\n"
-#: misc-utils/lsblk.c:1535
+#: misc-utils/lsblk.c:1538
msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认:内存盘)\n"
-#: misc-utils/lsblk.c:1536
+#: misc-utils/lsblk.c:1539
msgid " -f, --fs output info about filesystems\n"
msgstr " -f, --fs 输出文件系统信息\n"
-#: misc-utils/lsblk.c:1537
+#: misc-utils/lsblk.c:1540
msgid " -i, --ascii use ascii characters only\n"
msgstr " -i, --ascii 只使用 ascii 字符\n"
-#: misc-utils/lsblk.c:1538
+#: misc-utils/lsblk.c:1541
msgid " -I, --include <list> show only devices with specified major numbers\n"
msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
-#: misc-utils/lsblk.c:1539
+#: misc-utils/lsblk.c:1542
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/lsblk.c:1540
+#: misc-utils/lsblk.c:1543
msgid " -m, --perms output info about permissions\n"
msgstr " -m, --perms 输出权限信息\n"
-#: misc-utils/lsblk.c:1541
+#: misc-utils/lsblk.c:1544
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lsblk.c:1542
+#: misc-utils/lsblk.c:1545
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/lsblk.c:1543
+#: misc-utils/lsblk.c:1546
msgid " -O, --output-all output all columns\n"
msgstr " -O, --output-all 输出所有列\n"
-#: misc-utils/lsblk.c:1544
+#: misc-utils/lsblk.c:1547
msgid " -p, --paths print complete device path\n"
msgstr " -p, --paths 打印完整设备路径\n"
-#: misc-utils/lsblk.c:1547
+#: misc-utils/lsblk.c:1550
msgid " -s, --inverse inverse dependencies\n"
msgstr " -s, --inverse 反向依赖\n"
-#: misc-utils/lsblk.c:1548
+#: misc-utils/lsblk.c:1551
msgid " -S, --scsi output info about SCSI devices\n"
msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
-#: misc-utils/lsblk.c:1549
+#: misc-utils/lsblk.c:1552
msgid " -t, --topology output info about topology\n"
msgstr " -t, --topology 输出拓扑信息\n"
-#: misc-utils/lsblk.c:1550
+#: misc-utils/lsblk.c:1553
msgid " -x, --sort <column> sort output by <column>\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: misc-utils/lsblk.c:1555 misc-utils/lslocks.c:521 sys-utils/prlimit.c:196
+#: misc-utils/lsblk.c:1558 misc-utils/lslocks.c:521 sys-utils/prlimit.c:196
#: sys-utils/zramctl.c:399
#, c-format
msgid ""
@@ -8719,12 +8723,12 @@ msgstr ""
"\n"
"可用列(用于 --output):\n"
-#: misc-utils/lsblk.c:1568
+#: misc-utils/lsblk.c:1571
#, c-format
msgid "failed to access sysfs directory: %s"
msgstr "无法访问 sysfs 目录:%s"
-#: misc-utils/lsblk.c:1757
+#: misc-utils/lsblk.c:1760
msgid "the sort column has to be among the output columns"
msgstr "排序列必须是输出的列"
@@ -8811,7 +8815,7 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
" -V, --version 输出版本信息并退出\n"
-#: misc-utils/lslocks.c:557 schedutils/chrt.c:256 schedutils/ionice.c:179
+#: misc-utils/lslocks.c:557 schedutils/chrt.c:256 schedutils/ionice.c:177
#: schedutils/taskset.c:163 sys-utils/prlimit.c:585
msgid "invalid PID argument"
msgstr "无效的 PID 参数"
@@ -8906,11 +8910,6 @@ msgstr "缺少 路径名 参数"
msgid "%s: exceeded limit of symlinks"
msgstr "%s:超过了符号链接限制"
-#: misc-utils/rename.c:63
-#, c-format
-msgid "%s: lstat failed"
-msgstr "%s:lstat 失败"
-
#: misc-utils/rename.c:67
#, c-format
msgid "%s: not a symbolic link"
@@ -9165,43 +9164,45 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: misc-utils/whereis.c:191
+#: misc-utils/whereis.c:192
msgid "Locate the binary, source, and manual-page files for a command.\n"
msgstr ""
-#: misc-utils/whereis.c:194
+#: misc-utils/whereis.c:195
msgid " -b search only for binaries\n"
msgstr " -b 只搜索二进制文件\n"
-#: misc-utils/whereis.c:195
+#: misc-utils/whereis.c:196
msgid " -B <dirs> define binaries lookup path\n"
msgstr " -B <目录> 定义二进制文件查找路径\n"
-#: misc-utils/whereis.c:196
-msgid " -m search only for manuals\n"
+#: misc-utils/whereis.c:197
+#, fuzzy
+msgid " -m search only for manuals and infos\n"
msgstr " -m 只搜索 man 手册\n"
-#: misc-utils/whereis.c:197
-msgid " -M <dirs> define man lookup path\n"
+#: misc-utils/whereis.c:198
+#, fuzzy
+msgid " -M <dirs> define man and info lookup path\n"
msgstr " -M <目录> 定义 man 手册查找路径\n"
-#: misc-utils/whereis.c:198
+#: misc-utils/whereis.c:199
msgid " -s search only for sources\n"
msgstr " -s 只搜索源代码\n"
-#: misc-utils/whereis.c:199
+#: misc-utils/whereis.c:200
msgid " -S <dirs> define sources lookup path\n"
msgstr " -S <目录> 定义源代码查找路径\n"
-#: misc-utils/whereis.c:200
+#: misc-utils/whereis.c:201
msgid " -f terminate <dirs> argument list\n"
msgstr " -f 终止 <目录> 参数列表\n"
-#: misc-utils/whereis.c:201
+#: misc-utils/whereis.c:202
msgid " -u search for unusual entries\n"
msgstr " -u 搜索不常见记录\n"
-#: misc-utils/whereis.c:202
+#: misc-utils/whereis.c:203
msgid " -l output effective lookup paths\n"
msgstr " -l 输出有效查找路径\n"
@@ -9214,46 +9215,46 @@ msgstr "分区表"
msgid "error: %s: probing initialization failed"
msgstr "错误:%s:探测初始化失败"
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:312
#, 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:319
+#: misc-utils/wipefs.c:318
#, 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:348
+#: misc-utils/wipefs.c:347
#, c-format
msgid "%s: failed to create a signature backup"
msgstr "%s:创建签名备份失败"
-#: misc-utils/wipefs.c:361
+#: misc-utils/wipefs.c:360
#, c-format
msgid "%s: calling ioctl to re-read partition table: %m\n"
msgstr "%s:将调用 ioctl 来重新读分区表:%m\n"
-#: misc-utils/wipefs.c:411
+#: misc-utils/wipefs.c:410
#, c-format
msgid "%s: ignoring nested \"%s\" partition table on non-whole disk device"
msgstr "%s:忽略 非整盘 设备上的嵌套分区表“%s”"
-#: misc-utils/wipefs.c:428
+#: misc-utils/wipefs.c:427
#, c-format
msgid "%s: offset 0x%jx not found"
msgstr "%s:找不到偏移 0x%jx"
-#: misc-utils/wipefs.c:432
+#: misc-utils/wipefs.c:431
msgid "Use the --force option to force erase."
msgstr "使用 --force 选项强制擦除。"
-#: misc-utils/wipefs.c:456
+#: misc-utils/wipefs.c:455
msgid "Wipe signatures from a device.\n"
msgstr ""
-#: misc-utils/wipefs.c:459
+#: misc-utils/wipefs.c:458
msgid ""
" -a, --all wipe all magic strings (BE CAREFUL!)\n"
" -b, --backup create a signature backup in $HOME\n"
@@ -9276,11 +9277,11 @@ msgstr ""
" -t, --types <列表> 限制文件系统、RAID 或分区表的集合\n"
" -V, --version 输出版本信息并退出\n"
-#: misc-utils/wipefs.c:530
+#: misc-utils/wipefs.c:529
msgid "invalid offset argument"
msgstr "无效的 偏移 参数"
-#: misc-utils/wipefs.c:555
+#: misc-utils/wipefs.c:554
msgid "The --backup option is meaningless in this context"
msgstr "--backup 在此环境中无意义"
@@ -9442,15 +9443,7 @@ msgstr "%s:优先级 %lu\n"
msgid "ioprio_set failed"
msgstr "ioprio_set 失败"
-#: schedutils/ionice.c:103
-msgid ""
-"\n"
-"Sets or gets the IO scheduling class and priority of processes.\n"
-msgstr ""
-"\n"
-"设置或获取进程的 IO 调度类别和优先级。\n"
-
-#: schedutils/ionice.c:106
+#: schedutils/ionice.c:104
#, c-format
msgid ""
" %1$s [options] -p <pid>...\n"
@@ -9463,14 +9456,14 @@ msgstr ""
" %1$s [选项] -u <uid>...\n"
" %1$s [选项] <命令>\n"
-#: schedutils/ionice.c:112
+#: schedutils/ionice.c:110
#, fuzzy
msgid "Show or change the I/O-scheduling class and priority of a process.\n"
msgstr ""
"\n"
"设置或获取进程的 IO 调度类别和优先级。\n"
-#: schedutils/ionice.c:115
+#: schedutils/ionice.c:113
msgid ""
" -c, --class <class> name or number of scheduling class,\n"
" 0: none, 1: realtime, 2: best-effort, 3: idle\n"
@@ -9478,7 +9471,7 @@ msgstr ""
" -c, --class <类别> 调度类别的名称或数值\n"
" 0: 无, 1: 实时, 2: 尽力, 3: 空闲\n"
-#: schedutils/ionice.c:117
+#: schedutils/ionice.c:115
msgid ""
" -n, --classdata <num> priority (0..7) in the specified scheduling class,\n"
" only for the realtime and best-effort classes\n"
@@ -9486,56 +9479,56 @@ msgstr ""
" -n, --classdata <数字> 指定调度类别的优先级(0..7),只针对\n"
" “实时”和“尽力”类别\n"
-#: schedutils/ionice.c:119
+#: schedutils/ionice.c:117
msgid " -p, --pid <pid>... act on these already running processes\n"
msgstr " -p, --pid <pid>... 对这些已运行的进程操作\n"
-#: schedutils/ionice.c:120
+#: schedutils/ionice.c:118
msgid " -P, --pgid <pgrp>... act on already running processes in these groups\n"
msgstr " -P, --pgid <pgrp>... 对这些组中已运行的进程操作\n"
-#: schedutils/ionice.c:121
+#: schedutils/ionice.c:119
msgid " -t, --ignore ignore failures\n"
msgstr " -t, --ignore 忽略失败\n"
-#: schedutils/ionice.c:122
+#: schedutils/ionice.c:120
msgid " -u, --uid <uid>... act on already running processes owned by these users\n"
msgstr " -u, --uid <uid>... 对属于这些用户的已运行进程操作\n"
-#: schedutils/ionice.c:159
+#: schedutils/ionice.c:157
msgid "invalid class data argument"
msgstr "无效的类别数据参数"
-#: schedutils/ionice.c:165
+#: schedutils/ionice.c:163
msgid "invalid class argument"
msgstr "无效的类别参数"
-#: schedutils/ionice.c:170
+#: schedutils/ionice.c:168
#, c-format
msgid "unknown scheduling class: '%s'"
msgstr "未知的调度类别:“%s”"
-#: schedutils/ionice.c:178 schedutils/ionice.c:186 schedutils/ionice.c:194
+#: schedutils/ionice.c:176 schedutils/ionice.c:184 schedutils/ionice.c:192
msgid "can handle only one of pid, pgid or uid at once"
msgstr "无法一次只处理一个 pid、pgid 或 uid"
-#: schedutils/ionice.c:187
+#: schedutils/ionice.c:185
msgid "invalid PGID argument"
msgstr "无效的 PGID 参数"
-#: schedutils/ionice.c:195
+#: schedutils/ionice.c:193
msgid "invalid UID argument"
msgstr "无效的 UID 参数"
-#: schedutils/ionice.c:214
+#: schedutils/ionice.c:212
msgid "ignoring given class data for none class"
msgstr "将忽略为“无”类别指定的类别数据"
-#: schedutils/ionice.c:222
+#: schedutils/ionice.c:220
msgid "ignoring given class data for idle class"
msgstr "将忽略为“空闲”类别指定的类别数据"
-#: schedutils/ionice.c:227
+#: schedutils/ionice.c:225
#, c-format
msgid "unknown prio class %d"
msgstr "未知的优先级类别 %d"
@@ -9989,99 +9982,99 @@ msgstr "安全/认证消息(私有)"
msgid "FTP daemon"
msgstr "ftp 守护进程"
-#: sys-utils/dmesg.c:266
+#: sys-utils/dmesg.c:267
msgid "Display or control the kernel ring buffer.\n"
msgstr ""
-#: sys-utils/dmesg.c:269
+#: sys-utils/dmesg.c:270
msgid " -C, --clear clear the kernel ring buffer\n"
msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n"
-#: sys-utils/dmesg.c:270
+#: sys-utils/dmesg.c:271
msgid " -c, --read-clear read and clear all messages\n"
msgstr " -c, --read-clear 读取并清除所有消息\n"
-#: sys-utils/dmesg.c:271
+#: sys-utils/dmesg.c:272
msgid " -D, --console-off disable printing messages to console\n"
msgstr " -D, --console-off 禁止向终端打印消息\n"
-#: sys-utils/dmesg.c:272
+#: sys-utils/dmesg.c:273
msgid " -E, --console-on enable printing messages to console\n"
msgstr " -E, --console-on 启用向终端打印消息\n"
-#: sys-utils/dmesg.c:273
+#: sys-utils/dmesg.c:274
msgid " -F, --file <file> use the file instead of the kernel log buffer\n"
msgstr " -F, --file <文件> 用 文件 代替内核日志缓冲区\n"
-#: sys-utils/dmesg.c:274
+#: sys-utils/dmesg.c:275
msgid " -f, --facility <list> restrict output to defined facilities\n"
msgstr " -f, --facility <列表> 将输出限制为定义的设施\n"
-#: sys-utils/dmesg.c:275
+#: sys-utils/dmesg.c:276
msgid " -H, --human human readable output\n"
msgstr " -H, --human 易读格式输出\n"
-#: sys-utils/dmesg.c:276
+#: sys-utils/dmesg.c:277
msgid " -k, --kernel display kernel messages\n"
msgstr " -k, --kernel 显示内核消息\n"
-#: sys-utils/dmesg.c:277
+#: sys-utils/dmesg.c:278
msgid " -L, --color[=<when>] colorize messages (auto, always or never)\n"
msgstr " -L, --color[=<时机>] 彩色显示消息(auto, always 或 never)\n"
-#: sys-utils/dmesg.c:278
+#: sys-utils/dmesg.c:279
msgid " -l, --level <list> restrict output to defined levels\n"
msgstr " -l, --level <列表> 限制输出级别\n"
-#: sys-utils/dmesg.c:279
+#: sys-utils/dmesg.c:280
msgid " -n, --console-level <level> set level of messages printed to console\n"
msgstr " -n, --console-level <级别> 设置打印到终端的消息级别\n"
-#: sys-utils/dmesg.c:280
+#: sys-utils/dmesg.c:281
msgid " -P, --nopager do not pipe output into a pager\n"
msgstr " -P, --nopager 不将输出通过管道传递给分页程序\n"
-#: sys-utils/dmesg.c:281
+#: sys-utils/dmesg.c:282
msgid " -r, --raw print the raw message buffer\n"
msgstr " -r, --raw 打印原生消息缓冲区\n"
-#: sys-utils/dmesg.c:282
+#: sys-utils/dmesg.c:283
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:283
+#: sys-utils/dmesg.c:284
msgid " -s, --buffer-size <size> buffer size to query the kernel ring buffer\n"
msgstr " -s, --buffer-size <大小> 查询内核环形缓冲区所用的缓冲区大小\n"
-#: sys-utils/dmesg.c:284
+#: sys-utils/dmesg.c:285
msgid " -u, --userspace display userspace messages\n"
msgstr " -u, --userspace 显示用户空间消息\n"
-#: sys-utils/dmesg.c:285
+#: sys-utils/dmesg.c:286
msgid " -w, --follow wait for new messages\n"
msgstr " -w, --follow 等待新消息\n"
-#: sys-utils/dmesg.c:286
+#: sys-utils/dmesg.c:287
msgid " -x, --decode decode facility and level to readable string\n"
msgstr " -x, --decode 将设施和级别解码为可读的字符串\n"
-#: sys-utils/dmesg.c:287
+#: sys-utils/dmesg.c:288
msgid " -d, --show-delta show time delta between printed messages\n"
msgstr " -d, --show-delta 显示打印消息之间的时间差\n"
-#: sys-utils/dmesg.c:288
+#: sys-utils/dmesg.c:289
msgid " -e, --reltime show local time and time delta in readable format\n"
msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n"
-#: sys-utils/dmesg.c:289
+#: sys-utils/dmesg.c:290
msgid " -T, --ctime show human readable timestamp\n"
msgstr " -T, --ctime 显示易读的时间戳\n"
-#: sys-utils/dmesg.c:290
+#: sys-utils/dmesg.c:291
msgid " -t, --notime don't print messages timestamp\n"
msgstr " -t, --notime 不打印消息时间戳\n"
-#: sys-utils/dmesg.c:291
+#: sys-utils/dmesg.c:292
msgid ""
" --time-format <format> show time stamp using format:\n"
" [delta|reltime|ctime|notime|iso]\n"
@@ -10091,7 +10084,7 @@ msgstr ""
" [delta|reltime|ctime|notime|iso]\n"
"挂起/恢复会使 ctime 和 iso 时间戳不精确。\n"
-#: sys-utils/dmesg.c:297
+#: sys-utils/dmesg.c:298
msgid ""
"\n"
"Supported log facilities:\n"
@@ -10099,7 +10092,7 @@ msgstr ""
"\n"
"支持的日志设施:\n"
-#: sys-utils/dmesg.c:303
+#: sys-utils/dmesg.c:304
msgid ""
"\n"
"Supported log levels (priorities):\n"
@@ -10107,49 +10100,49 @@ msgstr ""
"\n"
"支持的日志级别(优先级):\n"
-#: sys-utils/dmesg.c:357
+#: sys-utils/dmesg.c:358
#, c-format
msgid "failed to parse level '%s'"
msgstr "解析级别“%s”失败"
-#: sys-utils/dmesg.c:359
+#: sys-utils/dmesg.c:360
#, c-format
msgid "unknown level '%s'"
msgstr "未知级别“%s”"
-#: sys-utils/dmesg.c:395
+#: sys-utils/dmesg.c:396
#, c-format
msgid "failed to parse facility '%s'"
msgstr "解析设施“%s”失败"
-#: sys-utils/dmesg.c:397
+#: sys-utils/dmesg.c:398
#, c-format
msgid "unknown facility '%s'"
msgstr "未知设施“%s”"
-#: sys-utils/dmesg.c:525
+#: sys-utils/dmesg.c:526
#, c-format
msgid "cannot mmap: %s"
msgstr "无法 mmap:%s"
-#: sys-utils/dmesg.c:1325
+#: sys-utils/dmesg.c:1341
msgid "invalid buffer size argument"
msgstr "无效的 缓冲区大小 参数"
-#: sys-utils/dmesg.c:1381
+#: sys-utils/dmesg.c:1397
msgid "--show-delta is ignored when used together with iso8601 time format"
msgstr "--show-delta 与 iso8601 时间格式共用时将忽略"
-#: sys-utils/dmesg.c:1404
+#: sys-utils/dmesg.c:1420
#, fuzzy
msgid "--raw can be used together with --level or --facility only when reading messages from /dev/kmsg"
msgstr "--raw 只有在从 /dev/kmsg 读消息时才可以与 --level 或 --facility 共用"
-#: sys-utils/dmesg.c:1414
+#: sys-utils/dmesg.c:1430
msgid "read kernel buffer failed"
msgstr "读取内核缓冲区失败"
-#: sys-utils/dmesg.c:1433
+#: sys-utils/dmesg.c:1449
msgid "klogctl failed"
msgstr "klogctl 失败"
@@ -11719,6 +11712,16 @@ msgstr "内核未做共享内存的相关配置\n"
msgid "------ Shared Memory Status --------\n"
msgstr "---------- 共享内存状态 ------------\n"
+#. TRANSLATORS: This output format is maintained for backward
+#. compatibility as ipcs is used in scripts. For consistency
+#. with the rest, the translated form can follow this model:
+#. *
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
#: sys-utils/ipcs.c:241
#, c-format
msgid ""
@@ -12599,12 +12602,10 @@ msgid "Failed to extract the node number"
msgstr "提取节点号失败"
#: sys-utils/lscpu.c:1246 sys-utils/lscpu.c:1256
-#, c-format
msgid "Y"
msgstr "Y"
#: sys-utils/lscpu.c:1246 sys-utils/lscpu.c:1256
-#, c-format
msgid "N"
msgstr "N"
@@ -13930,12 +13931,10 @@ msgid "%s: assuming RTC uses UTC ...\n"
msgstr "%s:将假设 RTC 使用 UTC...\n"
#: sys-utils/rtcwake.c:495
-#, c-format
msgid "Using UTC time.\n"
msgstr "使用 UTC 时间。\n"
#: sys-utils/rtcwake.c:496
-#, c-format
msgid "Using local time.\n"
msgstr "使用当地时间。\n"
@@ -14789,9 +14788,9 @@ msgstr ""
msgid ""
"\n"
"Available discard policy types (for --discard):\n"
-" once\t : only single-time area discards are issued\n"
-" pages\t : freed pages are discarded before they are reused\n"
-" If no policy is selected, both discard types are enabled (default).\n"
+" once : only single-time area discards are issued\n"
+" pages : freed pages are discarded before they are reused\n"
+"If no policy is selected, both discard types are enabled (default).\n"
msgstr ""
"\n"
"可用的丢弃策略类型(针对 --discard):\n"
@@ -15211,7 +15210,7 @@ msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 -
#: sys-utils/unshare.c:124
#, fuzzy
-msgid " -s, --setgroups <allow|deny> control setgroups syscall in user namespaces\n"
+msgid " -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n"
msgstr " -G, --setgid <gid> 在用户名字空间中设置 gid\n"
#: sys-utils/unshare.c:213
@@ -15224,7 +15223,7 @@ msgstr "子进程退出失败"
#: sys-utils/unshare.c:237
#, fuzzy
-msgid "options --setgroups=allow and --map-root-user are mutually exclusive."
+msgid "options --setgroups=allow and --map-root-user are mutually exclusive"
msgstr "选项 --{shell,fast,command,session-command,login} 和 --user 互斥"
#: sys-utils/unshare.c:254
@@ -15645,8 +15644,8 @@ msgid "setting terminal attributes failed: %m"
msgstr "设置终端属性失败:%m"
#: term-utils/agetty.c:1449
-#, c-format
-msgid "cannot open: %s: %m"
+#, fuzzy, c-format
+msgid "cannot open %s: %m"
msgstr "无法打开 %s:%m"
#: term-utils/agetty.c:1555
@@ -15866,7 +15865,7 @@ msgstr "checkname 失败:%m"
#: term-utils/agetty.c:2502
#, fuzzy, c-format
-msgid "cannot touch file: %s"
+msgid "cannot touch file %s"
msgstr "无法关闭文件 %s"
#: term-utils/agetty.c:2506
@@ -16841,11 +16840,11 @@ msgstr "[不是文件] 第 %d 行"
msgid " Overflow\n"
msgstr " 上溢\n"
-#: text-utils/more.c:1625
+#: text-utils/more.c:1627
msgid "...skipping\n"
msgstr "...跳过\n"
-#: text-utils/more.c:1659
+#: text-utils/more.c:1661
msgid ""
"\n"
"Pattern not found\n"
@@ -16853,19 +16852,19 @@ msgstr ""
"\n"
"未找到模式\n"
-#: text-utils/more.c:1664 text-utils/pg.c:1028 text-utils/pg.c:1174
+#: text-utils/more.c:1667 text-utils/pg.c:1028 text-utils/pg.c:1174
msgid "Pattern not found"
msgstr "找不到模式"
-#: text-utils/more.c:1710
+#: text-utils/more.c:1713
msgid "exec failed\n"
msgstr "exec 失败\n"
-#: text-utils/more.c:1724
+#: text-utils/more.c:1727
msgid "can't fork\n"
msgstr "无法 fork\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1761
msgid ""
"\n"
"...Skipping "
@@ -16873,19 +16872,19 @@ msgstr ""
"\n"
"...跳过 "
-#: text-utils/more.c:1762
+#: text-utils/more.c:1765
msgid "...Skipping to file "
msgstr "...跳到文件 "
-#: text-utils/more.c:1764
+#: text-utils/more.c:1767
msgid "...Skipping back to file "
msgstr "...将跳回文件 "
-#: text-utils/more.c:2047
+#: text-utils/more.c:2050
msgid "Line too long"
msgstr "行过长"
-#: text-utils/more.c:2084
+#: text-utils/more.c:2087
msgid "No previous command to substitute for"
msgstr "没有要替换的前一命令"
@@ -17153,6 +17152,55 @@ msgstr "输入中有未知转义序列:%o,%o"
msgid "Input line too long."
msgstr "输入行过长。"
+#~ msgid "Minimal size is %ju"
+#~ msgstr "最小为 %ju"
+
+#~ msgid "Help Screen for cfdisk"
+#~ msgstr "cfdisk 帮助页面"
+
+#~ msgid "disk drive."
+#~ msgstr "分区。"
+
+#~ msgid "Copyright (C) 2014 Karel Zak <kzak@redhat.com> "
+#~ msgstr "Copyright (C) 2014 Karel Zak <kzak@redhat.com> "
+
+#~ msgid "Based on the original cfdisk from Kevin E. Martin & aeb."
+#~ msgstr "基于由 Kevin E. Martin & aeb 编写的原 cfdisk。"
+
+#~ msgid " `no'"
+#~ msgstr " 写入"
+
+#, fuzzy
+#~ msgid "Too small partition size specified."
+#~ msgstr "未定义分区。"
+
+#~ msgid "Device open in read-only mode"
+#~ msgstr "设备以只读方式打开"
+
+#~ msgid "stat failed %s"
+#~ msgstr "stat 失败:%s"
+
+#, fuzzy
+#~ msgid "faild to allocate iterator"
+#~ msgstr "分配迭代器失败"
+
+#, fuzzy
+#~ msgid "cannot open: %s"
+#~ msgstr "打不开 %s"
+
+#~ msgid "%s: stat failed"
+#~ msgstr "%s:stat 失败"
+
+#~ msgid "%s: lstat failed"
+#~ msgstr "%s:lstat 失败"
+
+#~ msgid ""
+#~ "\n"
+#~ "Sets or gets the IO scheduling class and priority of processes.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "设置或获取进程的 IO 调度类别和优先级。\n"
+
#~ msgid "Please, select a type to create a new disk label."
#~ msgstr "请选择创建新磁盘标签的类型。"