diff options
| author | Karel Zak | 2015-07-31 10:56:34 +0200 |
|---|---|---|
| committer | Karel Zak | 2015-07-31 10:56:34 +0200 |
| commit | d3cac66d6641cf488357ec9a858cc06be2ec6996 (patch) | |
| tree | 80ba78a4d68bfa173126204514c5ce3184daf034 /po/zh_CN.po | |
| parent | lsblk: Display mountpoint even for top-level device (diff) | |
| download | kernel-qcow2-util-linux-d3cac66d6641cf488357ec9a858cc06be2ec6996.tar.gz kernel-qcow2-util-linux-d3cac66d6641cf488357ec9a858cc06be2ec6996.tar.xz kernel-qcow2-util-linux-d3cac66d6641cf488357ec9a858cc06be2ec6996.zip | |
po: merge changes
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 6051 |
1 files changed, 3538 insertions, 2513 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 405683a26..028a54498 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-02-19 13:02+0100\n" +"POT-Creation-Date: 2015-07-31 10:48+0200\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,39 +32,39 @@ 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:2278 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: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:384 -#: disk-utils/sfdisk.c:440 disk-utils/sfdisk.c:494 disk-utils/sfdisk.c:553 -#: disk-utils/sfdisk.c:620 disk-utils/sfdisk.c:652 disk-utils/sfdisk.c:1100 -#: 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:1111 -#: misc-utils/logger.c:698 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 -#: sys-utils/hwclock-rtc.c:414 sys-utils/hwclock-rtc.c:435 -#: sys-utils/hwclock-rtc.c:482 sys-utils/ldattach.c:371 -#: sys-utils/nsenter.c:117 sys-utils/rtcwake.c:109 sys-utils/rtcwake.c:268 -#: sys-utils/rtcwake.c:527 sys-utils/setpriv.c:230 sys-utils/setpriv.c:529 -#: sys-utils/setpriv.c:552 sys-utils/swapon.c:345 sys-utils/swapon.c:508 -#: sys-utils/switch_root.c:163 sys-utils/unshare.c:79 sys-utils/unshare.c:94 -#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2499 -#: term-utils/script.c:221 term-utils/script.c:246 term-utils/script.c:694 -#: 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 +#: disk-utils/blockdev.c:446 disk-utils/cfdisk.c:2628 disk-utils/delpart.c:57 +#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:704 disk-utils/fdisk.c:956 +#: disk-utils/fdisk-list.c:299 disk-utils/fdisk-list.c:339 +#: disk-utils/fdisk-list.c:358 disk-utils/fsck.c:1449 +#: 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:819 +#: disk-utils/mkswap.c:216 disk-utils/mkswap.c:255 disk-utils/partx.c:953 +#: disk-utils/resizepart.c:101 disk-utils/sfdisk.c:427 disk-utils/sfdisk.c:483 +#: disk-utils/sfdisk.c:537 disk-utils/sfdisk.c:596 disk-utils/sfdisk.c:663 +#: disk-utils/sfdisk.c:697 disk-utils/sfdisk.c:1193 disk-utils/swaplabel.c:60 +#: libfdisk/src/bsd.c:641 lib/path.c:70 lib/path.c:82 login-utils/islocal.c:87 +#: login-utils/last.c:653 login-utils/sulogin.c:475 login-utils/sulogin.c:512 +#: 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:1121 misc-utils/logger.c:889 misc-utils/mcookie.c:115 +#: misc-utils/uuidd.c:225 sys-utils/blkdiscard.c:154 sys-utils/dmesg.c:522 +#: sys-utils/eject.c:500 sys-utils/eject.c:700 sys-utils/fallocate.c:374 +#: sys-utils/fsfreeze.c:128 sys-utils/fstrim.c:72 sys-utils/hwclock.c:283 +#: sys-utils/hwclock-cmos.c:633 sys-utils/hwclock-rtc.c:162 +#: sys-utils/hwclock-rtc.c:256 sys-utils/hwclock-rtc.c:401 +#: sys-utils/hwclock-rtc.c:422 sys-utils/hwclock-rtc.c:469 +#: sys-utils/ldattach.c:388 sys-utils/nsenter.c:124 sys-utils/rtcwake.c:136 +#: sys-utils/rtcwake.c:265 sys-utils/setpriv.c:230 sys-utils/setpriv.c:529 +#: sys-utils/setpriv.c:552 sys-utils/swapon.c:342 sys-utils/swapon.c:505 +#: sys-utils/switch_root.c:163 sys-utils/unshare.c:102 sys-utils/unshare.c:117 +#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2615 +#: term-utils/script.c:416 term-utils/script.c:422 term-utils/script.c:424 +#: term-utils/script.c:512 term-utils/scriptreplay.c:206 +#: term-utils/scriptreplay.c:209 term-utils/wall.c:331 text-utils/more.c:607 +#: text-utils/rev.c:142 text-utils/tailf.c:66 text-utils/tailf.c:100 +#: text-utils/ul.c:225 #, c-format msgid "cannot open %s" msgstr "打不开 %s" @@ -203,7 +203,7 @@ msgstr "未知命令: %s" msgid "%s requires an argument" msgstr "%s 需要一个参数" -#: disk-utils/blockdev.c:368 disk-utils/blockdev.c:473 +#: disk-utils/blockdev.c:368 disk-utils/blockdev.c:474 #, c-format msgid "ioctl error on %s" msgstr "%s ioctl 出错" @@ -218,407 +218,460 @@ msgstr "%s 失败.\n" msgid "%s succeeded.\n" msgstr "%s 成功.\n" -#: disk-utils/blockdev.c:456 misc-utils/lsblk.c:1135 misc-utils/lsblk.c:1142 +#: disk-utils/blockdev.c:457 misc-utils/lsblk.c:1175 misc-utils/lsblk.c:1182 #, c-format msgid "%s: failed to initialize sysfs handler" msgstr "%s：初始化 sysfs 处理函数失败" -#: disk-utils/blockdev.c:460 +#: disk-utils/blockdev.c:461 #, fuzzy, c-format msgid "%s: failed to read partition start from sysfs" msgstr "%s：读取分区表失败" -#: disk-utils/blockdev.c:481 +#: disk-utils/blockdev.c:482 #, c-format msgid "RO RA SSZ BSZ StartSec Size Device\n" msgstr "RO RA SSZ BSZ 开始段 大小 设备\n" -#: disk-utils/cfdisk.c:171 +#: disk-utils/cfdisk.c:180 msgid "Bootable" msgstr "可启动" -#: disk-utils/cfdisk.c:171 +#: disk-utils/cfdisk.c:180 msgid "Toggle bootable flag of the current partition" msgstr "开关当前分区的 可启动 标志" -#: disk-utils/cfdisk.c:172 +#: disk-utils/cfdisk.c:181 msgid "Delete" msgstr "删除" -#: disk-utils/cfdisk.c:172 +#: disk-utils/cfdisk.c:181 msgid "Delete the current partition" msgstr "删除当前分区" -#: disk-utils/cfdisk.c:173 +#: disk-utils/cfdisk.c:182 msgid "New" msgstr "新建" -#: disk-utils/cfdisk.c:173 +#: disk-utils/cfdisk.c:182 msgid "Create new partition from free space" msgstr "在剩余空间上创建新分区" -#: disk-utils/cfdisk.c:174 +#: disk-utils/cfdisk.c:183 msgid "Quit" msgstr "退出" -#: disk-utils/cfdisk.c:174 +#: disk-utils/cfdisk.c:183 msgid "Quit program without writing partition table" msgstr "退出程序而不写入分区表" -#: 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 +#: disk-utils/cfdisk.c:184 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1016 +#: libfdisk/src/dos.c:2306 libfdisk/src/gpt.c:2763 libfdisk/src/sgi.c:1165 +#: libfdisk/src/sun.c:1113 msgid "Type" msgstr "类型" -#: disk-utils/cfdisk.c:175 +#: disk-utils/cfdisk.c:184 msgid "Change the partition type" msgstr "更改分区类型" -#: disk-utils/cfdisk.c:176 +#: disk-utils/cfdisk.c:185 msgid "Help" msgstr "帮助" -#: disk-utils/cfdisk.c:176 +#: disk-utils/cfdisk.c:185 msgid "Print help screen" msgstr "打印帮助界面" -#: disk-utils/cfdisk.c:177 +#: disk-utils/cfdisk.c:186 msgid "Sort" msgstr "排序" -#: disk-utils/cfdisk.c:177 +#: disk-utils/cfdisk.c:186 msgid "Fix partitions order" msgstr "修复分区顺序" -#: disk-utils/cfdisk.c:178 +#: disk-utils/cfdisk.c:187 msgid "Write" msgstr "写入" -#: disk-utils/cfdisk.c:178 +#: disk-utils/cfdisk.c:187 msgid "Write partition table to disk (this might destroy data)" msgstr "将分区表写入磁盘(可能损坏数据)" -#: disk-utils/cfdisk.c:179 +#: disk-utils/cfdisk.c:188 msgid "Dump" msgstr "" -#: disk-utils/cfdisk.c:179 +#: disk-utils/cfdisk.c:188 #, fuzzy msgid "Dump partition table to sfdisk compatible script file" msgstr "向屏幕或文件打印分区表" -#: disk-utils/cfdisk.c:560 disk-utils/fdisk.c:369 +#: disk-utils/cfdisk.c:627 disk-utils/fdisk.c:406 #, c-format msgid "internal error: unsupported dialog type %d" msgstr "内部错误：不支持的对话类型 %d" -#: disk-utils/cfdisk.c:1375 +#: disk-utils/cfdisk.c:1255 +#, fuzzy, c-format +msgid "%s (mounted)" +msgstr "%s 未挂载" + +#: disk-utils/cfdisk.c:1275 +#, fuzzy +msgid "Partition name:" +msgstr "分区名" + +#: disk-utils/cfdisk.c:1280 +#, fuzzy +msgid "Partition UUID:" +msgstr "分区 UUID" + +#: disk-utils/cfdisk.c:1290 +#, fuzzy +msgid "Partition type:" +msgstr "分区类型" + +#: disk-utils/cfdisk.c:1297 +#, fuzzy +msgid "Attributes:" +msgstr "属性" + +#: disk-utils/cfdisk.c:1340 +#, fuzzy +msgid "Filesystem:" +msgstr "邮件系统" + +#: disk-utils/cfdisk.c:1342 +#, fuzzy +msgid "Filesystem label:" +msgstr "文件系统标签" + +#: disk-utils/cfdisk.c:1346 +#, fuzzy +msgid "Filesystem UUID:" +msgstr "文件系统 UUID" + +#: disk-utils/cfdisk.c:1358 +#, fuzzy +msgid "Mountpoint:" +msgstr "挂载点" + +#: disk-utils/cfdisk.c:1699 #, c-format msgid "Disk: %s" msgstr "磁盘：%s" -#: disk-utils/cfdisk.c:1377 +#: disk-utils/cfdisk.c:1701 #, c-format msgid "Size: %s, %ju bytes, %ju sectors" msgstr "尺寸：%s，%ju 字节，%ju 个扇区" -#: disk-utils/cfdisk.c:1380 +#: disk-utils/cfdisk.c:1704 #, c-format msgid "Label: %s, identifier: %s" msgstr "标签：%s，标识符：%s" -#: disk-utils/cfdisk.c:1383 +#: disk-utils/cfdisk.c:1707 #, c-format msgid "Label: %s" msgstr "标签：%s" -#: disk-utils/cfdisk.c:1537 +#: disk-utils/cfdisk.c:1861 #, 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:1543 +#: disk-utils/cfdisk.c:1867 msgid "Please, specify size." msgstr "请指定文件大小。" -#: disk-utils/cfdisk.c:1565 +#: disk-utils/cfdisk.c:1889 #, fuzzy, c-format msgid "Minimum size is %ju bytes." msgstr "最大尺寸为 %ju 字节。" -#: disk-utils/cfdisk.c:1574 +#: disk-utils/cfdisk.c:1898 #, fuzzy, c-format msgid "Maximum size is %ju bytes." msgstr "最大尺寸为 %ju 字节。" -#: disk-utils/cfdisk.c:1581 +#: disk-utils/cfdisk.c:1905 msgid "Failed to parse size." msgstr "解析大小失败。" -#: disk-utils/cfdisk.c:1639 +#: disk-utils/cfdisk.c:1963 msgid "Select partition type" msgstr "选择分区类型" -#: disk-utils/cfdisk.c:1685 disk-utils/cfdisk.c:1715 +#: disk-utils/cfdisk.c:2009 disk-utils/cfdisk.c:2039 #, fuzzy msgid "Enter script file name: " msgstr "无法写脚本文件" -#: disk-utils/cfdisk.c:1686 +#: disk-utils/cfdisk.c:2010 msgid "The script file will be applied to in-memory partition table." msgstr "" -#: disk-utils/cfdisk.c:1695 disk-utils/cfdisk.c:1737 -#: disk-utils/fdisk-menu.c:463 disk-utils/fdisk-menu.c:501 +#: disk-utils/cfdisk.c:2019 disk-utils/cfdisk.c:2061 +#: disk-utils/fdisk-menu.c:464 disk-utils/fdisk-menu.c:502 #, fuzzy, c-format msgid "Cannot open %s" msgstr "打不开 %s" -#: disk-utils/cfdisk.c:1697 disk-utils/fdisk-menu.c:465 +#: disk-utils/cfdisk.c:2021 disk-utils/fdisk-menu.c:466 #, fuzzy, c-format msgid "Failed to parse script file %s" msgstr "读 typescript 文件 %s 失败" -#: disk-utils/cfdisk.c:1699 disk-utils/fdisk-menu.c:467 +#: disk-utils/cfdisk.c:2023 disk-utils/fdisk-menu.c:468 #, fuzzy, c-format msgid "Failed to apply script %s" msgstr "读 typescript 文件 %s 失败" -#: disk-utils/cfdisk.c:1716 +#: disk-utils/cfdisk.c:2040 msgid "The current in-memory partition table will be dumped to the file." msgstr "" -#: disk-utils/cfdisk.c:1724 disk-utils/fdisk-menu.c:489 +#: disk-utils/cfdisk.c:2048 disk-utils/fdisk-menu.c:490 #, fuzzy msgid "Failed to allocate script handler" msgstr "分配 GPT 头失败" -#: disk-utils/cfdisk.c:1730 +#: disk-utils/cfdisk.c:2054 #, fuzzy msgid "Failed to read disk layout into script." msgstr "向输出添加行出错" -#: disk-utils/cfdisk.c:1744 +#: disk-utils/cfdisk.c:2068 msgid "Disk layout successfully dumped." msgstr "" -#: disk-utils/cfdisk.c:1747 disk-utils/fdisk-menu.c:507 +#: disk-utils/cfdisk.c:2071 disk-utils/fdisk-menu.c:508 #, fuzzy, c-format msgid "Failed to write script %s" msgstr "读 typescript 文件 %s 失败" -#: disk-utils/cfdisk.c:1783 +#: disk-utils/cfdisk.c:2107 msgid "Select label type" msgstr "选择标签类型" -#: disk-utils/cfdisk.c:1786 disk-utils/fdisk.c:872 +#: disk-utils/cfdisk.c:2110 disk-utils/fdisk.c:961 msgid "Device does not contain a recognized partition table." msgstr "设备不包含可识别的分区表。" -#: disk-utils/cfdisk.c:1792 +#: disk-utils/cfdisk.c:2116 msgid "Select a type to create a new label or press 'L' to load script file." msgstr "" # 以下三句连贯，一起翻译 -#: disk-utils/cfdisk.c:1837 +#: disk-utils/cfdisk.c:2161 #, fuzzy msgid "This is cfdisk, a curses-based disk partitioning program." msgstr "这是 cfdisk，一款基于 curses 的磁盘分区程序，" -#: disk-utils/cfdisk.c:1838 +#: disk-utils/cfdisk.c:2162 #, fuzzy msgid "It lets you create, delete, and modify partitions on a block device." msgstr "您可以通过它创建、删除和修改您硬盘驱动器上的" # 以下两条注意对齐 -#: disk-utils/cfdisk.c:1840 +#: disk-utils/cfdisk.c:2164 msgid "Command Meaning" msgstr "命令 意义" -#: disk-utils/cfdisk.c:1841 +#: disk-utils/cfdisk.c:2165 msgid "------- -------" msgstr "------- -------" -#: disk-utils/cfdisk.c:1842 +#: disk-utils/cfdisk.c:2166 msgid " b Toggle bootable flag of the current partition" msgstr " b 切换当前分区的 可启动 标志" -#: disk-utils/cfdisk.c:1843 +#: disk-utils/cfdisk.c:2167 msgid " d Delete the current partition" msgstr " d 删除当前分区" -#: disk-utils/cfdisk.c:1844 +#: disk-utils/cfdisk.c:2168 msgid " h Print this screen" msgstr " h 打印此屏幕" -#: disk-utils/cfdisk.c:1845 +#: disk-utils/cfdisk.c:2169 msgid " n Create new partition from free space" msgstr " n 从空闲空间创建新分区" -#: disk-utils/cfdisk.c:1846 +#: disk-utils/cfdisk.c:2170 msgid " q Quit program without writing partition table" msgstr " q 退出程序但不写入分区表" -#: disk-utils/cfdisk.c:1847 +#: disk-utils/cfdisk.c:2171 msgid " s Fix partitions order (only when in disarray)" msgstr " s 修复分区顺序(仅磁盘阵列)" -#: disk-utils/cfdisk.c:1848 +#: disk-utils/cfdisk.c:2172 msgid " t Change the partition type" msgstr " t 更改分区类型" -#: disk-utils/cfdisk.c:1849 +#: disk-utils/cfdisk.c:2173 msgid " u Dump disk layout to sfdisk compatible script file" msgstr "" -#: disk-utils/cfdisk.c:1850 +#: disk-utils/cfdisk.c:2174 #, fuzzy msgid " W Write partition table to disk (you must enter uppercase W);" msgstr " W 将分区表写入磁盘(必须输入大写 W)" -#: disk-utils/cfdisk.c:1851 +#: disk-utils/cfdisk.c:2175 #, fuzzy msgid " since this might destroy data on the disk, you must either" msgstr " 由于这可能破坏磁盘上的数据，您必须" -#: disk-utils/cfdisk.c:1852 +#: disk-utils/cfdisk.c:2176 #, fuzzy msgid " confirm or deny the write by entering 'yes' or 'no'" msgstr " 通过输入“yes”或“no”来确实或拒绝" -#: disk-utils/cfdisk.c:1853 +#: disk-utils/cfdisk.c:2177 +#, fuzzy +msgid " x Display/hide extra information about a partition" +msgstr " -V 显示版本信息并退出\n" + +#: disk-utils/cfdisk.c:2178 msgid "Up Arrow Move cursor to the previous partition" msgstr "上箭头 光标移到上一分区" -#: disk-utils/cfdisk.c:1854 +#: disk-utils/cfdisk.c:2179 msgid "Down Arrow Move cursor to the next partition" msgstr "下箭头 光标移到下一分区" -#: disk-utils/cfdisk.c:1855 +#: disk-utils/cfdisk.c:2180 msgid "Left Arrow Move cursor to the previous menu item" msgstr "上箭头 光标移到上一菜单项" -#: disk-utils/cfdisk.c:1856 +#: disk-utils/cfdisk.c:2181 msgid "Right Arrow Move cursor to the next menu item" msgstr "下箭头 光标移到下一菜单项" -#: disk-utils/cfdisk.c:1858 +#: disk-utils/cfdisk.c:2183 msgid "Note: All of the commands can be entered with either upper or lower" msgstr "注：所有命令均可以大写或小写" -#: disk-utils/cfdisk.c:1859 +#: disk-utils/cfdisk.c:2184 #, fuzzy msgid "case letters (except for Write)." msgstr "字母输入(写入命令除外)。" -#: disk-utils/cfdisk.c:1861 +#: disk-utils/cfdisk.c:2186 msgid "Use lsblk(8) or partx(8) to see more details about the device." msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。" -#: disk-utils/cfdisk.c:1868 +#: disk-utils/cfdisk.c:2193 msgid "Press a key to continue." msgstr "按下一个键继续。" -#: disk-utils/cfdisk.c:1949 +#: disk-utils/cfdisk.c:2275 msgid "Could not toggle the flag." msgstr "无法切换标志。" -#: disk-utils/cfdisk.c:1959 +#: disk-utils/cfdisk.c:2285 #, c-format msgid "Could not delete partition %zu." msgstr "无法删除分区 %zu。" -#: disk-utils/cfdisk.c:1961 disk-utils/fdisk-menu.c:590 +#: disk-utils/cfdisk.c:2287 disk-utils/fdisk-menu.c:597 #, c-format msgid "Partition %zu has been deleted." msgstr "分区 %zu 已删除。" -#: disk-utils/cfdisk.c:1982 +#: disk-utils/cfdisk.c:2308 msgid "Partition size: " msgstr "分区大小：" -#: disk-utils/cfdisk.c:2023 +#: disk-utils/cfdisk.c:2349 #, c-format msgid "Changed type of partition %zu." msgstr "已更改分区 %zu 的类型。" -#: disk-utils/cfdisk.c:2025 +#: disk-utils/cfdisk.c:2351 #, c-format msgid "The type of partition %zu is unchanged." msgstr "分区 %zu 的类型未更改。" -#: disk-utils/cfdisk.c:2042 +#: disk-utils/cfdisk.c:2368 #, fuzzy msgid "Device is open in read-only mode." msgstr "设备以只读方式打开。" -#: disk-utils/cfdisk.c:2047 +#: disk-utils/cfdisk.c:2373 msgid "Are you sure you want to write the partition table to disk? " msgstr "您确定想将分区表写入磁盘吗？" -#: disk-utils/cfdisk.c:2049 +#: disk-utils/cfdisk.c:2375 msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog." msgstr "输入“yes”或“no”或按 ESC 取消对话框。" -#: disk-utils/cfdisk.c:2054 login-utils/lslogins.c:210 sys-utils/lscpu.c:1263 -#: sys-utils/lscpu.c:1273 +#: disk-utils/cfdisk.c:2380 login-utils/lslogins.c:208 sys-utils/lscpu.c:1267 +#: sys-utils/lscpu.c:1277 msgid "yes" msgstr "是" -#: disk-utils/cfdisk.c:2055 +#: disk-utils/cfdisk.c:2381 #, fuzzy msgid "Did not write partition table to disk." msgstr "不将分区表写入磁盘" -#: disk-utils/cfdisk.c:2060 +#: disk-utils/cfdisk.c:2386 #, fuzzy msgid "Failed to write disklabel." msgstr "写磁盘标签失败" -#: disk-utils/cfdisk.c:2063 disk-utils/fdisk-menu.c:545 +#: disk-utils/cfdisk.c:2389 disk-utils/fdisk-menu.c:546 msgid "The partition table has been altered." msgstr "分区表已调整。" -#: disk-utils/cfdisk.c:2085 disk-utils/cfdisk.c:2130 +#: disk-utils/cfdisk.c:2412 disk-utils/cfdisk.c:2474 msgid "Note that partition table entries are not in disk order now." msgstr "注意，现在分区表记录没有按磁盘顺序。" -#: disk-utils/cfdisk.c:2110 +#: disk-utils/cfdisk.c:2451 msgid "failed to create a new disklabel" msgstr "创建新磁盘标签失败" -#: disk-utils/cfdisk.c:2118 +#: disk-utils/cfdisk.c:2459 msgid "failed to read partitions" msgstr "读分区失败" -#: disk-utils/cfdisk.c:2128 disk-utils/fdisk.c:864 disk-utils/fdisk-menu.c:537 +#: disk-utils/cfdisk.c:2472 disk-utils/fdisk.c:953 disk-utils/fdisk-menu.c:538 msgid "Device open in read-only mode." msgstr "设备以只读方式打开。" -#: disk-utils/cfdisk.c:2200 +#: disk-utils/cfdisk.c:2548 #, c-format msgid " %1$s [options] <disk>\n" msgstr " %1$s [选项] <磁盘>\n" -#: disk-utils/cfdisk.c:2203 disk-utils/fdisk.c:642 disk-utils/sfdisk.c:1316 +#: disk-utils/cfdisk.c:2551 disk-utils/fdisk.c:722 disk-utils/sfdisk.c:1431 #, fuzzy msgid "Display or manipulate a disk partition table.\n" msgstr "%s：读取分区表失败" -#: disk-utils/cfdisk.c:2206 -msgid " -L --color[=<when>] colorize output (auto, always or never)\n" +#: disk-utils/cfdisk.c:2554 +#, fuzzy +msgid " -L, --color[=<when>] colorize output (auto, always or never)\n" msgstr " -L --color[=<何时>] 彩色输出(auto自动，always总是或never从不)\n" -#: disk-utils/cfdisk.c:2207 -msgid " -z --zero start with zeroed partition table\n" +#: disk-utils/cfdisk.c:2557 +#, fuzzy +msgid " -z, --zero start with zeroed partition table\n" msgstr " -z, --zero 以空分区表开始\n" -#: disk-utils/cfdisk.c:2246 disk-utils/fdisk.c:774 misc-utils/cal.c:374 -#: sys-utils/dmesg.c:1318 text-utils/hexdump.c:114 +#: disk-utils/cfdisk.c:2596 disk-utils/fdisk.c:863 disk-utils/sfdisk.c:1664 +#: misc-utils/cal.c:402 sys-utils/dmesg.c:1333 text-utils/hexdump.c:114 msgid "unsupported color mode" msgstr "不支持的颜色模式" -#: disk-utils/cfdisk.c:2264 disk-utils/fdisk.c:714 disk-utils/sfdisk.c:193 +#: disk-utils/cfdisk.c:2614 disk-utils/fdisk.c:799 disk-utils/sfdisk.c:212 msgid "failed to allocate libfdisk context" msgstr "分配 libfdisk 环境(context)失败" @@ -668,9 +721,9 @@ msgstr "" "柱面 %d 中有坏数据\n" "继续 ... " -#: disk-utils/fdformat.c:143 disk-utils/fsck.minix.c:196 +#: disk-utils/fdformat.c:143 disk-utils/fsck.minix.c:183 #: disk-utils/swaplabel.c:117 misc-utils/wipefs.c:452 -#: sys-utils/blkdiscard.c:63 sys-utils/tunelp.c:89 +#: sys-utils/blkdiscard.c:63 sys-utils/tunelp.c:91 #, c-format msgid " %s [options] <device>\n" msgstr " %s [选项] <设备>\n" @@ -717,18 +770,18 @@ msgstr "无效参数：%s" #: disk-utils/fdformat.c:220 disk-utils/fsck.cramfs.c:146 #: disk-utils/mkfs.bfs.c:185 disk-utils/mkfs.cramfs.c:331 #: disk-utils/mkfs.cramfs.c:751 disk-utils/mkfs.cramfs.c:788 -#: disk-utils/mkfs.minix.c:750 disk-utils/mkswap.c:242 disk-utils/partx.c:891 -#: login-utils/last.c:673 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 +#: disk-utils/mkfs.minix.c:813 disk-utils/mkswap.c:242 disk-utils/partx.c:892 +#: login-utils/last.c:667 login-utils/utmpdump.c:129 misc-utils/namei.c:231 +#: misc-utils/rename.c:63 sys-utils/blkdiscard.c:157 sys-utils/dmesg.c:524 +#: sys-utils/fallocate.c:198 sys-utils/fsfreeze.c:131 sys-utils/fstrim.c:77 +#: sys-utils/swapon.c:479 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 +#: text-utils/tailf.c:103 text-utils/tailf.c:280 #, fuzzy, c-format msgid "stat of %s failed" msgstr "stat 失败" -#: disk-utils/fdformat.c:223 disk-utils/partx.c:949 misc-utils/lsblk.c:1397 +#: disk-utils/fdformat.c:223 disk-utils/partx.c:950 misc-utils/lsblk.c:1468 #: sys-utils/blkdiscard.c:159 sys-utils/mountpoint.c:107 #, c-format msgid "%s: not a block device" @@ -769,12 +822,12 @@ msgstr "" msgid "user defined start track exceeds the user defined end track" msgstr "" -#: disk-utils/fdformat.c:253 misc-utils/logger.c:538 +#: disk-utils/fdformat.c:253 misc-utils/logger.c:695 #, fuzzy msgid "close failed" msgstr "关闭失败：%s" -#: disk-utils/fdisk.c:73 +#: disk-utils/fdisk.c:93 disk-utils/fdisk.c:109 #, c-format msgid "" "\n" @@ -783,90 +836,96 @@ msgstr "" "\n" "您确实要退出吗？" -#: disk-utils/fdisk.c:119 +#: disk-utils/fdisk.c:156 #, c-format msgid "Select (default %c): " msgstr "选择 (默认 %c)：" -#: disk-utils/fdisk.c:124 +#: disk-utils/fdisk.c:161 #, c-format msgid "Using default response %c." msgstr "将使用默认回应 %c。" -#: disk-utils/fdisk.c:137 disk-utils/fdisk.c:210 disk-utils/fdisk.c:281 +#: disk-utils/fdisk.c:174 disk-utils/fdisk.c:247 disk-utils/fdisk.c:318 +#: libfdisk/src/dos.c:1189 libfdisk/src/gpt.c:2254 msgid "Value out of range." msgstr "值超出范围。" -#: disk-utils/fdisk.c:166 +#: disk-utils/fdisk.c:203 #, c-format msgid "%s (%s, default %c): " msgstr "%s (%s，默认 %c)：" -#: disk-utils/fdisk.c:169 disk-utils/fdisk.c:235 +#: disk-utils/fdisk.c:206 disk-utils/fdisk.c:272 #, c-format msgid "%s (%s, default %ju): " msgstr "%s (%s，默认 %ju)：" -#: disk-utils/fdisk.c:174 +#: disk-utils/fdisk.c:211 #, c-format msgid "%s (%c-%c, default %c): " msgstr "%s (%c-%c，默认为 %c)：" -#: disk-utils/fdisk.c:177 disk-utils/fdisk.c:237 +#: disk-utils/fdisk.c:214 disk-utils/fdisk.c:274 #, c-format msgid "%s (%ju-%ju, default %ju): " msgstr "%s (%ju-%ju，默认 %ju)：" -#: disk-utils/fdisk.c:180 +#: disk-utils/fdisk.c:217 #, c-format msgid "%s (%c-%c): " msgstr "%s (%c-%c)：" -#: disk-utils/fdisk.c:183 disk-utils/fdisk.c:239 +#: disk-utils/fdisk.c:220 disk-utils/fdisk.c:276 #, c-format msgid "%s (%ju-%ju): " msgstr "%s (%ju-%ju): " -#: disk-utils/fdisk.c:346 disk-utils/sfdisk.c:166 +#: disk-utils/fdisk.c:383 disk-utils/sfdisk.c:186 msgid " [Y]es/[N]o: " msgstr "是[Y]/否[N]：" -#: disk-utils/fdisk.c:387 +#: disk-utils/fdisk.c:424 msgid "Partition type (type L to list all types): " msgstr "分区类型(输入 L 列出所有类型)：" -#: disk-utils/fdisk.c:388 +#: disk-utils/fdisk.c:425 msgid "Hex code (type L to list all codes): " msgstr "Hex 代码(输入 L 列出所有代码)：" -#: disk-utils/fdisk.c:485 +#: disk-utils/fdisk.c:522 msgid "DOS Compatibility flag is set (DEPRECATED!)" msgstr "已设置 DOS 兼容性标志(已废弃！)" -#: disk-utils/fdisk.c:486 +#: disk-utils/fdisk.c:523 msgid "DOS Compatibility flag is not set" msgstr "DOS 兼容性标志未设置" -#: disk-utils/fdisk.c:507 +#: disk-utils/fdisk.c:544 disk-utils/fdisk.c:580 #, c-format msgid "Partition %zu does not exist yet!" msgstr "分区 %zu 还不存在！" -#: disk-utils/fdisk.c:512 disk-utils/fdisk.c:521 libfdisk/src/ask.c:999 +#: disk-utils/fdisk.c:549 disk-utils/fdisk.c:558 libfdisk/src/ask.c:999 msgid "Unknown" msgstr "未知" -#: disk-utils/fdisk.c:520 +#: disk-utils/fdisk.c:557 #, c-format msgid "Changed type of partition '%s' to '%s'." msgstr "已将分区“%s”的类型更改为“%s”。" -#: disk-utils/fdisk.c:524 +#: disk-utils/fdisk.c:561 #, c-format msgid "Type of partition %zu is unchanged: %s." msgstr "分区 %zu 的类型未更改：%s。" -#: disk-utils/fdisk.c:577 +#: disk-utils/fdisk.c:600 +#, fuzzy, c-format +msgid "%15s: %s" +msgstr "磁盘：%s" + +#: disk-utils/fdisk.c:657 #, c-format msgid "" "\n" @@ -875,25 +934,25 @@ msgstr "" "\n" "%s: 偏移 = %ju, 大小 = %zu 字节。" -#: disk-utils/fdisk.c:583 +#: disk-utils/fdisk.c:663 msgid "cannot seek" msgstr "无法 seek" -#: disk-utils/fdisk.c:588 +#: disk-utils/fdisk.c:668 msgid "cannot read" msgstr "不能读" -#: disk-utils/fdisk.c:601 libfdisk/src/bsd.c:260 libfdisk/src/dos.c:946 -#: libfdisk/src/gpt.c:2044 +#: disk-utils/fdisk.c:681 libfdisk/src/bsd.c:259 libfdisk/src/dos.c:933 +#: libfdisk/src/gpt.c:2187 msgid "First sector" msgstr "第一个扇区" -#: disk-utils/fdisk.c:628 +#: disk-utils/fdisk.c:708 #, c-format msgid "BLKGETSIZE ioctl failed on %s" msgstr "对 %s 进行 BLKGETSIZE ioctl 失败" -#: disk-utils/fdisk.c:637 +#: disk-utils/fdisk.c:717 #, c-format msgid "" " %1$s [options] <disk> change partition table\n" @@ -902,96 +961,100 @@ msgstr "" " %1$s [选项] <磁盘> 更改分区表\n" " %1$s [选项] -l <磁盘> 列出分区表\n" -#: disk-utils/fdisk.c:645 +#: disk-utils/fdisk.c:725 msgid " -b, --sector-size <size> physical and logical sector size\n" msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n" -#: disk-utils/fdisk.c:646 +#: disk-utils/fdisk.c:726 +msgid " -B, --protect-boot don't erase bootbits when creat a new label\n" +msgstr "" + +#: disk-utils/fdisk.c:727 msgid " -c, --compatibility[=<mode>] mode is 'dos' or 'nondos' (default)\n" msgstr " -c, --compatibility[=<模式>] 模式，为“dos”或“nondos”(默认)\n" -#: disk-utils/fdisk.c:647 +#: disk-utils/fdisk.c:728 msgid " -L, --color[=<when>] colorize output (auto, always or never)\n" msgstr " -L, --color[=<时机>] 彩色输出(auto, always 或 never)\n" -#: disk-utils/fdisk.c:648 +#: disk-utils/fdisk.c:731 msgid " -l, --list display partitions end exit\n" msgstr " -l, --list 显示分区信息并退出\n" -#: disk-utils/fdisk.c:649 +#: disk-utils/fdisk.c:732 #, fuzzy msgid " -o, --output <list> output columns\n" msgstr " -o, --output <列表> 输出列\n" -#: disk-utils/fdisk.c:650 +#: disk-utils/fdisk.c:733 msgid " -t, --type <type> recognize specified partition table type only\n" msgstr " -t, --type <类型> 只识别指定的分区表类型\n" -#: disk-utils/fdisk.c:651 +#: disk-utils/fdisk.c:734 msgid " -u, --units[=<unit>] display units: 'cylinders' or 'sectors' (default)\n" msgstr " -u, --units[=<单位>] 显示单位，“cylinders”柱面或“sectors”扇区(默认)\n" -#: disk-utils/fdisk.c:652 +#: disk-utils/fdisk.c:735 msgid " -s, --getsz display device size in 512-byte sectors [DEPRECATED]\n" msgstr " -s, --getsz 以 512-字节扇区显示设备大小[已废弃]\n" -#: disk-utils/fdisk.c:653 +#: disk-utils/fdisk.c:736 #, fuzzy msgid " --bytes print SIZE in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" -#: disk-utils/fdisk.c:656 +#: disk-utils/fdisk.c:739 msgid " -C, --cylinders <number> specify the number of cylinders\n" msgstr " -C, --cylinders <数字> 指定柱面数\n" -#: disk-utils/fdisk.c:657 +#: disk-utils/fdisk.c:740 msgid " -H, --heads <number> specify the number of heads\n" msgstr " -H, --heads <数字> 指定磁头数\n" -#: disk-utils/fdisk.c:658 +#: disk-utils/fdisk.c:741 msgid " -S, --sectors <number> specify the number of sectors per track\n" msgstr " -S, --sectors <数字> 指定每条磁道的扇区数\n" -#: disk-utils/fdisk.c:724 +#: disk-utils/fdisk.c:809 msgid "invalid sector size argument" msgstr "无效的 扇区大小 参数" -#: disk-utils/fdisk.c:733 +#: disk-utils/fdisk.c:821 msgid "invalid cylinders argument" msgstr "无效的 柱面数 参数" -#: disk-utils/fdisk.c:745 +#: disk-utils/fdisk.c:833 msgid "not found DOS label driver" msgstr "未找到 DOS 标签驱动" -#: disk-utils/fdisk.c:751 +#: disk-utils/fdisk.c:839 #, c-format msgid "unknown compatibility mode '%s'" msgstr "未知兼容模式“%s”" -#: disk-utils/fdisk.c:760 +#: disk-utils/fdisk.c:848 msgid "invalid heads argument" msgstr "无效的 磁头数 参数" -#: disk-utils/fdisk.c:766 +#: disk-utils/fdisk.c:854 msgid "invalid sectors argument" msgstr "无效的 扇区数 参数" -#: disk-utils/fdisk.c:791 +#: disk-utils/fdisk.c:880 #, c-format msgid "unsupported disklabel: %s" msgstr "不支持的磁盘标签：%s" -#: disk-utils/fdisk.c:816 +#: disk-utils/fdisk.c:905 msgid "The device properties (sector size and geometry) should be used with one specified device only." msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。" -#: disk-utils/fdisk.c:855 +#: disk-utils/fdisk.c:944 #, c-format msgid "Welcome to fdisk (%s)." msgstr "欢迎使用 fdisk (%s)。" -#: disk-utils/fdisk.c:857 disk-utils/sfdisk.c:1137 +#: disk-utils/fdisk.c:946 disk-utils/sfdisk.c:1239 msgid "" "Changes will remain in memory only, until you decide to write them.\n" "Be careful before using the write command.\n" @@ -999,7 +1062,7 @@ msgstr "" "更改将停留在内存中，直到您决定将更改写入磁盘。\n" "使用写入命令前请三思。\n" -#: disk-utils/fdisk.c:877 +#: disk-utils/fdisk.c:966 msgid "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert command 'M')." msgstr "检测到混合 GPT。您需要手动同步混合 MBR (用专家命令“M”)" @@ -1013,12 +1076,12 @@ msgstr "Disk %s：%s，%ju 字节，%ju 个扇区" msgid "Geometry: %d heads, %llu sectors/track, %llu cylinders" msgstr "几何属性：%d 个磁头, %llu 个扇区/磁道, %llu 个柱面" -#: disk-utils/fdisk-list.c:59 +#: disk-utils/fdisk-list.c:59 disk-utils/fdisk-list.c:271 #, c-format msgid "Units: %s of %d * %ld = %ld bytes" msgstr "单元：%s / %d * %ld = %ld 字节" -#: disk-utils/fdisk-list.c:65 +#: disk-utils/fdisk-list.c:65 disk-utils/fdisk-list.c:277 #, c-format msgid "Sector size (logical/physical): %lu bytes / %lu bytes" msgstr "扇区大小(逻辑/物理)：%lu 字节 / %lu 字节" @@ -1043,16 +1106,17 @@ msgstr "磁盘标签类型：%s" msgid "Disk identifier: %s" msgstr "磁盘标识符：%s" -#: disk-utils/fdisk-list.c:107 disk-utils/fsck.c:1228 +#: disk-utils/fdisk-list.c:107 disk-utils/fdisk-list.c:217 +#: disk-utils/fsck.c:1245 msgid "failed to allocate iterator" msgstr "分配迭代器失败" -#: disk-utils/fdisk-list.c:113 +#: disk-utils/fdisk-list.c:113 disk-utils/fdisk-list.c:223 #, fuzzy msgid "failed to allocate output table" msgstr "初始化输出表失败" -#: disk-utils/fdisk-list.c:154 +#: disk-utils/fdisk-list.c:154 disk-utils/fdisk-list.c:247 #, fuzzy msgid "failed to allocate output line" msgstr "初始化输出行失败" @@ -1066,7 +1130,32 @@ msgstr "分区 %i 未起始于物理扇区边界。\n" msgid "Partition table entries are not in disk order." msgstr "分区表记录没有按磁盘顺序。" -#: disk-utils/fdisk-list.c:290 +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1011 libfdisk/src/dos.c:2300 +#: libfdisk/src/gpt.c:2759 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1107 +msgid "Start" +msgstr "起点" + +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1012 libfdisk/src/dos.c:2301 +#: libfdisk/src/gpt.c:2760 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1108 +msgid "End" +msgstr "末尾" + +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1013 libfdisk/src/dos.c:2302 +#: libfdisk/src/gpt.c:2761 libfdisk/src/sgi.c:1161 libfdisk/src/sun.c:1109 +msgid "Sectors" +msgstr "扇区" + +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2304 +#: libfdisk/src/gpt.c:2762 libfdisk/src/sgi.c:1163 libfdisk/src/sun.c:1111 +msgid "Size" +msgstr "大小" + +#: disk-utils/fdisk-list.c:265 +#, fuzzy, c-format +msgid "Unpartitioned space %s: %s, %ju bytes, %ju sectors" +msgstr "Disk %s：%s，%ju 字节，%ju 个扇区" + +#: disk-utils/fdisk-list.c:412 #, fuzzy, c-format msgid "" "\n" @@ -1075,7 +1164,7 @@ msgstr "" "\n" "可用列(用于 --show)：\n" -#: disk-utils/fdisk-list.c:331 +#: disk-utils/fdisk-list.c:453 #, fuzzy, c-format msgid "%s unknown column: %s" msgstr "未知列: %s" @@ -1089,266 +1178,276 @@ msgid "delete a partition" msgstr "删除分区" #: disk-utils/fdisk-menu.c:97 +#, fuzzy +msgid "list free unpartitioned space" +msgstr "列出扩展分区" + +#: disk-utils/fdisk-menu.c:98 msgid "list known partition types" msgstr "列出已知分区类型" -#: disk-utils/fdisk-menu.c:98 +#: disk-utils/fdisk-menu.c:99 msgid "add a new partition" msgstr "添加新分区" -#: disk-utils/fdisk-menu.c:99 +#: disk-utils/fdisk-menu.c:100 msgid "print the partition table" msgstr "打印分区表" -#: disk-utils/fdisk-menu.c:100 +#: disk-utils/fdisk-menu.c:101 msgid "change a partition type" msgstr "更改分区类型" -#: disk-utils/fdisk-menu.c:101 +#: disk-utils/fdisk-menu.c:102 msgid "verify the partition table" msgstr "检查分区表" #: disk-utils/fdisk-menu.c:103 +#, fuzzy +msgid "print information about a partition" +msgstr "%s：不是一个块设备" + +#: disk-utils/fdisk-menu.c:105 msgid "print the raw data of the first sector from the device" msgstr "打印设备第1个扇区的原始数据" -#: disk-utils/fdisk-menu.c:104 +#: disk-utils/fdisk-menu.c:106 msgid "print the raw data of the disklabel from the device" msgstr "打印设备磁盘标签的原始数据" -#: disk-utils/fdisk-menu.c:105 +#: disk-utils/fdisk-menu.c:107 msgid "fix partitions order" msgstr "修复分区顺序" -#: disk-utils/fdisk-menu.c:107 +#: disk-utils/fdisk-menu.c:109 msgid "Misc" msgstr "杂项" -#: disk-utils/fdisk-menu.c:108 +#: disk-utils/fdisk-menu.c:110 msgid "print this menu" msgstr "打印此菜单" -#: disk-utils/fdisk-menu.c:109 +#: disk-utils/fdisk-menu.c:111 msgid "change display/entry units" msgstr "更改 显示/记录 单位" -#: disk-utils/fdisk-menu.c:110 +#: disk-utils/fdisk-menu.c:112 msgid "extra functionality (experts only)" msgstr "更多功能(仅限专业人员)" -#: disk-utils/fdisk-menu.c:112 +#: disk-utils/fdisk-menu.c:114 msgid "Script" msgstr "" -#: disk-utils/fdisk-menu.c:113 +#: disk-utils/fdisk-menu.c:115 msgid "load disk layout from sfdisk script file" msgstr "" -#: disk-utils/fdisk-menu.c:114 +#: disk-utils/fdisk-menu.c:116 msgid "dump disk layout to sfdisk script file" msgstr "" -#: disk-utils/fdisk-menu.c:116 +#: disk-utils/fdisk-menu.c:118 msgid "Save & Exit" msgstr "保存并退出" -#: disk-utils/fdisk-menu.c:117 +#: disk-utils/fdisk-menu.c:119 msgid "write table to disk and exit" msgstr "将分区表写入磁盘并退出" -#: disk-utils/fdisk-menu.c:118 +#: disk-utils/fdisk-menu.c:120 msgid "write table to disk" msgstr "将分区表写入磁盘" -#: disk-utils/fdisk-menu.c:119 +#: disk-utils/fdisk-menu.c:121 msgid "quit without saving changes" msgstr "退出而不保存更改" -#: disk-utils/fdisk-menu.c:120 +#: disk-utils/fdisk-menu.c:122 msgid "return to main menu" msgstr "返回主菜单" -#: disk-utils/fdisk-menu.c:122 +#: disk-utils/fdisk-menu.c:124 msgid "return from BSD to DOS" msgstr "从 BSD 回到 DOS" -#: disk-utils/fdisk-menu.c:133 +#: disk-utils/fdisk-menu.c:135 msgid "Create a new label" msgstr "新建空磁盘标签" -#: disk-utils/fdisk-menu.c:134 +#: disk-utils/fdisk-menu.c:136 msgid "create a new empty GPT partition table" msgstr "新建一份 GPT 分区表" -#: disk-utils/fdisk-menu.c:135 +#: disk-utils/fdisk-menu.c:137 msgid "create a new empty SGI (IRIX) partition table" msgstr "新建一份空 GPT (IRIX) 分区表" -#: disk-utils/fdisk-menu.c:136 +#: disk-utils/fdisk-menu.c:138 msgid "create a new empty DOS partition table" msgstr "新建一份的空 DOS 分区表" -#: disk-utils/fdisk-menu.c:137 +#: disk-utils/fdisk-menu.c:139 msgid "create a new empty Sun partition table" msgstr "新建一份空 Sun 分区表" -#: disk-utils/fdisk-menu.c:141 +#: disk-utils/fdisk-menu.c:143 msgid "create an IRIX (SGI) partition table" msgstr "创建一份 IRIX(SGI) 分区表" -#: disk-utils/fdisk-menu.c:150 +#: disk-utils/fdisk-menu.c:152 msgid "Geometry" msgstr "几何属性" -#: disk-utils/fdisk-menu.c:151 +#: disk-utils/fdisk-menu.c:153 msgid "change number of cylinders" msgstr "更改柱面数" -#: disk-utils/fdisk-menu.c:152 +#: disk-utils/fdisk-menu.c:154 msgid "change number of heads" msgstr "更改磁头数" -#: disk-utils/fdisk-menu.c:153 +#: disk-utils/fdisk-menu.c:155 msgid "change number of sectors/track" msgstr "更改扇区/磁道数" -#: disk-utils/fdisk-menu.c:162 include/pt-mbr-partnames.h:91 +#: disk-utils/fdisk-menu.c:164 include/pt-mbr-partnames.h:92 msgid "GPT" msgstr "GPT" -#: disk-utils/fdisk-menu.c:163 +#: disk-utils/fdisk-menu.c:165 msgid "change disk GUID" msgstr "更改磁盘 GUID" -#: disk-utils/fdisk-menu.c:164 +#: disk-utils/fdisk-menu.c:166 msgid "change partition name" msgstr "更改分区名" -#: disk-utils/fdisk-menu.c:165 +#: disk-utils/fdisk-menu.c:167 msgid "change partition UUID" msgstr "更改分区 UUID" -#: disk-utils/fdisk-menu.c:166 +#: disk-utils/fdisk-menu.c:168 msgid "enter protective/hybrid MBR" msgstr "进入 保护/混合 MBR" -#: disk-utils/fdisk-menu.c:169 +#: disk-utils/fdisk-menu.c:171 msgid "toggle the legacy BIOS bootable flag" msgstr "开关旧 BIOS 的 可启动 标志" -#: disk-utils/fdisk-menu.c:170 +#: disk-utils/fdisk-menu.c:172 msgid "toggle the no block IO protocol flag" msgstr "开关 不阻塞 IO 协议 标志" -#: disk-utils/fdisk-menu.c:171 +#: disk-utils/fdisk-menu.c:173 msgid "toggle the required partition flag" msgstr "开关 必需分区 标志" -#: disk-utils/fdisk-menu.c:172 +#: disk-utils/fdisk-menu.c:174 msgid "toggle the GUID specific bits" msgstr "开/关 GUID 特定位" -#: disk-utils/fdisk-menu.c:182 +#: disk-utils/fdisk-menu.c:184 msgid "Sun" msgstr "Sun" -#: disk-utils/fdisk-menu.c:183 +#: disk-utils/fdisk-menu.c:185 msgid "toggle the read-only flag" msgstr "开关 只读 标志" -#: disk-utils/fdisk-menu.c:184 +#: disk-utils/fdisk-menu.c:186 msgid "toggle the mountable flag" msgstr "开关 可挂臷 标志" -#: disk-utils/fdisk-menu.c:186 +#: disk-utils/fdisk-menu.c:188 msgid "change number of alternate cylinders" msgstr "更改备选柱面数" -#: disk-utils/fdisk-menu.c:187 +#: disk-utils/fdisk-menu.c:189 msgid "change number of extra sectors per cylinder" msgstr "更改每柱面的额外扇区数" -#: disk-utils/fdisk-menu.c:188 +#: disk-utils/fdisk-menu.c:190 msgid "change interleave factor" msgstr "更改交错系数" -#: disk-utils/fdisk-menu.c:189 +#: disk-utils/fdisk-menu.c:191 msgid "change rotation speed (rpm)" msgstr "更改转速(转/分)" -#: disk-utils/fdisk-menu.c:190 +#: disk-utils/fdisk-menu.c:192 msgid "change number of physical cylinders" msgstr "更改物理柱面数" -#: disk-utils/fdisk-menu.c:199 +#: disk-utils/fdisk-menu.c:201 msgid "SGI" msgstr "SGI" -#: disk-utils/fdisk-menu.c:200 +#: disk-utils/fdisk-menu.c:202 msgid "select bootable partition" msgstr "选择可启动分区" -#: disk-utils/fdisk-menu.c:201 +#: disk-utils/fdisk-menu.c:203 msgid "edit bootfile entry" msgstr "编辑启动文件记录" -#: disk-utils/fdisk-menu.c:202 +#: disk-utils/fdisk-menu.c:204 msgid "select sgi swap partition" msgstr "选择 sgi 交换分区" -#: disk-utils/fdisk-menu.c:203 +#: disk-utils/fdisk-menu.c:205 msgid "create SGI info" msgstr "创建 SGI 信息" -#: disk-utils/fdisk-menu.c:212 +#: disk-utils/fdisk-menu.c:214 msgid "DOS (MBR)" msgstr "DOS (MBR)" -#: disk-utils/fdisk-menu.c:213 +#: disk-utils/fdisk-menu.c:215 msgid "toggle a bootable flag" msgstr "开关 可启动 标志" -#: disk-utils/fdisk-menu.c:214 +#: disk-utils/fdisk-menu.c:216 msgid "edit nested BSD disklabel" msgstr "编辑嵌套的 BSD 磁盘标签" -#: disk-utils/fdisk-menu.c:215 +#: disk-utils/fdisk-menu.c:217 msgid "toggle the dos compatibility flag" msgstr "开关 dos 兼容性标志" -#: disk-utils/fdisk-menu.c:217 +#: disk-utils/fdisk-menu.c:219 msgid "move beginning of data in a partition" msgstr "移动分区数据的起始点" -#: disk-utils/fdisk-menu.c:218 +#: disk-utils/fdisk-menu.c:220 msgid "change the disk identifier" msgstr "更改磁盘标识符" -#: disk-utils/fdisk-menu.c:220 +#: disk-utils/fdisk-menu.c:222 msgid "return from protective/hybrid MBR to GPT" msgstr "从 保护/混合 MBR 回到 GPT" -#: disk-utils/fdisk-menu.c:230 +#: disk-utils/fdisk-menu.c:232 msgid "BSD" msgstr "BSD" -#: disk-utils/fdisk-menu.c:231 +#: disk-utils/fdisk-menu.c:233 msgid "edit drive data" msgstr "编辑驱动数据" -#: disk-utils/fdisk-menu.c:232 +#: disk-utils/fdisk-menu.c:234 msgid "install bootstrap" msgstr "安装引导程序" -#: disk-utils/fdisk-menu.c:233 +#: disk-utils/fdisk-menu.c:235 msgid "show complete disklabel" msgstr "显示完整磁盘标签" -#: disk-utils/fdisk-menu.c:234 +#: disk-utils/fdisk-menu.c:236 msgid "link BSD partition to non-BSD partition" msgstr "将 BSD 分区链接到非 BSD 分区" -#: disk-utils/fdisk-menu.c:366 +#: disk-utils/fdisk-menu.c:368 #, c-format msgid "" "\n" @@ -1357,7 +1456,7 @@ msgstr "" "\n" "帮助 (专业命令)：\n" -#: disk-utils/fdisk-menu.c:368 disk-utils/sfdisk.c:929 +#: disk-utils/fdisk-menu.c:370 disk-utils/sfdisk.c:974 #, c-format msgid "" "\n" @@ -1366,341 +1465,355 @@ msgstr "" "\n" "帮助：\n" -#: disk-utils/fdisk-menu.c:388 +#: disk-utils/fdisk-menu.c:390 #, c-format msgid "You're editing nested '%s' partition table, primary partition table is '%s'." msgstr "您正在编辑嵌套的“%s”分区表，主分区表为“%s”。" -#: disk-utils/fdisk-menu.c:418 +#: disk-utils/fdisk-menu.c:420 msgid "Expert command (m for help): " msgstr "专家命令(输入 m 显示帮助)：" -#: disk-utils/fdisk-menu.c:420 +#: disk-utils/fdisk-menu.c:422 msgid "Command (m for help): " msgstr "命令(输入 m 获取帮助)：" -#: disk-utils/fdisk-menu.c:430 +#: disk-utils/fdisk-menu.c:432 #, c-format msgid "%c: unknown command" msgstr "%c：未知命令" -#: disk-utils/fdisk-menu.c:456 disk-utils/fdisk-menu.c:483 +#: disk-utils/fdisk-menu.c:457 disk-utils/fdisk-menu.c:484 #, fuzzy msgid "Enter script file name" msgstr "无法写脚本文件" -#: disk-utils/fdisk-menu.c:469 +#: disk-utils/fdisk-menu.c:470 msgid "Script successfully applied." msgstr "" -#: disk-utils/fdisk-menu.c:495 +#: disk-utils/fdisk-menu.c:496 #, fuzzy msgid "Failed to transform disk layout into script" msgstr "向输出添加行出错" -#: disk-utils/fdisk-menu.c:509 +#: disk-utils/fdisk-menu.c:510 msgid "Script successfully saved." msgstr "" -#: disk-utils/fdisk-menu.c:542 +#: disk-utils/fdisk-menu.c:543 msgid "failed to write disklabel" msgstr "写磁盘标签失败" -#: disk-utils/fdisk-menu.c:588 +#: disk-utils/fdisk-menu.c:595 #, c-format msgid "Could not delete partition %zu" msgstr "无法删除分区 %zu" -#: disk-utils/fdisk-menu.c:612 +#: disk-utils/fdisk-menu.c:619 msgid "Changing display/entry units to cylinders (DEPRECATED!)." msgstr "将显示/记录单位更改为柱面(已废弃！)。" -#: disk-utils/fdisk-menu.c:614 +#: disk-utils/fdisk-menu.c:621 msgid "Changing display/entry units to sectors." msgstr "将显示/记录单位更改为盲区。" -#: disk-utils/fdisk-menu.c:624 disk-utils/fdisk-menu.c:788 +#: disk-utils/fdisk-menu.c:631 disk-utils/fdisk-menu.c:794 msgid "Leaving nested disklabel." msgstr "离开嵌套的磁盘标签。" -#: disk-utils/fdisk-menu.c:665 +#: disk-utils/fdisk-menu.c:671 msgid "Entering protective/hybrid MBR disklabel." msgstr "进入 保护/混合 MBR 磁盘标签。" -#: disk-utils/fdisk-menu.c:681 +#: disk-utils/fdisk-menu.c:687 msgid "New UUID (in 8-4-4-4-12 format)" msgstr "新 UUID (以 8-4-4-4-12 格式)" -#: disk-utils/fdisk-menu.c:696 +#: disk-utils/fdisk-menu.c:702 msgid "New name" msgstr "新名称" -#: disk-utils/fdisk-menu.c:759 +#: disk-utils/fdisk-menu.c:765 msgid "Entering nested BSD disklabel." msgstr "进入嵌套的 BSD 磁盘标签。" -#: disk-utils/fdisk-menu.c:945 +#: disk-utils/fdisk-menu.c:951 msgid "Number of cylinders" msgstr "柱面数" -#: disk-utils/fdisk-menu.c:949 +#: disk-utils/fdisk-menu.c:955 msgid "Number of heads" msgstr "磁头数" -#: disk-utils/fdisk-menu.c:953 +#: disk-utils/fdisk-menu.c:959 msgid "Number of sectors" msgstr "扇区数" -#: disk-utils/fsck.c:208 +#: disk-utils/fsck.c:213 #, c-format msgid "%s is mounted\n" msgstr "%s 已经挂载\n" -#: disk-utils/fsck.c:210 +#: disk-utils/fsck.c:215 #, c-format msgid "%s is not mounted\n" msgstr "%s 未挂载\n" -#: disk-utils/fsck.c:324 disk-utils/fsck.cramfs.c:169 +#: disk-utils/fsck.c:329 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:250 libfdisk/src/bsd.c:587 +#: disk-utils/fsck.cramfs.c:248 disk-utils/sfdisk.c:271 libfdisk/src/bsd.c:646 #: 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 +#: login-utils/last.c:191 login-utils/last.c:228 login-utils/sulogin.c:689 +#: sys-utils/setpriv.c:239 term-utils/setterm.c:727 term-utils/setterm.c:784 +#: term-utils/setterm.c:788 term-utils/setterm.c:795 #, c-format msgid "cannot read %s" msgstr "不能读 %s" -#: disk-utils/fsck.c:326 lib/path.c:133 lib/path.c:154 +#: disk-utils/fsck.c:331 lib/path.c:133 lib/path.c:154 #, c-format msgid "parse error: %s" msgstr "解析错误：%s" -#: disk-utils/fsck.c:353 +#: disk-utils/fsck.c:358 #, c-format msgid "cannot create directory %s" msgstr "无法创建 %s 目录" -#: disk-utils/fsck.c:366 +#: disk-utils/fsck.c:371 #, c-format msgid "Locking disk by %s ... " msgstr "正由 %s 锁定磁盘..." -#: disk-utils/fsck.c:377 +#: disk-utils/fsck.c:382 #, c-format msgid "(waiting) " msgstr "(等待中) " #. TRANSLATORS: These are followups to "Locking disk...". -#: disk-utils/fsck.c:387 +#: disk-utils/fsck.c:392 msgid "succeeded" msgstr "成功" -#: disk-utils/fsck.c:387 +#: disk-utils/fsck.c:392 msgid "failed" msgstr "失败" -#: disk-utils/fsck.c:405 +#: disk-utils/fsck.c:410 #, c-format msgid "Unlocking %s.\n" msgstr "正在解锁 %s。\n" -#: disk-utils/fsck.c:438 +#: disk-utils/fsck.c:443 #, c-format msgid "failed to setup description for %s" msgstr "设置 %s 描述 失败" -#: disk-utils/fsck.c:468 +#: disk-utils/fsck.c:473 #, c-format msgid "%s: parse error at line %d -- ignore" msgstr "%s：第 %d 行解析出错 -- 忽略" -#: disk-utils/fsck.c:500 disk-utils/fsck.c:502 +#: disk-utils/fsck.c:505 disk-utils/fsck.c:507 #, c-format msgid "%s: failed to parse fstab" msgstr "%s：解析 fstab 失败" -#: 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:278 -#: term-utils/script.c:288 +#: disk-utils/fsck.c:680 login-utils/login.c:979 login-utils/sulogin.c:1061 +#: login-utils/vipw.c:204 sys-utils/flock.c:326 sys-utils/nsenter.c:149 +#: sys-utils/swapon.c:300 sys-utils/unshare.c:211 sys-utils/unshare.c:392 +#: term-utils/script.c:771 msgid "fork failed" msgstr "fork 失败" -#: disk-utils/fsck.c:670 +#: disk-utils/fsck.c:687 #, c-format msgid "%s: execute failed" msgstr "%s：执行失败" -#: disk-utils/fsck.c:758 +#: disk-utils/fsck.c:775 msgid "wait: no more child process?!?" msgstr "等待：没有剩余子进程了？！？" -#: disk-utils/fsck.c:761 sys-utils/flock.c:312 sys-utils/swapon.c:326 -#: sys-utils/unshare.c:226 +#: disk-utils/fsck.c:778 sys-utils/flock.c:343 sys-utils/swapon.c:324 +#: sys-utils/unshare.c:376 sys-utils/unshare.c:397 msgid "waitpid failed" msgstr "waitpid 失败" -#: disk-utils/fsck.c:779 +#: disk-utils/fsck.c:796 #, c-format msgid "Warning... %s for device %s exited with signal %d." msgstr "警告... 对设备 %2$s 的 %1$s 以信号 %3$d 退出。" -#: disk-utils/fsck.c:785 +#: disk-utils/fsck.c:802 #, c-format msgid "%s %s: status is %x, should never happen." msgstr "%s %s：状态为 %x，这不应该发生。" -#: disk-utils/fsck.c:831 +#: disk-utils/fsck.c:848 #, c-format msgid "Finished with %s (exit status %d)\n" msgstr "以 %s 结束(退出状态为 %d)\n" -#: disk-utils/fsck.c:909 +#: disk-utils/fsck.c:926 #, 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:975 +#: disk-utils/fsck.c:992 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:1091 +#: disk-utils/fsck.c:1108 #, 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:1103 +#: disk-utils/fsck.c:1120 #, c-format msgid "%s: skipping nonexistent device\n" msgstr "%s：将跳过不存在的设备\n" -#: disk-utils/fsck.c:1108 +#: disk-utils/fsck.c:1125 #, 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:1125 +#: disk-utils/fsck.c:1142 #, c-format msgid "%s: skipping unknown filesystem type\n" msgstr "%s：跳过未知的文件系统类型\n" -#: disk-utils/fsck.c:1139 +#: disk-utils/fsck.c:1156 #, c-format msgid "cannot check %s: fsck.%s not found" msgstr "无法检查 %s：找不到 fsck.%s" -#: disk-utils/fsck.c:1243 +#: disk-utils/fsck.c:1260 msgid "Checking all file systems.\n" msgstr "正在检查所有文件系统。\n" # pass number 是fstab中定义的，不为0则每次检测 -#: disk-utils/fsck.c:1334 +#: disk-utils/fsck.c:1351 #, c-format msgid "--waiting-- (pass %d)\n" msgstr "--等待中-- (第 %d 遍)\n" -#: disk-utils/fsck.c:1359 +#: disk-utils/fsck.c:1376 #, c-format msgid " %s [options] -- [fs-options] [<filesystem> ...]\n" msgstr " %s [选项] -- [文件系统选项] [<文件系统> ...]\n" -#: disk-utils/fsck.c:1363 +#: disk-utils/fsck.c:1380 #, fuzzy msgid "Check and repair a Linux filesystem.\n" msgstr "正在检查所有文件系统。\n" -#: disk-utils/fsck.c:1366 +#: disk-utils/fsck.c:1383 msgid " -A check all filesystems\n" msgstr " -A 检查所有文件系统\n" -#: disk-utils/fsck.c:1367 +#: disk-utils/fsck.c:1384 msgid " -C [<fd>] display progress bar; file descriptor is for GUIs\n" msgstr " -C [<fd>] 显示进度条；文件描述符 fd 用于图形用户界面\n" -#: disk-utils/fsck.c:1368 +#: disk-utils/fsck.c:1385 msgid " -l lock the device to guarantee exclusive access\n" msgstr " -l 锁定设备以确保独占访问\n" -#: disk-utils/fsck.c:1369 +#: disk-utils/fsck.c:1386 msgid " -M do not check mounted filesystems\n" msgstr " -M 不检查已挂臷的文件系统\n" -#: disk-utils/fsck.c:1370 +#: disk-utils/fsck.c:1387 msgid " -N do not execute, just show what would be done\n" msgstr " -N 不执行，只显示将执行的操作\n" -#: disk-utils/fsck.c:1371 +#: disk-utils/fsck.c:1388 msgid " -P check filesystems in parallel, including root\n" msgstr " -P 并行检查文件系统，包括 root\n" -#: disk-utils/fsck.c:1372 +#: disk-utils/fsck.c:1389 msgid " -R skip root filesystem; useful only with '-A'\n" msgstr " -R 跳过根文件系统；只在指定 '-A' 时有用\n" -#: disk-utils/fsck.c:1373 -msgid " -r report statistics for each device checked\n" +#: disk-utils/fsck.c:1390 +#, fuzzy +msgid "" +" -r [<fd>] report statistics for each device checked;\n" +" file descriptor is for GUIs\n" msgstr " -r 报告对每个已检查设备的统计\n" -#: disk-utils/fsck.c:1374 +#: disk-utils/fsck.c:1392 msgid " -s serialize the checking operations\n" msgstr " -s 串行化检查操作\n" -#: disk-utils/fsck.c:1375 +#: disk-utils/fsck.c:1393 msgid " -T do not show the title on startup\n" msgstr " -T 启动时不显示标题\n" -#: disk-utils/fsck.c:1376 +#: disk-utils/fsck.c:1394 +#, fuzzy msgid "" " -t <type> specify filesystem types to be checked;\n" -" <type> is allowed to be a comma-separated list\n" +" <type> is allowed to be a comma-separated list\n" msgstr "" " -t <类型> 指定要检查的文件系统类型；\n" " <类型> 可以是以英文逗号分隔的列表\n" -#: disk-utils/fsck.c:1378 +#: disk-utils/fsck.c:1396 msgid " -V explain what is being done\n" msgstr " -V 解释正在进行的操作\n" -#: disk-utils/fsck.c:1379 +#: disk-utils/fsck.c:1397 msgid " -? display this help and exit\n" msgstr " -? 显示此帮助并退出\n" -#: disk-utils/fsck.c:1382 +#: disk-utils/fsck.c:1400 msgid "See the specific fsck.* commands for available fs-options." msgstr "参见特定的 fsck.* 命令了解可用的文件系统选项。" -#: disk-utils/fsck.c:1420 +#: disk-utils/fsck.c:1439 msgid "too many devices" msgstr "设备过多" -#: disk-utils/fsck.c:1432 +#: disk-utils/fsck.c:1451 msgid "Is /proc mounted?" msgstr "/proc 挂载了吗？" -#: disk-utils/fsck.c:1440 +#: disk-utils/fsck.c:1459 #, c-format msgid "must be root to scan for matching filesystems: %s" msgstr "必须以 root 用户进行匹配文件系统扫描：%s" -#: disk-utils/fsck.c:1444 +#: disk-utils/fsck.c:1463 #, c-format msgid "couldn't find matching filesystem: %s" msgstr "找不到匹配的文件系统：%s" -#: disk-utils/fsck.c:1452 disk-utils/fsck.c:1539 misc-utils/kill.c:367 -#: sys-utils/eject.c:287 +#: disk-utils/fsck.c:1471 disk-utils/fsck.c:1566 misc-utils/kill.c:367 +#: sys-utils/eject.c:279 msgid "too many arguments" msgstr "参数过多" -#: disk-utils/fsck.c:1591 +#: disk-utils/fsck.c:1526 disk-utils/fsck.c:1529 +#, fuzzy +msgid "invalid argument -r" +msgstr "无效参数：%s" + +#: disk-utils/fsck.c:1577 +#, fuzzy, c-format +msgid "invalid argument -r %d" +msgstr "无效参数：%s" + +#: disk-utils/fsck.c:1619 msgid "the -l option can be used with one device only -- ignore" msgstr "-l 选项只能用于一个设备 -- 忽略" -#: disk-utils/fsck.cramfs.c:108 misc-utils/whereis.c:189 +#: disk-utils/fsck.cramfs.c:108 #, c-format msgid " %s [options] <file>\n" msgstr " %s [选项] <文件>\n" @@ -1744,8 +1857,8 @@ msgid "file length too short" msgstr "文件长度过短" #: disk-utils/fsck.cramfs.c:174 disk-utils/fsck.cramfs.c:228 -#: disk-utils/fsck.cramfs.c:244 libfdisk/src/bsd.c:659 libfdisk/src/bsd.c:831 -#: login-utils/last.c:191 login-utils/last.c:225 sys-utils/fallocate.c:203 +#: disk-utils/fsck.cramfs.c:244 libfdisk/src/bsd.c:718 libfdisk/src/bsd.c:890 +#: login-utils/last.c:186 login-utils/last.c:220 sys-utils/fallocate.c:203 #, c-format msgid "seek on %s failed" msgstr "在 %s 上定位失败" @@ -1796,7 +1909,7 @@ msgstr "无法检测 CRC：旧的 cramfs 格式" msgid "crc error" msgstr "crc 错误" -#: disk-utils/fsck.cramfs.c:297 disk-utils/fsck.minix.c:556 +#: disk-utils/fsck.cramfs.c:297 disk-utils/fsck.minix.c:545 msgid "seek failed" msgstr "定位失败" @@ -1823,13 +1936,13 @@ msgid "decompression error: %s" msgstr "解压出错：%s" #: disk-utils/fsck.cramfs.c:385 -#, c-format -msgid " hole at %ld (%zd)\n" +#, fuzzy, c-format +msgid " hole at %lu (%zu)\n" msgstr " 位于 %ld 的空洞(%zd)\n" #: disk-utils/fsck.cramfs.c:392 disk-utils/fsck.cramfs.c:547 -#, c-format -msgid " uncompressing block at %ld to %ld (%ld)\n" +#, fuzzy, c-format +msgid " uncompressing block at %lu to %lu (%lu)\n" msgstr " 正在将 %ld 处的块解压到 %ld (%ld)\n" #: disk-utils/fsck.cramfs.c:399 @@ -1844,7 +1957,7 @@ msgstr "无大小(%ld ： %ld)字节" #: disk-utils/fsck.cramfs.c:409 disk-utils/fsck.cramfs.c:513 #: disk-utils/swaplabel.c:104 misc-utils/uuidd.c:350 sys-utils/fallocate.c:382 -#: sys-utils/setpriv.c:535 sys-utils/setpriv.c:558 sys-utils/swapon.c:363 +#: sys-utils/setpriv.c:535 sys-utils/setpriv.c:558 sys-utils/swapon.c:360 #: term-utils/ttymsg.c:175 #, c-format msgid "write failed: %s" @@ -1961,100 +2074,107 @@ msgstr "无效的 块大小 参数" msgid "%s: OK\n" msgstr "%s：OK\n" -#: disk-utils/fsck.minix.c:199 +#: disk-utils/fsck.minix.c:185 #, fuzzy msgid "Check the consistency of a Minix filesystem.\n" msgstr "正在检查所有文件系统。\n" -#: disk-utils/fsck.minix.c:202 -msgid " -l list all filenames\n" +#: disk-utils/fsck.minix.c:187 +#, fuzzy +msgid " -l, --list list all filenames\n" msgstr " -l 列出所有文件名\n" -#: disk-utils/fsck.minix.c:203 -msgid " -a automatic repair\n" +#: disk-utils/fsck.minix.c:188 +#, fuzzy +msgid " -a, --auto automatic repair\n" msgstr " -a 自动修复\n" -#: disk-utils/fsck.minix.c:204 -msgid " -r interactive repair\n" +#: disk-utils/fsck.minix.c:189 +#, fuzzy +msgid " -r, --repair interactive repair\n" msgstr " -r 交互式修复\n" -#: disk-utils/fsck.minix.c:205 -msgid " -v be verbose\n" -msgstr " -v 详尽输出\n" +#: disk-utils/fsck.minix.c:190 +#, fuzzy +msgid " -v, --verbose be verbose\n" +msgstr " -v, --verbose 详尽模式\n" -#: disk-utils/fsck.minix.c:206 -msgid " -s output super-block information\n" +#: disk-utils/fsck.minix.c:191 +#, fuzzy +msgid " -s, --super output super-block information\n" msgstr " -s 输出超级块信息\n" -#: disk-utils/fsck.minix.c:207 -msgid " -m activate mode not cleared warnings\n" +#: disk-utils/fsck.minix.c:192 +#, fuzzy +msgid " -m, --uncleared activate mode not cleared warnings\n" msgstr " -m 激活 模式未清除 警告\n" -#: disk-utils/fsck.minix.c:208 -msgid " -f force check\n" +#: disk-utils/fsck.minix.c:193 +#, fuzzy +msgid " -f, --force force check\n" msgstr " -f 强制检查\n" #. TRANSLATORS: these yes no questions uses rpmatch(), and should be #. * translated. -#: disk-utils/fsck.minix.c:267 +#: disk-utils/fsck.minix.c:253 #, c-format msgid "%s (y/n)? " msgstr "%s (是/否)? " -#: disk-utils/fsck.minix.c:267 +#: disk-utils/fsck.minix.c:253 #, c-format msgid "%s (n/y)? " msgstr "%s (否/是)? " -#: disk-utils/fsck.minix.c:284 +#: disk-utils/fsck.minix.c:270 #, c-format msgid "y\n" msgstr "是\n" -#: disk-utils/fsck.minix.c:286 +#: disk-utils/fsck.minix.c:272 #, c-format msgid "n\n" msgstr "否\n" -#: disk-utils/fsck.minix.c:302 +#: disk-utils/fsck.minix.c:288 #, c-format msgid "%s is mounted.\t " msgstr "%s 已经挂载.\t" -#: disk-utils/fsck.minix.c:304 +#: disk-utils/fsck.minix.c:290 msgid "Do you really want to continue" msgstr "你确认要继续" -#: disk-utils/fsck.minix.c:308 +#: disk-utils/fsck.minix.c:294 #, c-format msgid "check aborted.\n" msgstr "检查失败.\n" -#: disk-utils/fsck.minix.c:324 disk-utils/fsck.minix.c:345 +#: disk-utils/fsck.minix.c:310 disk-utils/fsck.minix.c:331 #, c-format msgid "Zone nr < FIRSTZONE in file `%s'." msgstr "nr 区 < 文件“%s”中的 FIRSTZONE。" -#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:348 +#: disk-utils/fsck.minix.c:313 disk-utils/fsck.minix.c:334 #, c-format msgid "Zone nr >= ZONES in file `%s'." msgstr "nr 区 >= 文件“%s”中的 FIRSTZONE。" -#: disk-utils/fsck.minix.c:331 disk-utils/fsck.minix.c:352 +#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:338 msgid "Remove block" msgstr "删除块" -#: disk-utils/fsck.minix.c:368 +#: disk-utils/fsck.minix.c:354 #, c-format msgid "Read error: unable to seek to block in file '%s'\n" msgstr "读取错误: 不能在文件 '%s' 中定位到该块\n" -#: disk-utils/fsck.minix.c:374 +#: disk-utils/fsck.minix.c:360 #, c-format msgid "Read error: bad block in file '%s'\n" msgstr "读取错误: 文件 '%s' 中有坏块\n" -#: disk-utils/fsck.minix.c:386 +#: disk-utils/fsck.minix.c:372 #, c-format msgid "" "Internal error: trying to write bad block\n" @@ -2063,127 +2183,127 @@ msgstr "" "内部错误: 试图写坏块\n" "写请求忽略\n" -#: disk-utils/fsck.minix.c:392 +#: disk-utils/fsck.minix.c:378 msgid "seek failed in write_block" msgstr "在 write_block 中定位失败" -#: disk-utils/fsck.minix.c:395 +#: disk-utils/fsck.minix.c:381 #, c-format msgid "Write error: bad block in file '%s'\n" msgstr "写入错误: 文件 '%s' 中有坏块\n" -#: disk-utils/fsck.minix.c:507 +#: disk-utils/fsck.minix.c:496 msgid "seek failed in write_super_block" msgstr "在 write_super_block 中定位失败" -#: disk-utils/fsck.minix.c:509 +#: disk-utils/fsck.minix.c:498 msgid "unable to write super-block" msgstr "不能写超级块" -#: disk-utils/fsck.minix.c:522 +#: disk-utils/fsck.minix.c:511 msgid "Unable to write inode map" msgstr "不能写 inode map" -#: disk-utils/fsck.minix.c:525 +#: disk-utils/fsck.minix.c:514 msgid "Unable to write zone map" msgstr "不能写 zone map" -#: disk-utils/fsck.minix.c:528 +#: disk-utils/fsck.minix.c:517 msgid "Unable to write inodes" msgstr "不能写 inodes" -#: disk-utils/fsck.minix.c:560 +#: disk-utils/fsck.minix.c:549 msgid "unable to alloc buffer for superblock" msgstr "无法为超级块分配缓冲区" -#: disk-utils/fsck.minix.c:563 +#: disk-utils/fsck.minix.c:552 msgid "unable to read super block" msgstr "不能读超级块" -#: disk-utils/fsck.minix.c:581 +#: disk-utils/fsck.minix.c:574 msgid "bad magic number in super-block" msgstr "超级块中的魔数数字损坏" -#: disk-utils/fsck.minix.c:583 +#: disk-utils/fsck.minix.c:576 msgid "Only 1k blocks/zones supported" msgstr "只支持 1k 块/区" -#: disk-utils/fsck.minix.c:585 +#: disk-utils/fsck.minix.c:578 msgid "bad s_imap_blocks field in super-block" msgstr "不正确的 s_imap_blocks 域在超级块中" -#: disk-utils/fsck.minix.c:588 +#: disk-utils/fsck.minix.c:581 msgid "bad s_zmap_blocks field in super-block" msgstr "不正确的 s_zmap_blocks 域在超级块中" -#: disk-utils/fsck.minix.c:604 +#: disk-utils/fsck.minix.c:597 msgid "Unable to allocate buffer for inode map" msgstr "不能为 inode map 分配缓冲区" -#: disk-utils/fsck.minix.c:607 +#: disk-utils/fsck.minix.c:600 msgid "Unable to allocate buffer for zone map" msgstr "不能为 zone map 分配缓冲区" -#: disk-utils/fsck.minix.c:610 +#: disk-utils/fsck.minix.c:603 msgid "Unable to allocate buffer for inodes" msgstr "不能为 inodes 分配缓冲区" -#: disk-utils/fsck.minix.c:613 +#: disk-utils/fsck.minix.c:606 msgid "Unable to allocate buffer for inode count" msgstr "不能为 inode count 分配缓冲区" -#: disk-utils/fsck.minix.c:616 +#: disk-utils/fsck.minix.c:609 msgid "Unable to allocate buffer for zone count" msgstr "不能为 zone count 分配缓冲区" -#: disk-utils/fsck.minix.c:620 +#: disk-utils/fsck.minix.c:613 msgid "Unable to read inode map" msgstr "不能读 inode map" -#: disk-utils/fsck.minix.c:624 +#: disk-utils/fsck.minix.c:617 msgid "Unable to read zone map" msgstr "不能读 zone map" -#: disk-utils/fsck.minix.c:628 +#: disk-utils/fsck.minix.c:621 msgid "Unable to read inodes" msgstr "不能读 inodes" -#: disk-utils/fsck.minix.c:630 +#: disk-utils/fsck.minix.c:623 #, c-format msgid "Warning: Firstzone != Norm_firstzone\n" msgstr "警告: Firstzone != Norm_firstzone\n" -#: disk-utils/fsck.minix.c:635 +#: disk-utils/fsck.minix.c:628 #, c-format msgid "%ld inodes\n" msgstr "%ld inodes\n" -#: disk-utils/fsck.minix.c:636 +#: disk-utils/fsck.minix.c:629 #, c-format msgid "%ld blocks\n" msgstr "%ld 块\n" -#: disk-utils/fsck.minix.c:637 disk-utils/mkfs.minix.c:550 +#: disk-utils/fsck.minix.c:630 disk-utils/mkfs.minix.c:559 #, c-format msgid "Firstdatazone=%jd (%jd)\n" msgstr "Firstdatazone=%jd (%jd)\n" -#: disk-utils/fsck.minix.c:638 +#: disk-utils/fsck.minix.c:631 #, c-format msgid "Zonesize=%d\n" msgstr "Zonesize=%d\n" -#: disk-utils/fsck.minix.c:639 +#: disk-utils/fsck.minix.c:632 #, c-format msgid "Maxsize=%zu\n" msgstr "Maxsize=%zu\n" -#: disk-utils/fsck.minix.c:640 +#: disk-utils/fsck.minix.c:634 #, c-format msgid "Filesystem state=%d\n" msgstr "Filesystem state=%d\n" -#: disk-utils/fsck.minix.c:641 +#: disk-utils/fsck.minix.c:635 #, c-format msgid "" "namelen=%zd\n" @@ -2192,161 +2312,161 @@ msgstr "" "namelen=%zd\n" "\n" -#: disk-utils/fsck.minix.c:656 disk-utils/fsck.minix.c:706 +#: disk-utils/fsck.minix.c:650 disk-utils/fsck.minix.c:700 #, c-format msgid "Inode %d marked unused, but used for file '%s'\n" msgstr "Inode %d 标记为未使用, 但用于文件 '%s'\n" -#: disk-utils/fsck.minix.c:659 disk-utils/fsck.minix.c:709 +#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:703 msgid "Mark in use" msgstr "标记为已使用" -#: disk-utils/fsck.minix.c:681 disk-utils/fsck.minix.c:729 +#: disk-utils/fsck.minix.c:675 disk-utils/fsck.minix.c:723 #, c-format msgid "The file `%s' has mode %05o\n" msgstr "文件 `%s' 的模式 %05o\n" -#: disk-utils/fsck.minix.c:688 disk-utils/fsck.minix.c:735 +#: disk-utils/fsck.minix.c:682 disk-utils/fsck.minix.c:729 #, c-format msgid "Warning: inode count too big.\n" msgstr "警告: inode 计数太大.\n" -#: disk-utils/fsck.minix.c:747 disk-utils/fsck.minix.c:755 +#: disk-utils/fsck.minix.c:741 disk-utils/fsck.minix.c:749 msgid "root inode isn't a directory" msgstr "根 inode 不是一个目录" -#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:798 +#: disk-utils/fsck.minix.c:761 disk-utils/fsck.minix.c:792 #, c-format msgid "Block has been used before. Now in file `%s'." msgstr "块已经被使用, 现在在文件 `%s' 中." -#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:800 -#: disk-utils/fsck.minix.c:1127 disk-utils/fsck.minix.c:1136 -#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1192 +#: disk-utils/fsck.minix.c:763 disk-utils/fsck.minix.c:794 +#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131 +#: disk-utils/fsck.minix.c:1178 disk-utils/fsck.minix.c:1187 msgid "Clear" msgstr "清除" -#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810 +#: disk-utils/fsck.minix.c:773 disk-utils/fsck.minix.c:804 #, c-format msgid "Block %d in file `%s' is marked not in use." msgstr "文件中块 %d `%s' 标记为没有使用." -#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:812 +#: disk-utils/fsck.minix.c:775 disk-utils/fsck.minix.c:806 msgid "Correct" msgstr "正确" -#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1023 +#: disk-utils/fsck.minix.c:945 disk-utils/fsck.minix.c:1018 #, c-format msgid "The directory '%s' contains a bad inode number for file '%.*s'." msgstr "目录 '%s' 包含了一个不正确的 inode number 文件 '%.*s'. " -#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1025 +#: disk-utils/fsck.minix.c:947 disk-utils/fsck.minix.c:1020 msgid " Remove" msgstr " 删除" -#: disk-utils/fsck.minix.c:969 disk-utils/fsck.minix.c:1041 +#: disk-utils/fsck.minix.c:963 disk-utils/fsck.minix.c:1036 #, c-format msgid "%s: bad directory: '.' isn't first\n" msgstr "%s: 不正确的目录: '.' 不是第一个\n" -#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1050 +#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1045 #, c-format msgid "%s: bad directory: '..' isn't second\n" msgstr "%s: 不正确的目录: '.' 不是第二个\n" -#: disk-utils/fsck.minix.c:1084 disk-utils/fsck.minix.c:1101 +#: disk-utils/fsck.minix.c:1079 disk-utils/fsck.minix.c:1096 msgid "internal error" msgstr "内部错误" -#: disk-utils/fsck.minix.c:1087 disk-utils/fsck.minix.c:1104 +#: disk-utils/fsck.minix.c:1082 disk-utils/fsck.minix.c:1099 #, c-format msgid "%s: bad directory: size < 32" msgstr "%s: 不正确的目录: 大小 < 32" -#: disk-utils/fsck.minix.c:1116 +#: disk-utils/fsck.minix.c:1111 msgid "seek failed in bad_zone" msgstr "bad_zone 中定位失败" -#: disk-utils/fsck.minix.c:1126 disk-utils/fsck.minix.c:1182 +#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1177 #, c-format msgid "Inode %lu mode not cleared." msgstr "Inode %lu 模式未清除。" -#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1191 +#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1186 #, c-format msgid "Inode %lu not used, marked used in the bitmap." msgstr "Inode %lu 未使用，但在位图(bitmap)中标记为已使用。" -#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197 +#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1192 #, c-format msgid "Inode %lu used, marked unused in the bitmap." msgstr "Inode %lu 已使用，但在位图(bitmap)中标记为未使用。" -#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1198 +#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1193 msgid "Set" msgstr "设置" -#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1202 +#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197 #, c-format msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d." msgstr "Inode %lu (模式 = %07o), i_nlinks=%d, 已计数=%d。" -#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1205 +#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1200 msgid "Set i_nlinks to count" msgstr "将 i_nlinks 设为计数" -#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1217 +#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1212 #, c-format msgid "Zone %lu: marked in use, no file uses it." msgstr "%lu 区：标记为使用，但没有文件使用它。" -#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219 +#: disk-utils/fsck.minix.c:1158 disk-utils/fsck.minix.c:1214 msgid "Unmark" msgstr "清标记" -#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1224 +#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219 #, c-format msgid "Zone %lu: in use, counted=%d\n" msgstr "区 %lu：使用中，已计数=%d\n" -#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1227 +#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1222 #, c-format msgid "Zone %lu: not in use, counted=%d\n" msgstr "区 %lu：未使用，已计数=%d\n" -#: disk-utils/fsck.minix.c:1268 +#: disk-utils/fsck.minix.c:1270 msgid "bad inode size" msgstr "inode 大小有误" -#: disk-utils/fsck.minix.c:1270 +#: disk-utils/fsck.minix.c:1272 msgid "bad v2 inode size" msgstr "v2 inode 大小有误" -#: disk-utils/fsck.minix.c:1314 +#: disk-utils/fsck.minix.c:1317 msgid "need terminal for interactive repairs" msgstr "需要终端来进行交互式修复" -#: disk-utils/fsck.minix.c:1318 +#: disk-utils/fsck.minix.c:1321 #, c-format msgid "cannot open %s: %s" msgstr "无法打开 %s：%s" -#: disk-utils/fsck.minix.c:1329 +#: disk-utils/fsck.minix.c:1332 #, c-format msgid "%s is clean, no check.\n" msgstr "%s 是干净的，不检查。\n" -#: disk-utils/fsck.minix.c:1332 +#: disk-utils/fsck.minix.c:1335 #, c-format msgid "Forcing filesystem check on %s.\n" msgstr "强制在 %s 上进行文件系统检查。\n" -#: disk-utils/fsck.minix.c:1334 +#: disk-utils/fsck.minix.c:1337 #, c-format msgid "Filesystem on %s is dirty, needs checking.\n" msgstr "%s 上的文件系统有问题，需要检查。\n" -#: disk-utils/fsck.minix.c:1366 +#: disk-utils/fsck.minix.c:1369 #, c-format msgid "" "\n" @@ -2355,12 +2475,12 @@ msgstr "" "\n" "已使用 %6ld inodes(%ld%%)\n" -#: disk-utils/fsck.minix.c:1372 +#: disk-utils/fsck.minix.c:1375 #, c-format msgid "%6ld zones used (%ld%%)\n" msgstr "已使用 %6ld 区(%ld%%)\n" -#: disk-utils/fsck.minix.c:1374 +#: disk-utils/fsck.minix.c:1377 #, c-format msgid "" "\n" @@ -2383,7 +2503,7 @@ msgstr "" "------\n" "%6d 个文件\n" -#: disk-utils/fsck.minix.c:1388 +#: disk-utils/fsck.minix.c:1391 #, c-format msgid "" "----------------------------\n" @@ -2394,12 +2514,11 @@ msgstr "" "文件系统已经更改\n" "----------------\n" -#: disk-utils/fsck.minix.c:1400 disk-utils/mkfs.minix.c:808 -#: disk-utils/mkswap.c:540 disk-utils/partx.c:1004 disk-utils/resizepart.c:112 -#: login-utils/utmpdump.c:388 misc-utils/logger.c:333 misc-utils/logger.c:403 -#: misc-utils/logger.c:464 sys-utils/dmesg.c:660 sys-utils/wdctl.c:346 -#: sys-utils/wdctl.c:411 term-utils/script.c:342 term-utils/script.c:383 -#: term-utils/script.c:502 text-utils/pg.c:1249 +#: disk-utils/fsck.minix.c:1403 disk-utils/mkfs.minix.c:833 +#: disk-utils/mkswap.c:540 disk-utils/partx.c:1005 disk-utils/resizepart.c:112 +#: login-utils/utmpdump.c:388 misc-utils/logger.c:392 misc-utils/logger.c:401 +#: sys-utils/dmesg.c:657 sys-utils/wdctl.c:346 sys-utils/wdctl.c:411 +#: term-utils/script.c:268 term-utils/script.c:344 text-utils/pg.c:1249 msgid "write failed" msgstr "写失败" @@ -2544,18 +2663,18 @@ msgid "BlockSize: %d\n" msgstr "块大小：%d\n" #: disk-utils/mkfs.bfs.c:249 -#, c-format -msgid "Inodes: %lu (in 1 block)\n" +#, fuzzy, c-format +msgid "Inodes: %ld (in 1 block)\n" msgstr "Inodes：%lu (在 1 个块中)\n" #: disk-utils/mkfs.bfs.c:252 -#, c-format -msgid "Inodes: %lu (in %llu blocks)\n" +#, fuzzy, c-format +msgid "Inodes: %ld (in %llu blocks)\n" msgstr "Inodes：%lu (在 %llu 个块中)\n" #: disk-utils/mkfs.bfs.c:254 -#, c-format -msgid "Blocks: %lld\n" +#, fuzzy, c-format +msgid "Blocks: %llu\n" msgstr "块：%lld\n" #: disk-utils/mkfs.bfs.c:255 @@ -2592,37 +2711,37 @@ msgstr "写 .. 记录出错" msgid "error closing %s" msgstr "关闭 %s 出错" -#: disk-utils/mkfs.c:48 +#: disk-utils/mkfs.c:44 #, c-format msgid " %s [options] [-t <type>] [fs-options] <device> [<size>]\n" msgstr " %s [选项] [-t <类型>] [文件系统选项] <设备> [<大小>]\n" -#: disk-utils/mkfs.c:52 +#: disk-utils/mkfs.c:48 #, fuzzy msgid "Make a Linux filesystem.\n" msgstr "Linux 文件系统" -#: disk-utils/mkfs.c:55 +#: disk-utils/mkfs.c:51 #, c-format msgid " -t, --type=<type> filesystem type; when unspecified, ext2 is used\n" msgstr " -t, --type=<类型> 文件系统类型；若不指定，将使用 ext2\n" -#: disk-utils/mkfs.c:56 +#: disk-utils/mkfs.c:52 #, c-format msgid " fs-options parameters for the real filesystem builder\n" msgstr " fs-options 实际文件系统构建程序的参数\n" -#: disk-utils/mkfs.c:57 +#: disk-utils/mkfs.c:53 #, c-format msgid " <device> path to the device to be used\n" msgstr " <设备> 要使用设备的路径\n" -#: disk-utils/mkfs.c:58 +#: disk-utils/mkfs.c:54 #, c-format msgid " <size> number of blocks to be used on the device\n" msgstr " <大小> 要使用设备上的块数\n" -#: disk-utils/mkfs.c:59 +#: disk-utils/mkfs.c:55 #, c-format msgid "" " -V, --verbose explain what is being done;\n" @@ -2631,7 +2750,7 @@ msgstr "" " -V, --verbose 解释正在进行的操作；\n" " 多次指定 -V 将导致空运行(dry-run)\n" -#: disk-utils/mkfs.c:61 +#: disk-utils/mkfs.c:57 #, c-format msgid "" " -V, --version display version information and exit;\n" @@ -2640,19 +2759,19 @@ msgstr "" " -V, --version 显示版本信息并退出\n" " 将 -V 作为 --version 选项时必须是惟一选项\n" -#: disk-utils/mkfs.c:63 +#: disk-utils/mkfs.c:59 #, c-format 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 +#: disk-utils/mkfs.c:139 lib/exec_shell.c:45 login-utils/newgrp.c:233 #: 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: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 +#: login-utils/sulogin.c:825 login-utils/sulogin.c:829 schedutils/chrt.c:336 +#: schedutils/ionice.c:260 schedutils/taskset.c:239 sys-utils/flock.c:332 +#: sys-utils/nsenter.c:407 sys-utils/prlimit.c:644 sys-utils/rtcwake.c:575 #: sys-utils/setarch.c:314 sys-utils/setarch.c:389 sys-utils/setsid.c:117 -#: sys-utils/swapon.c:318 sys-utils/switch_root.c:243 sys-utils/unshare.c:258 -#: term-utils/script.c:558 text-utils/pg.c:1376 +#: sys-utils/swapon.c:316 sys-utils/switch_root.c:243 sys-utils/unshare.c:433 +#: term-utils/script.c:571 text-utils/pg.c:1376 #, c-format msgid "failed to execute %s" msgstr "执行 %s 失败" @@ -2814,105 +2933,141 @@ msgid "" "that some device files will be wrong." msgstr "警告：设备号被截短为 %u 位。几乎可以肯定某些设备文件将出错。" -#: disk-utils/mkfs.minix.c:149 -#, c-format -msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]" -msgstr "用法：%s [-c | -l 文件名] [-nXX] [-iXX] /dev/name [块数]" +#: disk-utils/mkfs.minix.c:135 +#, fuzzy, c-format +msgid " %s [options] /dev/name [blocks]\n" +msgstr "Usage: %s [选项] 设备 [块数]\n" -#: disk-utils/mkfs.minix.c:171 -#, c-format -msgid "%s is mounted; will not make a filesystem here!" -msgstr "%s 已挂载；将不会在此创建文件系统！" +#: disk-utils/mkfs.minix.c:137 +#, fuzzy +msgid " -1 use Minix version 1\n" +msgstr " -v 打印程序版本\n" + +#: disk-utils/mkfs.minix.c:138 +#, fuzzy +msgid " -2, -v use Minix version 2\n" +msgstr " -v 打印程序版本\n" + +#: disk-utils/mkfs.minix.c:139 +#, fuzzy +msgid " -3 use Minix version 3\n" +msgstr " -v 打印程序版本\n" + +#: disk-utils/mkfs.minix.c:140 +#, fuzzy +msgid " -n, --namelength <num> maximum length of filenames\n" +msgstr "解析文件名最大长度失败" + +#: disk-utils/mkfs.minix.c:141 +#, fuzzy +msgid " -i, --inodes <num> number of inodes for the filesystem\n" +msgstr " -C, --cylinders <数字> 指定柱面数\n" + +#: disk-utils/mkfs.minix.c:142 +#, fuzzy +msgid " -c, --check check the device for bad blocks\n" +msgstr " -u --unlock 移除锁\n" + +#: disk-utils/mkfs.minix.c:143 +msgid " -l, --badblocks <file> list of bad blocks from file\n" +msgstr "" -#: disk-utils/mkfs.minix.c:197 +#: disk-utils/mkfs.minix.c:173 #, c-format msgid "%s: seek to boot block failed in write_tables" msgstr "%s：在 write_tables 中定位到启动块失败" -#: disk-utils/mkfs.minix.c:200 +#: disk-utils/mkfs.minix.c:176 #, c-format msgid "%s: unable to clear boot sector" msgstr "%s：无法清除启动扇区" -#: disk-utils/mkfs.minix.c:202 +#: disk-utils/mkfs.minix.c:178 #, c-format msgid "%s: seek failed in write_tables" msgstr "%s：在 write_tables 中定位失败" -#: disk-utils/mkfs.minix.c:205 +#: disk-utils/mkfs.minix.c:181 #, c-format msgid "%s: unable to write super-block" msgstr "%s：无法写超级块" -#: disk-utils/mkfs.minix.c:208 +#: disk-utils/mkfs.minix.c:184 #, c-format msgid "%s: unable to write inode map" msgstr "%s：无法写 inode map" -#: disk-utils/mkfs.minix.c:211 +#: disk-utils/mkfs.minix.c:187 #, c-format msgid "%s: unable to write zone map" msgstr "%s：无法写 zone map" -#: disk-utils/mkfs.minix.c:214 +#: disk-utils/mkfs.minix.c:190 #, c-format msgid "%s: unable to write inodes" msgstr "%s：无法写 inodes" -#: disk-utils/mkfs.minix.c:219 +#: disk-utils/mkfs.minix.c:195 #, c-format msgid "%s: seek failed in write_block" msgstr "%s：在 write_block 中定位失败" -#: disk-utils/mkfs.minix.c:222 +#: disk-utils/mkfs.minix.c:198 #, c-format msgid "%s: write failed in write_block" msgstr "%s：在 write_block 中写入失败" -#: disk-utils/mkfs.minix.c:231 disk-utils/mkfs.minix.c:306 -#: disk-utils/mkfs.minix.c:355 +#: disk-utils/mkfs.minix.c:207 disk-utils/mkfs.minix.c:282 +#: disk-utils/mkfs.minix.c:331 #, c-format msgid "%s: too many bad blocks" msgstr "%s：坏块太多" -#: disk-utils/mkfs.minix.c:239 +#: disk-utils/mkfs.minix.c:215 #, c-format msgid "%s: not enough good blocks" msgstr "%s：好块不够" -#: disk-utils/mkfs.minix.c:489 +#: disk-utils/mkfs.minix.c:486 #, c-format msgid "%s: unable to allocate buffer for superblock" msgstr "%s：不能为超级块分配缓冲区" -#: disk-utils/mkfs.minix.c:535 +#: disk-utils/mkfs.minix.c:534 +#, c-format +msgid "" +"First data block at %jd, which is too far (max %d).\n" +"Try specifying fewer inodes by passing --inodes <num>" +msgstr "" + +#: disk-utils/mkfs.minix.c:544 #, c-format msgid "%s: unable to allocate buffers for maps" msgstr "%s：不能为 maps 分配缓冲区" -#: disk-utils/mkfs.minix.c:545 +#: disk-utils/mkfs.minix.c:554 #, c-format msgid "%s: unable to allocate buffer for inodes" msgstr "%s：不能为 inodes 分配缓冲区" -#: disk-utils/mkfs.minix.c:548 +#: disk-utils/mkfs.minix.c:557 #, c-format msgid "%lu inode\n" msgid_plural "%lu inodes\n" msgstr[0] "%lu 个 inode\n" -#: disk-utils/mkfs.minix.c:549 +#: disk-utils/mkfs.minix.c:558 #, c-format msgid "%lu block\n" msgid_plural "%lu blocks\n" msgstr[0] "%lu 个块\n" -#: disk-utils/mkfs.minix.c:551 +#: disk-utils/mkfs.minix.c:560 #, c-format msgid "Zonesize=%zu\n" msgstr "Zonesize=%zu\n" -#: disk-utils/mkfs.minix.c:552 +#: disk-utils/mkfs.minix.c:561 #, c-format msgid "" "Maxsize=%zu\n" @@ -2921,89 +3076,103 @@ msgstr "" "Maxsize=%zu\n" "\n" -#: disk-utils/mkfs.minix.c:565 +#: disk-utils/mkfs.minix.c:574 #, c-format msgid "%s: seek failed during testing of blocks" msgstr "%s：在测试块时定位失败" -#: disk-utils/mkfs.minix.c:572 +#: disk-utils/mkfs.minix.c:581 #, c-format msgid "Weird values in do_check: probably bugs\n" msgstr "do_check 中的值异常：可能有 bug\n" -#: disk-utils/mkfs.minix.c:605 +#: disk-utils/mkfs.minix.c:614 #, c-format msgid "%s: seek failed in check_blocks" msgstr "%s：在 check_blocks 中定位失败" -#: disk-utils/mkfs.minix.c:615 +#: disk-utils/mkfs.minix.c:624 #, c-format msgid "%s: bad blocks before data-area: cannot make fs" msgstr "%s：数据区前有坏块：无法创建文件系统" -#: disk-utils/mkfs.minix.c:622 disk-utils/mkfs.minix.c:646 +#: disk-utils/mkfs.minix.c:631 disk-utils/mkfs.minix.c:655 #, c-format msgid "%d bad block\n" msgid_plural "%d bad blocks\n" msgstr[0] "%d 个坏块\n" -#: disk-utils/mkfs.minix.c:631 +#: disk-utils/mkfs.minix.c:640 #, c-format msgid "%s: can't open file of bad blocks" msgstr "%s: 打不开坏块文件" -#: disk-utils/mkfs.minix.c:636 +#: disk-utils/mkfs.minix.c:645 #, c-format msgid "badblock number input error on line %d\n" msgstr "第 %d 行坏块数输入错误\n" -#: disk-utils/mkfs.minix.c:637 +#: disk-utils/mkfs.minix.c:646 #, c-format msgid "%s: cannot read badblocks file" msgstr "%s: 打不开 badblocks 文件" -#: disk-utils/mkfs.minix.c:673 disk-utils/mkfs.minix.c:675 -#, c-format -msgid "%s: bad inode size" -msgstr "%s：不正确的 inode 大小" - -#: disk-utils/mkfs.minix.c:684 -msgid "failed to parse number of inodes" -msgstr "解析 inode 数 失败" - #: disk-utils/mkfs.minix.c:690 -msgid "failed to parse maximum length of filenames" -msgstr "解析文件名最大长度失败" - -#: disk-utils/mkfs.minix.c:723 -msgid "failed to parse number of blocks" -msgstr "解析块数失败" - -#: disk-utils/mkfs.minix.c:766 #, c-format msgid "%s: device is misaligned" msgstr "%s：设备未正确对齐" -#: disk-utils/mkfs.minix.c:769 +#: disk-utils/mkfs.minix.c:692 #, c-format msgid "block size smaller than physical sector size of %s" msgstr "块尺寸比 %s 的物理扇区尺寸小" -#: disk-utils/mkfs.minix.c:773 +#: disk-utils/mkfs.minix.c:695 #, c-format msgid "cannot determine size of %s" msgstr "无法确定 %s 的大小" -#: disk-utils/mkfs.minix.c:782 +#: disk-utils/mkfs.minix.c:703 #, c-format -msgid "will not try to make filesystem on '%s'" -msgstr "将不会尝试在“%s”上创建文件系统" +msgid "%s: requested blocks (%llu) exceeds available (%llu) blocks\n" +msgstr "" -#: disk-utils/mkfs.minix.c:784 +#: disk-utils/mkfs.minix.c:706 #, c-format msgid "%s: number of blocks too small" msgstr "%s：块数太小" +#: disk-utils/mkfs.minix.c:721 disk-utils/mkfs.minix.c:727 +#, fuzzy, c-format +msgid "unsupported name length: %d" +msgstr "不支持的参数：%s" + +#: disk-utils/mkfs.minix.c:730 +#, fuzzy, c-format +msgid "unsupported minix file system version: %d" +msgstr "不支持的文件系统特性" + +#: disk-utils/mkfs.minix.c:765 +msgid "-v is ambiguous, use '-2' instead" +msgstr "" + +#: disk-utils/mkfs.minix.c:775 +msgid "failed to parse maximum length of filenames" +msgstr "解析文件名最大长度失败" + +#: disk-utils/mkfs.minix.c:779 +msgid "failed to parse number of inodes" +msgstr "解析 inode 数 失败" + +#: disk-utils/mkfs.minix.c:803 +msgid "failed to parse number of blocks" +msgstr "解析块数失败" + +#: disk-utils/mkfs.minix.c:810 +#, c-format +msgid "%s is mounted; will not make a filesystem here!" +msgstr "%s 已挂载；将不会在此创建文件系统！" + #: disk-utils/mkswap.c:81 #, c-format msgid "Bad user-specified page size %u" @@ -3250,7 +3419,7 @@ msgstr "易读形式的大小" msgid "partition name" msgstr "分区名" -#: disk-utils/partx.c:93 misc-utils/findmnt.c:130 misc-utils/lsblk.c:154 +#: disk-utils/partx.c:93 misc-utils/findmnt.c:132 misc-utils/lsblk.c:169 msgid "partition UUID" msgstr "分区 UUID" @@ -3258,7 +3427,7 @@ msgstr "分区 UUID" msgid "partition table type (dos, gpt, ...)" msgstr "分区表类型(dos、gpt、...)" -#: disk-utils/partx.c:95 misc-utils/lsblk.c:155 +#: disk-utils/partx.c:95 misc-utils/lsblk.c:170 msgid "partition flags" msgstr "分区标志" @@ -3266,189 +3435,189 @@ msgstr "分区标志" msgid "partition type (a string, a UUID, or hex)" msgstr "分区类型(字符串，UUID 或十六进制数)" -#: disk-utils/partx.c:114 sys-utils/losetup.c:482 +#: disk-utils/partx.c:115 sys-utils/losetup.c:493 msgid "failed to initialize loopcxt" msgstr "初始化 loopcxt 失败" -#: disk-utils/partx.c:118 +#: disk-utils/partx.c:119 #, c-format msgid "%s: failed to find unused loop device" msgstr "%s：查找未使用的回环设备失败" -#: disk-utils/partx.c:122 +#: disk-utils/partx.c:123 #, c-format msgid "Trying to use '%s' for the loop device\n" msgstr "尝试将“%s”用作回环设备\n" -#: disk-utils/partx.c:126 +#: disk-utils/partx.c:127 #, c-format msgid "%s: failed to set backing file" msgstr "%s：设置后备文件失败" -#: disk-utils/partx.c:131 sys-utils/losetup.c:671 +#: disk-utils/partx.c:132 sys-utils/losetup.c:690 #, c-format msgid "%s: failed to set up loop device" msgstr "%s：设置回环设备失败" -#: 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:328 sys-utils/prlimit.c:277 sys-utils/swapon.c:135 -#: sys-utils/wdctl.c:151 sys-utils/zramctl.c:113 +#: disk-utils/partx.c:162 login-utils/lslogins.c:322 misc-utils/findmnt.c:401 +#: misc-utils/lsblk.c:354 misc-utils/lslocks.c:342 sys-utils/losetup.c:104 +#: sys-utils/lscpu.c:332 sys-utils/lsipc.c:232 sys-utils/prlimit.c:277 +#: sys-utils/swapon.c:133 sys-utils/wdctl.c:151 sys-utils/zramctl.c:144 #, c-format msgid "unknown column: %s" msgstr "未知列: %s" -#: disk-utils/partx.c:208 +#: disk-utils/partx.c:209 #, c-format msgid "%s: failed to get partition number" msgstr "%s：获取分区号失败" -#: disk-utils/partx.c:273 +#: disk-utils/partx.c:274 #, c-format msgid "%s: error deleting partition %d" msgstr "%s：删除分区 %d 出错" -#: disk-utils/partx.c:275 +#: disk-utils/partx.c:276 #, c-format msgid "%s: error deleting partitions %d-%d" msgstr "%s：删除分区 %d-%d 出错" -#: disk-utils/partx.c:299 disk-utils/partx.c:446 disk-utils/partx.c:974 +#: disk-utils/partx.c:300 disk-utils/partx.c:447 disk-utils/partx.c:975 #, c-format msgid "specified range <%d:%d> does not make sense" msgstr "指定的范围 <%d:%d> 无效" -#: disk-utils/partx.c:308 +#: disk-utils/partx.c:309 #, c-format msgid "%s: partition #%d removed\n" msgstr "%s：分区 #%d 已移除\n" -#: disk-utils/partx.c:312 +#: disk-utils/partx.c:313 #, fuzzy, c-format msgid "%s: partition #%d doesn't exist\n" msgstr "%s：分区 #%d 已不存在\n" -#: disk-utils/partx.c:317 +#: disk-utils/partx.c:318 #, c-format msgid "%s: deleting partition #%d failed" msgstr "%s：删除分区 #%d 失败" -#: disk-utils/partx.c:337 +#: disk-utils/partx.c:338 #, c-format msgid "%s: error adding partition %d" msgstr "%s：添加分区 %d 出错" -#: disk-utils/partx.c:339 +#: disk-utils/partx.c:340 #, c-format msgid "%s: error adding partitions %d-%d" msgstr "%s：添加分区 %d-%d 出错" -#: disk-utils/partx.c:376 disk-utils/partx.c:482 +#: disk-utils/partx.c:377 disk-utils/partx.c:483 #, c-format msgid "%s: partition #%d added\n" msgstr "%s：分区 #%d 已添加\n" -#: disk-utils/partx.c:381 +#: disk-utils/partx.c:382 #, c-format msgid "%s: adding partition #%d failed" msgstr "%s：添加分区 #%d 失败" -#: disk-utils/partx.c:416 +#: disk-utils/partx.c:417 #, c-format msgid "%s: error updating partition %d" msgstr "%s：更新分区 %d 出错" -#: disk-utils/partx.c:418 +#: disk-utils/partx.c:419 #, c-format msgid "%s: error updating partitions %d-%d" msgstr "%s：更新分区 %d-%d 出错" -#: disk-utils/partx.c:455 +#: disk-utils/partx.c:456 #, c-format msgid "%s: no partition #%d" msgstr "%s：无分区 #%d" -#: disk-utils/partx.c:476 +#: disk-utils/partx.c:477 #, c-format msgid "%s: partition #%d resized\n" msgstr "%s：已调整分区 #%d 的大小\n" -#: disk-utils/partx.c:490 +#: disk-utils/partx.c:491 #, c-format msgid "%s: updating partition #%d failed" msgstr "%s：更新分区 #%d 失败" -#: disk-utils/partx.c:527 +#: disk-utils/partx.c:528 #, c-format msgid "#%2d: %9ju-%9ju (%9ju sector, %6ju MB)\n" msgid_plural "#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n" msgstr[0] "#%2d：%9ju-%9ju (%9ju 扇区%6ju MB)\n" -#: disk-utils/partx.c:546 misc-utils/findmnt.c:703 misc-utils/findmnt.c:720 -#: misc-utils/lslocks.c:402 +#: disk-utils/partx.c:547 misc-utils/findmnt.c:713 misc-utils/findmnt.c:730 +#: misc-utils/lslocks.c:405 msgid "failed to add line to output" msgstr "向输出添加行出错" -#: disk-utils/partx.c:609 +#: disk-utils/partx.c:610 msgid "failed to add data to output table" msgstr "向输出表添加数据出错" -#: disk-utils/partx.c:632 login-utils/lslogins.c:899 misc-utils/findmnt.c:1559 -#: misc-utils/lsblk.c:1769 misc-utils/lslocks.c:461 sys-utils/losetup.c:300 -#: sys-utils/lscpu.c:1434 sys-utils/prlimit.c:297 sys-utils/swapon.c:268 -#: sys-utils/wdctl.c:259 sys-utils/zramctl.c:339 +#: disk-utils/partx.c:633 login-utils/lslogins.c:928 misc-utils/findmnt.c:1582 +#: misc-utils/lsblk.c:1849 misc-utils/lslocks.c:465 sys-utils/losetup.c:304 +#: sys-utils/lscpu.c:1438 sys-utils/lsipc.c:322 sys-utils/prlimit.c:297 +#: sys-utils/swapon.c:266 sys-utils/wdctl.c:259 sys-utils/zramctl.c:418 msgid "failed to initialize output table" msgstr "初始化输出表失败" -#: disk-utils/partx.c:643 misc-utils/findmnt.c:1581 misc-utils/lsblk.c:1785 -#: misc-utils/lslocks.c:471 sys-utils/losetup.c:308 sys-utils/losetup.c:344 -#: sys-utils/lscpu.c:1439 sys-utils/prlimit.c:306 sys-utils/swapon.c:277 -#: sys-utils/wdctl.c:270 sys-utils/zramctl.c:348 +#: disk-utils/partx.c:644 misc-utils/findmnt.c:1608 misc-utils/lsblk.c:1869 +#: misc-utils/lslocks.c:479 sys-utils/losetup.c:316 sys-utils/losetup.c:352 +#: sys-utils/lscpu.c:1443 sys-utils/prlimit.c:306 sys-utils/swapon.c:275 +#: sys-utils/wdctl.c:270 sys-utils/zramctl.c:427 msgid "failed to initialize output column" msgstr "初始化输出列失败" -#: disk-utils/partx.c:683 +#: disk-utils/partx.c:684 #, c-format msgid "failed to initialize blkid filter for '%s'" msgstr "初始化“%s”的 blkid 过滤器失败" -#: disk-utils/partx.c:691 +#: disk-utils/partx.c:692 #, c-format msgid "%s: failed to read partition table" msgstr "%s：读取分区表失败" -#: disk-utils/partx.c:697 +#: disk-utils/partx.c:698 #, c-format msgid "%s: partition table type '%s' detected\n" msgstr "%s：检测到分区表类型“%s”\n" -#: disk-utils/partx.c:701 +#: disk-utils/partx.c:702 #, c-format msgid "%s: partition table with no partitions" msgstr "%s：分区表中无分区" -#: disk-utils/partx.c:713 +#: disk-utils/partx.c:714 #, c-format msgid " %s [-a|-d|-s|-u] [--nr <n:m> | <partition>] <disk>\n" msgstr " %s [-a|-d|-s|-u] [--nr <n:m> | <分区>] <磁盘>\n" -#: disk-utils/partx.c:717 +#: disk-utils/partx.c:718 msgid "Tell the kernel about the presence and numbering of partitions.\n" msgstr "" -#: disk-utils/partx.c:720 +#: disk-utils/partx.c:721 msgid " -a, --add add specified partitions or all of them\n" msgstr " -a, --add 添加指定的分区或所有分区\n" -#: disk-utils/partx.c:721 +#: disk-utils/partx.c:722 msgid " -d, --delete delete specified partitions or all of them\n" msgstr " -d, --delete 删除指定的分区或所有分区\n" -#: disk-utils/partx.c:722 +#: disk-utils/partx.c:723 msgid " -u, --update update specified partitions or all of them\n" msgstr " -u, --update 更新指定的分区或所有分区\n" -#: disk-utils/partx.c:723 +#: disk-utils/partx.c:724 msgid "" " -s, --show list partitions\n" "\n" @@ -3456,39 +3625,39 @@ msgstr "" " -s, --show 列出分区\n" "\n" -#: disk-utils/partx.c:724 misc-utils/lsblk.c:1535 +#: disk-utils/partx.c:725 misc-utils/lsblk.c:1606 msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" -#: disk-utils/partx.c:725 +#: disk-utils/partx.c:726 msgid " -g, --noheadings don't print headings for --show\n" msgstr " -g, --noheadings --show 时不打印标题\n" -#: disk-utils/partx.c:726 +#: disk-utils/partx.c:727 msgid " -n, --nr <n:m> specify the range of partitions (e.g. --nr 2:4)\n" msgstr " -n, --nr <n:m> 指定分区范围(例如：--nr 2:4)\n" -#: disk-utils/partx.c:727 +#: disk-utils/partx.c:728 msgid " -o, --output <list> define which output columns to use\n" msgstr " -o, --output <列表> 定义使用哪个输出列\n" -#: disk-utils/partx.c:728 misc-utils/lsblk.c:1548 +#: disk-utils/partx.c:729 misc-utils/lsblk.c:1620 msgid " -P, --pairs use key=\"value\" output format\n" msgstr " -P, --pairs 使用 key=“value” 输出格式\n" -#: disk-utils/partx.c:729 misc-utils/lsblk.c:1549 +#: disk-utils/partx.c:730 misc-utils/lsblk.c:1621 msgid " -r, --raw use raw output format\n" msgstr " -r, --raw 使用原生输出格式\n" -#: disk-utils/partx.c:730 +#: disk-utils/partx.c:731 msgid " -t, --type <type> specify the partition type (dos, bsd, solaris, etc.)\n" msgstr " -t, --type <类型> 指定分区类型(dos、bsd、solaris 等)\n" -#: disk-utils/partx.c:731 sys-utils/fallocate.c:91 +#: disk-utils/partx.c:732 sys-utils/fallocate.c:91 msgid " -v, --verbose verbose mode\n" msgstr " -v, --verbose 详尽模式\n" -#: disk-utils/partx.c:737 +#: disk-utils/partx.c:738 msgid "" "\n" "Available columns (for --show, --raw or --pairs):\n" @@ -3496,30 +3665,30 @@ msgstr "" "\n" "可用的列(针对 --show、--raw 或 --pairs)：\n" -#: disk-utils/partx.c:810 +#: disk-utils/partx.c:811 msgid "failed to parse --nr <M-N> range" msgstr "解析 --nr <M-N> 范围失败" -#: disk-utils/partx.c:910 +#: disk-utils/partx.c:911 msgid "--nr and <partition> are mutually exclusive" msgstr "--nr 和 <分区> 相互排斥" -#: disk-utils/partx.c:929 +#: disk-utils/partx.c:930 #, c-format msgid "partition: %s, disk: %s, lower: %d, upper: %d\n" msgstr "分区：%s，磁盘：%s，从分区：%d,到分区：%d\n" -#: disk-utils/partx.c:941 +#: disk-utils/partx.c:942 #, c-format msgid "%s: cannot delete partitions" msgstr "%s：不能删除分区" -#: disk-utils/partx.c:944 +#: disk-utils/partx.c:945 #, c-format msgid "%s: partitioned loop devices unsupported" msgstr "%s：不支持已分区的回环设备" -#: disk-utils/partx.c:961 +#: disk-utils/partx.c:962 #, c-format msgid "%s: failed to initialize blkid prober" msgstr "%s：初始化 blkid 探针失败" @@ -3620,60 +3789,60 @@ msgstr "%s：获取分区号 %s 的起点失败" msgid "failed to resize partition" msgstr "调整分区大小失败" -#: disk-utils/sfdisk.c:200 +#: disk-utils/sfdisk.c:220 #, fuzzy msgid "failed to allocate nested libfdisk context" msgstr "分配 libfdisk 环境(context)失败" -#: disk-utils/sfdisk.c:244 +#: disk-utils/sfdisk.c:265 #, fuzzy, c-format msgid "cannot seek %s" msgstr "无法 seek" -#: disk-utils/sfdisk.c:254 libfdisk/src/bsd.c:664 libfdisk/src/bsd.c:835 +#: disk-utils/sfdisk.c:275 libfdisk/src/bsd.c:723 libfdisk/src/bsd.c:894 #: sys-utils/hwclock.c:161 sys-utils/hwclock.c:163 #, c-format msgid "cannot write %s" msgstr "无法写 %s" -#: disk-utils/sfdisk.c:260 +#: disk-utils/sfdisk.c:281 #, fuzzy, c-format msgid "%12s (offset %5ju, size %5ju): %s" msgstr "" "\n" "%s: 偏移 = %ju, 大小 = %zu 字节。" -#: disk-utils/sfdisk.c:266 +#: disk-utils/sfdisk.c:287 #, fuzzy, c-format msgid "%s: failed to create a backup" msgstr "%s：创建签名备份失败" -#: disk-utils/sfdisk.c:286 misc-utils/wipefs.c:382 +#: disk-utils/sfdisk.c:307 misc-utils/wipefs.c:382 msgid "failed to create a signature backup, $HOME undefined" msgstr "创建签名备份失败，未定义 $HOME" -#: disk-utils/sfdisk.c:292 +#: disk-utils/sfdisk.c:313 msgid "Backup files:" msgstr "" -#: disk-utils/sfdisk.c:308 +#: disk-utils/sfdisk.c:329 #, fuzzy msgid "The partition table is unchanged (--no-act)." msgstr "分区表已调整。" -#: disk-utils/sfdisk.c:312 +#: disk-utils/sfdisk.c:333 #, fuzzy msgid "" "\n" "The partition table has been altered." msgstr "分区表已调整。" -#: disk-utils/sfdisk.c:360 +#: disk-utils/sfdisk.c:403 #, fuzzy, c-format msgid "unsupported label '%s'" msgstr "不支持的磁盘标签：%s" -#: disk-utils/sfdisk.c:363 +#: disk-utils/sfdisk.c:406 msgid "" "Id Name\n" "\n" @@ -3681,248 +3850,253 @@ msgstr "" "Id 名称\n" "\n" -#: disk-utils/sfdisk.c:393 +#: disk-utils/sfdisk.c:436 #, fuzzy msgid "unrecognized partition table type" msgstr " %s：未识别的分区表类型" -#: disk-utils/sfdisk.c:446 +#: disk-utils/sfdisk.c:489 #, c-format msgid "Cannot get size of %s" msgstr "无法获得 %s 的大小" -#: disk-utils/sfdisk.c:483 +#: disk-utils/sfdisk.c:526 #, fuzzy, c-format msgid "total: %ju blocks\n" msgstr "共计：%llu 个块\n" -#: disk-utils/sfdisk.c:545 disk-utils/sfdisk.c:616 disk-utils/sfdisk.c:678 -#: disk-utils/sfdisk.c:742 disk-utils/sfdisk.c:797 disk-utils/sfdisk.c:853 -#: disk-utils/sfdisk.c:1096 +#: disk-utils/sfdisk.c:588 disk-utils/sfdisk.c:659 disk-utils/sfdisk.c:723 +#: disk-utils/sfdisk.c:787 disk-utils/sfdisk.c:842 disk-utils/sfdisk.c:898 +#: disk-utils/sfdisk.c:1189 #, fuzzy msgid "no disk device specified" msgstr "未指定设备" -#: disk-utils/sfdisk.c:556 +#: disk-utils/sfdisk.c:599 msgid "toggle boot flags is supported for MBR only" msgstr "" -#: disk-utils/sfdisk.c:587 disk-utils/sfdisk.c:683 disk-utils/sfdisk.c:747 -#: disk-utils/sfdisk.c:802 disk-utils/sfdisk.c:858 disk-utils/sfdisk.c:1094 -#: disk-utils/sfdisk.c:1482 +#: disk-utils/sfdisk.c:630 disk-utils/sfdisk.c:728 disk-utils/sfdisk.c:792 +#: disk-utils/sfdisk.c:847 disk-utils/sfdisk.c:903 disk-utils/sfdisk.c:1187 +#: disk-utils/sfdisk.c:1613 #, fuzzy msgid "failed to parse partition number" msgstr "%s：获取分区号失败" -#: disk-utils/sfdisk.c:592 +#: disk-utils/sfdisk.c:635 #, c-format msgid "%s: partition %d: failed to toggle bootable flag" msgstr "" -#: disk-utils/sfdisk.c:624 +#: disk-utils/sfdisk.c:667 #, fuzzy msgid "failed to allocate dump struct" msgstr "分配(callocate) CPU 组 失败" -#: disk-utils/sfdisk.c:628 +#: disk-utils/sfdisk.c:671 #, fuzzy msgid "failed to dump partition table" msgstr "%s：读取分区表失败" -#: disk-utils/sfdisk.c:656 +#: disk-utils/sfdisk.c:701 #, fuzzy, c-format msgid "%s: not found partition table." msgstr "无分区表。\n" -#: disk-utils/sfdisk.c:660 +#: disk-utils/sfdisk.c:705 #, fuzzy, c-format msgid "%s: partition %zu: partition table contains only %zu partitions" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:663 +#: disk-utils/sfdisk.c:708 #, fuzzy, c-format msgid "%s: partition %zu: partition is unused" msgstr "分区 %zu：与 分区 %zu 重叠。" -#: disk-utils/sfdisk.c:682 disk-utils/sfdisk.c:746 disk-utils/sfdisk.c:801 -#: disk-utils/sfdisk.c:857 +#: disk-utils/sfdisk.c:727 disk-utils/sfdisk.c:791 disk-utils/sfdisk.c:846 +#: disk-utils/sfdisk.c:902 #, fuzzy msgid "no partition number specified" msgstr "分区号" -#: disk-utils/sfdisk.c:688 disk-utils/sfdisk.c:752 disk-utils/sfdisk.c:807 -#: disk-utils/sfdisk.c:863 +#: disk-utils/sfdisk.c:733 disk-utils/sfdisk.c:797 disk-utils/sfdisk.c:852 +#: disk-utils/sfdisk.c:908 #, fuzzy msgid "unexpected arguments" msgstr "参数数量异常" -#: disk-utils/sfdisk.c:703 +#: disk-utils/sfdisk.c:748 #, fuzzy, c-format msgid "%s: partition %zu: failed to get partition type" msgstr "%s：获取分区号失败" -#: disk-utils/sfdisk.c:722 +#: disk-utils/sfdisk.c:767 #, fuzzy, c-format msgid "failed to parse %s partition type '%s'" msgstr "解析设施“%s”失败" -#: disk-utils/sfdisk.c:726 +#: disk-utils/sfdisk.c:771 #, fuzzy, c-format msgid "%s: partition %zu: failed to set partition type" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:764 +#: disk-utils/sfdisk.c:809 #, fuzzy, c-format msgid "%s: partition %zu: failed to get partition UUID" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:777 disk-utils/sfdisk.c:832 disk-utils/sfdisk.c:886 +#: disk-utils/sfdisk.c:822 disk-utils/sfdisk.c:877 disk-utils/sfdisk.c:931 #, fuzzy msgid "failed to allocate partition object" msgstr "分配迭代器失败" -#: disk-utils/sfdisk.c:781 +#: disk-utils/sfdisk.c:826 #, fuzzy, c-format msgid "%s: partition %zu: failed to set partition UUID" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:819 +#: disk-utils/sfdisk.c:864 #, fuzzy, c-format msgid "%s: partition %zu: failed to get partition name" msgstr "%s：获取分区号失败" -#: disk-utils/sfdisk.c:836 +#: disk-utils/sfdisk.c:881 #, fuzzy, c-format msgid "%s: partition %zu: failed to set partition name" msgstr "%s：获取分区号失败" -#: disk-utils/sfdisk.c:890 +#: disk-utils/sfdisk.c:935 #, fuzzy, c-format msgid "%s: partition %zu: failed to set partition attributes" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:933 +#: disk-utils/sfdisk.c:978 #, fuzzy msgid " Commands:\n" msgstr "没有命令？" -#: disk-utils/sfdisk.c:935 +#: disk-utils/sfdisk.c:980 #, fuzzy msgid " write write table to disk and exit\n" msgstr "将分区表写入磁盘并退出" -#: disk-utils/sfdisk.c:936 +#: disk-utils/sfdisk.c:981 msgid " quit show new situation and wait for user's feedback before write\n" msgstr "" -#: disk-utils/sfdisk.c:937 +#: disk-utils/sfdisk.c:982 msgid " abort exit sfdisk shell\n" msgstr "" -#: disk-utils/sfdisk.c:938 +#: disk-utils/sfdisk.c:983 #, fuzzy msgid " print print partition table.\n" msgstr "打印分区表" -#: disk-utils/sfdisk.c:939 +#: disk-utils/sfdisk.c:984 #, fuzzy msgid " help this help.\n" msgstr " --help 显示此帮助并退出\n" -#: disk-utils/sfdisk.c:941 +#: disk-utils/sfdisk.c:986 msgid " CTRL-D the same like 'quit' command\n" msgstr "" -#: disk-utils/sfdisk.c:945 +#: disk-utils/sfdisk.c:990 #, fuzzy msgid " Input format:\n" msgstr "输出格式：\n" -#: disk-utils/sfdisk.c:947 +#: disk-utils/sfdisk.c:992 msgid " <start>, <size>, <type>, <bootable>\n" msgstr "" -#: disk-utils/sfdisk.c:950 +#: disk-utils/sfdisk.c:995 msgid "" " <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:955 +#: disk-utils/sfdisk.c:1000 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:960 +#: disk-utils/sfdisk.c:1005 msgid " <type> partition type. The default is Linux data partition.\n" msgstr "" -#: disk-utils/sfdisk.c:961 +#: disk-utils/sfdisk.c:1006 msgid " MBR: hex or L,S,E,X shortcuts.\n" msgstr "" -#: disk-utils/sfdisk.c:962 +#: disk-utils/sfdisk.c:1007 msgid " GPT: uuid or L,S,H shortcuts.\n" msgstr "" -#: disk-utils/sfdisk.c:965 +#: disk-utils/sfdisk.c:1010 msgid " <bootable> '*' to mark MBR partition as bootable. \n" msgstr "" -#: disk-utils/sfdisk.c:969 +#: disk-utils/sfdisk.c:1014 msgid " Example:\n" msgstr "" -#: disk-utils/sfdisk.c:971 +#: disk-utils/sfdisk.c:1016 #, fuzzy msgid " , 4G creates 4GiB partition on default start offset.\n" msgstr " n 从空闲空间创建新分区" -#: disk-utils/sfdisk.c:1003 sys-utils/dmesg.c:1443 +#: disk-utils/sfdisk.c:1048 sys-utils/dmesg.c:1457 msgid "unsupported command" msgstr "不支持的命令" -#: disk-utils/sfdisk.c:1005 +#: disk-utils/sfdisk.c:1050 #, fuzzy, c-format msgid "line %d: unsupported command" msgstr "不支持的命令" -#: disk-utils/sfdisk.c:1104 +#: disk-utils/sfdisk.c:1197 #, fuzzy msgid "failed to allocate script handler" msgstr "分配 GPT 头失败" -#: disk-utils/sfdisk.c:1115 +#: disk-utils/sfdisk.c:1213 #, fuzzy, c-format msgid "%s: cannot modify partition %d: no partition table was found" msgstr "%s：读取分区表失败" -#: disk-utils/sfdisk.c:1120 +#: disk-utils/sfdisk.c:1218 #, fuzzy, c-format msgid "%s: cannot modify partition %d: partition table contains only %zu partitions" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:1135 +#: disk-utils/sfdisk.c:1224 +#, fuzzy, c-format +msgid "warning: %s: partition %d is not defined yet" +msgstr "还没有定义分区！" + +#: disk-utils/sfdisk.c:1237 #, fuzzy, c-format msgid "" "\n" "Welcome to sfdisk (%s)." msgstr "欢迎使用 fdisk (%s)。" -#: disk-utils/sfdisk.c:1143 +#: disk-utils/sfdisk.c:1245 msgid "Checking that no-one is using this disk right now ..." msgstr "请检查现在是不是有人在使用此磁盘..." -#: disk-utils/sfdisk.c:1145 +#: disk-utils/sfdisk.c:1248 msgid "" " FAILED\n" "\n" msgstr "" -#: disk-utils/sfdisk.c:1148 +#: disk-utils/sfdisk.c:1251 #, fuzzy msgid "" "This disk is currently in use - repartitioning is probably a bad idea.\n" @@ -3934,25 +4108,25 @@ msgstr "" "请卸载此磁盘上所有的文件系统，并关闭(swapoff)上面的交换分区。\n" "可使用 --no-reread 标志阻止此检查。" -#: disk-utils/sfdisk.c:1153 +#: disk-utils/sfdisk.c:1256 msgid "Use the --force flag to overrule all checks." msgstr "使用 --force 标志否决所有检查。" -#: disk-utils/sfdisk.c:1155 +#: disk-utils/sfdisk.c:1258 #, fuzzy msgid "" " OK\n" "\n" msgstr "%s：OK\n" -#: disk-utils/sfdisk.c:1164 +#: disk-utils/sfdisk.c:1267 #, fuzzy msgid "" "\n" "Old situation:" msgstr "旧状况：\n" -#: disk-utils/sfdisk.c:1181 +#: disk-utils/sfdisk.c:1284 #, c-format msgid "" "\n" @@ -3961,63 +4135,63 @@ msgid "" "to override the default." msgstr "" -#: disk-utils/sfdisk.c:1184 +#: disk-utils/sfdisk.c:1287 #, fuzzy msgid "" "\n" "Type 'help' to get more information.\n" msgstr "请尝试执行“%s --help”了解更多信息。\n" -#: disk-utils/sfdisk.c:1202 +#: disk-utils/sfdisk.c:1305 #, fuzzy msgid "All partitions used." msgstr "未找到分区" -#: disk-utils/sfdisk.c:1210 +#: disk-utils/sfdisk.c:1313 #, fuzzy msgid "failed to allocate partition name" msgstr "添加分区失败" -#: disk-utils/sfdisk.c:1238 -#, fuzzy, c-format -msgid "Ignoring partition %zu." +#: disk-utils/sfdisk.c:1352 +#, fuzzy +msgid "Ignoring partition." msgstr "无法创建分区 %zu" -#: disk-utils/sfdisk.c:1246 +#: disk-utils/sfdisk.c:1361 #, fuzzy msgid "Failed to apply script headers, disk label not created." msgstr "写磁盘标签失败" -#: disk-utils/sfdisk.c:1258 +#: disk-utils/sfdisk.c:1373 #, fuzzy msgid "Failed to add partition" msgstr "添加分区失败" -#: disk-utils/sfdisk.c:1269 +#: disk-utils/sfdisk.c:1384 msgid "Script header accepted." msgstr "" -#: disk-utils/sfdisk.c:1278 +#: disk-utils/sfdisk.c:1393 #, fuzzy msgid "" "\n" "New situation:" msgstr "新状况：\n" -#: disk-utils/sfdisk.c:1287 +#: disk-utils/sfdisk.c:1402 #, fuzzy msgid "Do you want to write this to disk?" msgstr "您想把这些写入磁盘吗？[ynq] " -#: disk-utils/sfdisk.c:1289 +#: disk-utils/sfdisk.c:1404 msgid "Leaving." msgstr "" -#: disk-utils/sfdisk.c:1299 +#: disk-utils/sfdisk.c:1414 msgid "Leaving.\n" msgstr "" -#: disk-utils/sfdisk.c:1312 +#: disk-utils/sfdisk.c:1427 #, fuzzy, c-format msgid "" " %1$s [options] <dev> [[-N] <part>]\n" @@ -4026,167 +4200,182 @@ msgstr "" " %1$s [选项] [<回环设备>]\n" " %1$s [选项] -f | <回环设备> <文件>\n" -#: disk-utils/sfdisk.c:1318 +#: disk-utils/sfdisk.c:1433 msgid "" "\n" "Commands:\n" msgstr "" -#: disk-utils/sfdisk.c:1319 -msgid " -a, --activate <dev> [<part> ...] list or set bootable MBR partitions\n" +#: disk-utils/sfdisk.c:1434 +msgid " -A, --activate <dev> [<part> ...] list or set bootable MBR partitions\n" msgstr "" -#: disk-utils/sfdisk.c:1320 +#: disk-utils/sfdisk.c:1435 #, fuzzy msgid " -d, --dump <dev> dump partition table (usable for later input)\n" msgstr " -H, --human 易读格式输出\n" -#: disk-utils/sfdisk.c:1321 +#: disk-utils/sfdisk.c:1436 +#, fuzzy +msgid " -J, --json <dev> dump partition table in JSON format\n" +msgstr " -H, --human 易读格式输出\n" + +#: disk-utils/sfdisk.c:1437 msgid " -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n" msgstr "" -#: disk-utils/sfdisk.c:1322 +#: disk-utils/sfdisk.c:1438 #, fuzzy msgid " -l, --list [<dev> ...] list partitions of each device\n" msgstr " -l, --list 显示分区信息并退出\n" -#: disk-utils/sfdisk.c:1323 +#: disk-utils/sfdisk.c:1439 +#, fuzzy +msgid " -F, --list-free [<dev> ...] list unpartitions free areas of each device\n" +msgstr " -l, --list 显示分区信息并退出\n" + +#: disk-utils/sfdisk.c:1440 #, fuzzy msgid " -s, --show-size [<dev> ...] list sizes of all or specified devices\n" msgstr " -l, --list 列出所有或指定的信息(默认)\n" -#: disk-utils/sfdisk.c:1324 +#: disk-utils/sfdisk.c:1441 #, fuzzy msgid " -T, --list-types print the recognized types (see -X)\n" msgstr " -r, --raw 打印原生消息缓冲区\n" -#: disk-utils/sfdisk.c:1325 +#: disk-utils/sfdisk.c:1442 #, fuzzy -msgid " -V, --verify test whether partitions seem correct\n" +msgid " -V, --verify [<dev> ...] test whether partitions seem correct\n" msgstr " -l, --list 显示分区信息并退出\n" -#: disk-utils/sfdisk.c:1328 +#: disk-utils/sfdisk.c:1445 msgid " --part-label <dev> <part> [<str>] print or change partition label\n" msgstr "" -#: disk-utils/sfdisk.c:1329 +#: disk-utils/sfdisk.c:1446 msgid " --part-type <dev> <part> [<type>] print or change partition type\n" msgstr "" -#: disk-utils/sfdisk.c:1330 +#: disk-utils/sfdisk.c:1447 msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n" msgstr "" -#: disk-utils/sfdisk.c:1331 +#: disk-utils/sfdisk.c:1448 msgid " --part-attrs <dev> <part> [<str>] print or change partition attributes\n" msgstr "" -#: disk-utils/sfdisk.c:1334 +#: disk-utils/sfdisk.c:1451 #, fuzzy msgid " <dev> device (usually disk) path\n" msgstr " --help 显示此帮助并退出\n" -#: disk-utils/sfdisk.c:1335 +#: disk-utils/sfdisk.c:1452 #, fuzzy msgid " <part> partition number\n" msgstr " -l, --list 显示分区信息并退出\n" -#: disk-utils/sfdisk.c:1336 +#: disk-utils/sfdisk.c:1453 msgid " <type> partition type, GUID for GPT, hex for MBR\n" msgstr "" -#: disk-utils/sfdisk.c:1339 +#: disk-utils/sfdisk.c:1456 #, fuzzy -msgid " -A, --append append partitions to existing partition table\n" +msgid " -a, --append append partitions to existing partition table\n" msgstr " -z, --zero 以空分区表开始\n" -#: disk-utils/sfdisk.c:1340 +#: disk-utils/sfdisk.c:1457 #, fuzzy msgid " -b, --backup backup partition table sectors (see -O)\n" msgstr " -t, --type <类型> 只识别指定的分区表类型\n" -#: disk-utils/sfdisk.c:1341 +#: disk-utils/sfdisk.c:1458 #, fuzzy msgid " --bytes print SIZE in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" -#: disk-utils/sfdisk.c:1342 +#: disk-utils/sfdisk.c:1459 #, fuzzy msgid " -f, --force disable all consistency checking\n" msgstr " -r, --reset 重置所有计数(限 root 用户)\n" -#: disk-utils/sfdisk.c:1343 +#: disk-utils/sfdisk.c:1460 +#, fuzzy +msgid " --color[=<when>] colorize output (auto, always or never)\n" +msgstr " -L --color[=<何时>] 彩色输出(auto自动，always总是或never从不)\n" + +#: disk-utils/sfdisk.c:1463 #, fuzzy msgid " -N, --partno <num> specify partition number\n" msgstr " -H, --heads <数字> 指定磁头数\n" -#: disk-utils/sfdisk.c:1344 +#: disk-utils/sfdisk.c:1464 #, fuzzy msgid " -n, --no-act do everything except write to device\n" msgstr " -n, --no-mtab 不写 /etc/mtab\n" -#: disk-utils/sfdisk.c:1345 +#: disk-utils/sfdisk.c:1465 #, fuzzy msgid " --no-reread do not check whether the device is in use\n" msgstr " -J --noclear 提示之前不清屏\n" -#: disk-utils/sfdisk.c:1346 +#: disk-utils/sfdisk.c:1466 msgid " -O, --backup-file <path> override default backup file name\n" msgstr "" -#: disk-utils/sfdisk.c:1347 +#: disk-utils/sfdisk.c:1467 #, fuzzy msgid " -o, --output <list> output columns\n" msgstr " -o, --output <列表> 输出列\n" -#: disk-utils/sfdisk.c:1348 +#: disk-utils/sfdisk.c:1468 #, fuzzy msgid " -q, --quiet suppress extra info messages\n" msgstr " -U, --user 取消共享用户名字空间\n" -#: disk-utils/sfdisk.c:1349 +#: disk-utils/sfdisk.c:1469 #, fuzzy msgid " -X, --label <name> specify label type (dos, gpt, ...)\n" msgstr " -i, --irq <数字> 指定并口中断号\n" -#: disk-utils/sfdisk.c:1350 +#: disk-utils/sfdisk.c:1470 #, fuzzy msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n" msgstr " -t, --type <类型> 指定分区类型(dos、bsd、solaris 等)\n" -#: disk-utils/sfdisk.c:1352 +#: disk-utils/sfdisk.c:1472 #, fuzzy msgid " -L, --Linux deprecated, only for backward compatibility\n" msgstr " --4gb 忽略(纯为兼容)\n" -#: disk-utils/sfdisk.c:1353 +#: disk-utils/sfdisk.c:1473 #, fuzzy msgid " -u, --unit S deprecated, only sector unit is supported\n" msgstr " -i, --info 只打印有关采样步骤(sampling step)的信息\n" -#: disk-utils/sfdisk.c:1357 login-utils/chfn.c:103 login-utils/chsh.c:80 +#: disk-utils/sfdisk.c:1477 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:1445 +#: disk-utils/sfdisk.c:1570 #, c-format msgid "%s is deprecated in favour of --part-type" msgstr "" -#: disk-utils/sfdisk.c:1450 +#: disk-utils/sfdisk.c:1575 msgid "--id is deprecated in favour of --part-type" msgstr "" -#: disk-utils/sfdisk.c:1469 +#: disk-utils/sfdisk.c:1600 msgid "--Linux option is unnecessary and deprecated" msgstr "" -#: disk-utils/sfdisk.c:1495 +#: disk-utils/sfdisk.c:1626 #, fuzzy, c-format msgid "unsupported unit '%c'" msgstr "不支持的参数：%s" -#: disk-utils/sfdisk.c:1498 include/c.h:294 +#: disk-utils/sfdisk.c:1629 include/c.h:300 #, c-format msgid "%s from %s\n" msgstr "%s，来自 %s\n" @@ -4237,7 +4426,7 @@ msgstr "" msgid "ignore -U (UUIDs are unsupported)" msgstr "忽略 -U (不支持 UUID)" -#: include/c.h:287 +#: include/c.h:293 msgid "" "\n" "Usage:\n" @@ -4245,7 +4434,7 @@ msgstr "" "\n" "用法：\n" -#: include/c.h:288 +#: include/c.h:294 msgid "" "\n" "Options:\n" @@ -4253,15 +4442,15 @@ msgstr "" "\n" "选项：\n" -#: include/c.h:290 +#: include/c.h:296 msgid " -h, --help display this help and exit\n" msgstr " -h, --help 显示此帮助并退出\n" -#: include/c.h:291 +#: include/c.h:297 msgid " -V, --version output version information and exit\n" msgstr " -V, --version 输出版本信息并退出\n" -#: include/c.h:292 +#: include/c.h:298 #, c-format msgid "" "\n" @@ -4271,12 +4460,19 @@ msgstr "" "更多信息请参阅 %s。\n" #: include/closestream.h:42 include/closestream.h:44 login-utils/vipw.c:271 -#: login-utils/vipw.c:290 sys-utils/rtcwake.c:279 term-utils/script.c:596 -#: term-utils/script.c:600 term-utils/setterm.c:819 term-utils/wall.c:314 +#: login-utils/vipw.c:290 sys-utils/rtcwake.c:275 term-utils/setterm.c:815 #: text-utils/col.c:157 msgid "write error" msgstr "写出错" +#: include/colors.h:27 +msgid "colors enabled by default" +msgstr "" + +#: include/colors.h:29 +msgid "colors disabled by default" +msgstr "" + #: include/optutils.h:81 #, fuzzy, c-format msgid "%s: these options are mutually exclusive:" @@ -4454,8 +4650,8 @@ msgstr "Golden Bow" msgid "Priam Edisk" msgstr "Priam Edisk" -#: include/pt-mbr-partnames.h:44 include/pt-mbr-partnames.h:88 -#: include/pt-mbr-partnames.h:94 include/pt-mbr-partnames.h:95 +#: include/pt-mbr-partnames.h:44 include/pt-mbr-partnames.h:89 +#: include/pt-mbr-partnames.h:95 include/pt-mbr-partnames.h:96 msgid "SpeedStor" msgstr "SpeedStor" @@ -4511,7 +4707,7 @@ msgstr "NTFS 卷集" msgid "Linux plaintext" msgstr "Linux 纯文本" -#: include/pt-mbr-partnames.h:59 libfdisk/src/gpt.c:186 libfdisk/src/sgi.c:63 +#: include/pt-mbr-partnames.h:59 libfdisk/src/gpt.c:203 libfdisk/src/sgi.c:63 #: libfdisk/src/sun.c:54 msgid "Linux LVM" msgstr "Linux LVM" @@ -4572,99 +4768,104 @@ msgstr "BSDI swap" msgid "Boot Wizard hidden" msgstr "Boot Wizard 隐藏" -#: include/pt-mbr-partnames.h:74 libfdisk/src/gpt.c:207 +#: include/pt-mbr-partnames.h:74 +#, fuzzy +msgid "Acronis FAT32 LBA" +msgstr "W95 FAT32 (LBA)" + +#: include/pt-mbr-partnames.h:75 libfdisk/src/gpt.c:228 msgid "Solaris boot" msgstr "Solaris 启动" -#: include/pt-mbr-partnames.h:75 +#: include/pt-mbr-partnames.h:76 msgid "Solaris" msgstr "Solaris" -#: include/pt-mbr-partnames.h:76 +#: include/pt-mbr-partnames.h:77 msgid "DRDOS/sec (FAT-12)" msgstr "DRDOS/sec (FAT-12)" -#: include/pt-mbr-partnames.h:77 +#: include/pt-mbr-partnames.h:78 msgid "DRDOS/sec (FAT-16 < 32M)" msgstr "DRDOS/sec (FAT-16 < 32M)" -#: include/pt-mbr-partnames.h:78 +#: include/pt-mbr-partnames.h:79 msgid "DRDOS/sec (FAT-16)" msgstr "DRDOS/sec (FAT-16)" -#: include/pt-mbr-partnames.h:79 +#: include/pt-mbr-partnames.h:80 msgid "Syrinx" msgstr "Syrinx" -#: include/pt-mbr-partnames.h:80 +#: include/pt-mbr-partnames.h:81 msgid "Non-FS data" msgstr "非文件系统数据" -#: include/pt-mbr-partnames.h:81 +#: include/pt-mbr-partnames.h:82 msgid "CP/M / CTOS / ..." msgstr "CP/M / CTOS / ..." -#: include/pt-mbr-partnames.h:83 +#: include/pt-mbr-partnames.h:84 msgid "Dell Utility" msgstr "Dell 工具" -#: include/pt-mbr-partnames.h:84 +#: include/pt-mbr-partnames.h:85 msgid "BootIt" msgstr "BootIt" -#: include/pt-mbr-partnames.h:85 +#: include/pt-mbr-partnames.h:86 msgid "DOS access" msgstr "DOS 访问" -#: include/pt-mbr-partnames.h:87 +#: include/pt-mbr-partnames.h:88 msgid "DOS R/O" msgstr "DOS R/O" -#: include/pt-mbr-partnames.h:90 +#: include/pt-mbr-partnames.h:91 msgid "BeOS fs" msgstr "BeOS fs" -#: include/pt-mbr-partnames.h:92 +#: include/pt-mbr-partnames.h:93 msgid "EFI (FAT-12/16/32)" msgstr "EFI (FAT-12/16/32)" -#: include/pt-mbr-partnames.h:93 +#: include/pt-mbr-partnames.h:94 msgid "Linux/PA-RISC boot" msgstr "Linux/PA-RISC 启动" -#: include/pt-mbr-partnames.h:96 +#: include/pt-mbr-partnames.h:97 msgid "DOS secondary" msgstr "DOS 次要" -#: include/pt-mbr-partnames.h:97 +#: include/pt-mbr-partnames.h:98 msgid "VMware VMFS" msgstr "VMware VMFS" -#: include/pt-mbr-partnames.h:98 +#: include/pt-mbr-partnames.h:99 msgid "VMware VMKCORE" msgstr "VMware VMKCORE" -#: include/pt-mbr-partnames.h:99 libfdisk/src/sun.c:55 +#: include/pt-mbr-partnames.h:100 libfdisk/src/sun.c:55 msgid "Linux raid autodetect" msgstr "Linux raid 自动检测" -#: include/pt-mbr-partnames.h:102 +#: include/pt-mbr-partnames.h:103 msgid "LANstep" msgstr "LANstep" -#: include/pt-mbr-partnames.h:103 +#: include/pt-mbr-partnames.h:104 msgid "BBT" msgstr "BBT" -#: libfdisk/src/alignment.c:636 +#: libfdisk/src/alignment.c:662 msgid "Calling ioctl() to re-read partition table." msgstr "将调用 ioctl() 来重新读分区表。" -#: libfdisk/src/alignment.c:645 +#: libfdisk/src/alignment.c:671 msgid "Re-reading the partition table failed." msgstr "重新读取分区表失败。" -#: libfdisk/src/alignment.c:647 +#: libfdisk/src/alignment.c:673 msgid "The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or kpartx(8)." msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 kpartx(8) 后生效。" @@ -4690,277 +4891,230 @@ msgstr "分区号" msgid "Created a new partition %d of type '%s' and of size %s." msgstr "创建了一个新分区 %d，类型为“%s”，大小为 %s。" -#: libfdisk/src/bsd.c:167 +#: libfdisk/src/bsd.c:166 #, c-format msgid "Partition %zd: has invalid starting sector 0." msgstr "分区 %zd：无效的起始扇区 0。" -#: libfdisk/src/bsd.c:182 +#: libfdisk/src/bsd.c:181 #, c-format msgid "There is no *BSD partition on %s." msgstr "%s 上没有 *BSD 分区。" -#: libfdisk/src/bsd.c:260 libfdisk/src/dos.c:946 +#: libfdisk/src/bsd.c:259 libfdisk/src/dos.c:933 msgid "First cylinder" msgstr "第一个柱面" -#: libfdisk/src/bsd.c:293 libfdisk/src/dos.c:1168 +#: libfdisk/src/bsd.c:292 libfdisk/src/dos.c:1161 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:1173 libfdisk/src/gpt.c:2087 +#: libfdisk/src/bsd.c:297 libfdisk/src/dos.c:1166 libfdisk/src/gpt.c:2232 msgid "Last sector, +sectors or +size{K,M,G,T,P}" msgstr "上个扇区，+sectors 或 +size{K,M,G,T,P}" -#: libfdisk/src/bsd.c:382 +#: libfdisk/src/bsd.c:381 #, c-format msgid "The device %s does not contain BSD disklabel." msgstr "设备 %s 不包含BSD 磁盘标签。" -#: libfdisk/src/bsd.c:384 +#: libfdisk/src/bsd.c:383 msgid "Do you want to create a BSD disklabel?" msgstr "您想创建一个 BSD 磁盘标签吗？" -#: libfdisk/src/bsd.c:445 -#, c-format -msgid "type: %s" -msgstr "类型：%s" - -#: libfdisk/src/bsd.c:447 -#, c-format -msgid "type: %d" -msgstr "类型：%d" - #: libfdisk/src/bsd.c:449 -#, c-format -msgid "disk: %.*s" -msgstr "磁盘：%.*s" +#, fuzzy +msgid "Disk" +msgstr "磁盘：%s" -#: libfdisk/src/bsd.c:450 -#, c-format -msgid "label: %.*s" -msgstr "标签：%.*s" +#: libfdisk/src/bsd.c:456 +msgid "Packname" +msgstr "" -#: libfdisk/src/bsd.c:452 -#, c-format -msgid "flags: %s" -msgstr "标志：%s" +#: libfdisk/src/bsd.c:463 libfdisk/src/sun.c:1114 +msgid "Flags" +msgstr "标志" -#: libfdisk/src/bsd.c:453 +#: libfdisk/src/bsd.c:466 msgid " removable" msgstr " 可移动" -#: libfdisk/src/bsd.c:454 +#: libfdisk/src/bsd.c:467 msgid " ecc" msgstr " ecc" -#: libfdisk/src/bsd.c:455 +#: libfdisk/src/bsd.c:468 msgid " badsect" msgstr " 坏扇区" -#: libfdisk/src/bsd.c:459 -#, c-format -msgid "bytes/sector: %ld" -msgstr "字节/扇区：%ld" - -#: libfdisk/src/bsd.c:460 -#, c-format -msgid "sectors/track: %ld" -msgstr "扇区/磁道：%ld" - -#: libfdisk/src/bsd.c:461 -#, c-format -msgid "tracks/cylinder: %ld" -msgstr "磁道/柱面：%ld" +#: libfdisk/src/bsd.c:476 +#, fuzzy +msgid "Bytes/Sector" +msgstr "字节/扇区" -#: libfdisk/src/bsd.c:462 -#, c-format -msgid "sectors/cylinder: %ld" -msgstr "扇区/柱面：%ld" +#: libfdisk/src/bsd.c:481 +#, fuzzy +msgid "Tracks/Cylinder" +msgstr "磁道/柱面" -#: libfdisk/src/bsd.c:463 -#, c-format -msgid "cylinders: %ld" -msgstr "柱面：%ld" +#: libfdisk/src/bsd.c:486 +#, fuzzy +msgid "Sectors/Cylinder" +msgstr "扇区/柱面" -#: libfdisk/src/bsd.c:464 -#, c-format -msgid "rpm: %d" -msgstr "转/分：%d" +#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1014 libfdisk/src/dos.c:2303 +#: libfdisk/src/sgi.c:1162 libfdisk/src/sun.c:196 libfdisk/src/sun.c:1110 +msgid "Cylinders" +msgstr "柱面" -#: libfdisk/src/bsd.c:465 -#, c-format -msgid "interleave: %d" -msgstr "交错：%d" +#: libfdisk/src/bsd.c:496 libfdisk/src/sun.c:757 +#, fuzzy +msgid "Rpm" +msgstr "rpm" -#: libfdisk/src/bsd.c:466 -#, c-format -msgid "trackskew: %d" -msgstr "磁道螺距：%d" +#: libfdisk/src/bsd.c:501 libfdisk/src/sgi.c:292 libfdisk/src/sun.c:777 +#, fuzzy +msgid "Interleave" +msgstr "交错" -#: libfdisk/src/bsd.c:467 -#, c-format -msgid "cylinderskew: %d" -msgstr "柱面螺距：%d" +#: libfdisk/src/bsd.c:506 +#, fuzzy +msgid "Trackskew" +msgstr "磁道螺距" -#: libfdisk/src/bsd.c:468 -#, c-format -msgid "headswitch: %ld (milliseconds)" -msgstr "磁头切换：%ld (毫秒)" +#: libfdisk/src/bsd.c:511 +#, fuzzy +msgid "Cylinderskew" +msgstr "柱头螺距" -#: libfdisk/src/bsd.c:469 -#, c-format -msgid "track-to-track seek: %ld (milliseconds)" -msgstr "跨磁道定位：%ld (毫秒)" +#: libfdisk/src/bsd.c:516 +#, fuzzy +msgid "Headswitch" +msgstr "磁头切换" -#: libfdisk/src/bsd.c:472 -#, c-format -msgid "partitions: %d" -msgstr "分区数：%d" +#: libfdisk/src/bsd.c:521 +#, fuzzy +msgid "Track-to-track seek" +msgstr "跨磁道定位" -#: libfdisk/src/bsd.c:552 +#: libfdisk/src/bsd.c:611 msgid "bytes/sector" msgstr "字节/扇区" -#: libfdisk/src/bsd.c:555 +#: libfdisk/src/bsd.c:614 msgid "sectors/track" msgstr "扇区/磁道" -#: libfdisk/src/bsd.c:556 +#: libfdisk/src/bsd.c:615 msgid "tracks/cylinder" msgstr "磁道/柱面" -#: libfdisk/src/bsd.c:557 +#: libfdisk/src/bsd.c:616 msgid "cylinders" msgstr "柱面" -#: libfdisk/src/bsd.c:561 +#: libfdisk/src/bsd.c:620 msgid "sectors/cylinder" msgstr "扇区/柱面" -#: libfdisk/src/bsd.c:564 +#: libfdisk/src/bsd.c:623 msgid "rpm" msgstr "rpm" -#: libfdisk/src/bsd.c:565 +#: libfdisk/src/bsd.c:624 msgid "interleave" msgstr "交错" -#: libfdisk/src/bsd.c:566 +#: libfdisk/src/bsd.c:625 msgid "trackskew" msgstr "磁道螺距" -#: libfdisk/src/bsd.c:567 +#: libfdisk/src/bsd.c:626 msgid "cylinderskew" msgstr "柱头螺距" -#: libfdisk/src/bsd.c:569 +#: libfdisk/src/bsd.c:628 msgid "headswitch" msgstr "磁头切换" -#: libfdisk/src/bsd.c:570 +#: libfdisk/src/bsd.c:629 msgid "track-to-track seek" msgstr "跨磁道定位" -#: libfdisk/src/bsd.c:592 +#: libfdisk/src/bsd.c:651 #, c-format msgid "The bootstrap file %s successfully loaded." msgstr "成功加载了引导程序文件 %s。" -#: libfdisk/src/bsd.c:614 +#: libfdisk/src/bsd.c:673 #, c-format msgid "Bootstrap: %1$sboot -> boot%1$s (default %1$s)" msgstr "引导：%1$sboot -> boot%1$s (默认 %1$s)" -#: libfdisk/src/bsd.c:645 +#: libfdisk/src/bsd.c:704 msgid "Bootstrap overlaps with disklabel!" msgstr "引导程序与磁盘标签重叠！" -#: libfdisk/src/bsd.c:669 +#: libfdisk/src/bsd.c:728 #, c-format msgid "Bootstrap installed on %s." msgstr "已在 %s 上安装引导程序。" -#: libfdisk/src/bsd.c:840 +#: libfdisk/src/bsd.c:899 #, c-format msgid "Disklabel written to %s." msgstr "磁盘标签已写入 %s。" -#: libfdisk/src/bsd.c:846 libfdisk/src/context.c:580 +#: libfdisk/src/bsd.c:905 libfdisk/src/context.c:611 msgid "Syncing disks." msgstr "正在同步磁盘。" -#: libfdisk/src/bsd.c:887 +#: libfdisk/src/bsd.c:946 msgid "BSD label is not nested within a DOS partition." msgstr "BSD 标签未嵌套在 DOS 分区中。" -#: libfdisk/src/bsd.c:915 +#: libfdisk/src/bsd.c:974 #, c-format msgid "BSD partition '%c' linked to DOS partition %zu." msgstr "BSD 分区“%c”已链接到 DOS 分区 %zu。" -#: libfdisk/src/bsd.c:951 +#: libfdisk/src/bsd.c:1010 msgid "Slice" msgstr "片" -#: 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: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: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: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:2265 libfdisk/src/gpt.c:2556 -#: libfdisk/src/sgi.c:1137 libfdisk/src/sun.c:1081 -msgid "Size" -msgstr "大小" - -#: libfdisk/src/bsd.c:958 +#: libfdisk/src/bsd.c:1017 msgid "Fsize" msgstr "Fsize" -#: libfdisk/src/bsd.c:959 +#: libfdisk/src/bsd.c:1018 msgid "Bsize" msgstr "Bsize" -#: libfdisk/src/bsd.c:960 +#: libfdisk/src/bsd.c:1019 msgid "Cpg" msgstr "Cpg" -#: libfdisk/src/context.c:451 +#: libfdisk/src/context.c:482 #, 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:574 +#: libfdisk/src/context.c:605 #, c-format msgid "%s: close device failed" msgstr "%s：关闭设备失败" -#: libfdisk/src/context.c:741 +#: libfdisk/src/context.c:772 msgid "cylinder" msgid_plural "cylinders" msgstr[0] "柱面" -#: libfdisk/src/context.c:742 +#: libfdisk/src/context.c:773 msgid "sector" msgid_plural "sectors" msgstr[0] "扇区" -#: libfdisk/src/context.c:1047 +#: libfdisk/src/context.c:1078 msgid "Incomplete geometry setting." msgstr "不完整的几何属性设置。" @@ -5018,753 +5172,859 @@ msgstr "将忽略分区表 %zu 中的额外数据。" msgid "omitting empty partition (%zu)" msgstr "将忽略空分区(%zu)" -#: libfdisk/src/dos.c:677 +#: libfdisk/src/dos.c:664 #, fuzzy, c-format msgid "Created a new DOS disklabel with disk identifier 0x%08x." msgstr "使用磁盘标识符 0x%08x 创建新的 DOS 磁盘标签。\n" -#: libfdisk/src/dos.c:698 +#: libfdisk/src/dos.c:685 msgid "Enter the new disk identifier" msgstr "输入新磁盘标识符" -#: libfdisk/src/dos.c:705 +#: libfdisk/src/dos.c:692 msgid "Incorrect value." msgstr "无效的值。" -#: libfdisk/src/dos.c:714 +#: libfdisk/src/dos.c:701 #, c-format msgid "Disk identifier changed from 0x%08x to 0x%08x." msgstr "磁盘标识从 0x%08x 改为 0x%08x。" -#: libfdisk/src/dos.c:806 +#: libfdisk/src/dos.c:793 #, c-format msgid "Ignoring extra extended partition %zu" msgstr "将忽略额外的扩展分区 %zu" -#: libfdisk/src/dos.c:819 +#: libfdisk/src/dos.c:806 #, 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:933 +#: libfdisk/src/dos.c:920 #, c-format msgid "Start sector %ju out of range." msgstr "起始扇区 %ju 超出范围。" -#: libfdisk/src/dos.c:1038 libfdisk/src/gpt.c:1970 libfdisk/src/sgi.c:814 +#: libfdisk/src/dos.c:1026 libfdisk/src/gpt.c:2113 libfdisk/src/sgi.c:840 #: 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:1108 +#: libfdisk/src/dos.c:1096 #, c-format msgid "Sector %llu is already allocated." msgstr "扇区 %llu 已经分配." -#: libfdisk/src/dos.c:1145 libfdisk/src/gpt.c:1980 +#: libfdisk/src/dos.c:1133 libfdisk/src/gpt.c:2123 msgid "No free sectors available." msgstr "无空闲扇区可用。" -#: libfdisk/src/dos.c:1285 +#: libfdisk/src/dos.c:1287 #, c-format msgid "Adding logical partition %zu" msgstr "添加逻辑分区 %zu" -#: libfdisk/src/dos.c:1316 +#: libfdisk/src/dos.c:1318 #, c-format msgid "Partition %zu: contains sector 0" msgstr "分区 %zu：包含扇区 0" -#: libfdisk/src/dos.c:1318 +#: libfdisk/src/dos.c:1320 #, c-format msgid "Partition %zu: head %d greater than maximum %d" msgstr "分区 %zu：磁头 %d 大于最大值 %d" -#: libfdisk/src/dos.c:1321 +#: libfdisk/src/dos.c:1323 #, c-format msgid "Partition %zu: sector %d greater than maximum %llu" msgstr "分区 %zu：扇区 %d 大于最大值 %llu" -#: libfdisk/src/dos.c:1324 +#: libfdisk/src/dos.c:1326 #, c-format msgid "Partition %zu: cylinder %d greater than maximum %llu" msgstr "分区 %zu：柱面 %d 大于最大值 %llu" -#: libfdisk/src/dos.c:1330 +#: libfdisk/src/dos.c:1332 #, c-format msgid "Partition %zu: previous sectors %u disagrees with total %u" msgstr "分区 %zu：之前的扇区数 %u 与总数 %u 不符" -#: libfdisk/src/dos.c:1383 +#: libfdisk/src/dos.c:1385 #, 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:1394 +#: libfdisk/src/dos.c:1396 #, 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:1403 +#: libfdisk/src/dos.c:1405 #, c-format msgid "Partition %zu: does not end on cylinder boundary." msgstr "分区 %zu 未结束在柱面边界上。" -#: libfdisk/src/dos.c:1429 +#: libfdisk/src/dos.c:1431 #, c-format msgid "Partition %zu: bad start-of-data." msgstr "分区 %zu：数据起点错误。" -#: libfdisk/src/dos.c:1442 +#: libfdisk/src/dos.c:1444 #, c-format msgid "Partition %zu: overlaps partition %zu." msgstr "分区 %zu：与 分区 %zu 重叠。" -#: libfdisk/src/dos.c:1468 +#: libfdisk/src/dos.c:1470 #, c-format msgid "Partition %zu: empty." msgstr "分区 %zu：空分区。" -#: libfdisk/src/dos.c:1473 +#: libfdisk/src/dos.c:1475 #, c-format msgid "Logical partition %zu: not entirely in partition %zu." msgstr "逻辑分区 %zu：没有完全在分区 %zu 中。" -#: libfdisk/src/dos.c:1481 +#: libfdisk/src/dos.c:1483 #, c-format msgid "Total allocated sectors %llu greater than the maximum %llu." msgstr "分配的总扇区数 %llu 大于最大值 %llu。" -#: libfdisk/src/dos.c:1484 +#: libfdisk/src/dos.c:1486 #, c-format msgid "Remaining %lld unallocated %ld-byte sectors." msgstr "剩余 %lld 未分配的 %ld字节 扇区。" -#: libfdisk/src/dos.c:1532 +#: libfdisk/src/dos.c:1534 libfdisk/src/dos.c:1953 #, fuzzy msgid "Extended partition already exists." msgstr "扩展分区位置异常" -#: libfdisk/src/dos.c:1575 +#: libfdisk/src/dos.c:1577 msgid "The maximum number of partitions has been created." msgstr "已创建分区达到最大数量。" -#: libfdisk/src/dos.c:1587 +#: libfdisk/src/dos.c:1589 msgid "All primary partitions are in use." msgstr "所有主分区都在使用中。" -#: libfdisk/src/dos.c:1589 +#: libfdisk/src/dos.c:1591 #, fuzzy msgid "All space for primary partitions is in use." msgstr "所有主分区都在使用中。" #. TRANSLATORS: Try to keep this within 80 characters. -#: libfdisk/src/dos.c:1600 +#: libfdisk/src/dos.c:1602 #, fuzzy msgid "To create more partitions, first replace a primary with an extended partition." msgstr "要想创建多于 4 个分区，您需要先将一个主分区替换为扩展分区。" -#: libfdisk/src/dos.c:1605 +#: libfdisk/src/dos.c:1607 msgid "All logical partitions are in use. Adding a primary partition." msgstr "所有逻辑分区都在使用中。将添加一个主分区。" -#: libfdisk/src/dos.c:1627 +#: libfdisk/src/dos.c:1629 msgid "Partition type" msgstr "分区类型" -#: libfdisk/src/dos.c:1631 +#: libfdisk/src/dos.c:1633 #, c-format msgid "%zu primary, %d extended, %zu free" msgstr "%zu个主分区，%d个扩展分区，%zu空闲" -#: libfdisk/src/dos.c:1636 +#: libfdisk/src/dos.c:1638 msgid "primary" msgstr "主分区" -#: libfdisk/src/dos.c:1638 +#: libfdisk/src/dos.c:1640 msgid "extended" msgstr "扩展分区" -#: libfdisk/src/dos.c:1638 +#: libfdisk/src/dos.c:1640 msgid "container for logical partitions" msgstr "逻辑分区容器" -#: libfdisk/src/dos.c:1640 +#: libfdisk/src/dos.c:1642 msgid "logical" msgstr "逻辑分区" -#: libfdisk/src/dos.c:1640 +#: libfdisk/src/dos.c:1642 msgid "numbered from 5" msgstr "从 5 开始编号" -#: libfdisk/src/dos.c:1678 +#: libfdisk/src/dos.c:1680 #, c-format msgid "Invalid partition type `%c'." msgstr "无效的分区类型“%c”。" -#: libfdisk/src/dos.c:1696 +#: libfdisk/src/dos.c:1698 #, c-format msgid "Cannot write sector %jd: seek failed" msgstr "写扇区 %jd 失败：定位失败" -#: 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:1851 libfdisk/src/gpt.c:1097 +#, fuzzy +msgid "Disk identifier" +msgstr "磁盘标识符：%s" -#: libfdisk/src/dos.c:1917 +#: libfdisk/src/dos.c:1958 msgid "Type 0 means free space to many systems. Having partitions of type 0 is probably unwise." msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。" -#: libfdisk/src/dos.c:2103 +#: libfdisk/src/dos.c:1963 +msgid "Cannot change type of the extended partition which is already used by logical partitons. Delete logical partitions first." +msgstr "" + +#: libfdisk/src/dos.c:2142 msgid "Nothing to do. Ordering is correct already." msgstr "无须操作。顺序已经是正确的了。" -#: libfdisk/src/dos.c:2132 libfdisk/src/gpt.c:2471 +#: libfdisk/src/dos.c:2171 libfdisk/src/gpt.c:2678 msgid "Done." msgstr "完成。" -#: libfdisk/src/dos.c:2153 +#: libfdisk/src/dos.c:2192 #, c-format msgid "Partition %zu: no data area." msgstr "分区 %zu：无数据区。" -#: libfdisk/src/dos.c:2183 +#: libfdisk/src/dos.c:2222 msgid "New beginning of data" msgstr "新数据起点" -#: libfdisk/src/dos.c:2239 +#: libfdisk/src/dos.c:2278 #, c-format msgid "Partition %zu: is an extended partition." msgstr "分区 %zu：是一个扩展分区。" -#: libfdisk/src/dos.c:2245 +#: libfdisk/src/dos.c:2284 #, c-format msgid "The bootable flag on partition %zu is enabled now." msgstr "分区 %zu 的 可启动 标志已启用。" -#: libfdisk/src/dos.c:2246 +#: libfdisk/src/dos.c:2285 #, c-format msgid "The bootable flag on partition %zu is disabled now." msgstr "分区 %zu 的 可启动 标志已禁用。" -#: libfdisk/src/dos.c:2259 libfdisk/src/gpt.c:2552 libfdisk/src/sgi.c:1132 -#: libfdisk/src/sun.c:1076 +#: libfdisk/src/dos.c:2298 libfdisk/src/gpt.c:2758 libfdisk/src/sgi.c:1158 +#: libfdisk/src/sun.c:1106 msgid "Device" msgstr "设备" -#: libfdisk/src/dos.c:2260 libfdisk/src/sun.c:41 +#: libfdisk/src/dos.c:2299 libfdisk/src/sun.c:41 msgid "Boot" msgstr "启动" -#: libfdisk/src/dos.c:2266 libfdisk/src/sgi.c:1138 libfdisk/src/sun.c:1082 +#: libfdisk/src/dos.c:2305 libfdisk/src/sgi.c:1164 libfdisk/src/sun.c:1112 msgid "Id" msgstr "Id" -#: libfdisk/src/dos.c:2270 +#: libfdisk/src/dos.c:2309 msgid "Start-C/H/S" msgstr "始-C/H/S" -#: libfdisk/src/dos.c:2271 +#: libfdisk/src/dos.c:2310 msgid "End-C/H/S" msgstr "终-C/H/S" -#: libfdisk/src/dos.c:2272 libfdisk/src/gpt.c:2562 libfdisk/src/sgi.c:1140 +#: libfdisk/src/dos.c:2311 libfdisk/src/gpt.c:2768 libfdisk/src/sgi.c:1166 msgid "Attrs" msgstr "属性" -#: libfdisk/src/gpt.c:155 +#: libfdisk/src/gpt.c:159 msgid "EFI System" msgstr "EFI 系统" -#: libfdisk/src/gpt.c:157 +#: libfdisk/src/gpt.c:161 msgid "MBR partition scheme" msgstr "MBR 分区方案" -#: libfdisk/src/gpt.c:158 +#: libfdisk/src/gpt.c:162 msgid "Intel Fast Flash" msgstr "Intel Fast Flash" -#: libfdisk/src/gpt.c:161 +#: libfdisk/src/gpt.c:165 msgid "BIOS boot" msgstr "BIOS 启动" -#: libfdisk/src/gpt.c:164 +#: libfdisk/src/gpt.c:168 +#, fuzzy +msgid "Sony boot partition" +msgstr "BIOS 启动分区" + +#: libfdisk/src/gpt.c:169 +#, fuzzy +msgid "Lenovo boot partition" +msgstr "BIOS 启动分区" + +#: libfdisk/src/gpt.c:172 +#, fuzzy +msgid "PowerPC PReP boot" +msgstr "PPC PReP Boot" + +#: libfdisk/src/gpt.c:175 +#, fuzzy +msgid "ONIE boot" +msgstr "BIOS 启动" + +#: libfdisk/src/gpt.c:176 +msgid "ONIE config" +msgstr "" + +#: libfdisk/src/gpt.c:179 msgid "Microsoft reserved" msgstr "Microsoft 保留" -#: libfdisk/src/gpt.c:165 +#: libfdisk/src/gpt.c:180 msgid "Microsoft basic data" msgstr "Microsoft 基本数据" -#: libfdisk/src/gpt.c:166 +#: libfdisk/src/gpt.c:181 msgid "Microsoft LDM metadata" msgstr "Microsoft LDM 元数据" -#: libfdisk/src/gpt.c:167 +#: libfdisk/src/gpt.c:182 msgid "Microsoft LDM data" msgstr "Microsoft LDM 数据" -#: libfdisk/src/gpt.c:168 +#: libfdisk/src/gpt.c:183 msgid "Windows recovery environment" msgstr "Windows 恢复环境" -#: libfdisk/src/gpt.c:169 +#: libfdisk/src/gpt.c:184 msgid "IBM General Parallel Fs" msgstr "IBM 通用并行文件系统" -#: libfdisk/src/gpt.c:170 +#: libfdisk/src/gpt.c:185 msgid "Microsoft Storage Spaces" msgstr "Microsoft 存储空间" -#: libfdisk/src/gpt.c:173 +#: libfdisk/src/gpt.c:188 msgid "HP-UX data" msgstr "HP-UX 数据" -#: libfdisk/src/gpt.c:174 +#: libfdisk/src/gpt.c:189 msgid "HP-UX service" msgstr "HP-UX 服务" -#: libfdisk/src/gpt.c:177 libfdisk/src/sgi.c:61 libfdisk/src/sun.c:52 +#: libfdisk/src/gpt.c:192 libfdisk/src/sgi.c:61 libfdisk/src/sun.c:52 msgid "Linux swap" msgstr "Linux swap" -#: libfdisk/src/gpt.c:178 +#: libfdisk/src/gpt.c:193 msgid "Linux filesystem" msgstr "Linux 文件系统" -#: libfdisk/src/gpt.c:179 +#: libfdisk/src/gpt.c:194 msgid "Linux server data" msgstr "Linux 保留数据" -#: libfdisk/src/gpt.c:180 +#: libfdisk/src/gpt.c:195 msgid "Linux root (x86)" msgstr "Linux root (x86)" -#: libfdisk/src/gpt.c:181 +#: libfdisk/src/gpt.c:196 +#, fuzzy +msgid "Linux root (ARM)" +msgstr "Linux root (x86)" + +#: libfdisk/src/gpt.c:197 msgid "Linux root (x86-64)" msgstr "Linux root (x86-64)" -#: libfdisk/src/gpt.c:182 +#: libfdisk/src/gpt.c:198 +#, fuzzy +msgid "Linux root (ARM-64)" +msgstr "Linux root (x86-64)" + +#: libfdisk/src/gpt.c:199 msgid "Linux reserved" msgstr "Linux 保留" -#: libfdisk/src/gpt.c:183 +#: libfdisk/src/gpt.c:200 msgid "Linux home" msgstr "Linux home" -#: libfdisk/src/gpt.c:184 libfdisk/src/sgi.c:64 +#: libfdisk/src/gpt.c:201 libfdisk/src/sgi.c:64 msgid "Linux RAID" msgstr "Linux RAID" -#: libfdisk/src/gpt.c:185 +#: libfdisk/src/gpt.c:202 msgid "Linux extended boot" msgstr "Linux 扩展启动" -#: libfdisk/src/gpt.c:189 +#: libfdisk/src/gpt.c:210 msgid "FreeBSD data" msgstr "FreeBSD 数据" -#: libfdisk/src/gpt.c:190 +#: libfdisk/src/gpt.c:211 msgid "FreeBSD boot" msgstr "FreeBSD 启动" -#: libfdisk/src/gpt.c:191 +#: libfdisk/src/gpt.c:212 msgid "FreeBSD swap" msgstr "FreeBSD 交换" -#: libfdisk/src/gpt.c:192 +#: libfdisk/src/gpt.c:213 msgid "FreeBSD UFS" msgstr "FreeBSD UFS" -#: libfdisk/src/gpt.c:193 +#: libfdisk/src/gpt.c:214 msgid "FreeBSD ZFS" msgstr "FreeBSD ZFS" -#: libfdisk/src/gpt.c:194 +#: libfdisk/src/gpt.c:215 msgid "FreeBSD Vinum" msgstr "FreeBSD Vinum" -#: libfdisk/src/gpt.c:197 +#: libfdisk/src/gpt.c:218 msgid "Apple HFS/HFS+" msgstr "Apple HFS/HFS+" -#: libfdisk/src/gpt.c:198 +#: libfdisk/src/gpt.c:219 msgid "Apple UFS" msgstr "Apple UFS" -#: libfdisk/src/gpt.c:199 +#: libfdisk/src/gpt.c:220 msgid "Apple RAID" msgstr "Apple RAID" -#: libfdisk/src/gpt.c:200 +#: libfdisk/src/gpt.c:221 msgid "Apple RAID offline" msgstr "Apple RAID 离线" -#: libfdisk/src/gpt.c:201 +#: libfdisk/src/gpt.c:222 msgid "Apple boot" msgstr "Apple 启动" -#: libfdisk/src/gpt.c:202 +#: libfdisk/src/gpt.c:223 msgid "Apple label" msgstr "Apple 标签" -#: libfdisk/src/gpt.c:203 +#: libfdisk/src/gpt.c:224 msgid "Apple TV recovery" msgstr "Apple TV 恢复" -#: libfdisk/src/gpt.c:204 +#: libfdisk/src/gpt.c:225 msgid "Apple Core storage" msgstr "Apple Core 存储" -#: libfdisk/src/gpt.c:208 +#: libfdisk/src/gpt.c:229 msgid "Solaris root" msgstr "Solaris root" -#: libfdisk/src/gpt.c:210 +#: libfdisk/src/gpt.c:231 msgid "Solaris /usr & Apple ZFS" msgstr "Solaris /usr & Apple ZFS" -#: libfdisk/src/gpt.c:211 +#: libfdisk/src/gpt.c:232 msgid "Solaris swap" msgstr "Solaris 交换" -#: libfdisk/src/gpt.c:212 +#: libfdisk/src/gpt.c:233 msgid "Solaris backup" msgstr "Solaris 备份" -#: libfdisk/src/gpt.c:213 +#: libfdisk/src/gpt.c:234 msgid "Solaris /var" msgstr "Solaris /var" -#: libfdisk/src/gpt.c:214 +#: libfdisk/src/gpt.c:235 msgid "Solaris /home" msgstr "Solaris /home" -#: libfdisk/src/gpt.c:215 +#: libfdisk/src/gpt.c:236 msgid "Solaris alternate sector" msgstr "Solaris 备选扇区" -#: libfdisk/src/gpt.c:216 +#: libfdisk/src/gpt.c:237 msgid "Solaris reserved 1" msgstr "Solaris 保留 1" -#: libfdisk/src/gpt.c:217 +#: libfdisk/src/gpt.c:238 msgid "Solaris reserved 2" msgstr "Solaris 保留 2" -#: libfdisk/src/gpt.c:218 +#: libfdisk/src/gpt.c:239 msgid "Solaris reserved 3" msgstr "Solaris 保留 3" -#: libfdisk/src/gpt.c:219 +#: libfdisk/src/gpt.c:240 msgid "Solaris reserved 4" msgstr "Solaris 保留 4" -#: libfdisk/src/gpt.c:220 +#: libfdisk/src/gpt.c:241 msgid "Solaris reserved 5" msgstr "Solaris 保留 5" -#: libfdisk/src/gpt.c:223 +#: libfdisk/src/gpt.c:244 msgid "NetBSD swap" msgstr "NetBSD 交换" -#: libfdisk/src/gpt.c:224 +#: libfdisk/src/gpt.c:245 msgid "NetBSD FFS" msgstr "NetBSD FFS" -#: libfdisk/src/gpt.c:225 +#: libfdisk/src/gpt.c:246 msgid "NetBSD LFS" msgstr "NetBSD LFS" -#: libfdisk/src/gpt.c:226 +#: libfdisk/src/gpt.c:247 msgid "NetBSD concatenated" msgstr "NetBSD concatenated" -#: libfdisk/src/gpt.c:227 +#: libfdisk/src/gpt.c:248 msgid "NetBSD encrypted" msgstr "NetBSD 加密" -#: libfdisk/src/gpt.c:228 +#: libfdisk/src/gpt.c:249 msgid "NetBSD RAID" msgstr "NetBSD RAID" -#: libfdisk/src/gpt.c:231 +#: libfdisk/src/gpt.c:252 msgid "ChromeOS kernel" msgstr "ChromeOS 内核" -#: libfdisk/src/gpt.c:232 +#: libfdisk/src/gpt.c:253 msgid "ChromeOS root fs" msgstr "ChromeOS 根文件系统" -#: libfdisk/src/gpt.c:233 +#: libfdisk/src/gpt.c:254 msgid "ChromeOS reserved" msgstr "ChromeOS 保留" -#: libfdisk/src/gpt.c:236 +#: libfdisk/src/gpt.c:257 msgid "MidnightBSD data" msgstr "MidnightBSD 数据" -#: libfdisk/src/gpt.c:237 +#: libfdisk/src/gpt.c:258 msgid "MidnightBSD boot" msgstr "MidnightBSD 启动" -#: libfdisk/src/gpt.c:238 +#: libfdisk/src/gpt.c:259 msgid "MidnightBSD swap" msgstr "MidnightBSD 交换" -#: libfdisk/src/gpt.c:239 +#: libfdisk/src/gpt.c:260 msgid "MidnightBSD UFS" msgstr "MidnightBSD UFS" -#: libfdisk/src/gpt.c:240 +#: libfdisk/src/gpt.c:261 msgid "MidnightBSD ZFS" msgstr "MidnightBSD ZFS" -#: libfdisk/src/gpt.c:241 +#: libfdisk/src/gpt.c:262 msgid "MidnightBSD Vinum" msgstr "MidnightBSD Vinum" -#: libfdisk/src/gpt.c:493 +#: libfdisk/src/gpt.c:265 +msgid "Ceph Journal" +msgstr "" + +#: libfdisk/src/gpt.c:266 +msgid "Ceph Encrypted Journal" +msgstr "" + +#: libfdisk/src/gpt.c:267 +msgid "Ceph OSD" +msgstr "" + +#: libfdisk/src/gpt.c:268 +msgid "Ceph crypt OSD" +msgstr "" + +#: libfdisk/src/gpt.c:269 +msgid "Ceph disk in creation" +msgstr "" + +#: libfdisk/src/gpt.c:270 +msgid "Ceph crypt disk in creation" +msgstr "" + +#: libfdisk/src/gpt.c:273 +#, fuzzy +msgid "OpenBSD data" +msgstr "FreeBSD 数据" + +#: libfdisk/src/gpt.c:276 +#, fuzzy +msgid "QNX6 file system" +msgstr "Linux 文件系统" + +#: libfdisk/src/gpt.c:279 +#, fuzzy +msgid "Plan 9 partition" +msgstr "删除分区" + +#: libfdisk/src/gpt.c:544 msgid "failed to allocate GPT header" msgstr "分配 GPT 头失败" -#: libfdisk/src/gpt.c:655 +#: libfdisk/src/gpt.c:626 +msgid "First LBA specified by script is out of range." +msgstr "" + +#: libfdisk/src/gpt.c:637 +msgid "Last LBA specified by script is out of range." +msgstr "" + +#: libfdisk/src/gpt.c:771 #, 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:673 +#: libfdisk/src/gpt.c:789 msgid "gpt: stat() failed" msgstr "gpt：stat() 失败" -#: libfdisk/src/gpt.c:683 +#: libfdisk/src/gpt.c:799 #, c-format msgid "gpt: cannot handle files with mode %o" msgstr "gpt：无法操作模式为 %o 的文件" -#: libfdisk/src/gpt.c:949 +#: libfdisk/src/gpt.c:1066 msgid "GPT Header" msgstr "GPT 头" -#: libfdisk/src/gpt.c:954 +#: libfdisk/src/gpt.c:1071 msgid "GPT Entries" msgstr "GPT 记录项" -#: libfdisk/src/gpt.c:1269 +#: libfdisk/src/gpt.c:1104 +#, fuzzy +msgid "First LBA" +msgstr "第一个 LBA：%ju" + +#: libfdisk/src/gpt.c:1109 +#, fuzzy +msgid "Last LBA" +msgstr "上个 LBA: %ju" + +#. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header. +#: libfdisk/src/gpt.c:1115 +#, fuzzy +msgid "Alternative LBA" +msgstr "替代 LBA：%ju" + +#. TRANSLATORS: The start of the array of partition entries. +#: libfdisk/src/gpt.c:1121 +#, fuzzy +msgid "Partition entries LBA" +msgstr "分区记录项 LBA：%ju" + +#: libfdisk/src/gpt.c:1126 +#, fuzzy +msgid "Allocated partition entries" +msgstr "已分配的分区项：%u" + +#: libfdisk/src/gpt.c:1441 msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used." msgstr "备份 GPT 表损坏，但主表似乎正常，将使用它。" -#: libfdisk/src/gpt.c:1278 +#: libfdisk/src/gpt.c:1450 msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used." msgstr "主 GPT 表损坏，但备份似乎正常，将使用它。" -#: libfdisk/src/gpt.c:1452 +#: libfdisk/src/gpt.c:1624 #, fuzzy, c-format msgid "unsupported GPT attribute bit '%s'" msgstr "不支持的参数：%s" -#: libfdisk/src/gpt.c:1547 +#: libfdisk/src/gpt.c:1719 #, c-format msgid "Partition UUID changed from %s to %s." msgstr "分区 UUID 已从 %s 更改为 %s。" -#: libfdisk/src/gpt.c:1555 +#: libfdisk/src/gpt.c:1727 #, c-format msgid "Partition name changed from '%s' to '%.*s'." msgstr "分区名已由“%s”改为“%.*s”。" -#: libfdisk/src/gpt.c:1613 -#, c-format -msgid "First LBA: %ju" -msgstr "第一个 LBA：%ju" - -#: 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:1616 -#, c-format -msgid "Alternative LBA: %ju" -msgstr "替代 LBA：%ju" - -#. TRANSLATORS: The start of the array of partition entries. -#: libfdisk/src/gpt.c:1618 -#, fuzzy, c-format -msgid "Partition entries LBA: %ju" -msgstr "分区记录项 LBA：%ju" - -#: libfdisk/src/gpt.c:1619 -#, c-format -msgid "Allocated partition entries: %u" -msgstr "已分配的分区项：%u" - -#: libfdisk/src/gpt.c:1770 +#: libfdisk/src/gpt.c:1913 msgid "The device contains hybrid MBR -- writing GPT only. You have to sync the MBR manually." msgstr "该设备包含混合 MBR -- 将只写入 GPT。您需要手动同步 MBR。" -#: libfdisk/src/gpt.c:1805 +#: libfdisk/src/gpt.c:1948 msgid "Disk does not contain a valid backup header." msgstr "磁盘不含有效的备用磁头。" -#: libfdisk/src/gpt.c:1810 +#: libfdisk/src/gpt.c:1953 msgid "Invalid primary header CRC checksum." msgstr "无效的主磁头 CRC 校验和。" -#: libfdisk/src/gpt.c:1814 +#: libfdisk/src/gpt.c:1957 msgid "Invalid backup header CRC checksum." msgstr "无效的备份磁头 CRC 校验和。" -#: libfdisk/src/gpt.c:1819 +#: libfdisk/src/gpt.c:1962 msgid "Invalid partition entry checksum." msgstr "无效的分区记录校验和。" -#: libfdisk/src/gpt.c:1824 +#: libfdisk/src/gpt.c:1967 msgid "Invalid primary header LBA sanity checks." msgstr "无效的主磁头 LBA 完整性检查。" -#: libfdisk/src/gpt.c:1828 +#: libfdisk/src/gpt.c:1971 msgid "Invalid backup header LBA sanity checks." msgstr "无效的备用磁头 LBA 完整性检查。" -#: libfdisk/src/gpt.c:1833 +#: libfdisk/src/gpt.c:1976 msgid "MyLBA mismatch with real position at primary header." msgstr "MyLBA 不匹配，真正位置在主磁头。" -#: libfdisk/src/gpt.c:1837 +#: libfdisk/src/gpt.c:1980 msgid "MyLBA mismatch with real position at backup header." msgstr "MyLBA 不匹配，真正位置在备份磁头。" -#: libfdisk/src/gpt.c:1842 +#: libfdisk/src/gpt.c:1985 msgid "Disk is too small to hold all data." msgstr "磁盘太小，放不下所有数据。" -#: libfdisk/src/gpt.c:1852 +#: libfdisk/src/gpt.c:1995 msgid "Primary and backup header mismatch." msgstr "主磁头和备份磁头不匹配。" -#: libfdisk/src/gpt.c:1858 +#: libfdisk/src/gpt.c:2001 #, c-format msgid "Partition %u overlaps with partition %u." msgstr "分区 %u 与 %u 重叠。" -#: libfdisk/src/gpt.c:1865 +#: libfdisk/src/gpt.c:2008 #, c-format msgid "Partition %u is too big for the disk." msgstr "分区 %u 对于该磁盘而言过大。" -#: libfdisk/src/gpt.c:1872 +#: libfdisk/src/gpt.c:2015 #, c-format msgid "Partition %u ends before it starts." msgstr "分区 %u 结束于起点之前。" -#: libfdisk/src/gpt.c:1881 +#: libfdisk/src/gpt.c:2024 msgid "No errors detected." msgstr "未检测到错误。" -#: libfdisk/src/gpt.c:1882 +#: libfdisk/src/gpt.c:2025 #, c-format msgid "Header version: %s" msgstr "磁头版本：%s" -#: libfdisk/src/gpt.c:1883 +#: libfdisk/src/gpt.c:2026 #, c-format msgid "Using %u out of %d partitions." msgstr "使用着 %2$d 个分区中的 %1$u 个。" -#: libfdisk/src/gpt.c:1894 +#: libfdisk/src/gpt.c:2037 #, 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:1902 +#: libfdisk/src/gpt.c:2045 #, c-format msgid "%d error detected." msgid_plural "%d errors detected." msgstr[0] "检测到 %d 个错误。" -#: libfdisk/src/gpt.c:1976 +#: libfdisk/src/gpt.c:2119 msgid "All partitions are already in use." msgstr "所有分区均已占用。" -#: libfdisk/src/gpt.c:2031 libfdisk/src/gpt.c:2056 +#: libfdisk/src/gpt.c:2174 libfdisk/src/gpt.c:2199 #, c-format msgid "Sector %ju already used." msgstr "扇区 %ju 已使用。" -#: libfdisk/src/gpt.c:2116 +#: libfdisk/src/gpt.c:2260 #, c-format msgid "Could not create partition %zu" msgstr "无法创建分区 %zu" -#: libfdisk/src/gpt.c:2247 +#: libfdisk/src/gpt.c:2267 +#, c-format +msgid "The last usable GPT sector is %ju, but %ju is requested." +msgstr "" + +#: libfdisk/src/gpt.c:2274 +#, c-format +msgid "The first usable GPT sector is %ju, but %ju is requested." +msgstr "" + +#: libfdisk/src/gpt.c:2406 #, c-format msgid "Created a new GPT disklabel (GUID: %s)." msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。" -#: libfdisk/src/gpt.c:2284 +#: libfdisk/src/gpt.c:2424 msgid "Enter new disk UUID (in 8-4-4-4-12 format)" msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)" -#: libfdisk/src/gpt.c:2291 +#: libfdisk/src/gpt.c:2431 msgid "Failed to parse your UUID." msgstr "解析您的 UUID 失败。" -#: libfdisk/src/gpt.c:2305 +#: libfdisk/src/gpt.c:2445 #, c-format msgid "Disk identifier changed from %s to %s." msgstr "将磁盘标识从 %s 更改为 %s 失败。" -#: libfdisk/src/gpt.c:2391 +#: libfdisk/src/gpt.c:2551 +#, fuzzy, c-format +msgid "The attributes on partition %zu changed to 0x%016<PRIx64>." +msgstr "分区 %zu 的类型未更改。" + +#: libfdisk/src/gpt.c:2598 msgid "Enter GUID specific bit" msgstr "输入 GUID 特定位" -#: libfdisk/src/gpt.c:2406 +#: libfdisk/src/gpt.c:2613 #, c-format msgid "failed to toggle unsupported bit %lu" msgstr "开/关不支持的位 %lu 失败" -#: libfdisk/src/gpt.c:2419 +#: libfdisk/src/gpt.c:2626 #, c-format msgid "The GUID specific bit %d on partition %zu is enabled now." msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。" -#: libfdisk/src/gpt.c:2420 +#: libfdisk/src/gpt.c:2627 #, c-format msgid "The GUID specific bit %d on partition %zu is disabled now." msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。" -#: libfdisk/src/gpt.c:2424 +#: libfdisk/src/gpt.c:2631 #, c-format msgid "The %s flag on partition %zu is enabled now." msgstr "分区 %2$zu 上的标志 %1$s 现已启用。" -#: libfdisk/src/gpt.c:2425 +#: libfdisk/src/gpt.c:2632 #, c-format msgid "The %s flag on partition %zu is disabled now." msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。" -#: libfdisk/src/gpt.c:2559 +#: libfdisk/src/gpt.c:2765 msgid "Type-UUID" msgstr "类型-UUID" -#: libfdisk/src/gpt.c:2560 +#: libfdisk/src/gpt.c:2766 msgid "UUID" msgstr "UUID" -#: libfdisk/src/gpt.c:2561 login-utils/chfn.c:151 login-utils/chfn.c:153 +#: libfdisk/src/gpt.c:2767 login-utils/chfn.c:151 login-utils/chfn.c:153 #: login-utils/chfn.c:308 msgid "Name" msgstr "名称" -#: libfdisk/src/partition.c:751 +#: libfdisk/src/partition.c:768 msgid "Free space" msgstr "剩余空间" -#: libfdisk/src/parttype.c:259 misc-utils/findmnt.c:670 schedutils/ionice.c:79 +#: libfdisk/src/partition.c:1102 +#, fuzzy, c-format +msgid "Failed to resize partition #%zu." +msgstr "调整分区大小失败" + +#: libfdisk/src/parttype.c:259 misc-utils/findmnt.c:680 schedutils/ionice.c:79 #: sys-utils/hwclock.c:335 msgid "unknown" msgstr "未知" @@ -5837,155 +6097,154 @@ msgstr "在第二扇区创建了 SGI 信息。" msgid "Detected an SGI disklabel with wrong checksum." msgstr "检测到校验和错误的 sgi 磁盘标签。" -#: libfdisk/src/sgi.c:275 -#, c-format -msgid "" -"Label geometry: %d heads, %llu sectors\n" -" %llu cylinders, %d physical cylinders\n" -" %d extra sects/cyl, interleave %d:1\n" -msgstr "" -"标签几何属性： %d 个磁头，%llu 个扇区\n" -" %llu 个柱面，%d 个物理柱面\n" -" %d 个额外扇区/柱面，交错 %d:1\n" +#: libfdisk/src/sgi.c:282 libfdisk/src/sun.c:767 +#, fuzzy +msgid "Physical cylinders" +msgstr "物理柱面数" -#: libfdisk/src/sgi.c:282 -#, c-format -msgid "Bootfile: %s" +#: libfdisk/src/sgi.c:287 libfdisk/src/sun.c:772 +#, fuzzy +msgid "Extra sects/cyl" +msgstr "每个柱面的额外扇区数" + +#: libfdisk/src/sgi.c:297 +#, fuzzy +msgid "Bootfile" msgstr "启动文件：%s" -#: libfdisk/src/sgi.c:369 +#: libfdisk/src/sgi.c:395 msgid "Invalid bootfile! The bootfile must be an absolute non-zero pathname, e.g. \"/unix\" or \"/unix.save\"." msgstr "无效的启动文件！启动文件必须为绝对非零路径名，例如“/unix”或“/unix.save”。" -#: libfdisk/src/sgi.c:375 +#: libfdisk/src/sgi.c:401 #, c-format msgid "Name of bootfile is too long: %zu byte maximum." msgid_plural "Name of bootfile is too long: %zu bytes maximum." msgstr[0] "启动文件名过长：最多 %zu 个字节。" -#: libfdisk/src/sgi.c:382 +#: libfdisk/src/sgi.c:408 msgid "Bootfile must have a fully qualified pathname." msgstr "启动文件必须用完全限定路径名。" -#: libfdisk/src/sgi.c:388 +#: libfdisk/src/sgi.c:414 msgid "Be aware that the bootfile is not checked for existence. SGI's default is \"/unix\", and for backup \"/unix.save\"." msgstr "注意，不会检查启动文件是否存在。SGI 默认值为“/unix”，备份为“/unix.save”。" -#: libfdisk/src/sgi.c:413 +#: libfdisk/src/sgi.c:439 #, c-format msgid "The current boot file is: %s" msgstr "当前启动文件为：%s" -#: libfdisk/src/sgi.c:415 +#: libfdisk/src/sgi.c:441 msgid "Enter of the new boot file" msgstr "输入新启动文件的路径" -#: libfdisk/src/sgi.c:420 +#: libfdisk/src/sgi.c:446 msgid "Boot file is unchanged." msgstr "启动文件未改变。" -#: libfdisk/src/sgi.c:431 +#: libfdisk/src/sgi.c:457 #, c-format msgid "Bootfile has been changed to \"%s\"." msgstr "启动文件已更改为“%s”。" -#: libfdisk/src/sgi.c:571 +#: libfdisk/src/sgi.c:597 msgid "More than one entire disk entry present." msgstr "存在超过一个整磁盘记录。" -#: libfdisk/src/sgi.c:578 libfdisk/src/sun.c:455 +#: libfdisk/src/sgi.c:604 libfdisk/src/sun.c:455 msgid "No partitions defined." msgstr "未定义分区。" -#: libfdisk/src/sgi.c:588 +#: libfdisk/src/sgi.c:614 msgid "IRIX likes it when partition 11 covers the entire disk." msgstr "IRIX 偏向于让分区 11 覆盖整个磁盘。" -#: libfdisk/src/sgi.c:592 +#: libfdisk/src/sgi.c:618 #, c-format msgid "The entire disk partition should start at block 0, not at block %d." msgstr "整磁盘分区应开始于块 0，而非块 %d。" -#: libfdisk/src/sgi.c:603 +#: libfdisk/src/sgi.c:629 msgid "Partition 11 should cover the entire disk." msgstr "分区 11 应覆盖整个磁盘。" -#: libfdisk/src/sgi.c:627 +#: libfdisk/src/sgi.c:653 #, c-format msgid "Partitions %d and %d overlap by %d sector." msgid_plural "Partitions %d and %d overlap by %d sectors." msgstr[0] "分区 %d 与 %d 重叠了 %d 个扇区。" -#: libfdisk/src/sgi.c:638 libfdisk/src/sgi.c:660 +#: libfdisk/src/sgi.c:664 libfdisk/src/sgi.c:686 #, c-format msgid "Unused gap of %8u sector: sector %8u" msgid_plural "Unused gap of %8u sectors: sectors %8u-%u" msgstr[0] "有未使用的 %8u 个扇区的间隙：扇区 %8u-%u" -#: libfdisk/src/sgi.c:673 +#: libfdisk/src/sgi.c:699 msgid "The boot partition does not exist." msgstr "启动分区不存在。" -#: libfdisk/src/sgi.c:677 +#: libfdisk/src/sgi.c:703 msgid "The swap partition does not exist." msgstr "交换分区不存在。" -#: libfdisk/src/sgi.c:681 +#: libfdisk/src/sgi.c:707 msgid "The swap partition has no swap type." msgstr "交换分区不是交换类型。" -#: libfdisk/src/sgi.c:684 +#: libfdisk/src/sgi.c:710 msgid "You have chosen an unusual bootfile name." msgstr "您选择了一个不常用的启动文件名。" -#: libfdisk/src/sgi.c:734 +#: libfdisk/src/sgi.c:760 msgid "Partition overlap on the disk." msgstr "磁盘上的分区重叠。" -#: libfdisk/src/sgi.c:819 +#: libfdisk/src/sgi.c:845 msgid "Attempting to generate entire disk entry automatically." msgstr "尝试自动生成整磁盘记录。" -#: libfdisk/src/sgi.c:824 +#: libfdisk/src/sgi.c:850 msgid "The entire disk is already covered with partitions." msgstr "整个磁盘已经被分区覆盖。" -#: libfdisk/src/sgi.c:828 +#: libfdisk/src/sgi.c:854 msgid "You got a partition overlap on the disk. Fix it first!" msgstr "磁盘上有重叠分区。请先修复它！" -#: libfdisk/src/sgi.c:850 libfdisk/src/sun.c:541 +#: libfdisk/src/sgi.c:876 libfdisk/src/sun.c:541 #, c-format msgid "First %s" msgstr "起始 %s" -#: libfdisk/src/sgi.c:874 libfdisk/src/sgi.c:924 +#: libfdisk/src/sgi.c:900 libfdisk/src/sgi.c:950 msgid "It is highly recommended that the eleventh partition covers the entire disk and is of type 'SGI volume'." msgstr "强烈建议第十一分区覆盖整个磁盘，并使用“SGI volume”类型。" -#: libfdisk/src/sgi.c:889 libfdisk/src/sun.c:636 +#: libfdisk/src/sgi.c:915 libfdisk/src/sun.c:636 #, c-format msgid "Last %s or +%s or +size{K,M,G,T,P}" msgstr "最后 %s 或+%s 或 +大小{K,M,G,T,P}" -#: libfdisk/src/sgi.c:961 libfdisk/src/sun.c:242 +#: libfdisk/src/sgi.c:987 libfdisk/src/sun.c:242 #, c-format msgid "BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %llu. This value may be truncated for devices > 33.8 GB." msgstr "对 %s 执行 BLKGETSIZE ioctl 失败。将使用几何 柱面 属性值 %llu。对于大于 33.8 GB 的设备，这个值可能被截短。" -#: libfdisk/src/sgi.c:1027 +#: libfdisk/src/sgi.c:1053 msgid "Created a new SGI disklabel." msgstr "创建新的SGI 磁盘标签。" -#: libfdisk/src/sgi.c:1049 +#: libfdisk/src/sgi.c:1075 msgid "Sorry, only for non-empty partitions you can change the tag." msgstr "抱歉，只有非空分区才能更改标志(tag)。" -#: libfdisk/src/sgi.c:1055 +#: libfdisk/src/sgi.c:1081 msgid "Consider leaving partition 9 as volume header (0), and partition 11 as entire volume (6), as IRIX expects it." msgstr "考虑将分区 9 留作卷头(volume header) (0)，分区 11 作为整卷(6)，以符合 IRIX 规定。" -#: libfdisk/src/sgi.c:1064 +#: libfdisk/src/sgi.c:1090 msgid "It is highly recommended that the partition at offset 0 is of type \"SGI volhdr\", the IRIX system will rely on it to retrieve from its directory standalone tools like sash and fx. Only the \"SGI volume\" entire disk section may violate this. Are you sure about tagging this partition differently?" msgstr "强烈建议偏移 0 处的分区设为“SGI volhdr”类型，IRIX 会依靠它从它的目录中获取独立的工具，如 sash 和 fx。只有“SGI volume”整磁盘部分(entire disk section)能违反这一规定。您确定要将这一分区标记成其他类型吗？" @@ -6122,49 +6381,41 @@ msgid "If you want to maintain SunOS/Solaris compatibility, consider leaving thi msgstr "如果您想与 SunOS/Solaris 兼容，请保持此分区为 整盘 (5)，以 0 开始，大小为 %u 个扇区" #: libfdisk/src/sun.c:747 -#, c-format -msgid "" -"Label geometry: %d rpm, %d alternate and %d physical cylinders,\n" -" %d extra sects/cyl, interleave %d:1" -msgstr "" -"标签任何属性：%d rpm, %d 个备用柱面和 %d 个物理柱面，\n" -" %d 个额外扇区/柱面，交错 %d:1" - -#: libfdisk/src/sun.c:754 -#, c-format -msgid "Label ID: %s" +#, fuzzy +msgid "Label ID" msgstr "标签 ID：%s" -#: libfdisk/src/sun.c:755 -#, c-format -msgid "Volume ID: %s" +#: libfdisk/src/sun.c:752 +#, fuzzy +msgid "Volume ID" msgstr "卷 ID：%s" -#: libfdisk/src/sun.c:756 -msgid "<none>" -msgstr "<无>" +#: libfdisk/src/sun.c:762 +#, fuzzy +msgid "Alternate cylinders" +msgstr "备用柱面的数量" -#: libfdisk/src/sun.c:838 +#: libfdisk/src/sun.c:868 msgid "Number of alternate cylinders" msgstr "备用柱面的数量" -#: libfdisk/src/sun.c:863 +#: libfdisk/src/sun.c:893 msgid "Extra sectors per cylinder" msgstr "每个柱面的额外扇区数" -#: libfdisk/src/sun.c:887 +#: libfdisk/src/sun.c:917 msgid "Interleave factor" msgstr "交错系数" -#: libfdisk/src/sun.c:911 +#: libfdisk/src/sun.c:941 msgid "Rotation speed (rpm)" msgstr "转速(转/分)" -#: libfdisk/src/sun.c:935 +#: libfdisk/src/sun.c:965 msgid "Number of physical cylinders" msgstr "物理柱面数" -#: libfdisk/src/sun.c:1004 +#: libfdisk/src/sun.c:1034 msgid "" "Consider leaving partition 3 as Whole disk (5),\n" "as SunOS/Solaris expects it and even Linux likes it.\n" @@ -6172,7 +6423,7 @@ msgstr "" "考虑保持分区 3 为 整盘 (5)，\n" "这是 SunOS/Solaris 的规定，Linux 也建议这么做。\n" -#: libfdisk/src/sun.c:1015 +#: libfdisk/src/sun.c:1045 msgid "" "It is highly recommended that the partition at offset 0\n" "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n" @@ -6184,24 +6435,12 @@ msgstr "" "和启动锁。\n" "您确信要把该分区标记为 Linux 交换分区吗？" -#: libfdisk/src/sun.c:1084 -msgid "Flags" -msgstr "标志" - -#: lib/monotonic.c:25 -msgid "gettimeofday failed" -msgstr "gettimeofday 失败" - -#: lib/monotonic.c:38 -msgid "sysinfo failed" -msgstr "sysinfo 失败" - #: lib/pager.c:102 #, c-format msgid "waitpid failed (%s)" msgstr "waitpid 失败(%s)" -#: lib/path.c:209 sys-utils/lscpu.c:1539 +#: lib/path.c:209 sys-utils/lscpu.c:1543 msgid "failed to callocate cpu set" msgstr "分配(callocate) CPU 组 失败" @@ -6457,83 +6696,84 @@ 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:1196 +#: login-utils/last.c:152 login-utils/lslogins.c:1226 sys-utils/dmesg.c:1193 +#: sys-utils/lsipc.c:253 #, c-format msgid "unknown time format: %s" msgstr "未知时间格式: %s" -#: login-utils/last.c:264 login-utils/last.c:272 +#: login-utils/last.c:259 login-utils/last.c:267 #, c-format msgid "Interrupted %s" msgstr "中断的 %s" -#: login-utils/last.c:430 +#: login-utils/last.c:425 msgid "preallocation size exceeded" msgstr "超过了预分配大小" -#: login-utils/last.c:556 +#: login-utils/last.c:550 #, c-format msgid " %s [options] [<username>...] [<tty>...]\n" msgstr " %s [选项] [<用户名>...] [<tty>...]\n" -#: login-utils/last.c:559 +#: login-utils/last.c:553 msgid "Show a listing of last logged in users.\n" msgstr "" -#: login-utils/last.c:562 +#: login-utils/last.c:556 msgid " -<number> how many lines to show\n" msgstr " -<数字> 显示行数\n" -#: login-utils/last.c:563 +#: login-utils/last.c:557 msgid " -a, --hostlast display hostnames in the last column\n" msgstr " -a, --hostlast 最后一列显示主机名\n" -#: login-utils/last.c:564 +#: login-utils/last.c:558 msgid " -d, --dns translate the IP number back into a hostname\n" msgstr " -d, --dns 将 IP 号转换回主机名\n" -#: login-utils/last.c:566 +#: login-utils/last.c:560 #, c-format msgid " -f, --file <file> use a specific file instead of %s\n" msgstr " -F, --file <文件> 用指定文件代替 %s\n" -#: login-utils/last.c:567 +#: login-utils/last.c:561 msgid " -F, --fulltimes print full login and logout times and dates\n" msgstr " -F, --fulltimes 打印完整的登录和注销时间和日期\n" -#: login-utils/last.c:568 +#: login-utils/last.c:562 msgid " -i, --ip display IP numbers in numbers-and-dots notation\n" msgstr " -i, --ip 以数字和点的形式显示 IP 号\n" -#: login-utils/last.c:569 +#: login-utils/last.c:563 msgid " -n, --limit <number> how many lines to show\n" msgstr " -n, --limit <数字> 要显示的行数\n" -#: login-utils/last.c:570 +#: login-utils/last.c:564 msgid " -R, --nohostname don't display the hostname field\n" msgstr " -R, --nohostname 不显示主机名字段\n" -#: login-utils/last.c:571 +#: login-utils/last.c:565 msgid " -s, --since <time> display the lines since the specified time\n" msgstr " -s, --since <时间> 显示从指定时间起的行\n" -#: login-utils/last.c:572 +#: login-utils/last.c:566 msgid " -t, --until <time> display the lines until the specified time\n" msgstr " -t, --until <时间> 显示到指定时间为止的行\n" -#: login-utils/last.c:573 +#: login-utils/last.c:567 msgid " -p, --present <time> display who were present at the specified time\n" msgstr " -p, --present <时间> 显示在指定时间谁在场(present)\n" -#: login-utils/last.c:574 +#: login-utils/last.c:568 msgid " -w, --fullnames display full user and domain names\n" msgstr " -w, --fullnames 显示完整的用户名和域名\n" -#: login-utils/last.c:575 +#: login-utils/last.c:569 msgid " -x, --system display system shutdown entries and run level changes\n" msgstr " -x, --system 显示系统关机项和运行级别更改\n" -#: login-utils/last.c:576 +#: login-utils/last.c:570 msgid "" " --time-format <format> show timestamps in the specified <format>:\n" " notime|short|full|iso\n" @@ -6541,7 +6781,7 @@ msgstr "" " --time-format <格式> 以指定<格式>显示时间戳：\n" " notime|short|full|iso\n" -#: login-utils/last.c:865 +#: login-utils/last.c:861 #, c-format msgid "" "\n" @@ -6550,50 +6790,16 @@ msgstr "" "\n" "%s 开始 %s" -#: login-utils/last.c:935 +#: login-utils/last.c:934 msgid "failed to parse number" msgstr "解析数字失败" -#: login-utils/last.c:956 login-utils/last.c:961 login-utils/last.c:966 +#: login-utils/last.c:955 login-utils/last.c:960 login-utils/last.c:965 +#: sys-utils/rtcwake.c:480 #, c-format msgid "invalid time value \"%s\"" msgstr "无效的时间值\"%s\"" -#: login-utils/last-deprecated.c:155 -msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n" -msgstr "用法：last [-#] [-f 文件] [-t tty] [-h 主机名] [用户 ...]\n" - -#: login-utils/last-deprecated.c:252 -#, c-format -msgid "%s: mmap failed" -msgstr "%s：mmap 失败" - -#: login-utils/last-deprecated.c:312 -msgid " still logged in" -msgstr " 仍然登录" - -#: login-utils/last-deprecated.c:334 -#, c-format -msgid "" -"\n" -"wtmp begins %s" -msgstr "" -"\n" -"wtmp 开始 %s" - -#: login-utils/last-deprecated.c:433 -msgid "gethostname failed" -msgstr "gethostname 失败" - -#: login-utils/last-deprecated.c:479 -#, c-format -msgid "" -"\n" -"interrupted %10.10s %5.5s \n" -msgstr "" -"\n" -"中断了 %10.10s %5.5s \n" - #: login-utils/libuser.c:29 login-utils/libuser.c:31 msgid "Couldn't drop group privileges" msgstr "无法丢弃(drop)组优先级" @@ -6710,7 +6916,7 @@ msgstr "无法初始化 PAM：%s" msgid "FAILED LOGIN %u FROM %s FOR %s, %s" msgstr "FAILED LOGIN %u FROM %s FOR %s, %s" -#: login-utils/login.c:836 login-utils/sulogin.c:1030 +#: login-utils/login.c:836 login-utils/sulogin.c:1050 #, c-format msgid "" "Login incorrect\n" @@ -6799,12 +7005,12 @@ msgstr "有您的邮件。\n" msgid "setuid() failed" msgstr "setuid() 失败" -#: login-utils/login.c:1336 login-utils/sulogin.c:749 +#: login-utils/login.c:1336 login-utils/sulogin.c:763 #, c-format msgid "%s: change directory failed" msgstr "%s：更改目录失败" -#: login-utils/login.c:1343 login-utils/sulogin.c:750 +#: login-utils/login.c:1343 login-utils/sulogin.c:764 #, c-format msgid "Logging in with home = \"/\".\n" msgstr "以 home = “/” 登录。\n" @@ -6826,234 +7032,236 @@ msgstr "%s：%s 包含无效的数字值：%s" msgid "hush login status: restore original IDs failed" msgstr "静默(hush)登录状态：恢复原 ID 失败" -#: login-utils/lslogins.c:209 sys-utils/lscpu.c:1263 sys-utils/lscpu.c:1273 +#: login-utils/lslogins.c:207 sys-utils/lscpu.c:1267 sys-utils/lscpu.c:1277 msgid "no" msgstr "否" -#: login-utils/lslogins.c:218 misc-utils/lsblk.c:167 +#: login-utils/lslogins.c:216 misc-utils/lsblk.c:182 msgid "user name" msgstr "用户名" -#: login-utils/lslogins.c:218 +#: login-utils/lslogins.c:216 msgid "Username" msgstr "用户名" -#: login-utils/lslogins.c:219 sys-utils/renice.c:54 +#: login-utils/lslogins.c:217 sys-utils/renice.c:54 msgid "user ID" msgstr "用户 ID" -#: login-utils/lslogins.c:220 +#: login-utils/lslogins.c:218 msgid "password not required" msgstr "无需密码" -#: login-utils/lslogins.c:220 +#: login-utils/lslogins.c:218 msgid "Password not required" msgstr "无需密码" -#: login-utils/lslogins.c:221 +#: login-utils/lslogins.c:219 msgid "login by password disabled" msgstr "已禁止使用密码登录" -#: login-utils/lslogins.c:221 +#: login-utils/lslogins.c:219 msgid "Login by password disabled" msgstr "已禁止使用密码登录" -#: login-utils/lslogins.c:222 +#: login-utils/lslogins.c:220 msgid "password defined, but locked" msgstr "定义了密码，但已锁定" -#: login-utils/lslogins.c:222 +#: login-utils/lslogins.c:220 msgid "Password is locked" msgstr "密码已锁定" -#: login-utils/lslogins.c:223 +#: login-utils/lslogins.c:221 msgid "log in disabled by nologin(8) or pam_nologin(8)" msgstr "nologin(8) 或 pam_nologin(8) 禁止了登录" -#: login-utils/lslogins.c:223 +#: login-utils/lslogins.c:221 msgid "No login" msgstr "不能登录" -#: login-utils/lslogins.c:224 +#: login-utils/lslogins.c:222 msgid "primary group name" msgstr "主组名" -#: login-utils/lslogins.c:224 +#: login-utils/lslogins.c:222 msgid "Primary group" msgstr "主组" -#: login-utils/lslogins.c:225 +#: login-utils/lslogins.c:223 msgid "primary group ID" msgstr " 主组 ID" -#: login-utils/lslogins.c:226 +#: login-utils/lslogins.c:224 msgid "supplementary group names" msgstr "附属组名" -#: login-utils/lslogins.c:226 +#: login-utils/lslogins.c:224 msgid "Supplementary groups" msgstr "附属组" -#: login-utils/lslogins.c:227 +#: login-utils/lslogins.c:225 msgid "supplementary group IDs" msgstr "附属组 ID" -#: login-utils/lslogins.c:227 +#: login-utils/lslogins.c:225 msgid "Supplementary group IDs" msgstr "附属组 ID" -#: login-utils/lslogins.c:228 +#: login-utils/lslogins.c:226 msgid "home directory" msgstr "主目录" -#: login-utils/lslogins.c:228 +#: login-utils/lslogins.c:226 msgid "Home directory" msgstr "主目录" -#: login-utils/lslogins.c:229 +#: login-utils/lslogins.c:227 msgid "login shell" msgstr "登录 shell" -#: login-utils/lslogins.c:229 +#: login-utils/lslogins.c:227 msgid "Shell" msgstr "shell" -#: login-utils/lslogins.c:230 +#: login-utils/lslogins.c:228 msgid "full user name" msgstr "完整用户名" -#: login-utils/lslogins.c:230 +#: login-utils/lslogins.c:228 msgid "Gecos field" msgstr "Gecos 字段" -#: login-utils/lslogins.c:231 +#: login-utils/lslogins.c:229 msgid "date of last login" msgstr "上次登录日期" -#: login-utils/lslogins.c:231 +#: login-utils/lslogins.c:229 msgid "Last login" msgstr "上次登录" -#: login-utils/lslogins.c:232 +#: login-utils/lslogins.c:230 msgid "last tty used" msgstr "上次使用的终端" -#: login-utils/lslogins.c:232 +#: login-utils/lslogins.c:230 msgid "Last terminal" msgstr "上次的终端" -#: login-utils/lslogins.c:233 +#: login-utils/lslogins.c:231 msgid "hostname during the last session" msgstr "上次会话时的主机名(hostname)" -#: login-utils/lslogins.c:233 +#: login-utils/lslogins.c:231 msgid "Last hostname" msgstr "上次的主机名" -#: login-utils/lslogins.c:234 +#: login-utils/lslogins.c:232 msgid "date of last failed login" msgstr "上次登录失败的日期" -#: login-utils/lslogins.c:234 +#: login-utils/lslogins.c:232 msgid "Failed login" msgstr "失败的登录" -#: login-utils/lslogins.c:235 +#: login-utils/lslogins.c:233 msgid "where did the login fail?" msgstr "登录在哪里失败的？" -#: login-utils/lslogins.c:235 +#: login-utils/lslogins.c:233 msgid "Failed login terminal" msgstr "登录终端失败" -#: login-utils/lslogins.c:236 +#: login-utils/lslogins.c:234 msgid "user's hush settings" msgstr "用户的静默(hush)设置" -#: login-utils/lslogins.c:236 +#: login-utils/lslogins.c:234 msgid "Hushed" msgstr "已静默" -#: login-utils/lslogins.c:237 +#: login-utils/lslogins.c:235 msgid "days user is warned of password expiration" msgstr "警告用户密码过期的天数" -#: login-utils/lslogins.c:237 +#: login-utils/lslogins.c:235 msgid "Password expiration warn interval" msgstr "密码过期警告的间隔" -#: login-utils/lslogins.c:238 +#: login-utils/lslogins.c:236 msgid "password expiration date" msgstr "密码过期日" -#: login-utils/lslogins.c:238 +#: login-utils/lslogins.c:236 msgid "Password expiration" msgstr "密码过期" -#: login-utils/lslogins.c:239 +#: login-utils/lslogins.c:237 msgid "date of last password change" msgstr "上次更改密码的日期" -#: login-utils/lslogins.c:239 +#: login-utils/lslogins.c:237 msgid "Password changed" msgstr "密码已更改" -#: login-utils/lslogins.c:240 +#: login-utils/lslogins.c:238 #, fuzzy msgid "number of days required between changes" msgstr "限期更改密码的天数" -#: login-utils/lslogins.c:240 +#: login-utils/lslogins.c:238 msgid "Minimum change time" msgstr "最小更改时间" -#: login-utils/lslogins.c:241 +#: login-utils/lslogins.c:239 #, fuzzy msgid "max number of days a password may remain unchanged" msgstr "密码使用的最大天数" -#: login-utils/lslogins.c:241 +#: login-utils/lslogins.c:239 msgid "Maximum change time" msgstr "最大更改时间" -#: login-utils/lslogins.c:242 +#: login-utils/lslogins.c:240 msgid "the user's security context" msgstr "用户的安全环境(context)" -#: login-utils/lslogins.c:242 +#: login-utils/lslogins.c:240 msgid "Selinux context" msgstr "Selinux 环境" -#: login-utils/lslogins.c:243 +#: login-utils/lslogins.c:241 msgid "number of processes run by the user" msgstr "用户运行的进程数" -#: login-utils/lslogins.c:243 +#: login-utils/lslogins.c:241 msgid "Running processes" msgstr "运行中的进程" -#: login-utils/lslogins.c:289 misc-utils/findmnt.c:158 misc-utils/lsblk.c:216 +#: login-utils/lslogins.c:287 misc-utils/findmnt.c:160 misc-utils/lsblk.c:231 +#: sys-utils/lsipc.c:204 #, c-format msgid "too many columns specified, the limit is %zu columns" msgstr "指定了过多的列，限制是 %zu 列" -#: login-utils/lslogins.c:357 +#: login-utils/lslogins.c:355 sys-utils/lsipc.c:457 msgid "unsupported time type" msgstr "不支持的时间类型" -#: login-utils/lslogins.c:623 +#: login-utils/lslogins.c:652 msgid "failed to get supplementary groups" msgstr "获得附属组失败" -#: login-utils/lslogins.c:1048 +#: login-utils/lslogins.c:1077 msgid "internal error: unknown column" msgstr "内部错误：未知的列" -#: login-utils/lslogins.c:1052 +#: login-utils/lslogins.c:1081 sys-utils/lsipc.c:498 sys-utils/lsipc.c:647 +#: sys-utils/lsipc.c:863 sys-utils/lsipc.c:1076 msgid "failed to set data" msgstr "设置数据失败" -#: login-utils/lslogins.c:1146 +#: login-utils/lslogins.c:1175 #, c-format msgid "" "\n" @@ -7062,106 +7270,106 @@ msgstr "" "\n" "上次的日志：\n" -#: 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 +#: login-utils/lslogins.c:1234 login-utils/nologin.c:25 +#: misc-utils/lslocks.c:515 misc-utils/mcookie.c:82 misc-utils/uuidd.c:73 #: misc-utils/uuidgen.c:33 sys-utils/dmesg.c:264 sys-utils/ipcmk.c:66 -#: sys-utils/lscpu.c:1644 sys-utils/readprofile.c:104 sys-utils/rtcwake.c:72 -#: term-utils/setterm.c:404 text-utils/line.c:30 +#: sys-utils/lscpu.c:1651 sys-utils/lsipc.c:261 sys-utils/readprofile.c:104 +#: sys-utils/rtcwake.c:95 term-utils/setterm.c:390 text-utils/line.c:30 #, c-format msgid " %s [options]\n" msgstr " %s [选项]\n" -#: login-utils/lslogins.c:1208 +#: login-utils/lslogins.c:1237 msgid "Display information about known users in the system.\n" msgstr "" -#: login-utils/lslogins.c:1211 +#: login-utils/lslogins.c:1240 msgid " -a, --acc-expiration display info about passwords expiration\n" msgstr " -a, --acc-expiration 显示关于密码过期的信息\n" -#: login-utils/lslogins.c:1212 +#: login-utils/lslogins.c:1241 msgid " -c, --colon-separate display data in a format similar to /etc/passwd\n" msgstr " -c, --colon-separate 以与 /etc/passwd 相似的格式显示日期\n" -#: login-utils/lslogins.c:1213 +#: login-utils/lslogins.c:1242 sys-utils/lsipc.c:280 msgid " -e, --export display in an export-able output format\n" msgstr " -e, --export 以可导出的格式显示\n" -#: login-utils/lslogins.c:1214 +#: login-utils/lslogins.c:1243 msgid " -f, --failed display data about the users' last failed logins\n" msgstr " -f, --failed 显示有关该用户上次登录失败的数据\n" -#: login-utils/lslogins.c:1215 +#: login-utils/lslogins.c:1244 #, fuzzy msgid " -G, --supp-groups display information about groups\n" msgstr " -G, --groups-info 显示关于组的信息\n" -#: login-utils/lslogins.c:1216 +#: login-utils/lslogins.c:1245 msgid " -g, --groups=<groups> display users belonging to a group in <groups>\n" msgstr " -g, --groups=<groups> 显示属于<groups>中的组的用户\n" -#: login-utils/lslogins.c:1217 +#: login-utils/lslogins.c:1246 msgid " -L, --last show info about the users' last login sessions\n" msgstr " -L, --last 显示关于该用户上次登录会话的信息\n" -#: login-utils/lslogins.c:1218 +#: login-utils/lslogins.c:1247 msgid " -l, --logins=<logins> display only users from <logins>\n" msgstr " -l, --logins=<登录方式> 只显示以指定<登录方式>登录的用户\n" -#: login-utils/lslogins.c:1219 +#: login-utils/lslogins.c:1248 sys-utils/lsipc.c:282 msgid " -n, --newline display each piece of information on a new line\n" msgstr " -n, --newline 逐行显示每一部分信息\n" -#: login-utils/lslogins.c:1220 +#: login-utils/lslogins.c:1249 sys-utils/lsipc.c:275 msgid " --noheadings don't print headings\n" msgstr " --noheadings 不打印标题\n" -#: login-utils/lslogins.c:1221 +#: login-utils/lslogins.c:1250 sys-utils/lsipc.c:276 msgid " --notruncate don't truncate output\n" msgstr " --notruncate 不截断输出\n" -#: login-utils/lslogins.c:1222 +#: login-utils/lslogins.c:1251 sys-utils/lsipc.c:284 msgid " -o, --output[=<list>] define the columns to output\n" msgstr " -o, --output[=<列表>] 定义要输出的列\n" -#: login-utils/lslogins.c:1223 +#: login-utils/lslogins.c:1252 msgid " -p, --pwd display information related to login by password.\n" msgstr " -p, --pwd 显示与 用密码登录 相关的信息。\n" -#: login-utils/lslogins.c:1224 +#: login-utils/lslogins.c:1253 sys-utils/lsipc.c:286 msgid " -r, --raw display in raw mode\n" msgstr " -r, --raw 以原始方式显示\n" -#: login-utils/lslogins.c:1225 +#: login-utils/lslogins.c:1254 msgid " -s, --system-accs display system accounts\n" msgstr " -s, --system-accs 显示系统帐户\n" -#: login-utils/lslogins.c:1226 +#: login-utils/lslogins.c:1255 sys-utils/lsipc.c:277 msgid " --time-format=<type> display dates in short, full or iso format\n" msgstr " --time-format=<格式> 以短、长或 iso 格式显示日期\n" -#: login-utils/lslogins.c:1227 +#: login-utils/lslogins.c:1256 msgid " -u, --user-accs display user accounts\n" msgstr " -u, --user-accs 显示用户帐户\n" -#: login-utils/lslogins.c:1228 +#: login-utils/lslogins.c:1257 msgid " -Z, --context display SELinux contexts\n" msgstr " -Z, --context 显示 SELinux 环境\n" -#: login-utils/lslogins.c:1229 +#: login-utils/lslogins.c:1258 msgid " -z, --print0 delimit user entries with a nul character\n" msgstr " -z, --print0 用空字符(nul)分隔用户记录项\n" -#: login-utils/lslogins.c:1230 +#: login-utils/lslogins.c:1259 msgid " --wtmp-file <path> set an alternate path for wtmp\n" msgstr " --wtmp-file <路径> 设置 wtmp 的可选路径\n" -#: login-utils/lslogins.c:1231 +#: login-utils/lslogins.c:1260 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:1250 -#: sys-utils/lscpu.c:1661 +#: login-utils/lslogins.c:1265 misc-utils/findmnt.c:1262 +#: sys-utils/lscpu.c:1668 #, c-format msgid "" "\n" @@ -7170,11 +7378,11 @@ msgstr "" "\n" "可用的列：\n" -#: login-utils/lslogins.c:1419 +#: login-utils/lslogins.c:1448 msgid "failed to request selinux state" msgstr "请求 selinux 状态失败" -#: login-utils/lslogins.c:1433 login-utils/lslogins.c:1437 +#: login-utils/lslogins.c:1462 login-utils/lslogins.c:1466 msgid "Only one user may be specified. Use -l for multiple users." msgstr "只能指定一个用户。多用户请使用 -l。" @@ -7192,7 +7400,7 @@ msgstr "setgid() 失败" msgid "Password: " msgstr "密码：" -#: login-utils/newgrp.c:154 login-utils/sulogin.c:1010 +#: login-utils/newgrp.c:154 login-utils/sulogin.c:1030 msgid "crypt failed" msgstr "crypt 失败" @@ -7209,7 +7417,7 @@ msgstr "" msgid "who are you?" msgstr "您是哪位？" -#: login-utils/newgrp.c:211 login-utils/newgrp.c:223 sys-utils/nsenter.c:368 +#: login-utils/newgrp.c:211 login-utils/newgrp.c:223 sys-utils/nsenter.c:400 msgid "setgid failed" msgstr "setgid 失败" @@ -7221,7 +7429,7 @@ msgstr "无此组" msgid "permission denied" msgstr "权限不足" -#: login-utils/newgrp.c:227 sys-utils/nsenter.c:370 +#: login-utils/newgrp.c:227 sys-utils/nsenter.c:402 msgid "setuid failed" msgstr "setuid 失败" @@ -7253,7 +7461,7 @@ msgid "cannot block signals" msgstr "无法阻塞信号" #: login-utils/su-common.c:335 login-utils/su-common.c:343 -#: login-utils/su-common.c:349 +#: login-utils/su-common.c:349 term-utils/script.c:762 msgid "cannot set signal handler" msgstr "无法设置信号处理函数" @@ -7292,11 +7500,11 @@ msgstr "设置 PATH 失败" msgid "cannot set groups" msgstr "无法设置 组" -#: login-utils/su-common.c:607 sys-utils/eject.c:673 +#: login-utils/su-common.c:607 sys-utils/eject.c:665 msgid "cannot set group id" msgstr "无法设置 组 id" -#: login-utils/su-common.c:609 sys-utils/eject.c:676 +#: login-utils/su-common.c:609 sys-utils/eject.c:668 msgid "cannot set user id" msgstr "无法设置 用户 id" @@ -7418,72 +7626,82 @@ msgstr "将使用受限 shell %s" msgid "warning: cannot change directory to %s" msgstr "警告：无法更改到 %s 目录" -#: login-utils/sulogin.c:152 +#: login-utils/sulogin.c:159 msgid "tcgetattr failed" msgstr "tcgetattr 失败" -#: login-utils/sulogin.c:229 +#: login-utils/sulogin.c:236 msgid "tcsetattr failed" msgstr "tcsetattr 失败" -#: login-utils/sulogin.c:495 +#: login-utils/sulogin.c:501 #, c-format msgid "%s: no entry for root\n" msgstr "%s：无 root 的记录\n" -#: login-utils/sulogin.c:522 +#: login-utils/sulogin.c:528 #, c-format msgid "%s: no entry for root" msgstr "%s：无 root 的记录" -#: login-utils/sulogin.c:526 +#: login-utils/sulogin.c:533 #, c-format msgid "%s: root password garbled" msgstr "%s：root 密码有误" -#: login-utils/sulogin.c:554 +#: login-utils/sulogin.c:561 +#, c-format +msgid "" +"\n" +"Cannot open access to console, the root account is locked.\n" +"See sulogin(8) man page for more details.\n" +"\n" +"Press Enter to continue.\n" +msgstr "" + +#: login-utils/sulogin.c:567 #, c-format msgid "Give root password for login: " msgstr "指定 root 的登录密码：" -#: login-utils/sulogin.c:556 +#: login-utils/sulogin.c:569 #, c-format msgid "Press Enter for login: " msgstr "按 Enter 键登录：" -#: login-utils/sulogin.c:559 +#: login-utils/sulogin.c:572 #, c-format msgid "Give root password for maintenance\n" msgstr "指定 root 的维护密码\n" -#: login-utils/sulogin.c:561 -#, c-format -msgid "Press Enter for maintenance" +#: login-utils/sulogin.c:574 +#, fuzzy, c-format +msgid "Press Enter for maintenance\n" msgstr "按 Enter 键进行维护" -#: login-utils/sulogin.c:562 +#: login-utils/sulogin.c:575 #, c-format msgid "(or press Control-D to continue): " msgstr "(或按 Control-D 键继续)：" -#: login-utils/sulogin.c:753 +#: login-utils/sulogin.c:767 msgid "change directory to system root failed" msgstr "更改到系统根目录失败" -#: login-utils/sulogin.c:802 +#: login-utils/sulogin.c:816 msgid "setexeccon failed" msgstr "setexeccon 失败" -#: login-utils/sulogin.c:822 +#: login-utils/sulogin.c:836 #, c-format msgid " %s [options] [tty device]\n" msgstr " %s [选项] [tty 设备]\n" -#: login-utils/sulogin.c:825 +#: login-utils/sulogin.c:839 msgid "Single-user login.\n" msgstr "" -#: login-utils/sulogin.c:828 +#: login-utils/sulogin.c:842 msgid "" " -p, --login-shell start a login shell\n" " -t, --timeout <seconds> max time to wait for a password (default: no limit)\n" @@ -7493,24 +7711,24 @@ msgstr "" " -t, --timeout <秒数> 等待密码的最大时间(默认：无限制)\n" " -e, --force 如果 getpwnam(3) 失败，直接检查密码文件\n" -#: login-utils/sulogin.c:879 misc-utils/findmnt.c:1448 sys-utils/wdctl.c:523 +#: login-utils/sulogin.c:893 misc-utils/findmnt.c:1471 sys-utils/wdctl.c:523 #: term-utils/wall.c:135 msgid "invalid timeout argument" msgstr "无效的 timeout 超时参数" -#: login-utils/sulogin.c:901 +#: login-utils/sulogin.c:915 msgid "only superuser can run this program" msgstr "只有超级用户能运行此程序" -#: login-utils/sulogin.c:944 +#: login-utils/sulogin.c:958 msgid "cannot open console" msgstr "打不开终端" -#: login-utils/sulogin.c:951 +#: login-utils/sulogin.c:965 msgid "cannot open password database" msgstr "无法打开密码数据库" -#: login-utils/sulogin.c:1027 +#: login-utils/sulogin.c:1047 #, c-format msgid "" "Can not execute su shell\n" @@ -7519,7 +7737,7 @@ msgstr "" "无法执行 su shell\n" "\n" -#: login-utils/sulogin.c:1034 +#: login-utils/sulogin.c:1054 msgid "" "Timed out\n" "\n" @@ -7576,7 +7794,7 @@ msgstr "%s 的 Utmp undump\n" msgid "Utmp dump of %s\n" msgstr "%s 的 Utmp dump\n" -#: login-utils/vipw.c:142 term-utils/wall.c:200 +#: login-utils/vipw.c:142 msgid "can't open temporary file" msgstr "无法打开临时文件" @@ -7633,97 +7851,112 @@ msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n" msgid "Would you like to edit %s now [y/n]? " msgstr "您想现在编辑 %s 吗[y/n]？" -#: misc-utils/cal.c:365 +#: misc-utils/cal.c:387 +#, fuzzy +msgid "invalid month argument" +msgstr "无效的长度参数" + +#: misc-utils/cal.c:392 msgid "invalid week argument" msgstr "无效的 周 参数" -#: misc-utils/cal.c:367 +#: misc-utils/cal.c:394 msgid "illegal week value: use 1-53" msgstr "非法的 周 值：请使用 1-53" -#: misc-utils/cal.c:400 +#: misc-utils/cal.c:430 msgid "illegal day value" msgstr "日 值不合法" -#: misc-utils/cal.c:402 misc-utils/cal.c:418 +#: misc-utils/cal.c:432 misc-utils/cal.c:448 #, c-format msgid "illegal day value: use 1-%d" msgstr "日 值不合法：请使用 1-%d" -#: misc-utils/cal.c:405 misc-utils/cal.c:407 +#: misc-utils/cal.c:435 misc-utils/cal.c:437 msgid "illegal month value: use 1-12" msgstr "月份值不合法：请使用 1-12" -#: misc-utils/cal.c:410 misc-utils/cal.c:414 +#: misc-utils/cal.c:440 misc-utils/cal.c:444 msgid "illegal year value" msgstr "年份值不合法" -#: misc-utils/cal.c:412 +#: misc-utils/cal.c:442 msgid "illegal year value: use positive integer" msgstr "年份值不合法：请使用正整数" -#: misc-utils/cal.c:443 misc-utils/cal.c:456 +#: misc-utils/cal.c:473 misc-utils/cal.c:486 #, c-format msgid "illegal week value: year %d doesn't have week %d" msgstr "非法的 周 值：%d 年没有第 %d 周" -#: misc-utils/cal.c:602 +#: misc-utils/cal.c:627 #, c-format msgid "%s" msgstr "%s" -#: misc-utils/cal.c:608 +#: misc-utils/cal.c:633 #, c-format msgid "%d" msgstr "%d" -#: misc-utils/cal.c:614 +#: misc-utils/cal.c:639 #, c-format msgid "%s %d" msgstr "%s %d" -#: misc-utils/cal.c:925 +#: misc-utils/cal.c:942 #, c-format msgid " %s [options] [[[day] month] year]\n" msgstr " %s [选项] [[[日] 月] 年]\n" -#: misc-utils/cal.c:928 +#: misc-utils/cal.c:945 msgid "Display a calendar, or some part of it.\n" msgstr "显示日历或部分日历。\n" -#: misc-utils/cal.c:929 +#: misc-utils/cal.c:946 msgid "Without any arguments, display the current month.\n" msgstr "不带参数时，显示当月日历。\n" -#: misc-utils/cal.c:932 +#: misc-utils/cal.c:949 msgid " -1, --one show only a single month (default)\n" msgstr " -1, --one 只显示一个月(默认)\n" -#: misc-utils/cal.c:933 +#: misc-utils/cal.c:950 msgid " -3, --three show three months spanning the date\n" msgstr " -3, --three 显示该日期前后三个月\n" -#: misc-utils/cal.c:934 +#: misc-utils/cal.c:951 +#, fuzzy +msgid " -n, --months <num> show num months starting with date's month\n" +msgstr " -3, --three 显示该日期前后三个月\n" + +#: misc-utils/cal.c:952 msgid " -s, --sunday Sunday as first day of week\n" msgstr " -s, --sunday 周日作为一周的第一天\n" -#: misc-utils/cal.c:935 +#: misc-utils/cal.c:953 msgid " -m, --monday Monday as first day of week\n" msgstr " -m, --monday 周一作为一周的第一天\n" -#: misc-utils/cal.c:936 +#: misc-utils/cal.c:954 msgid " -j, --julian output Julian dates\n" msgstr " -j, --julian 输出儒略日期\n" -#: misc-utils/cal.c:937 +#: misc-utils/cal.c:955 msgid " -y, --year show the whole year\n" msgstr " -y, --year 显示全年\n" -#: misc-utils/cal.c:938 +#: misc-utils/cal.c:956 +#, fuzzy +msgid " -Y, --twelve show the next twelve months\n" +msgstr " -y, --year 显示全年\n" + +#: misc-utils/cal.c:957 msgid " -w, --week[=<num>] show US or ISO-8601 week numbers\n" msgstr " -w, --week[=<数字>] 显示美国或 ISO-8601 周数\n" -#: misc-utils/cal.c:939 +#: misc-utils/cal.c:958 msgid " --color[=<when>] colorize messages (auto, always or never)\n" msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n" @@ -7742,180 +7975,180 @@ msgstr "强制在 %s 上进行文件系统检查。\n" msgid "unable to resolve '%s'" msgstr "不能解析“%s”" -#: misc-utils/findmnt.c:121 +#: misc-utils/findmnt.c:123 msgid "source device" msgstr "源设备" -#: misc-utils/findmnt.c:122 +#: misc-utils/findmnt.c:124 msgid "mountpoint" msgstr "挂载点" -#: misc-utils/findmnt.c:123 misc-utils/lsblk.c:147 +#: misc-utils/findmnt.c:125 misc-utils/lsblk.c:162 msgid "filesystem type" msgstr "文件系统类型" -#: misc-utils/findmnt.c:124 +#: misc-utils/findmnt.c:126 msgid "all mount options" msgstr "全部挂臷选项" -#: misc-utils/findmnt.c:125 +#: misc-utils/findmnt.c:127 msgid "VFS specific mount options" msgstr "VFS 的特定挂载选项" -#: misc-utils/findmnt.c:126 +#: misc-utils/findmnt.c:128 msgid "FS specific mount options" msgstr "FS 的特定挂载选项" -#: misc-utils/findmnt.c:127 +#: misc-utils/findmnt.c:129 msgid "filesystem label" msgstr "文件系统标签" -#: misc-utils/findmnt.c:128 misc-utils/lsblk.c:150 +#: misc-utils/findmnt.c:130 misc-utils/lsblk.c:165 msgid "filesystem UUID" msgstr "文件系统 UUID" -#: misc-utils/findmnt.c:129 +#: misc-utils/findmnt.c:131 msgid "partition label" msgstr "分区标签" -#: misc-utils/findmnt.c:131 misc-utils/lsblk.c:146 +#: misc-utils/findmnt.c:133 misc-utils/lsblk.c:161 msgid "major:minor device number" msgstr "主:次 设备号" -#: misc-utils/findmnt.c:132 +#: misc-utils/findmnt.c:134 msgid "action detected by --poll" msgstr "--poll 检测到的操作" -#: misc-utils/findmnt.c:133 +#: misc-utils/findmnt.c:135 msgid "old mount options saved by --poll" msgstr "--poll 保存的旧挂载选项" -#: misc-utils/findmnt.c:134 +#: misc-utils/findmnt.c:136 msgid "old mountpoint saved by --poll" msgstr "--poll 保存的旧挂载点" -#: misc-utils/findmnt.c:135 +#: misc-utils/findmnt.c:137 msgid "filesystem size" msgstr "文件系统大小" -#: misc-utils/findmnt.c:136 +#: misc-utils/findmnt.c:138 msgid "filesystem size available" msgstr "文件系统可用大小" -#: misc-utils/findmnt.c:137 +#: misc-utils/findmnt.c:139 msgid "filesystem size used" msgstr "文件系统已用大小" -#: misc-utils/findmnt.c:138 +#: misc-utils/findmnt.c:140 msgid "filesystem use percentage" msgstr "文件系统使用百分比" -#: misc-utils/findmnt.c:139 +#: misc-utils/findmnt.c:141 msgid "filesystem root" msgstr "文件系统 root" -#: misc-utils/findmnt.c:140 +#: misc-utils/findmnt.c:142 msgid "task ID" msgstr "任务 ID" -#: misc-utils/findmnt.c:141 +#: misc-utils/findmnt.c:143 msgid "mount ID" msgstr "挂载 ID" -#: misc-utils/findmnt.c:142 +#: misc-utils/findmnt.c:144 msgid "optional mount fields" msgstr "可选的挂载字段" -#: misc-utils/findmnt.c:143 +#: misc-utils/findmnt.c:145 msgid "VFS propagation flags" msgstr "VFS 传播标志" -#: misc-utils/findmnt.c:144 +#: misc-utils/findmnt.c:146 msgid "dump(8) period in days [fstab only]" msgstr "dump(8) 周期(天数) [仅 fstab]" -#: misc-utils/findmnt.c:145 +#: misc-utils/findmnt.c:147 msgid "pass number on parallel fsck(8) [fstab only]" msgstr "并行 fsck(8) 的遍数(pass number) [仅 fstab]" -#: misc-utils/findmnt.c:348 +#: misc-utils/findmnt.c:358 #, c-format msgid "unknown action: %s" msgstr "未知操作: %s" -#: misc-utils/findmnt.c:658 +#: misc-utils/findmnt.c:668 msgid "mount" msgstr "挂载" -#: misc-utils/findmnt.c:661 +#: misc-utils/findmnt.c:671 msgid "umount" msgstr "卸载" -#: misc-utils/findmnt.c:664 +#: misc-utils/findmnt.c:674 msgid "remount" msgstr "重新挂载" -#: misc-utils/findmnt.c:667 +#: misc-utils/findmnt.c:677 msgid "move" msgstr "移动" -#: misc-utils/findmnt.c:797 +#: misc-utils/findmnt.c:807 #, c-format msgid "%s: parse error at line %d" msgstr "%s：第 %d 行解析出错" -#: misc-utils/findmnt.c:826 misc-utils/findmnt.c:1089 sys-utils/eject.c:727 -#: sys-utils/mount.c:647 +#: misc-utils/findmnt.c:836 misc-utils/findmnt.c:1099 sys-utils/eject.c:719 +#: sys-utils/mount.c:650 msgid "failed to initialize libmount table" msgstr "初始化 libmount table 失败" -#: misc-utils/findmnt.c:853 text-utils/hexdump-parse.c:84 +#: misc-utils/findmnt.c:863 text-utils/hexdump-parse.c:84 #, c-format msgid "can't read %s" msgstr "不能读 %s" -#: misc-utils/findmnt.c:1029 misc-utils/findmnt.c:1095 sys-utils/fstrim.c:169 +#: misc-utils/findmnt.c:1039 misc-utils/findmnt.c:1105 sys-utils/fstrim.c:199 #: 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 +#: sys-utils/swapoff.c:152 sys-utils/swapon.c:230 sys-utils/swapon.c:260 +#: sys-utils/swapon.c:689 sys-utils/umount.c:275 msgid "failed to initialize libmount iterator" msgstr "无法初始化 libmount 迭代器" -#: misc-utils/findmnt.c:1101 +#: misc-utils/findmnt.c:1111 msgid "failed to initialize libmount tabdiff" msgstr "初始化 libmount tabdiff 失败" -#: misc-utils/findmnt.c:1129 +#: misc-utils/findmnt.c:1139 msgid "poll() failed" msgstr "poll() 失败" -#: misc-utils/findmnt.c:1199 -#, c-format +#: misc-utils/findmnt.c:1209 +#, fuzzy, c-format msgid "" " %1$s [options]\n" " %1$s [options] <device> | <mountpoint>\n" " %1$s [options] <device> <mountpoint>\n" -" %1$s [options] [--source <device>] [--target <mountpoint>]\n" +" %1$s [options] [--source <device>] [--target <path> | --mountpoint <dir>]\n" msgstr "" " %1$s [选项]\n" " %1$s [选项] <设备> | <挂臷点>\n" " %1$s [选项] <设备> <挂臷点>\n" " %1$s [选项] [--source <设备>] [--target <挂臷点>]\n" -#: misc-utils/findmnt.c:1206 +#: misc-utils/findmnt.c:1216 #, fuzzy msgid "Find a (mounted) filesystem.\n" msgstr "Linux 文件系统" -#: misc-utils/findmnt.c:1209 +#: misc-utils/findmnt.c:1219 msgid " -s, --fstab search in static table of filesystems\n" msgstr " -s, --fstab 在文件系统表态表中搜索\n" -#: misc-utils/findmnt.c:1210 +#: misc-utils/findmnt.c:1220 msgid " -m, --mtab search in table of mounted filesystems\n" msgstr " -m, --mtab 在已挂载文件系统表中搜索\n" -#: misc-utils/findmnt.c:1211 +#: misc-utils/findmnt.c:1221 msgid "" " -k, --kernel search in kernel table of mounted\n" " filesystems (default)\n" @@ -7923,43 +8156,43 @@ msgstr "" " -k, --kernel 在已挂载文件系统的内核表中搜索\n" " (默认)\n" -#: misc-utils/findmnt.c:1214 +#: misc-utils/findmnt.c:1224 msgid " -p, --poll[=<list>] monitor changes in table of mounted filesystems\n" msgstr " -p, --poll[=<列表>] 监测已挂臷文件系统表的改变\n" -#: misc-utils/findmnt.c:1215 +#: misc-utils/findmnt.c:1225 msgid " -w, --timeout <num> upper limit in milliseconds that --poll will block\n" msgstr " -w, --timeout <数字> --poll 阻塞的时间上限(毫秒)\n" -#: misc-utils/findmnt.c:1218 +#: misc-utils/findmnt.c:1228 msgid " -A, --all disable all built-in filters, print all filesystems\n" msgstr " -A, --all 禁用所有内置过滤器，打印所有文件系统\n" -#: misc-utils/findmnt.c:1219 +#: misc-utils/findmnt.c:1229 msgid " -a, --ascii use ASCII chars for tree formatting\n" msgstr " -a, --ascii 用 ASCII 字符格式化树\n" -#: misc-utils/findmnt.c:1220 +#: misc-utils/findmnt.c:1230 msgid " -b, --bytes print sizes in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n" -#: misc-utils/findmnt.c:1221 +#: misc-utils/findmnt.c:1231 msgid " -C, --nocanonicalize don't canonicalize when comparing paths\n" msgstr " -c, --no-canonicalize 在比较路径时不对路径规范化\n" -#: misc-utils/findmnt.c:1222 +#: misc-utils/findmnt.c:1232 msgid " -c, --canonicalize canonicalize printed paths\n" msgstr " -c, --no-canonicalize 对打印的路径规范化\n" -#: misc-utils/findmnt.c:1223 +#: misc-utils/findmnt.c:1233 msgid " -D, --df imitate the output of df(1)\n" msgstr " -D, --df 仿照 df(1) 输出\n" -#: misc-utils/findmnt.c:1224 +#: misc-utils/findmnt.c:1234 msgid " -d, --direction <word> direction of search, 'forward' or 'backward'\n" msgstr " -d, --direction <单词> 搜索方向，“forward”(往前)或“backward”(往回)\n" -#: misc-utils/findmnt.c:1225 +#: misc-utils/findmnt.c:1235 msgid "" " -e, --evaluate convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n" " to device names\n" @@ -7967,51 +8200,56 @@ msgstr "" " -e, --evaluate 将标签(LABEL,UUID,PARTUUID,PARTLABEL) 转换为\n" " 设备名\n" -#: misc-utils/findmnt.c:1227 +#: misc-utils/findmnt.c:1237 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:1228 +#: misc-utils/findmnt.c:1238 msgid " -f, --first-only print the first found filesystem only\n" msgstr " -f, --first-only 只打印找到的第一个文件系统\n" -#: misc-utils/findmnt.c:1229 +#: misc-utils/findmnt.c:1239 msgid " -i, --invert invert the sense of matching\n" msgstr " -i, --invert 反转搜索的匹配\n" -#: misc-utils/findmnt.c:1230 +#: misc-utils/findmnt.c:1240 +#, fuzzy +msgid " -J, --json use JSON output format\n" +msgstr " -r, --raw 使用原生输出格式\n" + +#: misc-utils/findmnt.c:1241 msgid " -l, --list use list format output\n" msgstr " -l, --list 使用列表格式的输出\n" -#: misc-utils/findmnt.c:1231 +#: misc-utils/findmnt.c:1242 msgid " -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n" msgstr " -N, --task <tid> 使用替代的名字空间(/proc/<tid>/mountinfo 文件)\n" -#: misc-utils/findmnt.c:1232 +#: misc-utils/findmnt.c:1243 msgid " -n, --noheadings don't print column headings\n" msgstr " -n, --noheadings 不打印列标题\n" -#: misc-utils/findmnt.c:1233 +#: misc-utils/findmnt.c:1244 msgid " -O, --options <list> limit the set of filesystems by mount options\n" msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n" -#: misc-utils/findmnt.c:1234 +#: misc-utils/findmnt.c:1245 msgid " -o, --output <list> the output columns to be shown\n" msgstr " -o, --output <列表> 要显示的列\n" -#: misc-utils/findmnt.c:1235 +#: misc-utils/findmnt.c:1246 msgid " -P, --pairs use key=\"value\" output format\n" msgstr " -P, --pairs 使用 键=“值”的输出格式\n" -#: misc-utils/findmnt.c:1236 +#: misc-utils/findmnt.c:1247 msgid " -R, --submounts print all submounts for the matching filesystems\n" msgstr " -R, --submounts 打印匹配文件系统的所有子挂载(submount)\n" -#: misc-utils/findmnt.c:1237 +#: misc-utils/findmnt.c:1248 msgid " -r, --raw use raw output format\n" msgstr " -r, --raw 使用原生输出格式\n" -#: misc-utils/findmnt.c:1238 +#: misc-utils/findmnt.c:1249 msgid "" " -S, --source <string> the device to mount (by name, maj:min, \n" " LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n" @@ -8019,48 +8257,54 @@ msgstr "" " -S, --source <字符串> 要挂载的设备(按 名称, 主:次设备号, \n" " LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n" -#: misc-utils/findmnt.c:1240 -msgid " -T, --target <string> the mountpoint to use\n" +#: misc-utils/findmnt.c:1251 +#, fuzzy +msgid " -T, --target <path> the path to the filesystem to use\n" msgstr " -T, --target <字符串> 要使用的挂载点\n" -#: misc-utils/findmnt.c:1241 +#: misc-utils/findmnt.c:1252 +#, fuzzy +msgid " -M, --mountpoint <dir> the mountpoint directory\n" +msgstr " -r, --root [=<目录>] 设置根目录\n" + +#: misc-utils/findmnt.c:1253 msgid " -t, --types <list> limit the set of filesystems by FS types\n" msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n" -#: misc-utils/findmnt.c:1242 +#: misc-utils/findmnt.c:1254 msgid " -U, --uniq ignore filesystems with duplicate target\n" msgstr " -U, --uniq 忽略目标重复的文件系统\n" -#: misc-utils/findmnt.c:1243 +#: misc-utils/findmnt.c:1255 msgid " -u, --notruncate don't truncate text in columns\n" msgstr " -u, --notruncate 不截断列中的文本\n" -#: misc-utils/findmnt.c:1244 +#: misc-utils/findmnt.c:1256 msgid " -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n" msgstr " -v, --nofsroot 对绑定式或 btrfs 挂载不打印[/dir]\n" -#: misc-utils/findmnt.c:1359 +#: misc-utils/findmnt.c:1376 #, c-format msgid "unknown direction '%s'" msgstr "未知方向“%s”" -#: misc-utils/findmnt.c:1428 +#: misc-utils/findmnt.c:1448 msgid "invalid TID argument" msgstr "无效的 TID 参数" -#: misc-utils/findmnt.c:1488 +#: misc-utils/findmnt.c:1511 msgid "--poll accepts only one file, but more specified by --tab-file" msgstr "--poll 只接受一个文件，但用 --tab-file 指定了多个" -#: misc-utils/findmnt.c:1492 +#: misc-utils/findmnt.c:1515 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:1542 +#: misc-utils/findmnt.c:1565 msgid "failed to initialize libmount cache" msgstr "初始化 libmount 缓存失败" -#: misc-utils/findmnt.c:1575 +#: misc-utils/findmnt.c:1602 #, c-format msgid "%s column is requested, but --poll is not enabled" msgstr "请示了 %s 列，但未启用 --poll" @@ -8204,8 +8448,8 @@ msgstr "未知信号：%s" msgid "%s and %s are mutually exclusive" msgstr "%s 和 %s 相互排斥" -#: misc-utils/kill.c:400 misc-utils/kill.c:442 misc-utils/rename.c:173 -#: sys-utils/ipcrm.c:160 term-utils/agetty.c:787 term-utils/agetty.c:796 +#: misc-utils/kill.c:400 misc-utils/kill.c:442 misc-utils/rename.c:174 +#: sys-utils/ipcrm.c:160 term-utils/agetty.c:790 term-utils/agetty.c:799 msgid "not enough arguments" msgstr "参数不够" @@ -8214,10 +8458,18 @@ msgstr "参数不够" msgid "option '%s' requires an argument" msgstr "“%s”选项需要一个参数" -#: misc-utils/kill.c:418 term-utils/setterm.c:218 term-utils/setterm.c:256 -#: term-utils/setterm.c:294 term-utils/setterm.c:322 term-utils/setterm.c:336 -#: term-utils/setterm.c:347 term-utils/setterm.c:355 term-utils/setterm.c:370 -#: term-utils/setterm.c:384 term-utils/setterm.c:397 +#: misc-utils/kill.c:418 sys-utils/eject.c:205 sys-utils/eject.c:230 +#: sys-utils/tunelp.c:161 sys-utils/tunelp.c:168 sys-utils/tunelp.c:175 +#: sys-utils/tunelp.c:182 sys-utils/tunelp.c:189 sys-utils/tunelp.c:195 +#: sys-utils/tunelp.c:199 sys-utils/tunelp.c:206 sys-utils/tunelp.c:231 +#: term-utils/setterm.c:204 term-utils/setterm.c:242 term-utils/setterm.c:280 +#: term-utils/setterm.c:308 term-utils/setterm.c:322 term-utils/setterm.c:333 +#: term-utils/setterm.c:341 term-utils/setterm.c:356 term-utils/setterm.c:370 +#: term-utils/setterm.c:383 term-utils/setterm.c:545 term-utils/setterm.c:550 +#: term-utils/setterm.c:555 term-utils/setterm.c:560 term-utils/setterm.c:584 +#: term-utils/setterm.c:589 term-utils/setterm.c:594 term-utils/setterm.c:599 +#: term-utils/setterm.c:604 term-utils/setterm.c:609 term-utils/setterm.c:617 +#: term-utils/setterm.c:650 msgid "argument error" msgstr "参数出错" @@ -8245,167 +8497,205 @@ msgstr "将“kill --pid”选项当作命令的做法已经废弃" msgid "cannot find process \"%s\"" msgstr "找不到进程“%s”" -#: misc-utils/logger.c:167 +#: misc-utils/logger.c:204 #, c-format msgid "unknown facility name: %s" msgstr "未知设施名称：%s" -#: misc-utils/logger.c:173 +#: misc-utils/logger.c:210 #, c-format msgid "unknown priority name: %s" msgstr "未知优先级名称：%s" -#: misc-utils/logger.c:183 +#: misc-utils/logger.c:222 #, c-format msgid "openlog %s: pathname too long" msgstr "openlog %s：路径名过长" -#: misc-utils/logger.c:206 +#: misc-utils/logger.c:245 #, c-format msgid "socket %s" msgstr "套接字 %s" -#: misc-utils/logger.c:239 +#: misc-utils/logger.c:279 #, c-format msgid "failed to resolve name %s port %s: %s" msgstr "解析名称 %s 端口 %s 失败：%s" -#: misc-utils/logger.c:256 +#: misc-utils/logger.c:296 #, c-format msgid "failed to connect to %s port %s" msgstr "连接 %s 端口 %s 失败" -#: misc-utils/logger.c:283 +#: misc-utils/logger.c:323 #, c-format msgid "maximum input lines (%d) exceeded" msgstr "超过了最大输入行数(%d)" -#: misc-utils/logger.c:365 +#: misc-utils/logger.c:480 #, fuzzy msgid "localtime() failed" msgstr "fallocate 失败" -#: misc-utils/logger.c:373 +#: misc-utils/logger.c:490 #, fuzzy, c-format msgid "hostname '%s' is too long" msgstr "字段 %s 过长" -#: misc-utils/logger.c:380 +#: misc-utils/logger.c:496 #, fuzzy, c-format msgid "tag '%s' is too long" msgstr "字段 %s 过长" -#: misc-utils/logger.c:427 +#: misc-utils/logger.c:550 #, fuzzy, c-format msgid "ignoring unknown option argument: %s" msgstr "未知参数：%s" -#: misc-utils/logger.c:439 +#: misc-utils/logger.c:562 #, fuzzy, c-format msgid "invalid argument: %s: using automatic errors" msgstr "--auto/-a 选项参数无效" -#: misc-utils/logger.c:544 +#: misc-utils/logger.c:702 #, c-format msgid " %s [options] [<message>]\n" msgstr " %s [选项] [<消息>]\n" -#: misc-utils/logger.c:547 +#: misc-utils/logger.c:705 #, fuzzy msgid "Enter messages into the system log.\n" msgstr "无法设置系统时钟。\n" -#: misc-utils/logger.c:550 +#: misc-utils/logger.c:708 +#, fuzzy +msgid " -i log the logger command's PID\n" +msgstr " --help 显示此帮助并退出\n" + +#: misc-utils/logger.c:709 #, fuzzy -msgid " -i, --id[=<id>] log <id> (default is PID)\n" +msgid " --id[=<id>] log the given <id>, or otherwise the PID\n" msgstr " -a, --all 全部(默认)\n" -#: misc-utils/logger.c:551 +#: misc-utils/logger.c:710 #, fuzzy msgid " -f, --file <file> log the contents of this file\n" msgstr " -f, --file <文件> 记录此文件的内容\n" -#: misc-utils/logger.c:552 +#: misc-utils/logger.c:711 +#, fuzzy +msgid " -e, --skip-empty do not log empty lines when processing files\n" +msgstr " -n, --skip-login 不提示登录\n" + +#: misc-utils/logger.c:712 +#, fuzzy +msgid " --no-act do everything except the write the log\n" +msgstr " -n, --no-mtab 不写 /etc/mtab\n" + +#: misc-utils/logger.c:713 #, fuzzy msgid " -p, --priority <prio> mark given message with this priority\n" msgstr " -p, --priority <级别> 将指定消息标记为此优先级\n" -#: misc-utils/logger.c:553 +#: misc-utils/logger.c:714 +msgid " --octet-count use rfc6587 octet counting\n" +msgstr "" + +#: misc-utils/logger.c:715 #, fuzzy msgid " --prio-prefix look for a prefix on every line read from stdin\n" msgstr " --prio-prefix 在从 stdin 读取的每一行上查找前缀\n" -#: misc-utils/logger.c:554 +#: misc-utils/logger.c:716 #, fuzzy msgid " -s, --stderr output message to standard error as well\n" msgstr " -s, --stderr 也向标准错误输出消息\n" -#: misc-utils/logger.c:555 +#: misc-utils/logger.c:717 +#, fuzzy +msgid " -S, --size <size> maximum size for a single message\n" +msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n" + +#: misc-utils/logger.c:718 #, fuzzy msgid " -t, --tag <tag> mark every line with this tag\n" msgstr " -t, --tag <标志> 用此标志标记每一行\n" -#: misc-utils/logger.c:556 +#: misc-utils/logger.c:719 #, fuzzy msgid " -n, --server <name> write to this remote syslog server\n" msgstr " -n, --server <名称> 写入此远程 syslog 服务器\n" -#: misc-utils/logger.c:557 +#: misc-utils/logger.c:720 #, fuzzy msgid " -P, --port <number> use this UDP port\n" msgstr " -P, --port <数字> 使用此 UDP 端口\n" -#: misc-utils/logger.c:558 +#: misc-utils/logger.c:721 #, fuzzy msgid " -T, --tcp use TCP only\n" msgstr " -T, --tcp 只使用 TCP\n" -#: misc-utils/logger.c:559 +#: misc-utils/logger.c:722 #, fuzzy msgid " -d, --udp use UDP only\n" msgstr " -d, --udp 只使用 UDP\n" -#: misc-utils/logger.c:560 +#: misc-utils/logger.c:723 #, fuzzy msgid " --rfc3164 use the obsolete BSD syslog protocol\n" msgstr " -l, --list 列出所有或指定的信息(默认)\n" -#: misc-utils/logger.c:561 +#: misc-utils/logger.c:724 msgid "" -" --rfc5424[=<snip>] use the syslog protocol (the default);\n" +" --rfc5424[=<snip>] use the syslog protocol (the default for remote);\n" " <snip> can be notime, or notq, and/or nohost\n" msgstr "" -#: misc-utils/logger.c:563 +#: misc-utils/logger.c:726 +#, fuzzy +msgid " --msgid <msgid> set rfc5424 message id field\n" +msgstr " --rgid <gid> 设置实际 gid\n" + +#: misc-utils/logger.c:727 #, fuzzy msgid " -u, --socket <socket> write to this Unix socket\n" msgstr " -u, --socket <套接字> 写入此 Unix 套接字\n" -#: misc-utils/logger.c:564 +#: misc-utils/logger.c:728 msgid "" " --socket-errors[=<on|off|auto>]\n" " print connection errors when using Unix sockets\n" msgstr "" -#: misc-utils/logger.c:567 +#: misc-utils/logger.c:731 msgid " --journald[=<file>] write journald entry\n" msgstr " --journald[=<文件>] 写 journald 记录\n" -#: misc-utils/logger.c:640 +#: misc-utils/logger.c:813 #, c-format msgid "file %s" msgstr "文件 %s" -#: misc-utils/logger.c:649 +#: misc-utils/logger.c:828 #, fuzzy msgid "failed to parse id" msgstr "解析 pid 失败" -#: misc-utils/logger.c:715 +#: misc-utils/logger.c:846 +#, fuzzy +msgid "failed to parse message size" +msgstr "解析大小失败" + +#: misc-utils/logger.c:881 +msgid "--msgid cannot contain space" +msgstr "" + +#: misc-utils/logger.c:909 msgid "--file <file> and <message> are mutually exclusive, message is ignored" msgstr "" -#: misc-utils/logger.c:722 +#: misc-utils/logger.c:916 msgid "journald entry could not be written" msgstr "" @@ -8437,295 +8727,300 @@ msgstr " -s, --inverse 反向依赖\n" msgid " -t, --terminate <char> define the string-termination character\n" msgstr "" -#: misc-utils/lsblk.c:143 +#: misc-utils/lsblk.c:158 msgid "device name" msgstr "设备名" -#: misc-utils/lsblk.c:144 +#: misc-utils/lsblk.c:159 msgid "internal kernel device name" msgstr "内部内核设备名称" -#: misc-utils/lsblk.c:145 +#: misc-utils/lsblk.c:160 msgid "internal parent kernel device name" msgstr "内部上级内核设备名称" -#: misc-utils/lsblk.c:148 sys-utils/zramctl.c:75 +#: misc-utils/lsblk.c:163 sys-utils/zramctl.c:82 msgid "where the device is mounted" msgstr "设备挂载位置" -#: misc-utils/lsblk.c:149 +#: misc-utils/lsblk.c:164 msgid "filesystem LABEL" msgstr "文件系统标签" -#: misc-utils/lsblk.c:152 +#: misc-utils/lsblk.c:167 msgid "partition type UUID" msgstr "分区类型 UUID" -#: misc-utils/lsblk.c:153 +#: misc-utils/lsblk.c:168 msgid "partition LABEL" msgstr "分区 LABEL" -#: misc-utils/lsblk.c:157 +#: misc-utils/lsblk.c:172 msgid "read-ahead of the device" msgstr "该设备的预读(read-ahead)" -#: misc-utils/lsblk.c:158 sys-utils/losetup.c:71 +#: misc-utils/lsblk.c:173 sys-utils/losetup.c:73 msgid "read-only device" msgstr "只读设备" -#: misc-utils/lsblk.c:159 +#: misc-utils/lsblk.c:174 msgid "removable device" msgstr "可移动设备" -#: misc-utils/lsblk.c:160 +#: misc-utils/lsblk.c:175 msgid "removable or hotplug device (usb, pcmcia, ...)" msgstr "" -#: misc-utils/lsblk.c:161 +#: misc-utils/lsblk.c:176 msgid "rotational device" msgstr "转动设备" -#: misc-utils/lsblk.c:162 +#: misc-utils/lsblk.c:177 msgid "adds randomness" msgstr "添加随机性" -#: misc-utils/lsblk.c:163 +#: misc-utils/lsblk.c:178 msgid "device identifier" msgstr "设备标识符" -#: misc-utils/lsblk.c:164 +#: misc-utils/lsblk.c:179 msgid "disk serial number" msgstr "磁盘序列号" -#: misc-utils/lsblk.c:165 +#: misc-utils/lsblk.c:180 msgid "size of the device" msgstr "磁盘容量" -#: misc-utils/lsblk.c:166 +#: misc-utils/lsblk.c:181 msgid "state of the device" msgstr "设备的状态" -#: misc-utils/lsblk.c:168 +#: misc-utils/lsblk.c:183 msgid "group name" msgstr "组名" -#: misc-utils/lsblk.c:169 +#: misc-utils/lsblk.c:184 msgid "device node permissions" msgstr "设备节点权限" -#: misc-utils/lsblk.c:170 +#: misc-utils/lsblk.c:185 msgid "alignment offset" msgstr "对齐偏移量" -#: misc-utils/lsblk.c:171 +#: misc-utils/lsblk.c:186 msgid "minimum I/O size" msgstr "最小 I/O 大小" -#: misc-utils/lsblk.c:172 +#: misc-utils/lsblk.c:187 msgid "optimal I/O size" msgstr "最优 I/O 大小" -#: misc-utils/lsblk.c:173 +#: misc-utils/lsblk.c:188 msgid "physical sector size" msgstr "物理扇区大小" -#: misc-utils/lsblk.c:174 +#: misc-utils/lsblk.c:189 msgid "logical sector size" msgstr "逻辑扇区大小" -#: misc-utils/lsblk.c:175 +#: misc-utils/lsblk.c:190 msgid "I/O scheduler name" msgstr "I/O 调度器名称" -#: misc-utils/lsblk.c:176 +#: misc-utils/lsblk.c:191 msgid "request queue size" msgstr "请求队列大小" -#: misc-utils/lsblk.c:177 +#: misc-utils/lsblk.c:192 msgid "device type" msgstr "设备类型" -#: misc-utils/lsblk.c:178 +#: misc-utils/lsblk.c:193 msgid "discard alignment offset" msgstr "忽略对齐偏移量" -#: misc-utils/lsblk.c:179 +#: misc-utils/lsblk.c:194 msgid "discard granularity" msgstr "忽略粒度" -#: misc-utils/lsblk.c:180 +#: misc-utils/lsblk.c:195 msgid "discard max bytes" msgstr "忽略最大字节数" -#: misc-utils/lsblk.c:181 +#: misc-utils/lsblk.c:196 msgid "discard zeroes data" msgstr "忽略零数据" -#: misc-utils/lsblk.c:182 +#: misc-utils/lsblk.c:197 msgid "write same max bytes" msgstr "写相同的最大字节数" -#: misc-utils/lsblk.c:183 +#: misc-utils/lsblk.c:198 msgid "unique storage identifier" msgstr "惟一存储标识符" -#: misc-utils/lsblk.c:184 +#: misc-utils/lsblk.c:199 msgid "Host:Channel:Target:Lun for SCSI" msgstr "SCSI 的 Host:Channel:Target:Lun" -#: misc-utils/lsblk.c:185 +#: misc-utils/lsblk.c:200 msgid "device transport type" msgstr "设备传输类型" -#: misc-utils/lsblk.c:186 +#: misc-utils/lsblk.c:201 msgid "de-duplicated chain of subsystems" msgstr "" -#: misc-utils/lsblk.c:187 +#: misc-utils/lsblk.c:202 msgid "device revision" msgstr "设备修订版本" -#: misc-utils/lsblk.c:188 +#: misc-utils/lsblk.c:203 msgid "device vendor" msgstr "设备制造商" -#: misc-utils/lsblk.c:1122 +#: misc-utils/lsblk.c:1161 #, c-format msgid "%s: failed to get device path" msgstr "%s：获取设备路径失败" -#: misc-utils/lsblk.c:1129 +#: misc-utils/lsblk.c:1169 #, c-format msgid "%s: unknown device name" msgstr "%s：未知设备名称" -#: misc-utils/lsblk.c:1165 +#: misc-utils/lsblk.c:1206 #, c-format msgid "%s: failed to get dm name" msgstr "%s：获取 dm 名称失败" -#: misc-utils/lsblk.c:1206 +#: misc-utils/lsblk.c:1255 msgid "failed to open device directory in sysfs" msgstr "打开 sysfs 中的设备目录失败" -#: misc-utils/lsblk.c:1374 +#: misc-utils/lsblk.c:1445 #, c-format msgid "%s: failed to compose sysfs path" msgstr "%s：组成 sysfs 路径失败" -#: misc-utils/lsblk.c:1380 +#: misc-utils/lsblk.c:1451 #, c-format msgid "%s: failed to read link" msgstr "%s：读链接失败" -#: misc-utils/lsblk.c:1402 +#: misc-utils/lsblk.c:1473 #, c-format msgid "%s: failed to get sysfs name" msgstr "%s：获取 sysfs 名称失败" -#: misc-utils/lsblk.c:1411 +#: misc-utils/lsblk.c:1482 #, c-format msgid "%s: failed to get whole-disk device number" msgstr "%s：获取 整盘 设备号失败" -#: misc-utils/lsblk.c:1463 misc-utils/lsblk.c:1465 misc-utils/lsblk.c:1490 -#: misc-utils/lsblk.c:1492 +#: misc-utils/lsblk.c:1534 misc-utils/lsblk.c:1536 misc-utils/lsblk.c:1561 +#: misc-utils/lsblk.c:1563 #, c-format msgid "failed to parse list '%s'" msgstr "解析列表“%s”失败" #. TRANSLATORS: The standard value for %d is 256. -#: misc-utils/lsblk.c:1470 +#: misc-utils/lsblk.c:1541 #, 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:1497 +#: misc-utils/lsblk.c:1568 #, c-format msgid "the list of included devices is too large (limit is %d devices)" msgstr "包含设备列表过大(限制为 %d 台设备)" -#: misc-utils/lsblk.c:1528 sys-utils/wdctl.c:174 +#: misc-utils/lsblk.c:1599 sys-utils/wdctl.c:174 #, c-format msgid " %s [options] [<device> ...]\n" msgstr " %s [选项] [<设备> ...]\n" -#: misc-utils/lsblk.c:1531 +#: misc-utils/lsblk.c:1602 #, fuzzy msgid "List information about block devices.\n" msgstr "%s：不是一个块设备" -#: misc-utils/lsblk.c:1534 +#: misc-utils/lsblk.c:1605 msgid " -a, --all print all devices\n" msgstr " -a, --all 打印所有设备\n" -#: misc-utils/lsblk.c:1536 +#: misc-utils/lsblk.c:1607 msgid " -d, --nodeps don't print slaves or holders\n" msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n" -#: misc-utils/lsblk.c:1537 +#: misc-utils/lsblk.c:1608 msgid " -D, --discard print discard capabilities\n" msgstr " -D, --discard 打印时丢弃能力\n" -#: misc-utils/lsblk.c:1538 +#: misc-utils/lsblk.c:1609 msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n" msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认：内存盘)\n" -#: misc-utils/lsblk.c:1539 +#: misc-utils/lsblk.c:1610 msgid " -f, --fs output info about filesystems\n" msgstr " -f, --fs 输出文件系统信息\n" -#: misc-utils/lsblk.c:1540 +#: misc-utils/lsblk.c:1611 msgid " -i, --ascii use ascii characters only\n" msgstr " -i, --ascii 只使用 ascii 字符\n" -#: misc-utils/lsblk.c:1541 +#: misc-utils/lsblk.c:1612 msgid " -I, --include <list> show only devices with specified major numbers\n" msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n" -#: misc-utils/lsblk.c:1542 +#: misc-utils/lsblk.c:1613 +#, fuzzy +msgid " -J, --json use JSON output format\n" +msgstr " -r, --raw 使用原生输出格式\n" + +#: misc-utils/lsblk.c:1614 msgid " -l, --list use list format output\n" msgstr " -l, --list 使用列表格式的输出\n" -#: misc-utils/lsblk.c:1543 +#: misc-utils/lsblk.c:1615 msgid " -m, --perms output info about permissions\n" msgstr " -m, --perms 输出权限信息\n" -#: misc-utils/lsblk.c:1544 +#: misc-utils/lsblk.c:1616 msgid " -n, --noheadings don't print headings\n" msgstr " -n, --noheadings 不打印标题\n" -#: misc-utils/lsblk.c:1545 +#: misc-utils/lsblk.c:1617 msgid " -o, --output <list> output columns\n" msgstr " -o, --output <列表> 输出列\n" -#: misc-utils/lsblk.c:1546 +#: misc-utils/lsblk.c:1618 msgid " -O, --output-all output all columns\n" msgstr " -O, --output-all 输出所有列\n" -#: misc-utils/lsblk.c:1547 +#: misc-utils/lsblk.c:1619 msgid " -p, --paths print complete device path\n" msgstr " -p, --paths 打印完整设备路径\n" -#: misc-utils/lsblk.c:1550 +#: misc-utils/lsblk.c:1622 msgid " -s, --inverse inverse dependencies\n" msgstr " -s, --inverse 反向依赖\n" -#: misc-utils/lsblk.c:1551 +#: misc-utils/lsblk.c:1623 msgid " -S, --scsi output info about SCSI devices\n" msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n" -#: misc-utils/lsblk.c:1552 +#: misc-utils/lsblk.c:1624 msgid " -t, --topology output info about topology\n" msgstr " -t, --topology 输出拓扑信息\n" -#: misc-utils/lsblk.c:1553 +#: misc-utils/lsblk.c:1625 msgid " -x, --sort <column> sort output by <column>\n" msgstr " -x, --sort <列> 按<列>对输出排序\n" -#: misc-utils/lsblk.c:1558 misc-utils/lslocks.c:521 sys-utils/prlimit.c:196 -#: sys-utils/zramctl.c:399 +#: misc-utils/lsblk.c:1630 misc-utils/lslocks.c:530 sys-utils/prlimit.c:196 +#: sys-utils/zramctl.c:478 #, c-format msgid "" "\n" @@ -8734,82 +9029,84 @@ msgstr "" "\n" "可用列(用于 --output)：\n" -#: misc-utils/lsblk.c:1571 +#: misc-utils/lsblk.c:1643 #, c-format msgid "failed to access sysfs directory: %s" msgstr "无法访问 sysfs 目录：%s" -#: misc-utils/lsblk.c:1760 +#: misc-utils/lsblk.c:1840 msgid "the sort column has to be among the output columns" msgstr "排序列必须是输出的列" -#: misc-utils/lslocks.c:72 +#: misc-utils/lslocks.c:73 msgid "command of the process holding the lock" msgstr "持有锁的进程命令" -#: misc-utils/lslocks.c:73 +#: misc-utils/lslocks.c:74 msgid "PID of the process holding the lock" msgstr "持有锁的进程 PID" -#: misc-utils/lslocks.c:74 +#: misc-utils/lslocks.c:75 msgid "kind of lock: FL_FLOCK or FL_POSIX." msgstr "锁类型：FL_FLOCK 或 FL_POSIX。" -#: misc-utils/lslocks.c:75 +#: misc-utils/lslocks.c:76 msgid "size of the lock" msgstr "锁的大小" -#: misc-utils/lslocks.c:76 +#: misc-utils/lslocks.c:77 msgid "lock access mode" msgstr "锁访问模式" -#: misc-utils/lslocks.c:77 +#: misc-utils/lslocks.c:78 msgid "mandatory state of the lock: 0 (none), 1 (set)" msgstr "锁的强制(mandatory)状态：0(未设置)，1(设置)" -#: misc-utils/lslocks.c:78 +#: misc-utils/lslocks.c:79 msgid "relative byte offset of the lock" msgstr "锁的相对字节偏移量" -#: misc-utils/lslocks.c:79 +#: misc-utils/lslocks.c:80 msgid "ending offset of the lock" msgstr "锁的末尾偏移量" -#: misc-utils/lslocks.c:80 +#: misc-utils/lslocks.c:81 msgid "path of the locked file" msgstr "锁定文件的路径" -#: misc-utils/lslocks.c:81 +#: misc-utils/lslocks.c:82 msgid "PID of the process blocking the lock" msgstr "阻塞锁的进程的 PID" -#: misc-utils/lslocks.c:263 +#: misc-utils/lslocks.c:265 msgid "failed to parse ID" msgstr "解析 ID 失败" -#: misc-utils/lslocks.c:285 sys-utils/nsenter.c:214 +#: misc-utils/lslocks.c:287 sys-utils/nsenter.c:227 msgid "failed to parse pid" msgstr "解析 pid 失败" -#: misc-utils/lslocks.c:288 +#: misc-utils/lslocks.c:290 msgid "(unknown)" msgstr "(未知)" -#: misc-utils/lslocks.c:297 +#: misc-utils/lslocks.c:299 msgid "failed to parse start" msgstr "解析 起点 失败" -#: misc-utils/lslocks.c:304 +#: misc-utils/lslocks.c:306 msgid "failed to parse end" msgstr "解析 终点 失败" -#: misc-utils/lslocks.c:510 +#: misc-utils/lslocks.c:518 #, fuzzy msgid "List local system locks.\n" msgstr "无法设置系统时钟。\n" -#: misc-utils/lslocks.c:513 +#: misc-utils/lslocks.c:521 +#, fuzzy msgid "" +" -J, --json use JSON output format\n" " -p, --pid <pid> process id\n" " -o, --output <list> define which output columns to use\n" " -n, --noheadings don't print headings\n" @@ -8826,8 +9123,8 @@ msgstr "" " -h, --help 显示此帮助并退出\n" " -V, --version 输出版本信息并退出\n" -#: misc-utils/lslocks.c:557 schedutils/chrt.c:256 schedutils/ionice.c:177 -#: schedutils/taskset.c:163 sys-utils/prlimit.c:585 +#: misc-utils/lslocks.c:577 schedutils/chrt.c:260 schedutils/ionice.c:177 +#: schedutils/taskset.c:163 sys-utils/prlimit.c:586 msgid "invalid PID argument" msgstr "无效的 PID 参数" @@ -8858,16 +9155,16 @@ msgstr[0] "从 %2$s 获得 %1$zu 字节\n" msgid "closing %s failed" msgstr "关闭 %s 失败" -#: misc-utils/mcookie.c:167 sys-utils/blkdiscard.c:120 sys-utils/fstrim.c:287 +#: misc-utils/mcookie.c:166 sys-utils/blkdiscard.c:120 sys-utils/fstrim.c:320 #: text-utils/hexdump.c:117 msgid "failed to parse length" msgstr "解析长度失败" -#: misc-utils/mcookie.c:180 +#: misc-utils/mcookie.c:179 msgid "--max-size ignored when used without --file" msgstr "不带 --file 时忽略 --max-size" -#: misc-utils/mcookie.c:188 +#: misc-utils/mcookie.c:187 #, c-format msgid "Got %d byte from %s\n" msgid_plural "Got %d bytes from %s\n" @@ -8941,26 +9238,26 @@ msgstr "%s：unlink 失败" msgid "%s: symlinking to %s failed" msgstr "%s：符号链接到 %s 失败" -#: misc-utils/rename.c:104 +#: misc-utils/rename.c:105 #, c-format msgid "%s: rename to %s failed" msgstr "%s：重命名为 %s 失败" -#: misc-utils/rename.c:117 +#: misc-utils/rename.c:118 #, c-format msgid " %s [options] <expression> <replacement> <file>...\n" msgstr " %s [选项] <表达式> <替换> <文件>...\n" -#: misc-utils/rename.c:121 +#: misc-utils/rename.c:122 #, fuzzy msgid "Rename files.\n" msgstr "ttyname 失败" -#: misc-utils/rename.c:124 +#: misc-utils/rename.c:125 msgid " -v, --verbose explain what is being done\n" msgstr " -v, --verbose 解释正在进行的操作\n" -#: misc-utils/rename.c:125 +#: misc-utils/rename.c:126 msgid " -s, --symlink act on the target of symlinks\n" msgstr " -s, --symlink 在符号链接的目标上执行\n" @@ -9175,6 +9472,11 @@ msgstr "" " -h, --help 显示此帮助并退出\n" "\n" +#: misc-utils/whereis.c:189 +#, fuzzy, c-format +msgid " %s [options] [-BMS <dir>... -f] <name>\n" +msgstr " %s [选项] [<文件>...]\n" + #: misc-utils/whereis.c:192 msgid "Locate the binary, source, and manual-page files for a command.\n" msgstr "" @@ -9217,6 +9519,11 @@ msgstr " -u 搜索不常见记录\n" msgid " -l output effective lookup paths\n" msgstr " -l 输出有效查找路径\n" +#: misc-utils/whereis.c:619 +#, fuzzy +msgid "option -f is missing" +msgstr "缺少 路径名 参数" + #: misc-utils/wipefs.c:195 msgid "partition table" msgstr "分区表" @@ -9304,14 +9611,11 @@ msgstr "" "设置或获取进程的 IO 调度类别和优先级。\n" #: schedutils/chrt.c:62 -#, fuzzy, c-format +#, fuzzy msgid "" -"\n" "Set policy:\n" -" chrt [options] [<policy>] <priority> [-p <pid> | <command> [<arg>...]]\n" -"\n" -"Get policy:\n" -" chrt [options] -p <pid>\n" +" chrt [options] <priority> <command> [<arg>...]\n" +" chrt [options] -p <priority> <pid>\n" msgstr "" "\n" "chrt - 实时操纵进程的属性\n" @@ -9322,121 +9626,140 @@ msgstr "" "获得策略：\n" " chrt [选项] -p <pid>\n" -#: schedutils/chrt.c:68 -#, c-format +#: schedutils/chrt.c:66 msgid "" -"\n" -"Scheduling policies:\n" -" -b | --batch set policy to SCHED_BATCH\n" -" -f | --fifo set policy to SCHED_FIFO\n" -" -i | --idle set policy to SCHED_IDLE\n" -" -o | --other set policy to SCHED_OTHER\n" -" -r | --rr set policy to SCHED_RR (default)\n" +"Get policy:\n" +" chrt [options] -p <pid>\n" msgstr "" -"\n" -"调度策略：\n" -" -b | --batch 设置为 SCHED_BATCH 策略\n" -" -f | --fifo 设置为 SCHED_FIFO 策略\n" -" -i | --idle 设置为 SCHED_IDLE 策略\n" -" -o | --other 设置为 SCHED_OTHER 策略\n" -" -r | --rr 设置为 SCHED_RR 策略(默认)\n" -#: schedutils/chrt.c:77 -#, c-format -msgid "" -"\n" -"Scheduling flags:\n" -" -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n" +#: schedutils/chrt.c:70 +#, fuzzy +msgid "Policy options:\n" +msgstr "资源选项：\n" + +#: schedutils/chrt.c:71 +#, fuzzy +msgid " -b, --batch set policy to SCHED_BATCH\n" +msgstr " -n, --noparity 设为无校验位\n" + +#: schedutils/chrt.c:72 +#, fuzzy +msgid " -f, --fifo set policy to SCHED_FIFO\n" +msgstr " -n, --noparity 设为无校验位\n" + +#: schedutils/chrt.c:73 +#, fuzzy +msgid " -i, --idle set policy to SCHED_IDLE\n" +msgstr " -n, --noparity 设为无校验位\n" + +#: schedutils/chrt.c:74 +#, fuzzy +msgid " -o, --other set policy to SCHED_OTHER\n" +msgstr " -o, --oddparity 设为偶检验\n" + +#: schedutils/chrt.c:75 +#, fuzzy +msgid " -r, --rr set policy to SCHED_RR (default)\n" +msgstr " -1, --one 只显示一个月(默认)\n" + +#: schedutils/chrt.c:79 +msgid "Scheduling flag:\n" +msgstr "" + +#: schedutils/chrt.c:80 +#, fuzzy +msgid " -R, --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n" msgstr "" "\n" "调度标志：\n" " -R | --reset-on-fork 为 FIFO 或 RR 设置 SCHED_RESET_ON_FORK\n" -#: schedutils/chrt.c:81 -#, c-format -msgid "" -"\n" -"Options:\n" -" -a | --all-tasks operate on all the tasks (threads) for a given pid\n" -" -h | --help display this help\n" -" -m | --max show min and max valid priorities\n" -" -p | --pid operate on existing given pid\n" -" -v | --verbose display status information\n" -" -V | --version output version information\n" -"\n" +#: schedutils/chrt.c:83 +#, fuzzy +msgid "Other options:\n" +msgstr "输出格式：\n" + +#: schedutils/chrt.c:84 +msgid " -a, --all-tasks operate on all the tasks (threads) for a given pid\n" msgstr "" -"\n" -"选项：\n" -" -a | --all-tasks 在给定 pid 的所有任务(线程)上操作\n" -" -h | --help 显示此帮助\n" -" -m | --max 显示最小和最大有效优先级\n" -" -p | --pid 在存在的指定 pid 上操作\n" -" -v | --verbose 显示状态信息\n" -" -V | --version 输出版本信息\n" -"\n" -#: schedutils/chrt.c:104 +#: schedutils/chrt.c:85 +#, fuzzy +msgid " -m, --max show min and max valid priorities\n" +msgstr " -T, --ctime 显示易读的时间戳\n" + +#: schedutils/chrt.c:86 +#, fuzzy +msgid " -p, --pid operate on existing given pid\n" +msgstr " -z, --zero 以空分区表开始\n" + +#: schedutils/chrt.c:87 +#, fuzzy +msgid " -v, --verbose display status information\n" +msgstr " -v, --verbose 打印当前进行的操作\n" + +#: schedutils/chrt.c:108 #, c-format msgid "failed to get pid %d's policy" msgstr "无法获得 pid %d 的策略" -#: schedutils/chrt.c:107 +#: schedutils/chrt.c:111 #, c-format msgid "pid %d's new scheduling policy: " msgstr "pid %d 的新调度策略：" -#: schedutils/chrt.c:109 +#: schedutils/chrt.c:113 #, c-format msgid "pid %d's current scheduling policy: " msgstr "pid %d 的当前调度策略：" -#: schedutils/chrt.c:142 +#: schedutils/chrt.c:146 msgid "unknown scheduling policy" msgstr "未知的调度策略" -#: schedutils/chrt.c:146 +#: schedutils/chrt.c:150 #, c-format msgid "failed to get pid %d's attributes" msgstr "获取 pid %d 的属性失败" -#: schedutils/chrt.c:149 +#: schedutils/chrt.c:153 #, c-format msgid "pid %d's new scheduling priority: %d\n" msgstr "pid %d 的新调度策略：%d\n" -#: schedutils/chrt.c:152 +#: schedutils/chrt.c:156 #, c-format msgid "pid %d's current scheduling priority: %d\n" msgstr "pid %d 的当前调度优先级：%d\n" -#: schedutils/chrt.c:187 +#: schedutils/chrt.c:191 #, c-format msgid "SCHED_%s min/max priority\t: %d/%d\n" msgstr "SCHED_%s 最小/最大优先级\t：%d/%d\n" -#: schedutils/chrt.c:190 +#: schedutils/chrt.c:194 #, c-format msgid "SCHED_%s not supported?\n" msgstr "SCHED_%s 不支持？\n" -#: schedutils/chrt.c:285 schedutils/chrt.c:318 +#: schedutils/chrt.c:289 schedutils/chrt.c:322 msgid "cannot obtain the list of tasks" msgstr "无法获取任务列表" -#: schedutils/chrt.c:297 +#: schedutils/chrt.c:301 msgid "invalid priority argument" msgstr "无效的 优先级 参数" -#: schedutils/chrt.c:303 +#: schedutils/chrt.c:307 msgid "SCHED_RESET_ON_FORK flag is supported for SCHED_FIFO and SCHED_RR policies only" msgstr "SCHED_RESET_ON_FORK 标志只支持 SCHED_FIFO 和 SCHED_RR 策略" -#: schedutils/chrt.c:321 +#: schedutils/chrt.c:325 #, c-format msgid "failed to set tid %d's policy" msgstr "设置 tid %d 策略失败" -#: schedutils/chrt.c:324 +#: schedutils/chrt.c:328 #, c-format msgid "failed to set pid %d's policy" msgstr "设置 pid %d 的策略失败" @@ -9676,7 +9999,7 @@ msgstr "" " -s, --secure 执行安全忽略\n" " -v, --verbose 打印对齐的长度和偏移\n" -#: sys-utils/blkdiscard.c:124 sys-utils/fstrim.c:291 sys-utils/losetup.c:533 +#: sys-utils/blkdiscard.c:124 sys-utils/fstrim.c:324 sys-utils/losetup.c:547 #: text-utils/hexdump.c:124 msgid "failed to parse offset" msgstr "解析偏移失败" @@ -9686,12 +10009,12 @@ msgstr "解析偏移失败" msgid "failed to parse step" msgstr "解析大小失败" -#: sys-utils/blkdiscard.c:143 sys-utils/zramctl.c:537 sys-utils/zramctl.c:562 +#: sys-utils/blkdiscard.c:143 sys-utils/zramctl.c:616 sys-utils/zramctl.c:641 msgid "no device specified" msgstr "未指定设备" #: sys-utils/blkdiscard.c:148 sys-utils/fallocate.c:351 -#: sys-utils/fsfreeze.c:122 sys-utils/fstrim.c:313 +#: sys-utils/fsfreeze.c:122 sys-utils/fstrim.c:346 msgid "unexpected number of arguments" msgstr "参数数量异常" @@ -9731,53 +10054,53 @@ msgid "%s: BLKDISCARD ioctl failed" msgstr "%s：BLKDISCARD ioctl 失败" #: sys-utils/chcpu.c:87 sys-utils/chcpu.c:179 -#, c-format -msgid "CPU %d does not exist" +#, fuzzy, c-format +msgid "CPU %u does not exist" msgstr "CPU %d 不存在" #: sys-utils/chcpu.c:92 -#, c-format -msgid "CPU %d is not hot pluggable" +#, fuzzy, c-format +msgid "CPU %u is not hot pluggable" msgstr "CPU %d 不可热插拔" #: sys-utils/chcpu.c:98 -#, c-format -msgid "CPU %d is already enabled\n" +#, fuzzy, c-format +msgid "CPU %u is already enabled\n" msgstr "CPU %d 已经启用\n" #: sys-utils/chcpu.c:102 -#, c-format -msgid "CPU %d is already disabled\n" +#, fuzzy, c-format +msgid "CPU %u is already disabled\n" msgstr "CPU %d 已经禁用\n" #: sys-utils/chcpu.c:110 -#, c-format -msgid "CPU %d enable failed (CPU is deconfigured)" +#, fuzzy, c-format +msgid "CPU %u enable failed (CPU is deconfigured)" msgstr "启用 CPU %d 失败(CPU 已解除配置)" #: sys-utils/chcpu.c:113 -#, c-format -msgid "CPU %d enable failed" +#, fuzzy, c-format +msgid "CPU %u enable failed" msgstr "启用 CPU %d 失败" #: sys-utils/chcpu.c:116 -#, c-format -msgid "CPU %d enabled\n" +#, fuzzy, c-format +msgid "CPU %u enabled\n" msgstr "已启用 CPU %d\n" #: sys-utils/chcpu.c:119 -#, c-format -msgid "CPU %d disable failed (last enabled CPU)" +#, fuzzy, c-format +msgid "CPU %u disable failed (last enabled CPU)" msgstr "禁用 CPU %d 失败(上次启用的 CPU)" #: sys-utils/chcpu.c:125 -#, c-format -msgid "CPU %d disable failed" +#, fuzzy, c-format +msgid "CPU %u disable failed" msgstr "禁用 CPU %d 失败" #: sys-utils/chcpu.c:128 -#, c-format -msgid "CPU %d disabled\n" +#, fuzzy, c-format +msgid "CPU %u disabled\n" msgstr "CPU %d 已禁用\n" #: sys-utils/chcpu.c:141 @@ -9816,43 +10139,43 @@ msgid "Successfully set vertical dispatching mode\n" msgstr "成功设置了竖直分派模式\n" #: sys-utils/chcpu.c:184 -#, c-format -msgid "CPU %d is not configurable" +#, fuzzy, c-format +msgid "CPU %u is not configurable" msgstr "CPU %d 是不可配置的" #: sys-utils/chcpu.c:190 -#, c-format -msgid "CPU %d is already configured\n" +#, fuzzy, c-format +msgid "CPU %u is already configured\n" msgstr "CPU %d 已经配置\n" #: sys-utils/chcpu.c:194 -#, c-format -msgid "CPU %d is already deconfigured\n" +#, fuzzy, c-format +msgid "CPU %u is already deconfigured\n" msgstr "CPU %d 已经解除配置\n" #: sys-utils/chcpu.c:199 -#, c-format -msgid "CPU %d deconfigure failed (CPU is enabled)" +#, fuzzy, c-format +msgid "CPU %u deconfigure failed (CPU is enabled)" msgstr "CPU %d 解除配置失败(CPU 已启用)" #: sys-utils/chcpu.c:206 -#, c-format -msgid "CPU %d configure failed" +#, fuzzy, c-format +msgid "CPU %u configure failed" msgstr "CPU %d 配置失败" #: sys-utils/chcpu.c:209 -#, c-format -msgid "CPU %d configured\n" +#, fuzzy, c-format +msgid "CPU %u configured\n" msgstr "CPU %d 已配置\n" #: sys-utils/chcpu.c:213 -#, c-format -msgid "CPU %d deconfigure failed" +#, fuzzy, c-format +msgid "CPU %u deconfigure failed" msgstr "CPU %d 解除配置失败" #: sys-utils/chcpu.c:216 -#, c-format -msgid "CPU %d deconfigured\n" +#, fuzzy, c-format +msgid "CPU %u deconfigured\n" msgstr "CPU %d 已解除配置\n" #: sys-utils/chcpu.c:231 @@ -10033,59 +10356,59 @@ msgstr " -k, --kernel 显示内核消息\n" msgid " -L, --color[=<when>] colorize messages (auto, always or never)\n" msgstr " -L, --color[=<时机>] 彩色显示消息(auto, always 或 never)\n" -#: sys-utils/dmesg.c:279 +#: sys-utils/dmesg.c:281 msgid " -l, --level <list> restrict output to defined levels\n" msgstr " -l, --level <列表> 限制输出级别\n" -#: sys-utils/dmesg.c:280 +#: sys-utils/dmesg.c:282 msgid " -n, --console-level <level> set level of messages printed to console\n" msgstr " -n, --console-level <级别> 设置打印到终端的消息级别\n" -#: sys-utils/dmesg.c:281 +#: sys-utils/dmesg.c:283 msgid " -P, --nopager do not pipe output into a pager\n" msgstr " -P, --nopager 不将输出通过管道传递给分页程序\n" -#: sys-utils/dmesg.c:282 +#: sys-utils/dmesg.c:284 msgid " -r, --raw print the raw message buffer\n" msgstr " -r, --raw 打印原生消息缓冲区\n" -#: sys-utils/dmesg.c:283 +#: sys-utils/dmesg.c:285 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:284 +#: sys-utils/dmesg.c:286 msgid " -s, --buffer-size <size> buffer size to query the kernel ring buffer\n" msgstr " -s, --buffer-size <大小> 查询内核环形缓冲区所用的缓冲区大小\n" -#: sys-utils/dmesg.c:285 +#: sys-utils/dmesg.c:287 msgid " -u, --userspace display userspace messages\n" msgstr " -u, --userspace 显示用户空间消息\n" -#: sys-utils/dmesg.c:286 +#: sys-utils/dmesg.c:288 msgid " -w, --follow wait for new messages\n" msgstr " -w, --follow 等待新消息\n" -#: sys-utils/dmesg.c:287 +#: sys-utils/dmesg.c:289 msgid " -x, --decode decode facility and level to readable string\n" msgstr " -x, --decode 将设施和级别解码为可读的字符串\n" -#: sys-utils/dmesg.c:288 +#: sys-utils/dmesg.c:290 msgid " -d, --show-delta show time delta between printed messages\n" msgstr " -d, --show-delta 显示打印消息之间的时间差\n" -#: sys-utils/dmesg.c:289 +#: sys-utils/dmesg.c:291 msgid " -e, --reltime show local time and time delta in readable format\n" msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n" -#: sys-utils/dmesg.c:290 +#: sys-utils/dmesg.c:292 msgid " -T, --ctime show human readable timestamp\n" msgstr " -T, --ctime 显示易读的时间戳\n" -#: sys-utils/dmesg.c:291 +#: sys-utils/dmesg.c:293 msgid " -t, --notime don't print messages timestamp\n" msgstr " -t, --notime 不打印消息时间戳\n" -#: sys-utils/dmesg.c:292 +#: sys-utils/dmesg.c:294 msgid "" " --time-format <format> show time stamp using format:\n" " [delta|reltime|ctime|notime|iso]\n" @@ -10095,7 +10418,7 @@ msgstr "" " [delta|reltime|ctime|notime|iso]\n" "挂起/恢复会使 ctime 和 iso 时间戳不精确。\n" -#: sys-utils/dmesg.c:298 +#: sys-utils/dmesg.c:300 msgid "" "\n" "Supported log facilities:\n" @@ -10103,7 +10426,7 @@ msgstr "" "\n" "支持的日志设施：\n" -#: sys-utils/dmesg.c:304 +#: sys-utils/dmesg.c:306 msgid "" "\n" "Supported log levels (priorities):\n" @@ -10111,49 +10434,49 @@ msgstr "" "\n" "支持的日志级别(优先级)：\n" -#: sys-utils/dmesg.c:358 +#: sys-utils/dmesg.c:360 #, c-format msgid "failed to parse level '%s'" msgstr "解析级别“%s”失败" -#: sys-utils/dmesg.c:360 +#: sys-utils/dmesg.c:362 #, c-format msgid "unknown level '%s'" msgstr "未知级别“%s”" -#: sys-utils/dmesg.c:396 +#: sys-utils/dmesg.c:398 #, c-format msgid "failed to parse facility '%s'" msgstr "解析设施“%s”失败" -#: sys-utils/dmesg.c:398 +#: sys-utils/dmesg.c:400 #, c-format msgid "unknown facility '%s'" msgstr "未知设施“%s”" -#: sys-utils/dmesg.c:526 +#: sys-utils/dmesg.c:528 #, c-format msgid "cannot mmap: %s" msgstr "无法 mmap：%s" -#: sys-utils/dmesg.c:1341 +#: sys-utils/dmesg.c:1356 msgid "invalid buffer size argument" msgstr "无效的 缓冲区大小 参数" -#: sys-utils/dmesg.c:1397 +#: sys-utils/dmesg.c:1411 msgid "--show-delta is ignored when used together with iso8601 time format" msgstr "--show-delta 与 iso8601 时间格式共用时将忽略" -#: sys-utils/dmesg.c:1420 +#: sys-utils/dmesg.c:1434 #, 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:1430 +#: sys-utils/dmesg.c:1444 msgid "read kernel buffer failed" msgstr "读取内核缓冲区失败" -#: sys-utils/dmesg.c:1449 +#: sys-utils/dmesg.c:1463 msgid "klogctl failed" msgstr "klogctl 失败" @@ -10216,289 +10539,281 @@ msgstr "" "默认将依次尝试 -r、-s、-f 和 -q 直到成功。\n" #: sys-utils/eject.c:210 -msgid "invalid argument to --auto/-a option" -msgstr "--auto/-a 选项参数无效" - -#: sys-utils/eject.c:214 msgid "invalid argument to --changerslot/-c option" msgstr "--changerslot/-c 选项的参数无效" -#: sys-utils/eject.c:218 +#: sys-utils/eject.c:214 msgid "invalid argument to --cdspeed/-x option" msgstr "--cdspeed/-x 选项的参数无效" -#: sys-utils/eject.c:239 -msgid "invalid argument to --manualeject/-i option" -msgstr "--manualeject/-i 选项的参数无效" - -#: sys-utils/eject.c:334 +#: sys-utils/eject.c:326 msgid "CD-ROM auto-eject command failed" msgstr "CD-ROM 自动弹出命令失败" -#: sys-utils/eject.c:348 +#: sys-utils/eject.c:340 #, fuzzy msgid "CD-ROM door lock is not supported" msgstr "CD-ROM 驱动器未就绪" -#: sys-utils/eject.c:350 +#: sys-utils/eject.c:342 msgid "other users have the drive open and not CAP_SYS_ADMIN" msgstr "" -#: sys-utils/eject.c:352 +#: sys-utils/eject.c:344 msgid "CD-ROM lock door command failed" msgstr "CD-ROM 锁仓门命令失败" -#: sys-utils/eject.c:357 +#: sys-utils/eject.c:349 msgid "CD-Drive may NOT be ejected with device button" msgstr "CD 驱动器不能通过设备上的按钮弹出" -#: sys-utils/eject.c:359 +#: sys-utils/eject.c:351 msgid "CD-Drive may be ejected with device button" msgstr "CD 驱动器可以通过设备上的按钮弹出" -#: sys-utils/eject.c:370 +#: sys-utils/eject.c:362 msgid "CD-ROM select disc command failed" msgstr "CD-ROM 选择光盘命令失败" -#: sys-utils/eject.c:374 +#: sys-utils/eject.c:366 msgid "CD-ROM load from slot command failed" msgstr "CD-ROM 从槽加载命令失败" -#: sys-utils/eject.c:376 +#: sys-utils/eject.c:368 msgid "IDE/ATAPI CD-ROM changer not supported by this kernel\n" msgstr "此内核不支持 IDE/ATAPI CD-ROM\n" -#: sys-utils/eject.c:394 +#: sys-utils/eject.c:386 msgid "CD-ROM tray close command failed" msgstr "CD-ROM 关闭仓门命令失败" -#: sys-utils/eject.c:396 +#: sys-utils/eject.c:388 msgid "CD-ROM tray close command not supported by this kernel\n" msgstr "此内核不支持 CD-ROM 关闭仓门命令\n" -#: sys-utils/eject.c:413 +#: sys-utils/eject.c:405 msgid "CD-ROM eject unsupported" msgstr "不支持 CD-ROM 弹出" -#: sys-utils/eject.c:441 sys-utils/eject.c:464 sys-utils/eject.c:1019 +#: sys-utils/eject.c:433 sys-utils/eject.c:456 sys-utils/eject.c:1011 msgid "CD-ROM eject command failed" msgstr "CD-ROM 弹出命令失败" -#: sys-utils/eject.c:444 +#: sys-utils/eject.c:436 msgid "no CD-ROM information available" msgstr "没有可用的 CD-ROM 信息" -#: sys-utils/eject.c:447 +#: sys-utils/eject.c:439 msgid "CD-ROM drive is not ready" msgstr "CD-ROM 驱动器未就绪" -#: sys-utils/eject.c:490 +#: sys-utils/eject.c:482 msgid "CD-ROM select speed command failed" msgstr "CD-ROM 选择速度命令失败" -#: sys-utils/eject.c:492 sys-utils/eject.c:578 +#: sys-utils/eject.c:484 sys-utils/eject.c:570 msgid "CD-ROM select speed command not supported by this kernel" msgstr "此内核不支持 CD-ROM 选择速度命令" -#: sys-utils/eject.c:529 +#: sys-utils/eject.c:521 #, c-format msgid "%s: failed to finding CD-ROM name" msgstr "%s：获取 CD-ROM 名称失败" -#: sys-utils/eject.c:544 +#: sys-utils/eject.c:536 #, c-format msgid "%s: failed to read speed" msgstr "%s：读 速度 失败" -#: sys-utils/eject.c:552 +#: sys-utils/eject.c:544 msgid "failed to read speed" msgstr "读 速度 失败" -#: sys-utils/eject.c:596 +#: sys-utils/eject.c:588 msgid "not an sg device, or old sg driver" msgstr "不是 sg 设备，或为旧 sg 驱动" -#: sys-utils/eject.c:668 +#: sys-utils/eject.c:660 #, c-format msgid "%s: unmounting" msgstr "%s：正在卸载" -#: sys-utils/eject.c:683 +#: sys-utils/eject.c:675 #, c-format msgid "unable to exec /bin/umount of `%s'" msgstr "无法对“%s”执行 /bin/umount" -#: sys-utils/eject.c:686 +#: sys-utils/eject.c:678 msgid "unable to fork" msgstr "无法 fork" -#: sys-utils/eject.c:693 +#: sys-utils/eject.c:685 #, c-format msgid "unmount of `%s' did not exit normally" msgstr "卸载“%s”未正常退出" -#: sys-utils/eject.c:696 +#: sys-utils/eject.c:688 #, c-format msgid "unmount of `%s' failed\n" msgstr "挂臷“%s”失败\n" -#: sys-utils/eject.c:738 +#: sys-utils/eject.c:730 msgid "failed to parse mount table" msgstr "解析挂臷表失败" -#: sys-utils/eject.c:799 sys-utils/eject.c:900 +#: sys-utils/eject.c:791 sys-utils/eject.c:892 #, c-format msgid "%s: mounted on %s" msgstr "%s：已挂臷于 %s" -#: sys-utils/eject.c:841 +#: sys-utils/eject.c:833 msgid "setting CD-ROM speed to auto" msgstr "正在将 CD-ROM 速度设置为自动" -#: sys-utils/eject.c:843 +#: sys-utils/eject.c:835 #, c-format msgid "setting CD-ROM speed to %ldX" msgstr "正在将 CD-ROM 速度设置为 %ldX" -#: sys-utils/eject.c:869 +#: sys-utils/eject.c:861 #, c-format msgid "default device: `%s'" msgstr "默认设备：“%s”" -#: sys-utils/eject.c:875 +#: sys-utils/eject.c:867 #, c-format msgid "using default device `%s'" msgstr "使用默认设备“%s”" -#: sys-utils/eject.c:894 +#: sys-utils/eject.c:886 sys-utils/rtcwake.c:371 #, c-format msgid "%s: unable to find device" msgstr "%s：找不到设备" -#: sys-utils/eject.c:896 +#: sys-utils/eject.c:888 #, c-format msgid "device name is `%s'" msgstr "设备名称为“%s”" -#: sys-utils/eject.c:902 sys-utils/umount.c:207 sys-utils/umount.c:236 +#: sys-utils/eject.c:894 sys-utils/umount.c:207 sys-utils/umount.c:236 #: sys-utils/umount.c:410 sys-utils/umount.c:433 #, c-format msgid "%s: not mounted" msgstr "%s：未挂载" -#: sys-utils/eject.c:906 +#: sys-utils/eject.c:898 #, c-format msgid "%s: disc device: %s (disk device will be used for eject)" msgstr "%s：盘设备：%s(盘设备将用于弹出)" -#: sys-utils/eject.c:914 +#: sys-utils/eject.c:906 #, c-format msgid "%s: not found mountpoint or device with the given name" msgstr "%s：未找到指定名称的挂载点或设备" -#: sys-utils/eject.c:917 +#: sys-utils/eject.c:909 #, c-format msgid "%s: is whole-disk device" msgstr "%s：是 整盘 设备" -#: sys-utils/eject.c:921 +#: sys-utils/eject.c:913 #, c-format msgid "%s: is not hot-pluggable device" msgstr "%s：不是热插拔设备" -#: sys-utils/eject.c:925 +#: sys-utils/eject.c:917 #, c-format msgid "device is `%s'" msgstr "设备是“%s”" -#: sys-utils/eject.c:926 +#: sys-utils/eject.c:918 msgid "exiting due to -n/--noop option" msgstr "将因 -n/--noop 选项退出" -#: sys-utils/eject.c:940 +#: sys-utils/eject.c:932 #, c-format msgid "%s: enabling auto-eject mode" msgstr "%s：正在启用自动弹出模式" -#: sys-utils/eject.c:942 +#: sys-utils/eject.c:934 #, c-format msgid "%s: disabling auto-eject mode" msgstr "%s：正在禁用自动弹出模式" -#: sys-utils/eject.c:950 +#: sys-utils/eject.c:942 #, c-format msgid "%s: closing tray" msgstr "%s：正在关闭仓门" -#: sys-utils/eject.c:959 +#: sys-utils/eject.c:951 #, c-format msgid "%s: toggling tray" msgstr "%s：开关仓门" -#: sys-utils/eject.c:968 +#: sys-utils/eject.c:960 #, c-format msgid "%s: listing CD-ROM speed" msgstr "%s：正在列出 CD-ROM 速度" -#: sys-utils/eject.c:994 +#: sys-utils/eject.c:986 #, c-format msgid "error: %s: device in use" msgstr "错误：%s：设备正在使用" -#: sys-utils/eject.c:1000 +#: sys-utils/eject.c:992 #, c-format msgid "%s: selecting CD-ROM disc #%ld" msgstr "%s：正在选择 CD-ROM 盘 #%ld" -#: sys-utils/eject.c:1016 +#: sys-utils/eject.c:1008 #, c-format msgid "%s: trying to eject using CD-ROM eject command" msgstr "%s：正在尝试使用 CD-ROM 弹出命令弹出" -#: sys-utils/eject.c:1018 +#: sys-utils/eject.c:1010 msgid "CD-ROM eject command succeeded" msgstr "CD-ROM 弹出命令成功" -#: sys-utils/eject.c:1023 +#: sys-utils/eject.c:1015 #, c-format msgid "%s: trying to eject using SCSI commands" msgstr "%s：正在尝试使用 SCSI 命令弹出" -#: sys-utils/eject.c:1025 +#: sys-utils/eject.c:1017 msgid "SCSI eject succeeded" msgstr "SCSI 弹出成功" -#: sys-utils/eject.c:1026 +#: sys-utils/eject.c:1018 msgid "SCSI eject failed" msgstr "SCSI 弹出失败" -#: sys-utils/eject.c:1030 +#: sys-utils/eject.c:1022 #, c-format msgid "%s: trying to eject using floppy eject command" msgstr "%s：正在尝试使用软盘弹出命令弹出" -#: sys-utils/eject.c:1032 +#: sys-utils/eject.c:1024 msgid "floppy eject command succeeded" msgstr "软盘弹出命令成功" -#: sys-utils/eject.c:1033 +#: sys-utils/eject.c:1025 msgid "floppy eject command failed" msgstr "软盘弹出命令失败" -#: sys-utils/eject.c:1037 +#: sys-utils/eject.c:1029 #, c-format msgid "%s: trying to eject using tape offline command" msgstr "%s：正在尝试使用磁带离线命令弹出" -#: sys-utils/eject.c:1039 +#: sys-utils/eject.c:1031 msgid "tape offline command succeeded" msgstr "磁带离线命令成功" -#: sys-utils/eject.c:1040 +#: sys-utils/eject.c:1032 msgid "tape offline command failed" msgstr "磁带离线命令失败" -#: sys-utils/eject.c:1044 +#: sys-utils/eject.c:1036 msgid "unable to eject" msgstr "无法弹出" @@ -10573,7 +10888,7 @@ msgstr "没有指定长度参数" msgid "invalid offset value specified" msgstr "指定的偏移值无效" -#: sys-utils/flock.c:52 +#: sys-utils/flock.c:53 #, fuzzy, c-format msgid "" " %1$s [options] <file>|<directory> <command> [<argument>...]\n" @@ -10584,77 +10899,106 @@ msgstr "" " %1$s [选项] <文件|目录> -c <命令>\n" " %1$s [选项] <文件描述符号码>\n" -#: sys-utils/flock.c:58 +#: sys-utils/flock.c:59 msgid "Manage file locks from shell scripts.\n" msgstr "" -#: sys-utils/flock.c:61 +#: sys-utils/flock.c:62 #, fuzzy msgid " -s, --shared get a shared lock\n" msgstr " -s --shared 获得共享锁\n" -#: sys-utils/flock.c:62 +#: sys-utils/flock.c:63 #, fuzzy msgid " -x, --exclusive get an exclusive lock (default)\n" msgstr " -x --exclusive 获得排他锁(默认)\n" -#: sys-utils/flock.c:63 +#: sys-utils/flock.c:64 #, fuzzy msgid " -u, --unlock remove a lock\n" msgstr " -u --unlock 移除锁\n" -#: sys-utils/flock.c:64 +#: sys-utils/flock.c:65 #, fuzzy msgid " -n, --nonblock fail rather than wait\n" msgstr " -n --nonblock 失败而不等待\n" -#: sys-utils/flock.c:65 +#: sys-utils/flock.c:66 #, fuzzy msgid " -w, --timeout <secs> wait for a limited amount of time\n" msgstr " -w --timeout <秒数> 等待一段时间\n" -#: sys-utils/flock.c:66 +#: sys-utils/flock.c:67 #, fuzzy msgid " -E, --conflict-exit-code <number> exit code after conflict or timeout\n" msgstr " -E --conflict-exit-code <数字> 冲突或超时后的退出代码\n" -#: sys-utils/flock.c:67 +#: sys-utils/flock.c:68 #, fuzzy msgid " -o, --close close file descriptor before running command\n" msgstr " -o --close 在运行命令前关闭文件描述符\n" -#: sys-utils/flock.c:68 +#: sys-utils/flock.c:69 #, fuzzy msgid " -c, --command <command> run a single command string through the shell\n" msgstr " -c --command <命令> 通过 shell 运行一条命令\n" -#: sys-utils/flock.c:101 +#: sys-utils/flock.c:70 +#, fuzzy +msgid " --verbose increase verbosity\n" +msgstr " -v, --verbose 更详尽\n" + +#: sys-utils/flock.c:106 #, c-format msgid "cannot open lock file %s" msgstr "不能打开锁文件 %s" -#: sys-utils/flock.c:181 +#: sys-utils/flock.c:191 msgid "invalid timeout value" msgstr "无效的 超时值" -#: sys-utils/flock.c:185 +#: sys-utils/flock.c:195 msgid "invalid exit code" msgstr "无效退出代码" -#: sys-utils/flock.c:205 +#: sys-utils/flock.c:218 #, c-format msgid "%s requires exactly one command argument" msgstr "%s 需要惟一的命令行参数" -#: sys-utils/flock.c:223 +#: sys-utils/flock.c:236 #, fuzzy msgid "bad file descriptor" msgstr "标志描述" -#: sys-utils/flock.c:226 +#: sys-utils/flock.c:239 msgid "requires file descriptor, file or directory" msgstr "需要文件描述符、文件或目录" +#: sys-utils/flock.c:253 +#, fuzzy +msgid "cannot not setup timer" +msgstr "无法设置 组 id" + +#: sys-utils/flock.c:263 +#, fuzzy +msgid "failed to get lock" +msgstr "设置数据失败" + +#: sys-utils/flock.c:270 +msgid "timeout while waiting to get lock" +msgstr "" + +#: sys-utils/flock.c:311 +#, fuzzy, c-format +msgid "%s: getting lock took %ld.%06ld seconds\n" +msgstr "%s %.6f 秒\n" + +#: sys-utils/flock.c:322 +#, fuzzy, c-format +msgid "%s: executing %s\n" +msgstr "挂起模式：关；正在执行 %s\n" + #: sys-utils/fsfreeze.c:50 #, c-format msgid " %s [options] <mountpoint>\n" @@ -10691,65 +11035,65 @@ msgstr "%s：冻结失败" msgid "%s: unfreeze failed" msgstr "%s：解冻失败" -#: sys-utils/fstrim.c:80 +#: sys-utils/fstrim.c:82 #, c-format msgid "%s: not a directory" msgstr "%s：不是一个目录" -#: sys-utils/fstrim.c:88 +#: sys-utils/fstrim.c:91 #, c-format msgid "%s: FITRIM ioctl failed" msgstr "%s：FITRIM ioctl 失败" #. TRANSLATORS: The standard value here is a very large number. -#: sys-utils/fstrim.c:98 +#: sys-utils/fstrim.c:100 #, c-format msgid "%s: %s (%<PRIu64> bytes) trimmed\n" msgstr "%s：%s (%<PRIu64> 字节) 已修剪\n" -#: sys-utils/fstrim.c:173 sys-utils/swapon.c:688 sys-utils/umount.c:330 +#: sys-utils/fstrim.c:203 sys-utils/swapon.c:685 sys-utils/umount.c:330 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" -#: sys-utils/fstrim.c:230 +#: sys-utils/fstrim.c:263 #, c-format msgid " %s [options] <mount point>\n" msgstr " %s [选项] <挂臷点>\n" -#: sys-utils/fstrim.c:233 +#: sys-utils/fstrim.c:266 msgid "Discard unused blocks on a mounted filesystem.\n" msgstr "" -#: sys-utils/fstrim.c:236 +#: sys-utils/fstrim.c:269 msgid " -a, --all trim all mounted filesystems that are supported\n" msgstr " -a, --all 修剪不支持的所有已挂载文件系统\n" -#: sys-utils/fstrim.c:237 +#: sys-utils/fstrim.c:270 msgid " -o, --offset <num> the offset in bytes to start discarding from\n" msgstr " -o, --offset <数字> 开始丢弃的偏移量(字节)\n" -#: sys-utils/fstrim.c:238 +#: sys-utils/fstrim.c:271 msgid " -l, --length <num> the number of bytes to discard\n" msgstr " -l, --length <数字> 要丢弃的字符数\n" -#: sys-utils/fstrim.c:239 +#: sys-utils/fstrim.c:272 msgid " -m, --minimum <num> the minimum extent length to discard\n" msgstr " -m, --minimum <数字> 要丢弃的最小限制长度\n" -#: sys-utils/fstrim.c:240 +#: sys-utils/fstrim.c:273 msgid " -v, --verbose print number of discarded bytes\n" msgstr " -v, --verbose 打印丢弃的字节数\n" -#: sys-utils/fstrim.c:295 +#: sys-utils/fstrim.c:328 msgid "failed to parse minimum extent length" msgstr "解析 最小范围长度 失败" -#: sys-utils/fstrim.c:308 +#: sys-utils/fstrim.c:341 msgid "no mountpoint specified" msgstr "未指定挂载点" -#: sys-utils/fstrim.c:322 +#: sys-utils/fstrim.c:355 #, c-format msgid "%s: the discard operation is not supported" msgstr "%s：不支持丢弃操作" @@ -10805,52 +11149,52 @@ msgstr "...同步失败\n" msgid "...got clock tick\n" msgstr "...已获取时钟滴答\n" -#: sys-utils/hwclock.c:430 +#: sys-utils/hwclock.c:423 #, c-format msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n" msgstr "硬件时钟值无效：%4d/%.2d/%.2d %.2d:%.2d:%.2d\n" -#: sys-utils/hwclock.c:439 +#: sys-utils/hwclock.c:432 #, c-format msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n" msgstr "硬件时钟时间：%4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n" -#: sys-utils/hwclock.c:473 +#: sys-utils/hwclock.c:466 #, c-format msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n" msgstr "从硬件时钟读取的时间：%4d/%.2d/%.2d %02d:%02d:%02d\n" -#: sys-utils/hwclock.c:501 +#: sys-utils/hwclock.c:494 #, c-format msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n" msgstr "正在将硬件时钟设置为 %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n" -#: sys-utils/hwclock.c:507 +#: sys-utils/hwclock.c:500 #, c-format msgid "Clock not changed - testing only.\n" msgstr "时钟未更改 - 纯测试。\n" -#: sys-utils/hwclock.c:611 +#: sys-utils/hwclock.c:604 #, c-format msgid "sleeping ~%d usec\n" msgstr "将睡眠 ~%d 微秒\n" -#: sys-utils/hwclock.c:622 +#: sys-utils/hwclock.c:615 #, c-format msgid "time jumped backward %.6f seconds to %ld.%06d - retargeting\n" msgstr "时间回溯 %.6f 秒到了 %ld.%06d - 将重新定位\n" -#: sys-utils/hwclock.c:630 +#: sys-utils/hwclock.c:623 #, c-format msgid "%ld.%06d < %ld.%06d (%.6f)\n" msgstr "%ld.%06d < %ld.%06d (%.6f)\n" -#: sys-utils/hwclock.c:646 +#: sys-utils/hwclock.c:639 #, fuzzy, c-format msgid "missed it - %ld.%06d is too far past %ld.%06d (%.6f > %.6f)\n" msgstr "错过了 - %ld.%06d 落后 %ld.%06d 太久(%.6f > %.6f)\n" -#: sys-utils/hwclock.c:674 +#: sys-utils/hwclock.c:667 #, c-format msgid "" "%ld.%06d is close enough to %ld.%06d (%.6f < %.6f)\n" @@ -10859,24 +11203,24 @@ msgstr "" "%ld.%06d 距 %ld.%06d 太近(%.6f < %.6f)\n" "请将 RTC 设为 %ld (%ld + %d; refsystime = %ld.%06d)\n" -#: sys-utils/hwclock.c:696 +#: sys-utils/hwclock.c:689 msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095)." msgstr "硬件时钟寄存器包含的值无效(如一个月的第 50 天)或超出了程序能处理的范围(如2095年)。" -#: sys-utils/hwclock.c:706 +#: sys-utils/hwclock.c:699 #, fuzzy, c-format msgid "%s .%06d seconds\n" msgstr "%s %.6f 秒\n" -#: sys-utils/hwclock.c:737 +#: sys-utils/hwclock.c:730 msgid "No --date option specified." msgstr "未指定 --date 选项。" -#: sys-utils/hwclock.c:743 +#: sys-utils/hwclock.c:736 msgid "--date argument too long" msgstr "--date 的参数过长" -#: sys-utils/hwclock.c:750 +#: sys-utils/hwclock.c:743 msgid "" "The value of the --date option is not a valid date.\n" "In particular, it contains quotation marks." @@ -10884,21 +11228,21 @@ msgstr "" "--date 选项的参数不是有效的日期。\n" "具体说，它包含了引号。" -#: sys-utils/hwclock.c:758 +#: sys-utils/hwclock.c:751 #, c-format msgid "Issuing date command: %s\n" msgstr "正在发出 date 命令：%s\n" -#: sys-utils/hwclock.c:762 +#: sys-utils/hwclock.c:755 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed" msgstr "无法在 /bin/sh shell 中运行“date”程序。popen() 失败" -#: sys-utils/hwclock.c:770 +#: sys-utils/hwclock.c:763 #, c-format msgid "response from date command = %s\n" msgstr "date 命令的响应为 %s\n" -#: sys-utils/hwclock.c:772 +#: sys-utils/hwclock.c:765 #, c-format msgid "" "The date command issued by %s returned unexpected results.\n" @@ -10913,7 +11257,7 @@ msgstr "" "响应为：\n" " %s" -#: sys-utils/hwclock.c:783 +#: sys-utils/hwclock.c:776 #, c-format msgid "" "The date command issued by %s returned something other than an integer where the converted time value was expected.\n" @@ -10928,64 +11272,64 @@ msgstr "" "响应为：\n" " %s\n" -#: sys-utils/hwclock.c:795 +#: sys-utils/hwclock.c:788 #, c-format msgid "date string %s equates to %ld seconds since 1969.\n" msgstr "数据字符串 %s 等价于 1969年后 %ld 秒。\n" -#: sys-utils/hwclock.c:833 +#: sys-utils/hwclock.c:826 msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it." msgstr "硬件时钟不包含有效时间，因此无法从它来设置系统时间。" -#: sys-utils/hwclock.c:852 sys-utils/hwclock.c:939 +#: sys-utils/hwclock.c:845 sys-utils/hwclock.c:932 #, c-format msgid "Calling settimeofday:\n" msgstr "正在调用 settimeofday：\n" -#: sys-utils/hwclock.c:853 sys-utils/hwclock.c:941 +#: sys-utils/hwclock.c:846 sys-utils/hwclock.c:934 #, c-format msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n" msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n" -#: sys-utils/hwclock.c:855 sys-utils/hwclock.c:943 +#: sys-utils/hwclock.c:848 sys-utils/hwclock.c:936 #, c-format msgid "\ttz.tz_minuteswest = %d\n" msgstr "\ttz.tz_minuteswest = %d\n" -#: sys-utils/hwclock.c:859 sys-utils/hwclock.c:947 +#: sys-utils/hwclock.c:852 sys-utils/hwclock.c:940 #, c-format msgid "Not setting system clock because running in test mode.\n" msgstr "将不设置系统时钟，因为正以测试方式运行。\n" -#: sys-utils/hwclock.c:875 sys-utils/hwclock.c:971 +#: sys-utils/hwclock.c:868 sys-utils/hwclock.c:964 msgid "Must be superuser to set system clock." msgstr "只能以超级用户身份来设置系统时钟。" -#: sys-utils/hwclock.c:878 sys-utils/hwclock.c:974 +#: sys-utils/hwclock.c:871 sys-utils/hwclock.c:967 msgid "settimeofday() failed" msgstr "settimeofday() 失败" -#: sys-utils/hwclock.c:914 +#: sys-utils/hwclock.c:907 #, c-format msgid "Current system time: %ld = %s\n" msgstr "当前系统时间：%ld = %s\n" -#: sys-utils/hwclock.c:940 +#: sys-utils/hwclock.c:933 #, c-format msgid "\tUTC: %s\n" msgstr "\tUTC：%s\n" -#: sys-utils/hwclock.c:1005 +#: sys-utils/hwclock.c:998 #, fuzzy, c-format msgid "Not adjusting drift factor because the --update-drift option was not used.\n" msgstr "将不调整漂移系数，因为之前硬件时钟包含垃圾内容。\n" -#: sys-utils/hwclock.c:1009 +#: sys-utils/hwclock.c:1002 #, c-format msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n" msgstr "将不调整漂移系数，因为之前硬件时钟包含垃圾内容。\n" -#: sys-utils/hwclock.c:1014 +#: sys-utils/hwclock.c:1007 #, c-format msgid "" "Not adjusting drift factor because last calibration time is zero,\n" @@ -10994,12 +11338,12 @@ msgstr "" "将不调整漂移系数，因为上次校准时间为零，\n" "历史有问题；需要启动校准。\n" -#: sys-utils/hwclock.c:1020 +#: sys-utils/hwclock.c:1013 #, fuzzy, c-format msgid "Not adjusting drift factor because it has been less than four hours since the last calibration.\n" msgstr "将不调整漂移系数，因为从上次校准还不到一天。\n" -#: sys-utils/hwclock.c:1058 +#: sys-utils/hwclock.c:1051 #, c-format msgid "" "Clock drift factor was calculated as %f seconds/day.\n" @@ -11008,31 +11352,31 @@ msgstr "" "时钟漂移系数会按 %f 秒/天计算。\n" "系数过大，将重置为 0。\n" -#: sys-utils/hwclock.c:1065 +#: sys-utils/hwclock.c:1058 #, fuzzy, c-format msgid "" -"Clock drifted %.1f seconds in the past %.1f seconds\n" +"Clock drifted %f seconds in the past %f seconds\n" "in spite of a drift factor of %f seconds/day.\n" "Adjusting drift factor by %f seconds/day\n" msgstr "在过去的 %2$d 秒内，时钟漂移了 %1$.1f 秒，而漂移系数为 %3$f 秒/天。会将漂移系数调整 %4$f 秒/天\n" -#: sys-utils/hwclock.c:1108 +#: sys-utils/hwclock.c:1101 #, c-format msgid "Time since last adjustment is %d second\n" msgid_plural "Time since last adjustment is %d seconds\n" msgstr[0] "距上次调整的时间为 %d 秒\n" -#: sys-utils/hwclock.c:1112 +#: sys-utils/hwclock.c:1105 #, c-format msgid "Calculated Hardware Clock drift is %ld.%06d seconds\n" msgstr "" -#: sys-utils/hwclock.c:1142 +#: sys-utils/hwclock.c:1135 #, c-format msgid "Not updating adjtime file because of testing mode.\n" msgstr "将不更新 adjtime 文件，因为正以测试方式运行。\n" -#: sys-utils/hwclock.c:1143 +#: sys-utils/hwclock.c:1136 #, c-format msgid "" "Would have written the following to %s:\n" @@ -11041,55 +11385,55 @@ msgstr "" "若执行，将向 %s 写入以下内容：\n" "%s" -#: sys-utils/hwclock.c:1152 +#: sys-utils/hwclock.c:1145 #, c-format msgid "Could not open file with the clock adjustment parameters in it (%s) for writing" msgstr "无法打开包含时钟调整参数(%s)的文件来写入" -#: sys-utils/hwclock.c:1158 sys-utils/hwclock.c:1165 +#: sys-utils/hwclock.c:1151 sys-utils/hwclock.c:1158 #, c-format msgid "Could not update file with the clock adjustment parameters (%s) in it" msgstr "无法更新包含时钟调整参数(%s)的文件" -#: sys-utils/hwclock.c:1173 +#: sys-utils/hwclock.c:1166 msgid "Drift adjustment parameters not updated." msgstr "漂移调整参数未更新。" -#: sys-utils/hwclock.c:1209 +#: sys-utils/hwclock.c:1202 msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it." msgstr "硬件时间不包含有效时间，程序无法调整它。" -#: sys-utils/hwclock.c:1217 +#: sys-utils/hwclock.c:1210 #, c-format msgid "Not setting clock because last adjustment time is zero, so history is bad.\n" msgstr "将不设置时钟，因为上次调整时间为零，历史有误。\n" -#: sys-utils/hwclock.c:1221 +#: sys-utils/hwclock.c:1214 #, c-format msgid "Not setting clock because drift factor %f is far too high.\n" msgstr "将不设置时钟，因为上次漂移系数 %f 过高。\n" -#: sys-utils/hwclock.c:1250 +#: sys-utils/hwclock.c:1243 #, c-format msgid "No usable clock interface found.\n" msgstr "未找到可用的时钟接口。\n" -#: sys-utils/hwclock.c:1374 +#: sys-utils/hwclock.c:1367 #, c-format msgid "Needed adjustment is less than one second, so not setting clock.\n" msgstr "需要的调整不到一秒，将不设置时钟。\n" -#: sys-utils/hwclock.c:1397 sys-utils/hwclock.c:1403 +#: sys-utils/hwclock.c:1390 sys-utils/hwclock.c:1396 #, c-format msgid "Unable to set system clock.\n" msgstr "无法设置系统时钟。\n" -#: sys-utils/hwclock.c:1411 +#: sys-utils/hwclock.c:1404 #, c-format msgid "At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n" msgstr "位于1969(年)后 %ld 秒，RTC 应读取到的是1969(年)后 %ld 秒。\n" -#: sys-utils/hwclock.c:1440 +#: sys-utils/hwclock.c:1433 msgid "" "The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n" "This copy of hwclock was built for a machine other than Alpha\n" @@ -11099,38 +11443,38 @@ msgstr "" "这版 hwclock 程序不是为 Alpha 计算机编译的(因此目前也不打算在 Alpha\n" " 计算机上运行)。未执行任何操作。" -#: sys-utils/hwclock.c:1457 +#: sys-utils/hwclock.c:1450 msgid "Unable to get the epoch value from the kernel." msgstr "无法从内核获取纪元(epoch)值。" -#: sys-utils/hwclock.c:1459 +#: sys-utils/hwclock.c:1452 #, c-format msgid "Kernel is assuming an epoch value of %lu\n" msgstr "内核假设纪元(epoch)值为 %lu\n" -#: sys-utils/hwclock.c:1464 +#: sys-utils/hwclock.c:1457 msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it." msgstr "要设置纪元(epoch)值，您必须使用“epoch”选项来指定设置的值。" -#: sys-utils/hwclock.c:1468 +#: sys-utils/hwclock.c:1461 #, c-format msgid "Not setting the epoch to %d - testing only.\n" msgstr "不会将纪元(epoch)设置为 %d - 纯测试。\n" -#: sys-utils/hwclock.c:1472 +#: sys-utils/hwclock.c:1465 #, c-format msgid "Unable to set the epoch value in the kernel.\n" msgstr "无法设置内核中的纪元(epoch)值。\n" -#: sys-utils/hwclock.c:1564 +#: sys-utils/hwclock.c:1558 msgid " hwclock [function] [option...]\n" msgstr " hwclock [功能] [选项...]\n" -#: sys-utils/hwclock.c:1567 +#: sys-utils/hwclock.c:1561 msgid "Query or set the hardware clock.\n" msgstr "" -#: sys-utils/hwclock.c:1569 +#: sys-utils/hwclock.c:1563 msgid "" "\n" "Functions:\n" @@ -11138,7 +11482,7 @@ msgstr "" "\n" "功能：\n" -#: sys-utils/hwclock.c:1570 +#: sys-utils/hwclock.c:1564 #, fuzzy msgid "" " -h, --help show this help text and exit\n" @@ -11150,7 +11494,7 @@ msgstr "" " -r, --show 读取硬件时钟并打印结果\n" " --set 将 RTC 设置为 --date 指定的时间\n" -#: sys-utils/hwclock.c:1574 +#: sys-utils/hwclock.c:1568 msgid "" " -s, --hctosys set the system time from the hardware clock\n" " -w, --systohc set the hardware clock from the current system time\n" @@ -11164,11 +11508,11 @@ msgstr "" " --adjust 根据自上次时钟设置或调整后的系统漂移\n" " 来调整 RTC\n" -#: sys-utils/hwclock.c:1579 +#: sys-utils/hwclock.c:1573 msgid " -c, --compare periodically compare the system clock with the CMOS clock\n" msgstr " -c, --compare 定期将系统时钟与 CMOS 时钟相比较\n" -#: sys-utils/hwclock.c:1581 +#: sys-utils/hwclock.c:1575 msgid "" " --getepoch print out the kernel's hardware clock epoch value\n" " --setepoch set the kernel's hardware clock epoch value to the \n" @@ -11178,7 +11522,7 @@ msgstr "" " --setepoch 将内核的硬件时钟纪元(epoch)值设置为\n" " --epoch 选项指定的值\n" -#: sys-utils/hwclock.c:1585 +#: sys-utils/hwclock.c:1579 msgid "" " --predict predict RTC reading at time given with --date\n" " -V, --version display version information and exit\n" @@ -11186,7 +11530,7 @@ msgstr "" " --predict 预测 --date 选项所指定时刻读取到的 RTC 值\n" " -V, --version 显示版本信息并退出\n" -#: sys-utils/hwclock.c:1589 +#: sys-utils/hwclock.c:1583 msgid "" " -u, --utc the hardware clock is kept in UTC\n" " --localtime the hardware clock is kept in local time\n" @@ -11194,11 +11538,11 @@ msgstr "" " -u, --utc 硬件时钟保持为 UTC 时间\n" " --localtime 硬件时钟保持为本地时间\n" -#: sys-utils/hwclock.c:1592 +#: sys-utils/hwclock.c:1586 msgid " -f, --rtc <file> special /dev/... file to use instead of default\n" msgstr " -f, --rtc <文件> 代替默认文件的特殊 /dev/... 文件\n" -#: sys-utils/hwclock.c:1595 +#: sys-utils/hwclock.c:1589 #, c-format msgid "" " --directisa access the ISA bus directly instead of %s\n" @@ -11212,7 +11556,7 @@ msgstr "" " --date <时间> 指定要设置的硬件时钟时间\n" " --epoch <年> 指定作为硬件纪元(epoch)值起始的年份\n" -#: sys-utils/hwclock.c:1601 +#: sys-utils/hwclock.c:1595 #, fuzzy, c-format msgid "" " --update-drift update drift factor in %1$s (requires\n" @@ -11226,7 +11570,7 @@ msgstr "" " --adjfile <文件> 指定调整文件的路径；\n" " 默认为 %s\n" -#: sys-utils/hwclock.c:1607 +#: sys-utils/hwclock.c:1601 msgid "" " --test do not update anything, just show what would happen\n" " -D, --debug debugging mode\n" @@ -11236,7 +11580,7 @@ msgstr "" " -D, --debug 调试模式\n" "\n" -#: sys-utils/hwclock.c:1610 +#: sys-utils/hwclock.c:1604 msgid "" " -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n" " tell hwclock the type of Alpha you have (see hwclock(8))\n" @@ -11246,44 +11590,37 @@ msgstr "" " 告知 hwclock 您使用的 Alpha 类型(参阅 hwclock(8))\n" "\n" -#: sys-utils/hwclock.c:1738 +#: sys-utils/hwclock.c:1730 msgid "Unable to connect to audit system" msgstr "无法连接到审计系统" -#: sys-utils/hwclock.c:1836 +#: sys-utils/hwclock.c:1828 msgid "invalid epoch argument" msgstr "无效的纪元(epoch)参数" -#: sys-utils/hwclock.c:1881 +#: sys-utils/hwclock.c:1865 +#, fuzzy +msgid "Sorry, only the superuser can use the Hardware Clock." +msgstr "抱歉，只有超级用户才能设置硬件时钟。" + +#: sys-utils/hwclock.c:1878 #, c-format msgid "%s takes no non-option arguments. You supplied %d.\n" msgstr "%s 不接受无选项的参数。您提供了 %d。\n" -#: sys-utils/hwclock.c:1890 +#: sys-utils/hwclock.c:1887 msgid "With --noadjfile, you must specify either --utc or --localtime" msgstr "指定 --noadjfile 时，您必须指定 --utc 或 --localtime" -#: sys-utils/hwclock.c:1903 +#: sys-utils/hwclock.c:1900 msgid "No usable set-to time. Cannot set clock." msgstr "无可用的待设置时间。无法设置时钟。" -#: sys-utils/hwclock.c:1918 -msgid "Sorry, only the superuser can change the Hardware Clock." -msgstr "抱歉，只有超级用户才能设置硬件时钟。" - -#: sys-utils/hwclock.c:1922 -msgid "Sorry, only the superuser can change the System Clock." -msgstr "抱歉，只有超级用户才能设置系统时钟。" - -#: sys-utils/hwclock.c:1926 -msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel." -msgstr "抱歉，只有超级用户才能更改内核中的硬件时钟纪元(epoch)。" - -#: sys-utils/hwclock.c:1949 +#: sys-utils/hwclock.c:1924 msgid "Cannot access the Hardware Clock via any known method." msgstr "无法通过已知的任何方式访问硬件时钟。" -#: sys-utils/hwclock.c:1952 +#: sys-utils/hwclock.c:1927 msgid "Use the --debug option to see the details of our search for an access method." msgstr "请使用 --debug 选项来观察程序搜索访问方法的详情。" @@ -11367,76 +11704,71 @@ msgstr "等待时间更改超时。" msgid "%s does not have interrupt functions. " msgstr "%s 没有中断函数。" -#: sys-utils/hwclock-rtc.c:290 -#, c-format -msgid "read() to %s to wait for clock tick failed" -msgstr "对 %s read() 以等待时钟嘀嗒失败" - -#: sys-utils/hwclock-rtc.c:314 +#: sys-utils/hwclock-rtc.c:302 #, c-format msgid "select() to %s to wait for clock tick failed" msgstr "对 %s select() 以等待时钟嘀嗒失败" -#: sys-utils/hwclock-rtc.c:317 +#: sys-utils/hwclock-rtc.c:306 #, c-format msgid "select() to %s to wait for clock tick timed out" msgstr "对 %s select() 以等待时钟嘀嗒超时" -#: sys-utils/hwclock-rtc.c:326 +#: sys-utils/hwclock-rtc.c:313 #, c-format msgid "ioctl() to %s to turn off update interrupts failed" msgstr "对 %s ioctl() 以关闭更新中断失败" -#: sys-utils/hwclock-rtc.c:329 +#: sys-utils/hwclock-rtc.c:316 #, c-format msgid "ioctl() to %s to turn on update interrupts failed unexpectedly" msgstr "对 %s ioctl() 以打开更新中断意外失败" -#: sys-utils/hwclock-rtc.c:383 +#: sys-utils/hwclock-rtc.c:370 #, c-format msgid "ioctl(%s) to %s to set the time failed." msgstr "对 %2$s ioctl(%1$s) 以设置时间失败。" -#: sys-utils/hwclock-rtc.c:389 +#: sys-utils/hwclock-rtc.c:376 #, c-format msgid "ioctl(%s) was successful.\n" msgstr "ioctl(%s) 成功。\n" -#: sys-utils/hwclock-rtc.c:400 +#: sys-utils/hwclock-rtc.c:387 msgid "Using the /dev interface to the clock." msgstr "将对时钟使用 /dev 接口。" -#: sys-utils/hwclock-rtc.c:430 sys-utils/hwclock-rtc.c:477 +#: sys-utils/hwclock-rtc.c:417 sys-utils/hwclock-rtc.c:464 #, c-format msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s. This file does not exist on this system." msgstr "要操作内核中的纪元(epoch)值，必须通过设备特殊文件 %s 访问 Linux “rtc”设备驱动。此系统上不存在该文件。" -#: sys-utils/hwclock-rtc.c:442 +#: sys-utils/hwclock-rtc.c:429 #, c-format msgid "ioctl(RTC_EPOCH_READ) to %s failed" msgstr "对 %s 进行 ioctl(RTC_EPOCH_READ) 失败" -#: sys-utils/hwclock-rtc.c:448 +#: sys-utils/hwclock-rtc.c:435 #, c-format msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n" msgstr "我们从 %2$s 通过 ioctl 读取到纪元(epoch)值 %1$ld。\n" -#: sys-utils/hwclock-rtc.c:468 +#: sys-utils/hwclock-rtc.c:455 #, c-format msgid "The epoch value may not be less than 1900. You requested %ld" msgstr "纪元(epoch)值不能小于 1900。您要求了 %ld" -#: sys-utils/hwclock-rtc.c:487 -#, c-format -msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n" +#: sys-utils/hwclock-rtc.c:474 +#, fuzzy, c-format +msgid "setting epoch to %lu with RTC_EPOCH_SET ioctl to %s.\n" msgstr "正通过 RTC_EPOCH_SET ioctl 对 %2$s 设置纪元(epoch)值 %1$ld。\n" -#: sys-utils/hwclock-rtc.c:493 +#: sys-utils/hwclock-rtc.c:480 #, c-format msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl." msgstr "%s 的内核设备驱动没有 RTC_EPOCH_SET ioctl (方法)。" -#: sys-utils/hwclock-rtc.c:497 +#: sys-utils/hwclock-rtc.c:484 #, c-format msgid "ioctl(RTC_EPOCH_SET) to %s failed" msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败" @@ -11462,7 +11794,7 @@ msgstr " -Q, --queue 创建消息队列\n" msgid " -p, --mode <mode> permission for the resource (default is 0644)\n" msgstr " -p, --mode <模式> 资源的权限模式掩码(默认为 0644)\n" -#: sys-utils/ipcmk.c:110 sys-utils/losetup.c:552 sys-utils/zramctl.c:477 +#: sys-utils/ipcmk.c:110 sys-utils/losetup.c:566 sys-utils/zramctl.c:556 msgid "failed to parse size" msgstr "解析大小失败" @@ -11626,7 +11958,7 @@ msgid "" " %1$s -m|-q|-s -i <id>\n" msgstr "" -#: sys-utils/ipcs.c:57 +#: sys-utils/ipcs.c:57 sys-utils/lsipc.c:264 msgid "Show information on IPC facilities.\n" msgstr "" @@ -11634,19 +11966,19 @@ msgstr "" msgid " -i, --id <id> print details on resource identified by <id>\n" msgstr " -i, --id <id> 打印由<id>标识的资源的详细信息\n" -#: sys-utils/ipcs.c:65 +#: sys-utils/ipcs.c:65 sys-utils/lsipc.c:267 msgid "Resource options:\n" msgstr "资源选项：\n" -#: sys-utils/ipcs.c:66 +#: sys-utils/ipcs.c:66 sys-utils/lsipc.c:268 msgid " -m, --shmems shared memory segments\n" msgstr " -m, --shmems 共享内存段\n" -#: sys-utils/ipcs.c:67 +#: sys-utils/ipcs.c:67 sys-utils/lsipc.c:269 msgid " -q, --queues message queues\n" msgstr " -q, --queues 消息队列\n" -#: sys-utils/ipcs.c:68 +#: sys-utils/ipcs.c:68 sys-utils/lsipc.c:270 msgid " -s, --semaphores semaphores\n" msgstr " -s, --semaphores 信号量\n" @@ -11849,11 +12181,11 @@ msgstr "状态" msgid "Not set" msgstr "未设置" -#: sys-utils/ipcs.c:335 +#: sys-utils/ipcs.c:335 sys-utils/lsipc.c:1019 sys-utils/lsipc.c:1025 msgid "dest" msgstr "目标" -#: sys-utils/ipcs.c:336 +#: sys-utils/ipcs.c:336 sys-utils/lsipc.c:1020 sys-utils/lsipc.c:1031 msgid "locked" msgstr "已锁定" @@ -11883,8 +12215,8 @@ msgid "max ops per semop call = %d\n" msgstr "每次信号量调用最大操作数 = %d\n" #: sys-utils/ipcs.c:362 -#, c-format -msgid "semaphore max value = %d\n" +#, fuzzy, c-format +msgid "semaphore max value = %u\n" msgstr "信号量最大值 = %d\n" #: sys-utils/ipcs.c:371 @@ -12038,6 +12370,7 @@ msgid "messages" msgstr "消息" #: sys-utils/ipcs.c:569 sys-utils/ipcs.c:599 sys-utils/ipcs.c:632 +#: sys-utils/lsipc.c:532 sys-utils/lsipc.c:732 sys-utils/lsipc.c:920 #, c-format msgid "id %d not found" msgstr "找不到 id %d" @@ -12199,68 +12532,68 @@ msgstr "%s (字节) = " msgid "%s (kbytes) = " msgstr "%s (千字节) = " -#: sys-utils/ldattach.c:179 +#: sys-utils/ldattach.c:180 msgid "invalid iflag" msgstr "无效的 iflag" -#: sys-utils/ldattach.c:195 +#: sys-utils/ldattach.c:196 #, c-format msgid " %s [options] <ldisc> <device>\n" msgstr " %s [选项] <线路规则> <设备>\n" -#: sys-utils/ldattach.c:198 +#: sys-utils/ldattach.c:199 msgid "Attach a line discipline to a serial line.\n" msgstr "" -#: sys-utils/ldattach.c:201 +#: sys-utils/ldattach.c:202 msgid " -d, --debug print verbose messages to stderr\n" msgstr " -d, --debug 向标准错误打印详尽消息\n" -#: sys-utils/ldattach.c:202 +#: sys-utils/ldattach.c:203 msgid " -s, --speed <value> set serial line speed\n" msgstr " -s, --speed <值> 设置串口线速度\n" -#: sys-utils/ldattach.c:203 +#: sys-utils/ldattach.c:204 msgid " -c, --intro-command <string> intro sent before ldattach\n" msgstr "" -#: sys-utils/ldattach.c:204 +#: sys-utils/ldattach.c:205 msgid " -p, --pause <seconds> pause between intro and ldattach\n" msgstr "" -#: sys-utils/ldattach.c:205 +#: sys-utils/ldattach.c:206 msgid " -7, --sevenbits set character size to 7 bits\n" msgstr " -7, --sevenbits 字节大小设为 7 位\n" -#: sys-utils/ldattach.c:206 +#: sys-utils/ldattach.c:207 msgid " -8, --eightbits set character size to 8 bits\n" msgstr " -8, --eightbits 字节大小设为 8 位\n" -#: sys-utils/ldattach.c:207 +#: sys-utils/ldattach.c:208 msgid " -n, --noparity set parity to none\n" msgstr " -n, --noparity 设为无校验位\n" -#: sys-utils/ldattach.c:208 +#: sys-utils/ldattach.c:209 msgid " -e, --evenparity set parity to even\n" msgstr " -e, --evenparity 设为奇检验\n" -#: sys-utils/ldattach.c:209 +#: sys-utils/ldattach.c:210 msgid " -o, --oddparity set parity to odd\n" msgstr " -o, --oddparity 设为偶检验\n" -#: sys-utils/ldattach.c:210 +#: sys-utils/ldattach.c:211 msgid " -1, --onestopbit set stop bits to one\n" msgstr " -1, --onestopbit 停止位设为 1\n" -#: sys-utils/ldattach.c:211 +#: sys-utils/ldattach.c:212 msgid " -2, --twostopbits set stop bits to two\n" msgstr " -2, --twostopbits 停止位设为 2\n" -#: sys-utils/ldattach.c:212 +#: sys-utils/ldattach.c:213 msgid " -i, --iflag [-]<iflag> set input mode flag\n" msgstr " -i, --iflag [-]<iflag> 设置输入模式标志\n" -#: sys-utils/ldattach.c:217 +#: sys-utils/ldattach.c:219 msgid "" "\n" "Known <ldisc> names:\n" @@ -12268,7 +12601,7 @@ msgstr "" "\n" "已知<线路规则>名称：\n" -#: sys-utils/ldattach.c:219 +#: sys-utils/ldattach.c:223 msgid "" "\n" "Known <iflag> names:\n" @@ -12276,118 +12609,118 @@ msgstr "" "\n" "已知<iflag>名称：\n" -#: sys-utils/ldattach.c:336 +#: sys-utils/ldattach.c:340 msgid "invalid speed argument" msgstr "无效的 速度 参数" -#: sys-utils/ldattach.c:339 +#: sys-utils/ldattach.c:343 #, fuzzy msgid "invalid pause argument" msgstr "无效的 磁头数 参数" -#: sys-utils/ldattach.c:355 +#: sys-utils/ldattach.c:359 msgid "invalid option" msgstr "无效选项" -#: sys-utils/ldattach.c:366 +#: sys-utils/ldattach.c:370 msgid "invalid line discipline argument" msgstr "无效的 线路规则 参数" -#: sys-utils/ldattach.c:373 +#: sys-utils/ldattach.c:390 #, c-format msgid "%s is not a serial line" msgstr "%s 不是串行线" -#: sys-utils/ldattach.c:380 +#: sys-utils/ldattach.c:397 #, c-format msgid "cannot get terminal attributes for %s" msgstr "无法获取 %s 的终端属性" -#: sys-utils/ldattach.c:383 +#: sys-utils/ldattach.c:400 #, c-format msgid "speed %d unsupported" msgstr "不支持速度 %d" -#: sys-utils/ldattach.c:432 +#: sys-utils/ldattach.c:449 #, c-format msgid "cannot set terminal attributes for %s" msgstr "无法设置 %s 的终端属性" -#: sys-utils/ldattach.c:442 +#: sys-utils/ldattach.c:459 #, fuzzy, c-format msgid "cannot write intro command to %s" msgstr "无法创建 %s 目录" -#: sys-utils/ldattach.c:452 +#: sys-utils/ldattach.c:469 msgid "cannot set line discipline" msgstr "无法设置行规则" -#: sys-utils/ldattach.c:461 +#: sys-utils/ldattach.c:479 msgid "cannot daemonize" msgstr "无法转为守护进程" -#: sys-utils/losetup.c:64 +#: sys-utils/losetup.c:66 msgid "autoclear flag set" msgstr "已设置 自动清除 标志" -#: sys-utils/losetup.c:65 +#: sys-utils/losetup.c:67 msgid "device backing file" msgstr "设备后备文件" -#: sys-utils/losetup.c:66 +#: sys-utils/losetup.c:68 msgid "backing file inode number" msgstr "后备文件 inode 号" -#: sys-utils/losetup.c:67 +#: sys-utils/losetup.c:69 msgid "backing file major:minor device number" msgstr "后备文件 主:次 设备号" -#: sys-utils/losetup.c:68 +#: sys-utils/losetup.c:70 msgid "loop device name" msgstr "回环设备名" -#: sys-utils/losetup.c:69 +#: sys-utils/losetup.c:71 msgid "offset from the beginning" msgstr "起始位置偏移" -#: sys-utils/losetup.c:70 +#: sys-utils/losetup.c:72 msgid "partscan flag set" msgstr "已设置 partscan 标志" -#: sys-utils/losetup.c:72 +#: sys-utils/losetup.c:74 msgid "size limit of the file in bytes" msgstr "文件的大小限制(字节数)" -#: sys-utils/losetup.c:73 +#: sys-utils/losetup.c:75 msgid "loop device major:minor number" msgstr "回环设备 主:次 设备号" -#: sys-utils/losetup.c:129 sys-utils/losetup.c:141 +#: sys-utils/losetup.c:132 sys-utils/losetup.c:144 #, c-format msgid ", offset %ju" msgstr "，偏移 %ju" -#: sys-utils/losetup.c:132 sys-utils/losetup.c:144 +#: sys-utils/losetup.c:135 sys-utils/losetup.c:147 #, c-format msgid ", sizelimit %ju" msgstr "，大小限制 %ju" -#: sys-utils/losetup.c:152 +#: sys-utils/losetup.c:155 #, c-format msgid ", encryption %s (type %u)" msgstr "，加密 %s(类型 %u)" -#: sys-utils/losetup.c:193 +#: sys-utils/losetup.c:196 #, c-format msgid "%s: detach failed" msgstr "%s：断开失败" -#: sys-utils/losetup.c:315 sys-utils/lscpu.c:1456 sys-utils/prlimit.c:229 -#: sys-utils/swapon.c:164 sys-utils/wdctl.c:215 sys-utils/zramctl.c:259 +#: sys-utils/losetup.c:323 sys-utils/lscpu.c:1460 sys-utils/prlimit.c:229 +#: sys-utils/swapon.c:162 sys-utils/wdctl.c:215 sys-utils/zramctl.c:339 msgid "failed to initialize output line" msgstr "初始化输出行失败" -#: sys-utils/losetup.c:367 +#: sys-utils/losetup.c:375 #, c-format msgid "" " %1$s [options] [<loopdev>]\n" @@ -12396,75 +12729,80 @@ msgstr "" " %1$s [选项] [<回环设备>]\n" " %1$s [选项] -f | <回环设备> <文件>\n" -#: sys-utils/losetup.c:372 +#: sys-utils/losetup.c:380 msgid "Set up and control loop devices.\n" msgstr "" -#: sys-utils/losetup.c:375 +#: sys-utils/losetup.c:383 msgid " -a, --all list all used devices\n" msgstr " -a, --all 列出所有使用的设备\n" -#: sys-utils/losetup.c:376 +#: sys-utils/losetup.c:384 msgid " -d, --detach <loopdev>... detach one or more devices\n" msgstr " -d, --detach <回环设备>... 断开一台或多台设备\n" -#: sys-utils/losetup.c:377 +#: sys-utils/losetup.c:385 msgid " -D, --detach-all detach all used devices\n" msgstr " -D, --detach-all 断开所有使用的设备\n" -#: sys-utils/losetup.c:378 +#: sys-utils/losetup.c:386 msgid " -f, --find find first unused device\n" msgstr " -f, --find 查找第一个未使用的设备\n" -#: sys-utils/losetup.c:379 +#: sys-utils/losetup.c:387 msgid " -c, --set-capacity <loopdev> resize the device\n" msgstr " -c, --set-capacity <回环设备> 改变设备容量\n" -#: sys-utils/losetup.c:380 +#: sys-utils/losetup.c:388 msgid " -j, --associated <file> list all devices associated with <file>\n" msgstr " -j, --associated <文件> 列出所有与 <文件> 相关的设备\n" -#: sys-utils/losetup.c:384 +#: sys-utils/losetup.c:392 msgid " -o, --offset <num> start at offset <num> into file\n" msgstr " -o, --offset <数字> 在文件偏移量 <数字> 处开始\n" -#: sys-utils/losetup.c:385 +#: sys-utils/losetup.c:393 msgid " --sizelimit <num> device is limited to <num> bytes of the file\n" msgstr " --sizelimit <数字> 设备限制为了文件的<数字>个字节\n" -#: sys-utils/losetup.c:386 +#: sys-utils/losetup.c:394 msgid " -P, --partscan create a partitioned loop device\n" msgstr " -P, --partscan 创建带分区的回环设备\n" -#: sys-utils/losetup.c:387 +#: sys-utils/losetup.c:395 msgid " -r, --read-only set up a read-only loop device\n" msgstr " -r, --read-only 创建只读的回环设备\n" -#: sys-utils/losetup.c:388 +#: sys-utils/losetup.c:396 msgid " --show print device name after setup (with -f)\n" msgstr " --show 设置后打印设备名(加 -f 选项)\n" -#: sys-utils/losetup.c:389 +#: sys-utils/losetup.c:397 msgid " -v, --verbose verbose mode\n" msgstr " -v, --verbose 详尽模式\n" -#: sys-utils/losetup.c:393 +#: sys-utils/losetup.c:401 msgid " -l, --list list info about all or specified (default)\n" msgstr " -l, --list 列出所有或指定的信息(默认)\n" -#: sys-utils/losetup.c:394 +#: sys-utils/losetup.c:402 msgid " -O, --output <cols> specify columns to output for --list\n" msgstr " -O, --output <列> 指定 --list 选项要输出的列\n" -#: sys-utils/losetup.c:395 +#: sys-utils/losetup.c:403 msgid " -n, --noheadings don't print headings for --list output\n" msgstr " -n, --noheadings --list 输出时不打印标题\n" -#: sys-utils/losetup.c:396 +#: sys-utils/losetup.c:404 msgid " --raw use raw --list output format\n" msgstr " --raw 使用原生 --list 输出格式\n" -#: sys-utils/losetup.c:402 +#: sys-utils/losetup.c:405 +#, fuzzy +msgid " -J, --json use JSON --list output format\n" +msgstr " --raw 使用原生 --list 输出格式\n" + +#: sys-utils/losetup.c:411 msgid "" "\n" "Available --list columns:\n" @@ -12472,155 +12810,155 @@ msgstr "" "\n" "可用的 --list 列：\n" -#: sys-utils/losetup.c:422 +#: sys-utils/losetup.c:431 #, c-format msgid "%s: Warning: file is smaller than 512 bytes; the loop device may be useless or invisible for system tools." msgstr "%s：警告，文件小于 512 个字节，回环设备可能无用或在系统工具中看不到。" -#: sys-utils/losetup.c:426 +#: sys-utils/losetup.c:435 #, c-format msgid "%s: Warning: file does not fit into a 512-byte sector; the end of the file will be ignored." msgstr "%s：警告，文件未对齐 512 字节扇区，其末尾将被忽略。" -#: sys-utils/losetup.c:497 sys-utils/losetup.c:507 sys-utils/losetup.c:597 -#: sys-utils/losetup.c:611 sys-utils/losetup.c:687 +#: sys-utils/losetup.c:508 sys-utils/losetup.c:518 sys-utils/losetup.c:616 +#: sys-utils/losetup.c:630 sys-utils/losetup.c:706 #, c-format msgid "%s: failed to use device" msgstr "%s：使用设备失败" -#: sys-utils/losetup.c:608 +#: sys-utils/losetup.c:627 msgid "no loop device specified" msgstr "未指定回环设备" -#: sys-utils/losetup.c:616 +#: sys-utils/losetup.c:635 msgid "no file specified" msgstr "未指定文件" -#: sys-utils/losetup.c:623 +#: sys-utils/losetup.c:642 #, c-format msgid "the options %s are allowed during loop device setup only" msgstr "选项 %s 只允许在设置回环设备时使用" -#: sys-utils/losetup.c:628 +#: sys-utils/losetup.c:647 msgid "the option --offset is not allowed in this context" msgstr "此环境下不允许使用 --offset 选项" -#: sys-utils/losetup.c:648 sys-utils/losetup.c:699 +#: sys-utils/losetup.c:667 sys-utils/losetup.c:726 msgid "cannot find an unused loop device" msgstr "找不到未使用的回环设备" -#: sys-utils/losetup.c:658 +#: sys-utils/losetup.c:677 #, c-format msgid "%s: failed to use backing file" msgstr "%s：使用后备文件失败" -#: sys-utils/losetup.c:720 +#: sys-utils/losetup.c:747 #, c-format msgid "%s: set capacity failed" msgstr "%s：设置容量失败" -#: sys-utils/lscpu.c:89 +#: sys-utils/lscpu.c:93 msgid "none" msgstr "无" -#: sys-utils/lscpu.c:90 +#: sys-utils/lscpu.c:94 msgid "para" msgstr "半" -#: sys-utils/lscpu.c:91 +#: sys-utils/lscpu.c:95 msgid "full" msgstr "完全" -#: sys-utils/lscpu.c:92 +#: sys-utils/lscpu.c:96 msgid "container" msgstr "容器" -#: sys-utils/lscpu.c:153 +#: sys-utils/lscpu.c:157 msgid "horizontal" msgstr "水平" -#: sys-utils/lscpu.c:154 +#: sys-utils/lscpu.c:158 msgid "vertical" msgstr "竖直" -#: sys-utils/lscpu.c:303 +#: sys-utils/lscpu.c:307 msgid "logical CPU number" msgstr "逻辑 CPU 数量" -#: sys-utils/lscpu.c:304 +#: sys-utils/lscpu.c:308 msgid "logical core number" msgstr "逻辑核心数量" -#: sys-utils/lscpu.c:305 +#: sys-utils/lscpu.c:309 msgid "logical socket number" msgstr "逻辑(CPU)座数量" -#: sys-utils/lscpu.c:306 +#: sys-utils/lscpu.c:310 msgid "logical NUMA node number" msgstr "逻辑 NUMA 节点数量" -#: sys-utils/lscpu.c:307 +#: sys-utils/lscpu.c:311 msgid "logical book number" msgstr "逻辑 book 数" -#: sys-utils/lscpu.c:308 +#: sys-utils/lscpu.c:312 msgid "shows how caches are shared between CPUs" msgstr "显示 CPU 间是如何共享缓存的" -#: sys-utils/lscpu.c:309 +#: sys-utils/lscpu.c:313 msgid "CPU dispatching mode on virtual hardware" msgstr "虚拟硬件上的 CPU 调度模式" -#: sys-utils/lscpu.c:310 +#: sys-utils/lscpu.c:314 msgid "physical address of a CPU" msgstr "CPU 的物理地址" -#: sys-utils/lscpu.c:311 +#: sys-utils/lscpu.c:315 msgid "shows if the hypervisor has allocated the CPU" msgstr "显示超级监督(hypervisor)是否分配了 CPU" -#: sys-utils/lscpu.c:312 +#: sys-utils/lscpu.c:316 msgid "shows if Linux currently makes use of the CPU" msgstr "显示 Linux 当前是否在使用该 CPU" -#: sys-utils/lscpu.c:313 +#: sys-utils/lscpu.c:317 msgid "shows the maximum MHz of the CPU" msgstr "显示 CPU 的最大 MHz" -#: sys-utils/lscpu.c:314 +#: sys-utils/lscpu.c:318 msgid "shows the minimum MHz of the CPU" msgstr "显示 CPU 的最小 MHz" -#: sys-utils/lscpu.c:409 +#: sys-utils/lscpu.c:413 msgid "error: uname failed" msgstr "错误：uname 失败" -#: sys-utils/lscpu.c:484 +#: sys-utils/lscpu.c:488 #, c-format msgid "failed to determine number of CPUs: %s" msgstr "确定 CPU 数 失败：%s" -#: sys-utils/lscpu.c:728 +#: sys-utils/lscpu.c:732 msgid "error: can not set signal handler" msgstr "错误：无法设置信号处理函数" -#: sys-utils/lscpu.c:733 +#: sys-utils/lscpu.c:737 msgid "error: can not restore signal handler" msgstr "错误：无法恢复信号处理函数" -#: sys-utils/lscpu.c:1168 +#: sys-utils/lscpu.c:1172 msgid "Failed to extract the node number" msgstr "提取节点号失败" -#: sys-utils/lscpu.c:1260 sys-utils/lscpu.c:1270 +#: sys-utils/lscpu.c:1264 sys-utils/lscpu.c:1274 msgid "Y" msgstr "Y" -#: sys-utils/lscpu.c:1260 sys-utils/lscpu.c:1270 +#: sys-utils/lscpu.c:1264 sys-utils/lscpu.c:1274 msgid "N" msgstr "N" -#: sys-utils/lscpu.c:1352 +#: sys-utils/lscpu.c:1356 #, c-format msgid "" "# The following is the parsable format, which can be fed to other\n" @@ -12630,165 +12968,574 @@ msgstr "" "# 以下是可解析格式，可以输给其他程序。每列中的各个不同项有一个惟一\n" "# 的从 0 开始的 ID。\n" -#: sys-utils/lscpu.c:1502 +#: sys-utils/lscpu.c:1506 msgid "Architecture:" msgstr "架构：" -#: sys-utils/lscpu.c:1516 +#: sys-utils/lscpu.c:1520 msgid "CPU op-mode(s):" msgstr "CPU 运行模式：" -#: sys-utils/lscpu.c:1519 sys-utils/lscpu.c:1521 +#: sys-utils/lscpu.c:1523 sys-utils/lscpu.c:1525 msgid "Byte Order:" msgstr "字节序：" -#: sys-utils/lscpu.c:1523 +#: sys-utils/lscpu.c:1527 msgid "CPU(s):" msgstr "CPU(s):" -#: sys-utils/lscpu.c:1526 +#: sys-utils/lscpu.c:1530 msgid "On-line CPU(s) mask:" msgstr "在线 CPU 掩码：" -#: sys-utils/lscpu.c:1527 +#: sys-utils/lscpu.c:1531 msgid "On-line CPU(s) list:" msgstr "在线 CPU 列表：" -#: sys-utils/lscpu.c:1546 +#: sys-utils/lscpu.c:1550 msgid "Off-line CPU(s) mask:" msgstr "离线 CPU 掩码：" -#: sys-utils/lscpu.c:1547 +#: sys-utils/lscpu.c:1551 msgid "Off-line CPU(s) list:" msgstr "离线 CPU 列表：" -#: sys-utils/lscpu.c:1578 +#: sys-utils/lscpu.c:1582 msgid "Thread(s) per core:" msgstr "每个核的线程数：" -#: sys-utils/lscpu.c:1579 +#: sys-utils/lscpu.c:1583 msgid "Core(s) per socket:" msgstr "每个座的核数：" -#: sys-utils/lscpu.c:1582 +#: sys-utils/lscpu.c:1586 msgid "Socket(s) per book:" msgstr "每个 book 的座数：" -#: sys-utils/lscpu.c:1584 +#: sys-utils/lscpu.c:1588 msgid "Book(s):" msgstr "Book：" -#: sys-utils/lscpu.c:1586 +#: sys-utils/lscpu.c:1590 msgid "Socket(s):" msgstr "座：" -#: sys-utils/lscpu.c:1590 +#: sys-utils/lscpu.c:1594 msgid "NUMA node(s):" msgstr "NUMA 节点：" -#: sys-utils/lscpu.c:1592 +#: sys-utils/lscpu.c:1596 msgid "Vendor ID:" msgstr "厂商 ID：" -#: sys-utils/lscpu.c:1594 +#: sys-utils/lscpu.c:1598 msgid "CPU family:" msgstr "CPU 系列：" -#: sys-utils/lscpu.c:1596 +#: sys-utils/lscpu.c:1600 msgid "Model:" msgstr "型号：" -#: sys-utils/lscpu.c:1598 +#: sys-utils/lscpu.c:1602 msgid "Model name:" msgstr "型号名称：" -#: sys-utils/lscpu.c:1600 +#: sys-utils/lscpu.c:1604 msgid "Stepping:" msgstr "步进：" -#: sys-utils/lscpu.c:1602 +#: sys-utils/lscpu.c:1606 msgid "CPU MHz:" msgstr "CPU MHz：" -#: sys-utils/lscpu.c:1604 +#: sys-utils/lscpu.c:1608 msgid "CPU max MHz:" msgstr "CPU 最大 MHz：" -#: sys-utils/lscpu.c:1606 +#: sys-utils/lscpu.c:1610 msgid "CPU min MHz:" msgstr "CPU 最小 MHz：" -#: sys-utils/lscpu.c:1608 +#: sys-utils/lscpu.c:1612 msgid "BogoMIPS:" msgstr "BogoMIPS：" -#: sys-utils/lscpu.c:1611 sys-utils/lscpu.c:1613 +#: sys-utils/lscpu.c:1615 sys-utils/lscpu.c:1617 msgid "Virtualization:" msgstr "虚拟化：" -#: sys-utils/lscpu.c:1616 +#: sys-utils/lscpu.c:1620 msgid "Hypervisor:" msgstr "超管理器：" -#: sys-utils/lscpu.c:1618 +#: sys-utils/lscpu.c:1622 msgid "Hypervisor vendor:" msgstr "超管理器厂商：" -#: sys-utils/lscpu.c:1619 +#: sys-utils/lscpu.c:1623 msgid "Virtualization type:" msgstr "虚拟化类型：" -#: sys-utils/lscpu.c:1622 +#: sys-utils/lscpu.c:1626 msgid "Dispatching mode:" msgstr "分派模式：" -#: sys-utils/lscpu.c:1628 +#: sys-utils/lscpu.c:1632 #, c-format msgid "%s cache:" msgstr "%s 缓存：" -#: sys-utils/lscpu.c:1634 +#: sys-utils/lscpu.c:1638 #, c-format msgid "NUMA node%d CPU(s):" msgstr "NUMA 节点%d CPU：" -#: sys-utils/lscpu.c:1647 +#: sys-utils/lscpu.c:1643 +#, fuzzy +msgid "Flags:" +msgstr "标志" + +#: sys-utils/lscpu.c:1654 msgid "Display information about the CPU architecture.\n" msgstr "" -#: sys-utils/lscpu.c:1650 +#: sys-utils/lscpu.c:1657 msgid " -a, --all print both online and offline CPUs (default for -e)\n" msgstr " -a, --all 同时打印在线和离线 CPU (-e 选项默认值)\n" -#: sys-utils/lscpu.c:1651 +#: sys-utils/lscpu.c:1658 msgid " -b, --online print online CPUs only (default for -p)\n" msgstr " -b, --online 只打印在线 CPU (-p 选项默认值)\n" -#: sys-utils/lscpu.c:1652 +#: sys-utils/lscpu.c:1659 msgid " -c, --offline print offline CPUs only\n" msgstr " -c, --offline 只打印离线 CPU\n" -#: sys-utils/lscpu.c:1653 +#: sys-utils/lscpu.c:1660 msgid " -e, --extended[=<list>] print out an extended readable format\n" msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n" -#: sys-utils/lscpu.c:1654 +#: sys-utils/lscpu.c:1661 msgid " -p, --parse[=<list>] print out a parsable format\n" msgstr " -p, --parse[=<列表>] 打印可解析格式\n" -#: sys-utils/lscpu.c:1655 +#: sys-utils/lscpu.c:1662 msgid " -s, --sysroot <dir> use specified directory as system root\n" msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n" -#: sys-utils/lscpu.c:1656 +#: sys-utils/lscpu.c:1663 msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n" msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n" -#: sys-utils/lscpu.c:1753 +#: sys-utils/lscpu.c:1760 #, c-format msgid "%s: options --all, --online and --offline may only be used with options --extended or --parse.\n" msgstr "%s：--all、--online 和 --offline 选项只能与 --extended 或 --parse 选项一起使用。\n" +#: sys-utils/lsipc.c:149 +#, fuzzy +msgid "Resource key" +msgstr "资源名称" + +#: sys-utils/lsipc.c:149 +#, fuzzy +msgid "Key" +msgstr "键" + +#: sys-utils/lsipc.c:150 +#, fuzzy +msgid "Resource ID" +msgstr "资源名称" + +#: sys-utils/lsipc.c:150 +#, fuzzy +msgid "ID" +msgstr "UUID" + +#: sys-utils/lsipc.c:151 +msgid "Owner's username or UID" +msgstr "" + +#: sys-utils/lsipc.c:151 +#, fuzzy +msgid "Owner" +msgstr "拥有者" + +#: sys-utils/lsipc.c:152 +#, fuzzy +msgid "Permissions" +msgstr "版本：" + +#: sys-utils/lsipc.c:153 +msgid "Creator UID" +msgstr "" + +#: sys-utils/lsipc.c:154 +msgid "Creator user" +msgstr "" + +#: sys-utils/lsipc.c:155 +msgid "Creator GID" +msgstr "" + +#: sys-utils/lsipc.c:156 +#, fuzzy +msgid "Creator group" +msgstr "主组" + +#: sys-utils/lsipc.c:157 +#, fuzzy +msgid "User ID" +msgstr "用户 ID" + +#: sys-utils/lsipc.c:157 +#, fuzzy +msgid "UID" +msgstr "UUID" + +#: sys-utils/lsipc.c:158 +#, fuzzy +msgid "User name" +msgstr "用户名" + +#: sys-utils/lsipc.c:159 +msgid "Group ID" +msgstr "" + +#: sys-utils/lsipc.c:159 +#, fuzzy +msgid "GID" +msgstr "SGI" + +#: sys-utils/lsipc.c:160 +#, fuzzy +msgid "Group name" +msgstr "组名" + +#: sys-utils/lsipc.c:161 +#, fuzzy +msgid "Time of the last change" +msgstr "交换区大小" + +#: sys-utils/lsipc.c:161 +#, fuzzy +msgid "Last change" +msgstr "上次更改" + +#: sys-utils/lsipc.c:164 +#, fuzzy +msgid "Bytes used" +msgstr "已使用字节数" + +#: sys-utils/lsipc.c:165 +#, fuzzy +msgid "Number of messages" +msgstr "磁头数" + +#: sys-utils/lsipc.c:165 +#, fuzzy +msgid "Messages" +msgstr "消息" + +#: sys-utils/lsipc.c:166 +#, fuzzy +msgid "Time of last msg sent" +msgstr "上次登录日期" + +#: sys-utils/lsipc.c:166 +msgid "Msg sent" +msgstr "" + +#: sys-utils/lsipc.c:167 +msgid "Time of last msg received" +msgstr "" + +#: sys-utils/lsipc.c:167 +msgid "Msg received" +msgstr "" + +#: sys-utils/lsipc.c:168 +msgid "PID of the last msg sender" +msgstr "" + +#: sys-utils/lsipc.c:168 +msgid "Msg sender" +msgstr "" + +#: sys-utils/lsipc.c:169 +msgid "PID of the last msg receiver" +msgstr "" + +#: sys-utils/lsipc.c:169 +msgid "Msg receiver" +msgstr "" + +#: sys-utils/lsipc.c:172 +#, fuzzy +msgid "Segment size" +msgstr "获得块大小" + +#: sys-utils/lsipc.c:173 +#, fuzzy +msgid "Number of attached processes" +msgstr "最大进程数" + +#: sys-utils/lsipc.c:173 +msgid "Attached processes" +msgstr "" + +#: sys-utils/lsipc.c:174 +#, fuzzy +msgid "Status" +msgstr "状态" + +#: sys-utils/lsipc.c:175 +#, fuzzy +msgid "Attach time" +msgstr "已连上" + +#: sys-utils/lsipc.c:176 +#, fuzzy +msgid "Detach time" +msgstr "已断开" + +#: sys-utils/lsipc.c:177 +#, fuzzy +msgid "Creator command line" +msgstr "全部挂臷选项" + +#: sys-utils/lsipc.c:177 +#, fuzzy +msgid "Creator command" +msgstr "非法命令" + +#: sys-utils/lsipc.c:178 +msgid "PID of the creator" +msgstr "" + +#: sys-utils/lsipc.c:178 +msgid "Creator PID" +msgstr "" + +#: sys-utils/lsipc.c:179 +msgid "PID of last user" +msgstr "" + +#: sys-utils/lsipc.c:179 +#, fuzzy +msgid "Last user PID" +msgstr "用户 ID" + +#: sys-utils/lsipc.c:182 +#, fuzzy +msgid "Number of semaphores" +msgstr "扇区数" + +#: sys-utils/lsipc.c:182 +#, fuzzy +msgid "Semaphores" +msgstr "信号量 id：%d\n" + +#: sys-utils/lsipc.c:183 +msgid "Time of the last operation" +msgstr "" + +#: sys-utils/lsipc.c:183 +#, fuzzy +msgid "Last operation" +msgstr "操作 %d\n" + +#: sys-utils/lsipc.c:186 +#, fuzzy +msgid "Resource name" +msgstr "资源名称" + +#: sys-utils/lsipc.c:186 +#, fuzzy +msgid "Resource" +msgstr "资源名称" + +#: sys-utils/lsipc.c:187 +#, fuzzy +msgid "Resource description" +msgstr "资源描述" + +#: sys-utils/lsipc.c:187 +#, fuzzy +msgid "Description" +msgstr "标志描述" + +#: sys-utils/lsipc.c:188 +msgid "Currently used" +msgstr "" + +#: sys-utils/lsipc.c:188 +msgid "Used" +msgstr "" + +#: sys-utils/lsipc.c:189 +#, fuzzy +msgid "Currently use percentage" +msgstr "文件系统使用百分比" + +#: sys-utils/lsipc.c:189 +#, fuzzy +msgid "Use" +msgstr "用法：" + +#: sys-utils/lsipc.c:190 +msgid "System-wide limit" +msgstr "" + +#: sys-utils/lsipc.c:190 +msgid "Limit" +msgstr "" + +#: sys-utils/lsipc.c:225 +#, c-format +msgid "column %s does not apply to the specified IPC" +msgstr "" + +#: sys-utils/lsipc.c:271 +msgid " -g, --global info about system-wide usage (may be used with -m, -q and -s)\n" +msgstr "" + +#: sys-utils/lsipc.c:272 +#, fuzzy +msgid " -i, --id <id> print details on resource identified by <id>\n" +msgstr " -i, --id <id> 打印由<id>标识的资源的详细信息\n" + +#: sys-utils/lsipc.c:278 +#, fuzzy +msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n" +msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" + +#: sys-utils/lsipc.c:279 +#, fuzzy +msgid " -c, --creator show creator and owner\n" +msgstr " -c, --creator 显示创建者和拥有者\n" + +#: sys-utils/lsipc.c:281 +#, fuzzy +msgid " -J, --json use the JSON output format\n" +msgstr " -r, --raw 使用原生输出格式\n" + +#: sys-utils/lsipc.c:283 +#, fuzzy +msgid " -l, --list force list output format (for example with --id)\n" +msgstr " -l, --list 使用列表格式的输出\n" + +#: sys-utils/lsipc.c:285 +msgid " -P, --numeric-perms print numeric permissions (PERMS column)\n" +msgstr "" + +#: sys-utils/lsipc.c:287 +#, fuzzy +msgid " -t, --time show attach, detach and change times\n" +msgstr " -t, --time 显示附加、脱离和更改时间\n" + +#: sys-utils/lsipc.c:293 +#, fuzzy, c-format +msgid "" +"\n" +"Generic columns:\n" +msgstr "" +"\n" +"常规选项：\n" + +#: sys-utils/lsipc.c:297 +#, fuzzy, c-format +msgid "" +"\n" +"Shared memory columns (--shmems):\n" +msgstr "" +"\n" +"共享内存段 shmid=%d\n" + +#: sys-utils/lsipc.c:301 +#, c-format +msgid "" +"\n" +"Messages queues columns (--queues):\n" +msgstr "" + +#: sys-utils/lsipc.c:305 +#, fuzzy, c-format +msgid "" +"\n" +"Semaphores columns (--semaphores):\n" +msgstr " -s, --semaphores 信号量\n" + +#: sys-utils/lsipc.c:309 +#, c-format +msgid "" +"\n" +"Summary columns (--global):\n" +msgstr "" + +#: sys-utils/lsipc.c:397 +#, c-format +msgid "" +"Elements:\n" +"\n" +msgstr "" + +#: sys-utils/lsipc.c:718 +#, fuzzy +msgid "Total number of semaphores" +msgstr "扇区数" + +#: sys-utils/lsipc.c:719 +#, fuzzy +msgid "Number of Semaphore IDs" +msgstr "扇区数" + +#: sys-utils/lsipc.c:889 +#, fuzzy +msgid "Number of message queues" +msgstr "磁头数" + +#: sys-utils/lsipc.c:890 +#, fuzzy +msgid "Max size of message (bytes)" +msgstr "最大消息尺寸" + +#: sys-utils/lsipc.c:891 +#, fuzzy +msgid "Default max size of queue (bytes)" +msgstr "默认的队列最大尺寸" + +#: sys-utils/lsipc.c:1021 sys-utils/lsipc.c:1036 +msgid "hugetlb" +msgstr "" + +#: sys-utils/lsipc.c:1022 sys-utils/lsipc.c:1041 +#, fuzzy +msgid "noreserve" +msgstr "Linux 保留" + +#: sys-utils/lsipc.c:1101 +#, fuzzy +msgid "Shared memory segments" +msgstr "" +"\n" +"共享内存段 shmid=%d\n" + +#: sys-utils/lsipc.c:1102 +#, fuzzy +msgid "Shared memory pages" +msgstr "共享内存 id：%d\n" + +#: sys-utils/lsipc.c:1175 +#, fuzzy +msgid "failed to parse IPC identifier" +msgstr "解析 pid 失败" + +#: sys-utils/lsipc.c:1269 +#, fuzzy +msgid "the --global is mutually exclusive with --creator, --id and --time" +msgstr "--pid 和 命令 互相排斥" + #: sys-utils/mount.c:66 sys-utils/umount.c:118 #, c-format msgid "only root can use \"--%s\" option (effective UID is %u)" @@ -13098,37 +13845,37 @@ msgstr "%s 是写保护的，但指明了“-w”标志" msgid "cannot remount %s read-write, is write-protected" msgstr "无法以读写方式重新挂载 %s，它是写保护的" -#: sys-utils/mount.c:615 +#: sys-utils/mount.c:615 sys-utils/mount.c:635 sys-utils/unshare.c:184 +#, c-format +msgid "mount %s on %s failed" +msgstr "将 %s 挂载到 %s 失败" + +#: sys-utils/mount.c:618 #, c-format msgid "%s is write-protected, mounting read-only" msgstr "%s 写保护，将以只读方式挂载" -#: sys-utils/mount.c:628 +#: sys-utils/mount.c:631 #, c-format msgid "no medium found on %s" msgstr "在 %s 上找不到媒体" -#: sys-utils/mount.c:632 -#, c-format -msgid "mount %s on %s failed" -msgstr "将 %s 挂载到 %s 失败" - -#: sys-utils/mount.c:656 +#: sys-utils/mount.c:659 #, c-format msgid "%s: failed to parse" msgstr "%s：解析失败" -#: sys-utils/mount.c:695 +#: sys-utils/mount.c:698 #, c-format msgid "unsupported option format: %s" msgstr "不支持的参数格式：%s" -#: sys-utils/mount.c:697 +#: sys-utils/mount.c:700 #, c-format msgid "failed to append option '%s'" msgstr "追加选项“%s”失败" -#: sys-utils/mount.c:714 +#: sys-utils/mount.c:717 #, c-format msgid "" " %1$s [-lhV]\n" @@ -13143,12 +13890,12 @@ msgstr "" " %1$s [选项] <源> <目录>\n" " %1$s <操作> <挂载点> [<目标>]\n" -#: sys-utils/mount.c:722 +#: sys-utils/mount.c:725 #, fuzzy msgid "Mount a filesystem.\n" msgstr "正在检查所有文件系统。\n" -#: sys-utils/mount.c:726 +#: sys-utils/mount.c:729 #, c-format msgid "" " -a, --all mount all filesystems mentioned in fstab\n" @@ -13163,7 +13910,7 @@ msgstr "" " -F, --fork 对每个设备禁用 fork(和 -a 选项一起使用)\n" " -T, --fstab <路径> /etc/fstab 的替代文件\n" -#: sys-utils/mount.c:732 +#: sys-utils/mount.c:735 #, c-format msgid "" " -h, --help display this help text and exit\n" @@ -13176,7 +13923,7 @@ msgstr "" " -l, --show-labels 列出所有带有指定标签的挂载\n" " -n, --no-mtab 不写 /etc/mtab\n" -#: sys-utils/mount.c:737 +#: sys-utils/mount.c:740 #, c-format msgid "" " -o, --options <list> comma-separated list of mount options\n" @@ -13189,7 +13936,7 @@ msgstr "" " -r, --read-only 以只读方式挂载文件系统(同 -o ro)\n" " -t, --types <列表> 限制文件系统类型集合\n" -#: sys-utils/mount.c:742 +#: sys-utils/mount.c:745 #, c-format msgid "" " --source <src> explicitly specifies source (path, label, uuid)\n" @@ -13198,7 +13945,7 @@ msgstr "" " --source <源> 指明源(路径、标签、uuid)\n" " --target <目标> 指明挂载点\n" -#: sys-utils/mount.c:745 +#: sys-utils/mount.c:748 #, c-format msgid "" " -v, --verbose say what is being done\n" @@ -13209,7 +13956,7 @@ msgstr "" " -V, --version 显示版本信息并退出\n" " -w, --rw, --read-write 以读写方式挂载文件系统(默认)\n" -#: sys-utils/mount.c:754 +#: sys-utils/mount.c:757 #, c-format msgid "" "\n" @@ -13230,7 +13977,7 @@ msgstr "" " PARTLABEL=<标签> 按分区标签指定设备\n" " PARTUUID=<uuid> 按分区 UUID 指定设备\n" -#: sys-utils/mount.c:763 +#: sys-utils/mount.c:766 #, c-format msgid "" " <device> specifies device by path\n" @@ -13241,7 +13988,7 @@ msgstr "" " <目录> 绑定式挂载的挂载点(参阅 --bind/rbind)\n" " <文件> 用于设置回环设备的常规文件\n" -#: sys-utils/mount.c:768 +#: sys-utils/mount.c:771 #, c-format msgid "" "\n" @@ -13256,7 +14003,7 @@ msgstr "" " -M, --move 将子树移动到其他位置\n" " -R, --rbind 挂载其他位置的子树及其包含的所有子挂载(submount)\n" -#: sys-utils/mount.c:773 +#: sys-utils/mount.c:776 #, c-format msgid "" " --make-shared mark a subtree as shared\n" @@ -13269,7 +14016,7 @@ msgstr "" " --make-private 将子树标记为 私有\n" " --make-unbindable 将子树标记为 不可绑定\n" -#: sys-utils/mount.c:778 +#: sys-utils/mount.c:781 #, c-format msgid "" " --make-rshared recursively mark a whole subtree as shared\n" @@ -13282,15 +14029,15 @@ msgstr "" " --make-rprivate 递归地将整个子树标记为 私有\n" " --make-runbindable 递归地将整个子树标记为 不可绑定\n" -#: sys-utils/mount.c:864 sys-utils/umount.c:549 +#: sys-utils/mount.c:867 sys-utils/umount.c:549 msgid "libmount context allocation failed" msgstr "libmount 环境(context)分配失败" -#: sys-utils/mount.c:921 sys-utils/umount.c:602 +#: sys-utils/mount.c:924 sys-utils/umount.c:602 msgid "failed to set options pattern" msgstr "设置选项模式失败" -#: sys-utils/mount.c:1074 +#: sys-utils/mount.c:1077 msgid "source specified more than once" msgstr "源指定了多次" @@ -13327,112 +14074,130 @@ msgstr "%s 不是一个挂载点\n" msgid "%s is a mountpoint\n" msgstr "%s 是一个挂载点\n" -#: sys-utils/nsenter.c:65 sys-utils/setpriv.c:93 sys-utils/unshare.c:108 +#: sys-utils/nsenter.c:69 sys-utils/setpriv.c:93 sys-utils/unshare.c:232 #, fuzzy, c-format msgid " %s [options] <program> [<argument>...]\n" msgstr " %s [选项] <程序> [参数 ...]\n" -#: sys-utils/nsenter.c:69 +#: sys-utils/nsenter.c:73 msgid "Run a program with namespaces of other processes.\n" msgstr "" -#: sys-utils/nsenter.c:72 +#: sys-utils/nsenter.c:76 msgid " -t, --target <pid> target process to get namespaces from\n" msgstr " -t, --target <pid> 要获取名字空间的目标进程\n" -#: sys-utils/nsenter.c:73 +#: sys-utils/nsenter.c:77 #, fuzzy msgid " -m, --mount[=<file>] enter mount namespace\n" msgstr " -m, --mount [=<文件>] 进入挂臷名字空间\n" -#: sys-utils/nsenter.c:74 +#: sys-utils/nsenter.c:78 #, fuzzy msgid " -u, --uts[=<file>] enter UTS namespace (hostname etc)\n" msgstr " -u, --uts [=<文件>] 进入 UTS 名字空间(主机名等)\n" -#: sys-utils/nsenter.c:75 +#: sys-utils/nsenter.c:79 #, fuzzy msgid " -i, --ipc[=<file>] enter System V IPC namespace\n" msgstr " -i, --ipc [=<文件>] 进入系统 V IPC 名字空间\n" -#: sys-utils/nsenter.c:76 +#: sys-utils/nsenter.c:80 #, fuzzy msgid " -n, --net[=<file>] enter network namespace\n" msgstr " -n, --net [=<文件>] 进入网络名字空间\n" -#: sys-utils/nsenter.c:77 +#: sys-utils/nsenter.c:81 #, fuzzy msgid " -p, --pid[=<file>] enter pid namespace\n" msgstr " -p, --pid [=<文件>] 进入 pid 名字空间\n" -#: sys-utils/nsenter.c:78 +#: sys-utils/nsenter.c:82 #, fuzzy msgid " -U, --user[=<file>] enter user namespace\n" msgstr " -U, --user [=<文件>] 进入用户名字空间\n" -#: sys-utils/nsenter.c:79 +#: sys-utils/nsenter.c:83 #, fuzzy msgid " -S, --setuid <uid> set uid in entered namespace\n" msgstr " -S, --setuid <uid> 在用户名字空间中设置 uid\n" -#: sys-utils/nsenter.c:80 +#: sys-utils/nsenter.c:84 #, fuzzy msgid " -G, --setgid <gid> set gid in entered namespace\n" msgstr " -G, --setgid <gid> 在用户名字空间中设置 gid\n" -#: sys-utils/nsenter.c:81 +#: sys-utils/nsenter.c:85 msgid " --preserve-credentials do not touch uids or gids\n" msgstr "" -#: sys-utils/nsenter.c:82 +#: sys-utils/nsenter.c:86 #, fuzzy msgid " -r, --root[=<dir>] set the root directory\n" msgstr " -r, --root [=<目录>] 设置根目录\n" -#: sys-utils/nsenter.c:83 +#: sys-utils/nsenter.c:87 #, fuzzy msgid " -w, --wd[=<dir>] set the working directory\n" msgstr " -w, --wd [=<目录>] 设置工作目录\n" -#: sys-utils/nsenter.c:84 +#: sys-utils/nsenter.c:88 msgid " -F, --no-fork do not fork before exec'ing <program>\n" msgstr " -F, --no-fork 执行 <程序> 前不 fork\n" -#: sys-utils/nsenter.c:109 +#: sys-utils/nsenter.c:90 +msgid " -Z, --follow-context set SELinux context according to --target PID\n" +msgstr "" + +#: sys-utils/nsenter.c:116 #, c-format msgid "neither filename nor target pid supplied for %s" msgstr "没有为 %s 提供文件名或目标 pid" -#: sys-utils/nsenter.c:253 +#: sys-utils/nsenter.c:266 msgid "failed to parse uid" msgstr "解析 uid 失败" -#: sys-utils/nsenter.c:257 +#: sys-utils/nsenter.c:270 msgid "failed to parse gid" msgstr "解析 gid 失败" -#: sys-utils/nsenter.c:324 +#: sys-utils/nsenter.c:306 +msgid "no target PID specified for --follow-context" +msgstr "" + +#: sys-utils/nsenter.c:308 +#, fuzzy, c-format +msgid "failed to get %d SELinux context" +msgstr "无法创建新的 selinux 环境(context)" + +#: sys-utils/nsenter.c:311 +#, fuzzy, c-format +msgid "failed to set exec context to '%s'" +msgstr "无法将人格(personality)设置为 %s" + +#: sys-utils/nsenter.c:356 #, c-format msgid "reassociate to namespace '%s' failed" msgstr "重新关联到名字空间“%s”失败" -#: sys-utils/nsenter.c:335 +#: sys-utils/nsenter.c:367 msgid "cannot open current working directory" msgstr "打不开当前工作目录" -#: sys-utils/nsenter.c:342 +#: sys-utils/nsenter.c:374 msgid "change directory by root file descriptor failed" msgstr "根据 root 文件描述符 更改目录失败" -#: sys-utils/nsenter.c:345 +#: sys-utils/nsenter.c:377 msgid "chroot failed" msgstr "chroot 失败" -#: sys-utils/nsenter.c:355 +#: sys-utils/nsenter.c:387 msgid "change directory by working directory file descriptor failed" msgstr "按工作目录文件描述符更改目录失败" -#: sys-utils/nsenter.c:366 sys-utils/setpriv.c:816 sys-utils/setpriv.c:820 +#: sys-utils/nsenter.c:398 sys-utils/setpriv.c:816 sys-utils/setpriv.c:820 msgid "setgroups failed" msgstr "setgroups 失败" @@ -13637,8 +14402,8 @@ msgstr "" " -y, --rttime 实时调度时进程调度的 CPU\n" " (间隔)时间(毫秒)\n" -#: sys-utils/prlimit.c:243 sys-utils/prlimit.c:249 sys-utils/prlimit.c:365 -#: sys-utils/prlimit.c:370 +#: sys-utils/prlimit.c:243 sys-utils/prlimit.c:249 sys-utils/prlimit.c:366 +#: sys-utils/prlimit.c:371 msgid "unlimited" msgstr "无限制" @@ -13653,30 +14418,30 @@ msgid "the soft limit %s cannot exceed the hard limit" msgstr "软限制 %s 不能超过硬限制" #: sys-utils/prlimit.c:363 -#, c-format -msgid "New %s limit: " +#, fuzzy, c-format +msgid "New %s limit for pid %d: " msgstr "新的 %s 限制：" -#: sys-utils/prlimit.c:377 +#: sys-utils/prlimit.c:378 #, c-format msgid "failed to set the %s resource limit" msgstr "设置 %s 资源限制失败" -#: sys-utils/prlimit.c:378 +#: sys-utils/prlimit.c:379 #, c-format msgid "failed to get the %s resource limit" msgstr "获取 %s 资源限制失败" -#: sys-utils/prlimit.c:455 +#: sys-utils/prlimit.c:456 #, c-format msgid "failed to parse %s limit" msgstr "解析 %s 限制失败" -#: sys-utils/prlimit.c:584 +#: sys-utils/prlimit.c:585 msgid "option --pid may be specified only once" msgstr "--pid 选项只能指定一次" -#: sys-utils/prlimit.c:615 +#: sys-utils/prlimit.c:616 msgid "options --pid and COMMAND are mutually exclusive" msgstr "--pid 和 命令 互相排斥" @@ -13741,8 +14506,8 @@ msgid "Assuming reversed byte order. Use -n to force native byte order." msgstr "将假设为反向字节顺序。可使用 -n 强制为原生字节顺序。" #: sys-utils/readprofile.c:286 -#, c-format -msgid "Sampling_step: %i\n" +#, fuzzy, c-format +msgid "Sampling_step: %u\n" msgstr "采样步数(step)：%i\n" #: sys-utils/readprofile.c:302 sys-utils/readprofile.c:323 @@ -13832,15 +14597,15 @@ msgstr "未知用户 %s" msgid "bad %s value: %s" msgstr "错误值 %s" -#: sys-utils/rtcwake.c:75 +#: sys-utils/rtcwake.c:98 msgid "Enter a system sleep state until a specified wakeup time.\n" msgstr "" -#: sys-utils/rtcwake.c:78 +#: sys-utils/rtcwake.c:101 msgid " -a, --auto reads the clock mode from adjust file (default)\n" msgstr " -a, --auto 从 adjust 文件读取时钟模式(默认)\n" -#: sys-utils/rtcwake.c:80 +#: sys-utils/rtcwake.c:103 #, c-format msgid "" " -A, --adjfile <file> specifies the path to the adjust file\n" @@ -13849,175 +14614,182 @@ msgstr "" " -A, --adjfile <文件> 指定 adjust 文件的路径\n" " 默认为 %s\n" -#: sys-utils/rtcwake.c:82 +#: sys-utils/rtcwake.c:105 +#, fuzzy +msgid " --date <timestamp> date time of timestamp to wake\n" +msgstr " -t, --time <time_t> 指定唤醒时刻\n" + +#: sys-utils/rtcwake.c:106 msgid " -d, --device <device> select rtc device (rtc0|rtc1|...)\n" msgstr " -d, --device <设备> 选择 rtc 设备(rtc0|rtc1|...)\n" -#: sys-utils/rtcwake.c:83 +#: sys-utils/rtcwake.c:107 msgid " -n, --dry-run does everything, but suspend\n" msgstr " -n, --dry-run 演示操作但不执行(suspend)\n" -#: sys-utils/rtcwake.c:84 +#: sys-utils/rtcwake.c:108 msgid " -l, --local RTC uses local timezone\n" msgstr " -l, --local RTC 使用本地时区\n" -#: sys-utils/rtcwake.c:85 +#: sys-utils/rtcwake.c:109 +msgid " --list-modes list available modes\n" +msgstr "" + +#: sys-utils/rtcwake.c:110 msgid " -m, --mode <mode> standby|mem|... sleep mode\n" msgstr " -m, --mode <模式> 指定 standby|mem|... 等睡眠模式\n" -#: sys-utils/rtcwake.c:86 +#: sys-utils/rtcwake.c:111 msgid " -s, --seconds <seconds> seconds to sleep\n" msgstr " -s, --seconds <秒数> 指定睡眠的秒数\n" -#: sys-utils/rtcwake.c:87 +#: sys-utils/rtcwake.c:112 msgid " -t, --time <time_t> time to wake\n" msgstr " -t, --time <time_t> 指定唤醒时刻\n" -#: sys-utils/rtcwake.c:88 +#: sys-utils/rtcwake.c:113 msgid " -u, --utc RTC uses UTC\n" msgstr " -u, --utc RTC 使用 UTC\n" -#: sys-utils/rtcwake.c:89 +#: sys-utils/rtcwake.c:114 msgid " -v, --verbose verbose messages\n" msgstr " -v, --verbose 输出详尽消息\n" -#: sys-utils/rtcwake.c:146 +#: sys-utils/rtcwake.c:167 msgid "read rtc time failed" msgstr "读取 rtc 时间失败" -#: sys-utils/rtcwake.c:151 +#: sys-utils/rtcwake.c:173 msgid "read system time failed" msgstr "读取系统时间失败" -#: sys-utils/rtcwake.c:169 +#: sys-utils/rtcwake.c:189 msgid "convert rtc time failed" msgstr "转换 rtc 时间失败" -#: sys-utils/rtcwake.c:229 -msgid "set rtc alarm failed" -msgstr "设置 rtc 闹钟失败" - -#: sys-utils/rtcwake.c:233 -msgid "enable rtc alarm failed" -msgstr "启用 rtc 闹钟失败" - #: sys-utils/rtcwake.c:237 msgid "set rtc wake alarm failed" msgstr "设置 rtc 唤醒闹钟失败" -#: sys-utils/rtcwake.c:340 +#: sys-utils/rtcwake.c:302 +#, fuzzy, c-format +msgid "unexpected third line in: %s: %s" +msgstr "%s 上的文件结尾异常" + +#: sys-utils/rtcwake.c:315 sys-utils/rtcwake.c:622 msgid "read rtc alarm failed" msgstr "读取 rtc 闹钟失败" -#: sys-utils/rtcwake.c:346 +#: sys-utils/rtcwake.c:320 #, c-format msgid "alarm: off\n" msgstr "闹钟：关\n" -#: sys-utils/rtcwake.c:363 +#: sys-utils/rtcwake.c:333 msgid "convert time failed" msgstr "转换时间失败" -#: sys-utils/rtcwake.c:370 +#: sys-utils/rtcwake.c:338 #, c-format msgid "alarm: on %s" msgstr "闹钟：于 %s" -#: sys-utils/rtcwake.c:448 +#: sys-utils/rtcwake.c:382 +#, fuzzy, c-format +msgid "could not read: %s" +msgstr "无法读 %s" + +#: sys-utils/rtcwake.c:462 #, c-format msgid "unrecognized suspend state '%s'" msgstr "不支持的挂起状态“%s”" -#: sys-utils/rtcwake.c:458 +#: sys-utils/rtcwake.c:470 msgid "invalid seconds argument" msgstr "无效的 秒数 参数" -#: sys-utils/rtcwake.c:465 +#: sys-utils/rtcwake.c:474 msgid "invalid time argument" msgstr "无效的 时间 参数" -#: sys-utils/rtcwake.c:489 +#: sys-utils/rtcwake.c:502 #, c-format msgid "%s: assuming RTC uses UTC ...\n" msgstr "%s：将假设 RTC 使用 UTC...\n" -#: sys-utils/rtcwake.c:495 +#: sys-utils/rtcwake.c:509 msgid "Using UTC time.\n" msgstr "使用 UTC 时间。\n" -#: sys-utils/rtcwake.c:496 +#: sys-utils/rtcwake.c:510 msgid "Using local time.\n" msgstr "使用当地时间。\n" -#: sys-utils/rtcwake.c:501 -msgid "must provide wake time (see -t and -s options)" +#: sys-utils/rtcwake.c:513 +#, fuzzy +msgid "must provide wake time (see --seconds, --time and --date options)" msgstr "必须指定唤醒时间(参阅 -t 和 -s 选项)" -#: sys-utils/rtcwake.c:518 +#: sys-utils/rtcwake.c:519 #, c-format msgid "%s not enabled for wakeup events" msgstr "%s 没有为唤醒事件启用" -#: sys-utils/rtcwake.c:533 +#: sys-utils/rtcwake.c:526 #, c-format msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n" msgstr "闹钟 %ld，sys 时间 %ld，rtc 时间 %ld，秒数 %u\n" -#: sys-utils/rtcwake.c:539 -#, c-format -msgid "suspend to \"%s\" unavailable" -msgstr "挂起到“%s”不可用" - -#: sys-utils/rtcwake.c:547 +#: sys-utils/rtcwake.c:533 #, c-format msgid "time doesn't go backward to %s" msgstr "时间不能返回到 %s" -#: sys-utils/rtcwake.c:557 +#: sys-utils/rtcwake.c:543 #, c-format msgid "%s: wakeup using %s at %s" msgstr "%1$s：用 %3$s 的 %2$s 唤醒" -#: sys-utils/rtcwake.c:561 +#: sys-utils/rtcwake.c:547 #, c-format msgid "%s: wakeup from \"%s\" using %s at %s" msgstr "%s：从“%s”唤醒，使用 %s，时间 %s" -#: sys-utils/rtcwake.c:570 +#: sys-utils/rtcwake.c:557 #, c-format msgid "suspend mode: no; leaving\n" msgstr "挂起模式：无；将离开\n" -#: sys-utils/rtcwake.c:578 +#: sys-utils/rtcwake.c:566 #, c-format msgid "suspend mode: off; executing %s\n" msgstr "挂起模式：关；正在执行 %s\n" -#: sys-utils/rtcwake.c:597 +#: sys-utils/rtcwake.c:585 #, c-format msgid "suspend mode: on; reading rtc\n" msgstr "挂起模式：开；正在读 rtc\n" -#: sys-utils/rtcwake.c:603 +#: sys-utils/rtcwake.c:590 msgid "rtc read failed" msgstr "读 rtc 失败" -#: sys-utils/rtcwake.c:614 +#: sys-utils/rtcwake.c:602 #, c-format msgid "suspend mode: disable; disabling alarm\n" msgstr "挂起模式：禁用；正在禁用闹钟\n" -#: sys-utils/rtcwake.c:618 +#: sys-utils/rtcwake.c:606 #, c-format msgid "suspend mode: show; printing alarm info\n" msgstr "挂起模式：显示；正在打印闹钟信息\n" -#: sys-utils/rtcwake.c:625 +#: sys-utils/rtcwake.c:613 #, c-format msgid "suspend mode: %s; suspending system\n" msgstr "挂起模式：%s；正在挂起系统\n" -#: sys-utils/rtcwake.c:638 sys-utils/rtcwake.c:644 +#: sys-utils/rtcwake.c:627 msgid "disable rtc alarm interrupt failed" msgstr "禁用 rtc 闹钟中断失败" @@ -14547,7 +15319,7 @@ msgstr "非超级用户。" msgid "%s: swapoff failed" msgstr "%s：swapoff 失败" -#: sys-utils/swapoff.c:119 sys-utils/swapon.c:727 +#: sys-utils/swapoff.c:119 sys-utils/swapon.c:724 #, c-format msgid " %s [options] [<spec>]\n" msgstr " %s [选项] [<指定>]\n" @@ -14584,193 +15356,193 @@ msgstr "" " <设备> 要使用设备的名称\n" " <文件> 要使用文件的名称\n" -#: sys-utils/swapon.c:111 +#: sys-utils/swapon.c:109 msgid "device file or partition path" msgstr "设备文件或分区路径" -#: sys-utils/swapon.c:112 +#: sys-utils/swapon.c:110 msgid "type of the device" msgstr "设备的类型" -#: sys-utils/swapon.c:113 +#: sys-utils/swapon.c:111 msgid "size of the swap area" msgstr "交换区大小" -#: sys-utils/swapon.c:114 +#: sys-utils/swapon.c:112 msgid "bytes in use" msgstr "已使用字节数" -#: sys-utils/swapon.c:115 +#: sys-utils/swapon.c:113 msgid "swap priority" msgstr "交换优先级" -#: sys-utils/swapon.c:116 +#: sys-utils/swapon.c:114 msgid "swap uuid" msgstr "" -#: sys-utils/swapon.c:117 +#: sys-utils/swapon.c:115 #, fuzzy msgid "swap label" msgstr "Apple 标签" -#: sys-utils/swapon.c:234 +#: sys-utils/swapon.c:232 #, c-format msgid "%s\t\t\t\tType\t\tSize\tUsed\tPriority\n" msgstr "%s\t\t\t\t类型\t\t大小\t已用\t权限\n" -#: sys-utils/swapon.c:234 +#: sys-utils/swapon.c:232 msgid "Filename" msgstr "文件名" -#: sys-utils/swapon.c:298 +#: sys-utils/swapon.c:296 #, c-format msgid "%s: reinitializing the swap." msgstr "%s：正在重新初始化交换区。" -#: sys-utils/swapon.c:350 +#: sys-utils/swapon.c:347 #, c-format msgid "%s: lseek failed" msgstr "%s：lseek 失败" -#: sys-utils/swapon.c:356 +#: sys-utils/swapon.c:353 #, c-format msgid "%s: write signature failed" msgstr "%s：写签名失败" -#: sys-utils/swapon.c:440 +#: sys-utils/swapon.c:437 #, c-format msgid "%s: found swap signature: version %ud, page-size %d, %s byte order" msgstr "%s：找到交换区签名：版本为 %ud，页面大小为 %d，%s 字节顺序" -#: sys-utils/swapon.c:445 +#: sys-utils/swapon.c:442 msgid "different" msgstr "不同" -#: sys-utils/swapon.c:445 +#: sys-utils/swapon.c:442 msgid "same" msgstr "相同" -#: sys-utils/swapon.c:488 +#: sys-utils/swapon.c:485 #, c-format msgid "%s: insecure permissions %04o, %04o suggested." msgstr "%s：不安全的权限 %04o，建议使用 %04o。" -#: sys-utils/swapon.c:493 +#: sys-utils/swapon.c:490 #, c-format msgid "%s: insecure file owner %d, 0 (root) suggested." msgstr "%s：不安全的文件拥有者 %d，建议使用 0(root)。" -#: sys-utils/swapon.c:499 +#: sys-utils/swapon.c:496 #, c-format msgid "%s: skipping - it appears to have holes." msgstr "%s：将跳过 - 它似乎有空洞。" -#: sys-utils/swapon.c:513 +#: sys-utils/swapon.c:510 #, c-format msgid "%s: get size failed" msgstr "%s：获取大小失败" -#: sys-utils/swapon.c:519 +#: sys-utils/swapon.c:516 #, c-format msgid "%s: read swap header failed" msgstr "%s：读交换区头失败" -#: sys-utils/swapon.c:529 +#: sys-utils/swapon.c:526 #, c-format msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu" msgstr "%s：页大小=%d，交换区大小=%llu，设备大小=%llu" -#: sys-utils/swapon.c:534 +#: sys-utils/swapon.c:531 #, c-format msgid "%s: last_page 0x%08llx is larger than actual size of swapspace" msgstr "%s：末页 0x%08llx 大于交换空间的实际大小" -#: sys-utils/swapon.c:544 +#: sys-utils/swapon.c:541 #, c-format msgid "%s: swap format pagesize does not match." msgstr "%s：交换格式页大小不匹配。" -#: sys-utils/swapon.c:552 +#: sys-utils/swapon.c:549 #, c-format msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)" msgstr "%s：交换格式页大小不匹配。(使用 --fixpgsz 来重新对它初始化。)" -#: sys-utils/swapon.c:561 +#: sys-utils/swapon.c:558 #, c-format msgid "%s: software suspend data detected. Rewriting the swap signature." msgstr "%s：检测到软件挂起数据。将重新写交换区签名。" -#: sys-utils/swapon.c:586 +#: sys-utils/swapon.c:583 #, c-format msgid "swapon %s\n" msgstr "swapon %s\n" -#: sys-utils/swapon.c:625 +#: sys-utils/swapon.c:622 #, c-format msgid "%s: swapon failed" msgstr "%s：swapon 失败" -#: sys-utils/swapon.c:730 +#: sys-utils/swapon.c:727 msgid "Enable devices and files for paging and swapping.\n" msgstr "" -#: sys-utils/swapon.c:733 +#: sys-utils/swapon.c:730 #, fuzzy msgid " -a, --all enable all swaps from /etc/fstab\n" msgstr " -a, --all 列出所有使用的设备\n" -#: sys-utils/swapon.c:734 +#: sys-utils/swapon.c:731 msgid " -d, --discard[=<policy>] enable swap discards, if supported by device\n" msgstr "" -#: sys-utils/swapon.c:735 +#: sys-utils/swapon.c:732 msgid " -e, --ifexists silently skip devices that do not exist\n" msgstr "" -#: sys-utils/swapon.c:736 +#: sys-utils/swapon.c:733 msgid " -f, --fixpgsz reinitialize the swap space if necessary\n" msgstr "" -#: sys-utils/swapon.c:737 +#: sys-utils/swapon.c:734 #, fuzzy msgid " -o, --options <list> comma-separated list of swap options\n" msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n" -#: sys-utils/swapon.c:738 +#: sys-utils/swapon.c:735 #, fuzzy msgid " -p, --priority <prio> specify the priority of the swap device\n" msgstr " -p, --priority <级别> 将指定消息标记为此优先级\n" -#: sys-utils/swapon.c:739 +#: sys-utils/swapon.c:736 #, fuzzy msgid " -s, --summary display summary about used swap devices (DEPRECATED)\n" msgstr " -s, --getsz 以 512-字节扇区显示设备大小[已废弃]\n" -#: sys-utils/swapon.c:740 +#: sys-utils/swapon.c:737 msgid " --show[=<columns>] display summary in definable table\n" msgstr "" -#: sys-utils/swapon.c:741 +#: sys-utils/swapon.c:738 #, fuzzy msgid " --noheadings don't print table heading (with --show)\n" msgstr " --noheadings 不打印标题\n" -#: sys-utils/swapon.c:742 +#: sys-utils/swapon.c:739 #, fuzzy msgid " --raw use the raw output format (with --show)\n" msgstr " -r, --raw 使用原生输出格式\n" -#: sys-utils/swapon.c:743 +#: sys-utils/swapon.c:740 #, fuzzy msgid " --bytes display swap size in bytes in --show output\n" msgstr " --help 显示此帮助并退出\n" -#: sys-utils/swapon.c:744 +#: sys-utils/swapon.c:741 #, fuzzy msgid " -v, --verbose verbose mode\n" msgstr " -v, --verbose 详尽模式\n" -#: sys-utils/swapon.c:750 +#: sys-utils/swapon.c:747 msgid "" "\n" "The <spec> parameter:\n" @@ -14794,7 +15566,7 @@ msgstr "" " <设备> 要使用设备的名称\n" " <文件> 要使用文件的名称\n" -#: sys-utils/swapon.c:760 +#: sys-utils/swapon.c:757 #, fuzzy msgid "" "\n" @@ -14809,7 +15581,7 @@ msgstr "" " pages\t ：对释放的页在重新使用前丢弃\n" " * 如果未选择策略，则两者都将启用。(默认)\n" -#: sys-utils/swapon.c:765 +#: sys-utils/swapon.c:762 msgid "" "\n" "Available columns (for --show):\n" @@ -14817,11 +15589,11 @@ msgstr "" "\n" "可用列(用于 --show)：\n" -#: sys-utils/swapon.c:840 +#: sys-utils/swapon.c:837 msgid "failed to parse priority" msgstr "解析优先级失败" -#: sys-utils/swapon.c:859 +#: sys-utils/swapon.c:856 #, c-format msgid "unsupported discard policy: %s" msgstr "不支持的丢弃策略：%s" @@ -14835,7 +15607,7 @@ msgstr "找不到对应 %s 的设备" msgid "failed to open directory" msgstr "打开目录失败" -#: sys-utils/switch_root.c:67 term-utils/wall.c:305 +#: sys-utils/switch_root.c:67 msgid "stat failed" msgstr "stat 失败" @@ -14894,114 +15666,110 @@ msgstr "失败了。抱歉。" msgid "cannot access %s" msgstr "无法访问 %s" -#: sys-utils/tunelp.c:92 +#: sys-utils/tunelp.c:94 msgid "Set various parameters for the line printer.\n" msgstr "" -#: sys-utils/tunelp.c:95 +#: sys-utils/tunelp.c:97 msgid " -i, --irq <num> specify parallel port irq\n" msgstr " -i, --irq <数字> 指定并口中断号\n" -#: sys-utils/tunelp.c:96 +#: sys-utils/tunelp.c:98 msgid " -t, --time <ms> driver wait time in milliseconds\n" msgstr " -t, --time <毫秒数> 驱动等待时间(毫秒)\n" -#: sys-utils/tunelp.c:97 +#: sys-utils/tunelp.c:99 msgid " -c, --chars <num> number of output characters before sleep\n" msgstr " -c, --chars <数字> 睡眠前输出的字符数\n" -#: sys-utils/tunelp.c:98 +#: sys-utils/tunelp.c:100 msgid " -w, --wait <us> strobe wait in micro seconds\n" msgstr " -w, --wait <微秒数> 选通(strobe)信号等待时间(微秒)\n" #. TRANSLATORS: do not translate <on|off> arguments. The #. argument reader does not recognize locale, unless `on' is #. exactly that very same string. -#: sys-utils/tunelp.c:102 +#: sys-utils/tunelp.c:104 msgid " -a, --abort <on|off> abort on error\n" msgstr " -a, --abort <on|off> 出错时中止\n" -#: sys-utils/tunelp.c:103 +#: sys-utils/tunelp.c:105 msgid " -o, --check-status <on|off> check printer status before printing\n" msgstr " -o, --check-status <on|off> 打印前检查打印机状态\n" -#: sys-utils/tunelp.c:104 +#: sys-utils/tunelp.c:106 msgid " -C, --careful <on|off> extra checking to status check\n" msgstr " -C, --careful <on|off> 进行状态检查外的其他检查\n" -#: sys-utils/tunelp.c:105 +#: sys-utils/tunelp.c:107 msgid " -s, --status query printer status\n" msgstr " -s, --status 查询打印机状态\n" -#: sys-utils/tunelp.c:106 +#: sys-utils/tunelp.c:108 msgid " -T, --trust-irq <on|off> make driver to trust irq\n" msgstr " -T, --trust-irq <on|off> 将驱动设置为信任的中断\n" -#: sys-utils/tunelp.c:107 +#: sys-utils/tunelp.c:109 msgid " -r, --reset reset the port\n" msgstr " -r, --reset 重置端口\n" -#: sys-utils/tunelp.c:108 +#: sys-utils/tunelp.c:110 msgid " -q, --print-irq <on|off> display current irq setting\n" msgstr " -q, --print-irq <on|off> 显示当前的中断设置\n" -#: sys-utils/tunelp.c:121 -msgid "bad value" -msgstr "错误值" - -#: sys-utils/tunelp.c:284 +#: sys-utils/tunelp.c:261 #, c-format msgid "%s not an lp device" msgstr "%s 不是循环设备" -#: sys-utils/tunelp.c:304 +#: sys-utils/tunelp.c:280 msgid "LPGETSTATUS error" msgstr "LPGETSTATUS 出错" -#: sys-utils/tunelp.c:309 +#: sys-utils/tunelp.c:285 #, c-format msgid "%s status is %d" msgstr "%s 状态为 %d" -#: sys-utils/tunelp.c:311 +#: sys-utils/tunelp.c:287 #, c-format msgid ", busy" msgstr "，忙碌" -#: sys-utils/tunelp.c:313 +#: sys-utils/tunelp.c:289 #, c-format msgid ", ready" msgstr "，就绪" -#: sys-utils/tunelp.c:315 +#: sys-utils/tunelp.c:291 #, c-format msgid ", out of paper" msgstr "，缺页" -#: sys-utils/tunelp.c:317 +#: sys-utils/tunelp.c:293 #, c-format msgid ", on-line" msgstr "，在线" -#: sys-utils/tunelp.c:319 +#: sys-utils/tunelp.c:295 #, c-format msgid ", error" msgstr "，错误" -#: sys-utils/tunelp.c:325 +#: sys-utils/tunelp.c:300 msgid "ioctl failed" msgstr "ioctl 失败" -#: sys-utils/tunelp.c:335 +#: sys-utils/tunelp.c:310 msgid "LPGETIRQ error" msgstr "LPGETIRQ 出错" -#: sys-utils/tunelp.c:340 +#: sys-utils/tunelp.c:315 #, c-format msgid "%s using IRQ %d\n" msgstr "%s 使用中断请求 %d\n" -#: sys-utils/tunelp.c:342 +#: sys-utils/tunelp.c:317 #, c-format msgid "%s using polling\n" msgstr "%s 使用轮询\n" @@ -15169,75 +15937,102 @@ msgstr "%s：找不到" msgid "%s: failed to determine source (--all-targets is unsupported on systems with regular mtab file)." msgstr "%s：确定源失败(有常规 mtab 文件的系统不支持 --all-targets)" -#: sys-utils/unshare.c:62 +#: sys-utils/unshare.c:85 #, fuzzy, c-format msgid "unsupported --setgroups argument '%s'" msgstr "不支持的参数：%s" -#: sys-utils/unshare.c:83 sys-utils/unshare.c:98 +#: sys-utils/unshare.c:106 sys-utils/unshare.c:121 #, c-format msgid "write failed %s" msgstr "写失败：%s" -#: sys-utils/unshare.c:112 +#: sys-utils/unshare.c:144 +#, fuzzy, c-format +msgid "unsupported propagation mode: %s" +msgstr "不支持的参数格式：%s" + +#: sys-utils/unshare.c:153 +#, fuzzy +msgid "cannot change root filesystem propagation" +msgstr "正在检查所有文件系统。\n" + +#: sys-utils/unshare.c:198 +#, fuzzy, c-format +msgid "cannot stat %s" +msgstr "无法 seek" + +#: sys-utils/unshare.c:236 msgid "Run a program with some namespaces unshared from the parent.\n" msgstr "" -#: sys-utils/unshare.c:115 -msgid " -m, --mount unshare mounts namespace\n" -msgstr " -m, --mount 取消共享挂载名字空间\n" +#: sys-utils/unshare.c:239 +#, fuzzy +msgid " -m, --mount[=<file>] unshare mounts namespace\n" +msgstr " -m, --mount [=<文件>] 进入挂臷名字空间\n" -#: sys-utils/unshare.c:116 -msgid " -u, --uts unshare UTS namespace (hostname etc)\n" -msgstr " -u, --uts 取消共享 UTS 名字空间(主机名等)\n" +#: sys-utils/unshare.c:240 +#, fuzzy +msgid " -u, --uts[=<file>] unshare UTS namespace (hostname etc)\n" +msgstr " -u, --uts [=<文件>] 进入 UTS 名字空间(主机名等)\n" -#: sys-utils/unshare.c:117 -msgid " -i, --ipc unshare System V IPC namespace\n" -msgstr " -i, --ipc 取消共享 System V IPC 名字空间\n" +#: sys-utils/unshare.c:241 +#, fuzzy +msgid " -i, --ipc[=<file>] unshare System V IPC namespace\n" +msgstr " -i, --ipc [=<文件>] 进入系统 V IPC 名字空间\n" -#: sys-utils/unshare.c:118 -msgid " -n, --net unshare network namespace\n" -msgstr " -n, --net 取消共享网络名字空间\n" +#: sys-utils/unshare.c:242 +#, fuzzy +msgid " -n, --net[=<file>] unshare network namespace\n" +msgstr " -n, --net [=<文件>] 进入网络名字空间\n" -#: sys-utils/unshare.c:119 -msgid " -p, --pid unshare pid namespace\n" -msgstr " -p, --pid 取消共享 pid 名字空间\n" +#: sys-utils/unshare.c:243 +#, fuzzy +msgid " -p, --pid[=<file>] unshare pid namespace\n" +msgstr " -p, --pid [=<文件>] 进入 pid 名字空间\n" -#: sys-utils/unshare.c:120 -msgid " -U, --user unshare user namespace\n" -msgstr " -U, --user 取消共享用户名字空间\n" +#: sys-utils/unshare.c:244 +#, fuzzy +msgid " -U, --user[=<file>] unshare user namespace\n" +msgstr " -U, --user [=<文件>] 进入用户名字空间\n" -#: sys-utils/unshare.c:121 +#: sys-utils/unshare.c:245 msgid " -f, --fork fork before launching <program>\n" msgstr " -f, --fork 在启动<程序>前 fork\n" -#: sys-utils/unshare.c:122 +#: sys-utils/unshare.c:246 msgid " --mount-proc[=<dir>] mount proc filesystem first (implies --mount)\n" msgstr " --mount-proc[=<目录>] 先挂载 proc 文件系统(连带打开 --mount)\n" -#: sys-utils/unshare.c:123 +#: sys-utils/unshare.c:247 msgid " -r, --map-root-user map current user to root (implies --user)\n" msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n" -#: sys-utils/unshare.c:124 +#: sys-utils/unshare.c:248 +msgid "" +" --propagation <slave|shared|private|unchanged>\n" +" modify mount propagation in mount namespace\n" +msgstr "" + +#: sys-utils/unshare.c:250 #, fuzzy msgid " -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n" msgstr " -G, --setgid <gid> 在用户名字空间中设置 gid\n" -#: sys-utils/unshare.c:213 +#: sys-utils/unshare.c:364 msgid "unshare failed" msgstr "unshare 失败" -#: sys-utils/unshare.c:231 +#: sys-utils/unshare.c:402 msgid "child exit failed" msgstr "子进程退出失败" -#: sys-utils/unshare.c:237 +#: sys-utils/unshare.c:409 #, fuzzy msgid "options --setgroups=allow and --map-root-user are mutually exclusive" msgstr "选项 --{shell,fast,command,session-command,login} 和 --user 互斥" -#: sys-utils/unshare.c:254 +#: sys-utils/unshare.c:429 #, c-format msgid "mount %s failed" msgstr "挂载 %s 失败" @@ -15413,41 +16208,58 @@ msgstr "标识：" msgid "version" msgstr "版本：" -#: sys-utils/zramctl.c:67 +#: sys-utils/zramctl.c:71 #, fuzzy msgid "zram device name" msgstr "设备名" -#: sys-utils/zramctl.c:68 +#: sys-utils/zramctl.c:72 msgid "limit on the uncompressed amount of data" msgstr "" -#: sys-utils/zramctl.c:69 +#: sys-utils/zramctl.c:73 msgid "uncompressed size of stored data" msgstr "" -#: sys-utils/zramctl.c:70 +#: sys-utils/zramctl.c:74 msgid "compressed size of stored data" msgstr "" -#: sys-utils/zramctl.c:71 +#: sys-utils/zramctl.c:75 msgid "the selected compression algorithm" msgstr "" -#: sys-utils/zramctl.c:72 +#: sys-utils/zramctl.c:76 msgid "number of concurrent compress operations" msgstr "" -#: sys-utils/zramctl.c:73 +#: sys-utils/zramctl.c:77 #, fuzzy msgid "empty pages with no allocated memory" msgstr "分配内存失败：%m" -#: sys-utils/zramctl.c:74 +#: sys-utils/zramctl.c:78 msgid "all memory including allocator fragmentation and metadata overhead" msgstr "" -#: sys-utils/zramctl.c:376 +#: sys-utils/zramctl.c:79 +msgid "memory limit used to store compressed data" +msgstr "" + +#: sys-utils/zramctl.c:80 +msgid "memory zram have consumed to store compressed data" +msgstr "" + +#: sys-utils/zramctl.c:81 +msgid "number of objects migrated migrated by compaction" +msgstr "" + +#: sys-utils/zramctl.c:297 sys-utils/zramctl.c:308 +#, fuzzy +msgid "Failed to parse mm_stat" +msgstr "解析 起点 失败" + +#: sys-utils/zramctl.c:455 #, fuzzy, c-format msgid "" " %1$s [options] <device>\n" @@ -15457,229 +16269,234 @@ msgstr "" " %1$s [选项] [<回环设备>]\n" " %1$s [选项] -f | <回环设备> <文件>\n" -#: sys-utils/zramctl.c:382 +#: sys-utils/zramctl.c:461 msgid "Set up and control zram devices.\n" msgstr "" -#: sys-utils/zramctl.c:385 +#: sys-utils/zramctl.c:464 msgid " -a, --algorithm lzo|lz4 compression algorithm to use\n" msgstr "" -#: sys-utils/zramctl.c:386 +#: sys-utils/zramctl.c:465 #, fuzzy msgid " -b, --bytes print sizes in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n" -#: sys-utils/zramctl.c:387 +#: sys-utils/zramctl.c:466 #, fuzzy msgid " -f, --find find a free device\n" msgstr " -f, --find 查找第一个未使用的设备\n" -#: sys-utils/zramctl.c:388 +#: sys-utils/zramctl.c:467 #, fuzzy msgid " -n, --noheadings don't print headings\n" msgstr " -n, --noheadings 不打印标题\n" -#: sys-utils/zramctl.c:389 +#: sys-utils/zramctl.c:468 #, fuzzy msgid " -o, --output <list> columns to use for status output\n" msgstr " -o, --output[=<列表>] 定义要输出的列\n" -#: sys-utils/zramctl.c:390 +#: sys-utils/zramctl.c:469 #, fuzzy msgid " --raw use raw status output format\n" msgstr " --raw 使用原生 --list 输出格式\n" -#: sys-utils/zramctl.c:391 +#: sys-utils/zramctl.c:470 #, fuzzy msgid " -r, --reset reset all specified devices\n" msgstr " -D, --detach-all 断开所有使用的设备\n" -#: sys-utils/zramctl.c:392 +#: sys-utils/zramctl.c:471 #, fuzzy msgid " -s, --size <size> device size\n" msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n" -#: sys-utils/zramctl.c:393 +#: sys-utils/zramctl.c:472 #, fuzzy msgid " -t, --streams <number> number of compression streams\n" msgstr " -s, --sectors <数字> 设置要使用的扇区数\n" -#: sys-utils/zramctl.c:459 +#: sys-utils/zramctl.c:538 #, fuzzy, c-format msgid "unsupported algorithm: %s" msgstr "不支持的参数：%s" -#: sys-utils/zramctl.c:481 +#: sys-utils/zramctl.c:560 #, fuzzy msgid "failed to parse streams" msgstr "解析 起点 失败" -#: sys-utils/zramctl.c:503 +#: sys-utils/zramctl.c:582 #, fuzzy msgid "option --find is mutually exclusive with <device>" msgstr "--pid 和 命令 互相排斥" -#: sys-utils/zramctl.c:509 +#: sys-utils/zramctl.c:588 #, fuzzy msgid "only one <device> at a time is allowed" msgstr "当前只支持一个设备参数" -#: sys-utils/zramctl.c:512 +#: sys-utils/zramctl.c:591 msgid "options --algorithm and --streams must be combined with --size" msgstr "" -#: sys-utils/zramctl.c:542 sys-utils/zramctl.c:570 +#: sys-utils/zramctl.c:621 sys-utils/zramctl.c:649 #, fuzzy, c-format msgid "%s: failed to reset" msgstr "%s：解析失败" -#: sys-utils/zramctl.c:552 sys-utils/zramctl.c:560 +#: sys-utils/zramctl.c:631 sys-utils/zramctl.c:639 msgid "no free zram device found" msgstr "" -#: sys-utils/zramctl.c:574 +#: sys-utils/zramctl.c:653 #, fuzzy, c-format msgid "%s: failed to set number of streams" msgstr "解析行数失败" -#: sys-utils/zramctl.c:578 +#: sys-utils/zramctl.c:657 #, fuzzy, c-format msgid "%s: failed to set algorithm" msgstr "%s：设置后备文件失败" -#: sys-utils/zramctl.c:581 +#: sys-utils/zramctl.c:660 #, fuzzy, c-format msgid "%s: failed to set disksize (%ju bytes)" msgstr "%s：获取 整盘 设备号失败" -#: term-utils/agetty.c:446 +#: term-utils/agetty.c:449 #, c-format msgid "%s%s (automatic login)\n" msgstr "%s%s (自动登录)\n" -#: term-utils/agetty.c:500 +#: term-utils/agetty.c:503 #, c-format msgid "%s: can't change root directory %s: %m" msgstr "%s：无法更改根目录 %s：%m" -#: term-utils/agetty.c:505 +#: term-utils/agetty.c:508 #, c-format msgid "%s: can't change working directory %s: %m" msgstr "%s：无法更改工作目录 %s：%m" -#: term-utils/agetty.c:510 +#: term-utils/agetty.c:513 #, c-format msgid "%s: can't change process priority: %m" msgstr "%s：无法更改进程优先级：%m" -#: term-utils/agetty.c:521 +#: term-utils/agetty.c:524 #, c-format msgid "%s: can't exec %s: %m" msgstr "%s：无法执行 %s：%m" -#: term-utils/agetty.c:552 term-utils/agetty.c:839 term-utils/agetty.c:851 -#: term-utils/agetty.c:1408 term-utils/agetty.c:1426 term-utils/agetty.c:1458 -#: term-utils/agetty.c:1468 term-utils/agetty.c:1505 term-utils/agetty.c:1853 -#: term-utils/agetty.c:2371 +#: term-utils/agetty.c:555 term-utils/agetty.c:842 term-utils/agetty.c:854 +#: term-utils/agetty.c:1411 term-utils/agetty.c:1429 term-utils/agetty.c:1464 +#: term-utils/agetty.c:1474 term-utils/agetty.c:1511 term-utils/agetty.c:1965 +#: term-utils/agetty.c:2487 #, c-format msgid "failed to allocate memory: %m" msgstr "分配内存失败：%m" -#: term-utils/agetty.c:716 +#: term-utils/agetty.c:719 msgid "invalid argument of --local-line" msgstr "--local-line 选项参数无效" -#: term-utils/agetty.c:748 +#: term-utils/agetty.c:751 #, c-format msgid "bad timeout value: %s" msgstr "超时值有误：%s" -#: term-utils/agetty.c:869 +#: term-utils/agetty.c:872 #, c-format msgid "bad speed: %s" msgstr "速度有误：%s" -#: term-utils/agetty.c:871 +#: term-utils/agetty.c:874 msgid "too many alternate speeds" msgstr "备选速度过多" -#: term-utils/agetty.c:999 term-utils/agetty.c:1016 term-utils/agetty.c:1056 +#: term-utils/agetty.c:1002 term-utils/agetty.c:1019 term-utils/agetty.c:1059 #, c-format msgid "/dev/%s: cannot open as standard input: %m" msgstr "/dev/%s：无法以标准输入打开：%m" -#: term-utils/agetty.c:1022 +#: term-utils/agetty.c:1025 #, c-format msgid "/dev/%s: not a character device" msgstr "/dev/%s：不是字符设备" -#: term-utils/agetty.c:1024 +#: term-utils/agetty.c:1027 #, c-format msgid "/dev/%s: not a tty" msgstr "/dev/%s：不是终端" -#: term-utils/agetty.c:1028 term-utils/agetty.c:1060 +#: term-utils/agetty.c:1031 term-utils/agetty.c:1063 #, c-format msgid "/dev/%s: cannot get controlling tty: %m" msgstr "/dev/%s：无法获取控制 tty：%m" -#: term-utils/agetty.c:1050 +#: term-utils/agetty.c:1053 #, c-format msgid "/dev/%s: vhangup() failed: %m" msgstr "/dev/%s：vhangup() 失败：%m" -#: term-utils/agetty.c:1071 +#: term-utils/agetty.c:1074 #, c-format msgid "%s: not open for read/write" msgstr "%s：未打开(就)读/写" -#: term-utils/agetty.c:1076 +#: term-utils/agetty.c:1079 #, c-format msgid "/dev/%s: cannot set process group: %m" msgstr "/dev/%s：无法设置进程组：%m" -#: term-utils/agetty.c:1090 +#: term-utils/agetty.c:1093 #, c-format msgid "%s: dup problem: %m" msgstr "%s：dup 问题：%m" -#: term-utils/agetty.c:1107 +#: term-utils/agetty.c:1110 #, c-format msgid "%s: failed to get terminal attributes: %m" msgstr "%s：获取终端属性失败：%m" -#: term-utils/agetty.c:1314 term-utils/agetty.c:1334 +#: term-utils/agetty.c:1317 term-utils/agetty.c:1337 #, c-format msgid "setting terminal attributes failed: %m" msgstr "设置终端属性失败：%m" -#: term-utils/agetty.c:1449 +#: term-utils/agetty.c:1454 +#, fuzzy +msgid "cannot open os-release file" +msgstr "不能打开锁文件 %s" + +#: term-utils/agetty.c:1632 #, fuzzy, c-format -msgid "cannot open %s: %m" -msgstr "无法打开 %s：%m" +msgid "failed to create reload file: %s: %m" +msgstr "读 typescript 文件 %s 失败" -#: term-utils/agetty.c:1555 +#: term-utils/agetty.c:1723 msgid "[press ENTER to login]" msgstr "[按 ENTER 键登录]" -#: term-utils/agetty.c:1571 +#: term-utils/agetty.c:1747 msgid "Num Lock off" msgstr "Num Lock 关" -#: term-utils/agetty.c:1574 +#: term-utils/agetty.c:1750 msgid "Num Lock on" msgstr "Num Lock 开" -#: term-utils/agetty.c:1577 +#: term-utils/agetty.c:1753 msgid "Caps Lock on" msgstr "Caps Lock 开" -#: term-utils/agetty.c:1580 +#: term-utils/agetty.c:1756 msgid "Scroll Lock on" msgstr "Scroll Lock 开" -#: term-utils/agetty.c:1583 +#: term-utils/agetty.c:1759 #, c-format msgid "" "Hint: %s\n" @@ -15688,32 +16505,32 @@ msgstr "" "提示：%s\n" "\n" -#: term-utils/agetty.c:1774 +#: term-utils/agetty.c:1886 #, c-format msgid "%s: read: %m" msgstr "%s：read：%m" -#: term-utils/agetty.c:1833 +#: term-utils/agetty.c:1945 #, c-format msgid "%s: input overrun" msgstr "%s：输入过载" -#: term-utils/agetty.c:1849 term-utils/agetty.c:1857 +#: term-utils/agetty.c:1961 term-utils/agetty.c:1969 #, c-format msgid "%s: invalid character conversion for login name" msgstr "%s：登录名字符转换无效" -#: term-utils/agetty.c:1863 +#: term-utils/agetty.c:1975 #, c-format msgid "%s: invalid character 0x%x in login name" msgstr "%s：登录名中的字符 0x%x 无效" -#: term-utils/agetty.c:1948 +#: term-utils/agetty.c:2060 #, c-format msgid "%s: failed to set terminal attributes: %m" msgstr "%s：设置终端属性失败：%m" -#: term-utils/agetty.c:1984 +#: term-utils/agetty.c:2096 #, c-format msgid "" " %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n" @@ -15722,164 +16539,164 @@ msgstr "" " %1$s [选项] <线路> [<波特率>,...] [<终端类型>]\n" " %1$s [选项] <波特率>,... <线路> [<终端类型>]\n" -#: term-utils/agetty.c:1988 +#: term-utils/agetty.c:2100 msgid "Open a terminal and set its mode.\n" msgstr "" -#: term-utils/agetty.c:1991 +#: term-utils/agetty.c:2103 msgid " -8, --8bits assume 8-bit tty\n" msgstr " -8, --8bits 采用 8 位 tty\n" -#: term-utils/agetty.c:1992 +#: term-utils/agetty.c:2104 msgid " -a, --autologin <user> login the specified user automatically\n" msgstr " -a, --autologin <用户> 以指定用户自动登录\n" -#: term-utils/agetty.c:1993 +#: term-utils/agetty.c:2105 msgid " -c, --noreset do not reset control mode\n" msgstr " -c, --noreset 不重置控制模式\n" -#: term-utils/agetty.c:1994 +#: term-utils/agetty.c:2106 msgid " -E, --remote use -r <hostname> for login(1)\n" msgstr " -E, --remote 使用 -r <主机名> 选项调用 login(1)\n" -#: term-utils/agetty.c:1995 +#: term-utils/agetty.c:2107 msgid " -f, --issue-file <file> display issue file\n" msgstr " -f, --issue-file <文件> 指定要显示的预登录消息(issue)文件\n" -#: term-utils/agetty.c:1996 +#: term-utils/agetty.c:2108 msgid " -h, --flow-control enable hardware flow control\n" msgstr " -h, --flow-control 启用硬件流控制\n" -#: term-utils/agetty.c:1997 +#: term-utils/agetty.c:2109 msgid " -H, --host <hostname> specify login host\n" msgstr " -H, --host <主机名> 指定登录主机\n" -#: term-utils/agetty.c:1998 +#: term-utils/agetty.c:2110 msgid " -i, --noissue do not display issue file\n" msgstr " -i, --noissue 不显示预登录消息(issue)文件\n" -#: term-utils/agetty.c:1999 +#: term-utils/agetty.c:2111 msgid " -I, --init-string <string> set init string\n" msgstr " -I, --init-string <字符串> 设置初始字符串\n" -#: term-utils/agetty.c:2000 +#: term-utils/agetty.c:2112 msgid " -J --noclear do not clear the screen before prompt\n" msgstr " -J --noclear 提示之前不清屏\n" -#: term-utils/agetty.c:2001 +#: term-utils/agetty.c:2113 msgid " -l, --login-program <file> specify login program\n" msgstr " -l, --login-program <文件> 指定登录程序\n" -#: term-utils/agetty.c:2002 +#: term-utils/agetty.c:2114 msgid " -L, --local-line[=<mode>] control the local line flag\n" msgstr " -L, --local-line[=<模式>] 控制本地线路标志\n" -#: term-utils/agetty.c:2003 +#: term-utils/agetty.c:2115 msgid " -m, --extract-baud extract baud rate during connect\n" msgstr " -m, --extract-baud 连接过程中提取波特率\n" -#: term-utils/agetty.c:2004 +#: term-utils/agetty.c:2116 msgid " -n, --skip-login do not prompt for login\n" msgstr " -n, --skip-login 不提示登录\n" -#: term-utils/agetty.c:2005 +#: term-utils/agetty.c:2117 msgid " -N --nonewline do not print a newline before issue\n" msgstr " -N --nonewline 预登录消息(issue)前不打印换行(newline)\n" -#: term-utils/agetty.c:2006 +#: term-utils/agetty.c:2118 msgid " -o, --login-options <opts> options that are passed to login\n" msgstr " -o, --login-options <选项> 传递给登录程序的选项\n" -#: term-utils/agetty.c:2007 +#: term-utils/agetty.c:2119 msgid " -p, --login-pause wait for any key before the login\n" msgstr " -p, --login-pause 登录前等待按下任意键来继续\n" -#: term-utils/agetty.c:2008 +#: term-utils/agetty.c:2120 msgid " -r, --chroot <dir> change root to the directory\n" msgstr " -r, --chroot <目录> 将根目录更改为指定目录\n" -#: term-utils/agetty.c:2009 +#: term-utils/agetty.c:2121 msgid " -R, --hangup do virtually hangup on the tty\n" msgstr " -R, --hangup 对 tty 执行虚拟挂起(virtual hangup)\n" -#: term-utils/agetty.c:2010 +#: term-utils/agetty.c:2122 msgid " -s, --keep-baud try to keep baud rate after break\n" msgstr " -s, --keep-baud 中断(break)后尝试保持波特率\n" -#: term-utils/agetty.c:2011 +#: term-utils/agetty.c:2123 msgid " -t, --timeout <number> login process timeout\n" msgstr " -t, --timeout <数字> 登录进程超时(秒)\n" -#: term-utils/agetty.c:2012 +#: term-utils/agetty.c:2124 msgid " -U, --detect-case detect uppercase terminal\n" msgstr " -U, --detect-case 检测纯大写终端\n" -#: term-utils/agetty.c:2013 +#: term-utils/agetty.c:2125 msgid " -w, --wait-cr wait carriage-return\n" msgstr " -w, --wait-cr 等待回车\n" -#: term-utils/agetty.c:2014 +#: term-utils/agetty.c:2126 msgid " --nohints do not print hints\n" msgstr " --nohints 不打印提示信息\n" -#: term-utils/agetty.c:2015 +#: term-utils/agetty.c:2127 msgid " --nohostname no hostname at all will be shown\n" msgstr " --nohostname 将完全不显示主机名\n" -#: term-utils/agetty.c:2016 +#: term-utils/agetty.c:2128 msgid " --long-hostname show full qualified hostname\n" msgstr " --long-hostname 显示完全限定主机名\n" -#: term-utils/agetty.c:2017 +#: term-utils/agetty.c:2129 msgid " --erase-chars <string> additional backspace chars\n" msgstr " --erase-chars <字符串> 附加的退格字符\n" -#: term-utils/agetty.c:2018 +#: term-utils/agetty.c:2130 msgid " --kill-chars <string> additional kill chars\n" msgstr " --kill-chars <字符串> 附加的杀死(kill)字符\n" -#: term-utils/agetty.c:2019 +#: term-utils/agetty.c:2131 msgid " --chdir <directory> chdir before the login\n" msgstr " --chdir <目录> 登录前切换目录(chdir)\n" -#: term-utils/agetty.c:2020 +#: term-utils/agetty.c:2132 msgid " --delay <number> sleep seconds before prompt\n" msgstr " --delay <数字> 提示前睡眠的秒数\n" -#: term-utils/agetty.c:2021 +#: term-utils/agetty.c:2133 msgid " --nice <number> run login with this priority\n" msgstr " --nice <数字> 以指定优先级运行 login\n" -#: term-utils/agetty.c:2022 +#: term-utils/agetty.c:2134 #, fuzzy msgid " --reload reload prompts on running agetty instances\n" msgstr " --nohints 不打印提示信息\n" -#: term-utils/agetty.c:2023 +#: term-utils/agetty.c:2135 msgid " --help display this help and exit\n" msgstr " --help 显示此帮助并退出\n" -#: term-utils/agetty.c:2024 +#: term-utils/agetty.c:2136 msgid " --version output version information and exit\n" msgstr " --version 输出版本信息并退出\n" -#: term-utils/agetty.c:2335 +#: term-utils/agetty.c:2447 #, c-format msgid "%d user" msgid_plural "%d users" msgstr[0] "%d 位用户" -#: term-utils/agetty.c:2459 +#: term-utils/agetty.c:2575 #, c-format msgid "checkname failed: %m" msgstr "checkname 失败：%m" -#: term-utils/agetty.c:2502 +#: term-utils/agetty.c:2618 #, fuzzy, c-format msgid "cannot touch file %s" msgstr "无法关闭文件 %s" -#: term-utils/agetty.c:2506 +#: term-utils/agetty.c:2622 msgid "--reload is unsupported on your system" msgstr "" @@ -15927,27 +16744,16 @@ msgstr "拒绝了写您的终端" msgid "invalid argument: %s" msgstr "无效参数：%s" -#: term-utils/script.c:134 -#, c-format -msgid "" -"output file `%s' is a link\n" -"Use --force if you really want to use it.\n" -"Program not started." -msgstr "" -"输出文件“%s”是链接\n" -"如果真想用它，使用 --force 选项。\n" -"程序没有启动。" - -#: term-utils/script.c:144 +#: term-utils/script.c:157 #, c-format msgid " %s [options] [file]\n" msgstr " %s [选项] [文件]\n" -#: term-utils/script.c:147 +#: term-utils/script.c:160 msgid "Make a typescript of a terminal session.\n" msgstr "" -#: term-utils/script.c:150 +#: term-utils/script.c:163 msgid "" " -a, --append append the output\n" " -c, --command <command> run command rather than interactive shell\n" @@ -15971,21 +16777,46 @@ msgstr "" " -h, --help 显示此帮助并退出\n" "\n" -#: term-utils/script.c:256 +#: term-utils/script.c:185 #, c-format -msgid "Script started, file is %s\n" -msgstr "脚本已启动，文件为 %s\n" +msgid "" +"output file `%s' is a link\n" +"Use --force if you really want to use it.\n" +"Program not started." +msgstr "" +"输出文件“%s”是链接\n" +"如果真想用它，使用 --force 选项。\n" +"程序没有启动。" -#: term-utils/script.c:451 +#: term-utils/script.c:197 #, c-format -msgid "Script started on %s" -msgstr "脚本启动于 %s" +msgid "Script done, file is %s\n" +msgstr "脚本完成，文件为 %s\n" -#: term-utils/script.c:493 +#: term-utils/script.c:258 msgid "cannot write script file" msgstr "无法写脚本文件" -#: term-utils/script.c:593 +#: term-utils/script.c:388 +#, fuzzy, c-format +msgid "" +"\n" +"Session terminated.\n" +msgstr "" +"\n" +"会话已终止，正在杀死 shell..." + +#: term-utils/script.c:429 +#, c-format +msgid "Script started on %s" +msgstr "脚本启动于 %s" + +#: term-utils/script.c:446 +#, fuzzy +msgid "poll failed" +msgstr "poll() 失败" + +#: term-utils/script.c:501 #, c-format msgid "" "\n" @@ -15994,23 +16825,23 @@ msgstr "" "\n" "脚本完成，于 %s" -#: term-utils/script.c:610 -#, c-format -msgid "Script done, file is %s\n" -msgstr "脚本完成，文件为 %s\n" - -#: term-utils/script.c:636 +#: term-utils/script.c:597 msgid "failed to get terminal attributes" msgstr "取终端属性失败" -#: term-utils/script.c:643 +#: term-utils/script.c:604 msgid "openpty failed" msgstr "openpty 失败" -#: term-utils/script.c:683 +#: term-utils/script.c:643 msgid "out of pty's" msgstr "pty 的输出" +#: term-utils/script.c:743 +#, c-format +msgid "Script started, file is %s\n" +msgstr "脚本已启动，文件为 %s\n" + #: term-utils/scriptreplay.c:42 #, c-format msgid " %s [-t] timingfile [typescript] [divisor]\n" @@ -16076,222 +16907,222 @@ msgstr "读时序文件 %s 失败" msgid "timings file %s: %lu: unexpected format" msgstr "时序文件 %s：%lu：格式异常" -#: term-utils/setterm.c:192 term-utils/setterm.c:220 term-utils/setterm.c:258 -#: term-utils/setterm.c:296 term-utils/setterm.c:315 term-utils/setterm.c:324 -#: term-utils/setterm.c:338 term-utils/setterm.c:372 term-utils/setterm.c:386 +#: term-utils/setterm.c:206 term-utils/setterm.c:244 term-utils/setterm.c:282 +#: term-utils/setterm.c:301 term-utils/setterm.c:310 term-utils/setterm.c:324 +#: term-utils/setterm.c:358 term-utils/setterm.c:372 #, c-format msgid "argument error: %s" msgstr "参数出错：%s" -#: term-utils/setterm.c:261 +#: term-utils/setterm.c:247 #, c-format msgid "argument error: bright %s is not supported" msgstr "参数错误：不支持亮度 %s" -#: term-utils/setterm.c:352 +#: term-utils/setterm.c:338 msgid "too many tabs" msgstr "标签过多" -#: term-utils/setterm.c:407 +#: term-utils/setterm.c:393 msgid "Set the attributes of a terminal.\n" msgstr "" -#: term-utils/setterm.c:410 +#: term-utils/setterm.c:396 msgid " --term <terminal_name> override TERM environment variable\n" msgstr " --term <终端名> 替换 TERM 环境变量\n" -#: term-utils/setterm.c:411 +#: term-utils/setterm.c:397 msgid " --reset reset terminal to power-on state\n" msgstr " --reset 重置端口到上电时的状态\n" -#: term-utils/setterm.c:412 +#: term-utils/setterm.c:398 msgid " --initialize display init string, and use default settings\n" msgstr " --initialize 显示初始化字符串，并使用默认设置\n" -#: term-utils/setterm.c:413 +#: term-utils/setterm.c:399 msgid " --default use default terminal settings\n" msgstr " --default 使用默认终端设置\n" -#: term-utils/setterm.c:414 +#: term-utils/setterm.c:400 msgid " --store save current terminal settings as default\n" msgstr " --store 将当前终端设置保存为默认值\n" -#: term-utils/setterm.c:415 +#: term-utils/setterm.c:401 msgid " --cursor [on|off] display cursor\n" msgstr " --cursor [on|off] 显示光标\n" -#: term-utils/setterm.c:416 +#: term-utils/setterm.c:402 msgid " --repeat [on|off] keyboard repeat\n" msgstr " --repeat [on|off] 键盘重复\n" -#: term-utils/setterm.c:417 +#: term-utils/setterm.c:403 msgid " --appcursorkeys [on|off] cursor key application mode\n" msgstr " --appcursorkeys [on|off] 光标键应用程序模式\n" -#: term-utils/setterm.c:418 +#: term-utils/setterm.c:404 msgid " --linewrap [on|off] continue on a new line when a line is full\n" msgstr " --linewrap [on|off] 一行满时在新行中继续\n" -#: term-utils/setterm.c:419 +#: term-utils/setterm.c:405 msgid " --inversescreen [on|off] swap colors for the whole screen\n" msgstr " --inversescreen [on|off] 交换整个屏幕的颜色\n" -#: term-utils/setterm.c:420 +#: term-utils/setterm.c:406 msgid " --foreground default|<color> set foreground color\n" msgstr " --foreground default|<颜色> 设置前景色\n" -#: term-utils/setterm.c:421 +#: term-utils/setterm.c:407 msgid " --background default|<color> set background color\n" msgstr " --background default|<颜色> 设置背景色\n" -#: term-utils/setterm.c:422 +#: term-utils/setterm.c:408 msgid " --ulcolor [bright] <color> set underlined text color\n" msgstr " --ulcolor [bright] <颜色> 设置下划线颜色\n" -#: term-utils/setterm.c:423 +#: term-utils/setterm.c:409 msgid " --hbcolor [bright] <color> set bold text color\n" msgstr " --hbcolor [bright] <颜色> 设置粗体字颜色\n" -#: term-utils/setterm.c:424 +#: term-utils/setterm.c:410 msgid " <color>: black blue cyan green grey magenta red white yellow\n" msgstr " <颜色>：black blue cyan green grey magenta red white yellow\n" -#: term-utils/setterm.c:425 +#: term-utils/setterm.c:411 msgid " --bold [on|off] bold\n" msgstr " --bold [on|off] 粗体\n" -#: term-utils/setterm.c:426 +#: term-utils/setterm.c:412 msgid " --half-bright [on|off] dim\n" msgstr " -half-bright [on|off] 变暗\n" -#: term-utils/setterm.c:427 +#: term-utils/setterm.c:413 msgid " --blink [on|off] blink\n" msgstr " --blink [on|off] 闪烁\n" -#: term-utils/setterm.c:428 +#: term-utils/setterm.c:414 msgid " --underline [on|off] underline\n" msgstr " --underline [on|off] 下划线\n" -#: term-utils/setterm.c:429 +#: term-utils/setterm.c:415 msgid " --reverse [on|off] swap foreground and background colors\n" msgstr " --reverse [on|off] 交换前景色和背景色\n" -#: term-utils/setterm.c:430 +#: term-utils/setterm.c:416 msgid " --clear [all|rest] clear screen and set cursor position\n" msgstr " --clear [all|rest] 清屏并设置光标位置\n" -#: term-utils/setterm.c:431 +#: term-utils/setterm.c:417 msgid " --tabs [<number>...] set these tab stop positions, or show them\n" msgstr " --tabs [<数字>...] 设置这些制表位置，或显示制表位\n" -#: term-utils/setterm.c:432 +#: term-utils/setterm.c:418 msgid " --clrtabs [<number>...] clear these tab stop positions, or all\n" msgstr " --clrtabs [<数字>...] 清除这些或所有制表位\n" -#: term-utils/setterm.c:433 +#: term-utils/setterm.c:419 msgid " --regtabs [1-160] set a regular tab stop interval\n" msgstr " --regtabs [1-160] 设置常规的制表位间隔\n" -#: term-utils/setterm.c:434 +#: term-utils/setterm.c:420 msgid " --blank [0-60|force|poke] set time of inactivity before screen blanks\n" msgstr " --blank [0-60|force|poke] 设置多久不活动后屏幕变空白\n" -#: term-utils/setterm.c:435 +#: term-utils/setterm.c:421 msgid " --dump [<number>] write vcsa<number> console dump to file\n" msgstr " --dump [<数字>] 将 vcsa<数字> 终端转储到文件\n" -#: term-utils/setterm.c:436 +#: term-utils/setterm.c:422 msgid " --append [<number>] append vcsa<number> console dump to file\n" msgstr " --append [<数字>] 将 vcsa<数字> 终端转储追加到文件\n" -#: term-utils/setterm.c:437 +#: term-utils/setterm.c:423 msgid " --file <filename> name of the dump file\n" msgstr " -f, --file <文件名> 转储文件的名字\n" -#: term-utils/setterm.c:438 +#: term-utils/setterm.c:424 msgid " --msg [on|off] send kernel messages to console\n" msgstr " --msg [on|off] 将内核消息发送到终端\n" -#: term-utils/setterm.c:439 +#: term-utils/setterm.c:425 msgid " --msglevel 0-8 kernel console log level\n" msgstr " --msglevel 0-8 内核终端日志记录级别\n" -#: term-utils/setterm.c:440 +#: term-utils/setterm.c:426 msgid " --powersave [on|vsync|hsync|powerdown|off]\n" msgstr " -powersave [on|vsync|hsync|powerdown|off]\n" -#: term-utils/setterm.c:441 +#: term-utils/setterm.c:427 msgid " set vesa powersaving features\n" msgstr " 设置 vesa 节能功能\n" -#: term-utils/setterm.c:442 +#: term-utils/setterm.c:428 msgid " --powerdown [0-60] set vesa powerdown interval in minutes\n" msgstr " --powerdown [0-60] 设置 vesa 关闭电源间隔(分钟)\n" -#: term-utils/setterm.c:443 +#: term-utils/setterm.c:429 msgid " --blength [0-2000] duration of the bell in milliseconds\n" msgstr " --blength [0-2000] 响铃持续时间(毫秒)\n" -#: term-utils/setterm.c:444 +#: term-utils/setterm.c:430 msgid " --bfreq <number> bell frequency in Hertz\n" msgstr " --bfreq <数字> 响铃频率，单位为 Hz\n" -#: term-utils/setterm.c:445 +#: term-utils/setterm.c:431 msgid " --version show version information and exit\n" msgstr " --version 输出版本信息并退出\n" -#: term-utils/setterm.c:446 +#: term-utils/setterm.c:432 msgid " --help display this help and exit\n" msgstr " --help 显示此帮助并退出\n" -#: term-utils/setterm.c:454 +#: term-utils/setterm.c:440 msgid "duplicate use of an option" msgstr "重复使用某选项" -#: term-utils/setterm.c:748 +#: term-utils/setterm.c:744 msgid "cannot force blank" msgstr "无法强制清空(blank)" -#: term-utils/setterm.c:753 +#: term-utils/setterm.c:749 msgid "cannot force unblank" msgstr "无法强制反清空(unblank)" -#: term-utils/setterm.c:759 +#: term-utils/setterm.c:755 msgid "cannot get blank status" msgstr "无法获取空白状态" -#: term-utils/setterm.c:785 +#: term-utils/setterm.c:781 #, c-format msgid "can not open dump file %s for output" msgstr "无法打开转储文件 %s 进行输出" -#: term-utils/setterm.c:828 +#: term-utils/setterm.c:824 #, c-format msgid "terminal %s does not support %s" msgstr "终端 %s 不支持 %s" -#: term-utils/setterm.c:1004 +#: term-utils/setterm.c:1000 msgid "cannot (un)set powersave mode" msgstr "无法设置(取消)节能模式" -#: term-utils/setterm.c:1023 term-utils/setterm.c:1032 +#: term-utils/setterm.c:1019 term-utils/setterm.c:1028 msgid "klogctl error" msgstr "klogctl 出错" -#: term-utils/setterm.c:1053 +#: term-utils/setterm.c:1049 msgid "$TERM is not defined." msgstr "$TERM 未定义。" -#: term-utils/setterm.c:1060 +#: term-utils/setterm.c:1056 msgid "terminfo database cannot be found" msgstr "找不到 terminfo 数据库" -#: term-utils/setterm.c:1062 +#: term-utils/setterm.c:1058 #, c-format msgid "%s: unknown terminal type" msgstr "%s：未知终端类型" -#: term-utils/setterm.c:1064 +#: term-utils/setterm.c:1060 msgid "terminal is hardcopy" msgstr "终端为硬拷贝(hardcopy)" @@ -16351,28 +17182,24 @@ msgstr "--nobanner 只有 root 能用" msgid "invalid timeout argument: %s" msgstr "无效的超时参数：%s" -#: term-utils/wall.c:214 +#: term-utils/wall.c:269 msgid "cannot get passwd uid" msgstr "无法获取 passwd uid" -#: term-utils/wall.c:219 +#: term-utils/wall.c:274 msgid "cannot get tty name" msgstr "无法获得 tty 名称" -#: term-utils/wall.c:237 +#: term-utils/wall.c:294 #, c-format msgid "Broadcast message from %s@%s (%s) (%s):" msgstr "来自 %s@%s (%s) (%s) 的广播消息：" -#: term-utils/wall.c:272 +#: term-utils/wall.c:327 #, c-format msgid "will not read %s - use stdin." msgstr "将不读 %s - 使用 stdin。" -#: term-utils/wall.c:311 -msgid "fread failed" -msgstr "fread 失败" - #: term-utils/write.c:82 #, c-format msgid " %s [options] <user> [<ttyname>]\n" @@ -16607,23 +17434,23 @@ msgstr " -x, --two-bytes-hex 双字节十六进制显示\n" msgid " -L, --color[=<mode>] interpret color formatting specifiers\n" msgstr " -L, --color[=<模式>] 解释颜色格式化限定符\n" -#: text-utils/hexdump.c:168 +#: text-utils/hexdump.c:170 msgid " -e, --format <format> format string to be used for displaying data\n" msgstr " -e, --format <格式> 用于显示数据的格式化字符串\n" -#: text-utils/hexdump.c:169 +#: text-utils/hexdump.c:171 msgid " -f, --format-file <file> file that contains format strings\n" msgstr " -f, --format-file <文件> 包含格式字符串的文件\n" -#: text-utils/hexdump.c:170 +#: text-utils/hexdump.c:172 msgid " -n, --length <length> interpret only length bytes of input\n" msgstr " -n, --length <长度> 只解释规定字节长度的输入\n" -#: text-utils/hexdump.c:171 +#: text-utils/hexdump.c:173 msgid " -s, --skip <offset> skip offset bytes from the beginning\n" msgstr " -s, --skip <偏移> 跳过开头的指定字节偏移\n" -#: text-utils/hexdump.c:172 +#: text-utils/hexdump.c:174 msgid " -v, --no-squeezing output identical lines\n" msgstr " -v, --no-squeezing 输出相同的行\n" @@ -17091,7 +17918,7 @@ msgstr "用法：%s [选项] [文件 ...]\n" msgid "Reverse lines characterwise.\n" msgstr "" -#: text-utils/tailf.c:114 +#: text-utils/tailf.c:116 #, c-format msgid "incomplete write to \"%s\" (written %zd, expected %zd)\n" msgstr "不完整写入“%s”(写入 %zd，应为 %zd)\n" @@ -17120,14 +17947,23 @@ msgstr " -C, --cylinders <数字> 指定柱面数\n" msgid " -<number> same as '-n <number>'\n" msgstr " -<数字> 显示行数\n" -#: text-utils/tailf.c:223 text-utils/tailf.c:264 +#: text-utils/tailf.c:210 +msgid "Warning: use of 'tailf' is deprecated, use 'tail -f' instead.\n" +msgstr "" + +#: text-utils/tailf.c:223 text-utils/tailf.c:263 msgid "failed to parse number of lines" msgstr "解析行数失败" -#: text-utils/tailf.c:276 +#: text-utils/tailf.c:275 msgid "no input file specified" msgstr "未指定输入文件" +#: text-utils/tailf.c:282 +#, fuzzy, c-format +msgid "%s: is not a file" +msgstr "%s：不是目录" + #: text-utils/ul.c:136 #, c-format msgid " %s [options] [<file> ...]\n" @@ -17163,6 +17999,213 @@ msgstr "输入中有未知转义序列：%o，%o" msgid "Input line too long." msgstr "输入行过长。" +#~ msgid " -v be verbose\n" +#~ msgstr " -v 详尽输出\n" + +#~ msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]" +#~ msgstr "用法：%s [-c | -l 文件名] [-nXX] [-iXX] /dev/name [块数]" + +#~ msgid "%s: bad inode size" +#~ msgstr "%s：不正确的 inode 大小" + +#~ msgid "will not try to make filesystem on '%s'" +#~ msgstr "将不会尝试在“%s”上创建文件系统" + +#~ msgid "type: %s" +#~ msgstr "类型：%s" + +#~ msgid "type: %d" +#~ msgstr "类型：%d" + +#~ msgid "disk: %.*s" +#~ msgstr "磁盘：%.*s" + +#~ msgid "label: %.*s" +#~ msgstr "标签：%.*s" + +#~ msgid "flags: %s" +#~ msgstr "标志：%s" + +#~ msgid "bytes/sector: %ld" +#~ msgstr "字节/扇区：%ld" + +#~ msgid "sectors/track: %ld" +#~ msgstr "扇区/磁道：%ld" + +#~ msgid "tracks/cylinder: %ld" +#~ msgstr "磁道/柱面：%ld" + +#~ msgid "sectors/cylinder: %ld" +#~ msgstr "扇区/柱面：%ld" + +#~ msgid "cylinders: %ld" +#~ msgstr "柱面：%ld" + +#~ msgid "rpm: %d" +#~ msgstr "转/分：%d" + +#~ msgid "interleave: %d" +#~ msgstr "交错：%d" + +#~ msgid "trackskew: %d" +#~ msgstr "磁道螺距：%d" + +#~ msgid "cylinderskew: %d" +#~ msgstr "柱面螺距：%d" + +#~ msgid "headswitch: %ld (milliseconds)" +#~ msgstr "磁头切换：%ld (毫秒)" + +#~ msgid "track-to-track seek: %ld (milliseconds)" +#~ msgstr "跨磁道定位：%ld (毫秒)" + +#~ msgid "partitions: %d" +#~ msgstr "分区数：%d" + +#~ msgid "You cannot change a partition into an extended one or vice versa. Delete it first." +#~ msgstr "您不能将分区更改为扩展分区或从扩展分区改回。请先删除该分区。" + +#~ msgid "" +#~ "Label geometry: %d heads, %llu sectors\n" +#~ " %llu cylinders, %d physical cylinders\n" +#~ " %d extra sects/cyl, interleave %d:1\n" +#~ msgstr "" +#~ "标签几何属性： %d 个磁头，%llu 个扇区\n" +#~ " %llu 个柱面，%d 个物理柱面\n" +#~ " %d 个额外扇区/柱面，交错 %d:1\n" + +#~ msgid "" +#~ "Label geometry: %d rpm, %d alternate and %d physical cylinders,\n" +#~ " %d extra sects/cyl, interleave %d:1" +#~ msgstr "" +#~ "标签任何属性：%d rpm, %d 个备用柱面和 %d 个物理柱面，\n" +#~ " %d 个额外扇区/柱面，交错 %d:1" + +#~ msgid "<none>" +#~ msgstr "<无>" + +#~ msgid "gettimeofday failed" +#~ msgstr "gettimeofday 失败" + +#~ msgid "sysinfo failed" +#~ msgstr "sysinfo 失败" + +#~ msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n" +#~ msgstr "用法：last [-#] [-f 文件] [-t tty] [-h 主机名] [用户 ...]\n" + +#~ msgid "%s: mmap failed" +#~ msgstr "%s：mmap 失败" + +#~ msgid " still logged in" +#~ msgstr " 仍然登录" + +#~ msgid "" +#~ "\n" +#~ "wtmp begins %s" +#~ msgstr "" +#~ "\n" +#~ "wtmp 开始 %s" + +#~ msgid "gethostname failed" +#~ msgstr "gethostname 失败" + +#~ msgid "" +#~ "\n" +#~ "interrupted %10.10s %5.5s \n" +#~ msgstr "" +#~ "\n" +#~ "中断了 %10.10s %5.5s \n" + +#~ msgid "" +#~ "\n" +#~ "Scheduling policies:\n" +#~ " -b | --batch set policy to SCHED_BATCH\n" +#~ " -f | --fifo set policy to SCHED_FIFO\n" +#~ " -i | --idle set policy to SCHED_IDLE\n" +#~ " -o | --other set policy to SCHED_OTHER\n" +#~ " -r | --rr set policy to SCHED_RR (default)\n" +#~ msgstr "" +#~ "\n" +#~ "调度策略：\n" +#~ " -b | --batch 设置为 SCHED_BATCH 策略\n" +#~ " -f | --fifo 设置为 SCHED_FIFO 策略\n" +#~ " -i | --idle 设置为 SCHED_IDLE 策略\n" +#~ " -o | --other 设置为 SCHED_OTHER 策略\n" +#~ " -r | --rr 设置为 SCHED_RR 策略(默认)\n" + +#~ msgid "" +#~ "\n" +#~ "Options:\n" +#~ " -a | --all-tasks operate on all the tasks (threads) for a given pid\n" +#~ " -h | --help display this help\n" +#~ " -m | --max show min and max valid priorities\n" +#~ " -p | --pid operate on existing given pid\n" +#~ " -v | --verbose display status information\n" +#~ " -V | --version output version information\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "选项：\n" +#~ " -a | --all-tasks 在给定 pid 的所有任务(线程)上操作\n" +#~ " -h | --help 显示此帮助\n" +#~ " -m | --max 显示最小和最大有效优先级\n" +#~ " -p | --pid 在存在的指定 pid 上操作\n" +#~ " -v | --verbose 显示状态信息\n" +#~ " -V | --version 输出版本信息\n" +#~ "\n" + +#~ msgid "invalid argument to --auto/-a option" +#~ msgstr "--auto/-a 选项参数无效" + +#~ msgid "invalid argument to --manualeject/-i option" +#~ msgstr "--manualeject/-i 选项的参数无效" + +#~ msgid "Sorry, only the superuser can change the System Clock." +#~ msgstr "抱歉，只有超级用户才能设置系统时钟。" + +#~ msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel." +#~ msgstr "抱歉，只有超级用户才能更改内核中的硬件时钟纪元(epoch)。" + +#~ msgid "read() to %s to wait for clock tick failed" +#~ msgstr "对 %s read() 以等待时钟嘀嗒失败" + +#~ msgid "set rtc alarm failed" +#~ msgstr "设置 rtc 闹钟失败" + +#~ msgid "enable rtc alarm failed" +#~ msgstr "启用 rtc 闹钟失败" + +#~ msgid "suspend to \"%s\" unavailable" +#~ msgstr "挂起到“%s”不可用" + +#~ msgid "bad value" +#~ msgstr "错误值" + +#~ msgid " -m, --mount unshare mounts namespace\n" +#~ msgstr " -m, --mount 取消共享挂载名字空间\n" + +#~ msgid " -u, --uts unshare UTS namespace (hostname etc)\n" +#~ msgstr " -u, --uts 取消共享 UTS 名字空间(主机名等)\n" + +#~ msgid " -i, --ipc unshare System V IPC namespace\n" +#~ msgstr " -i, --ipc 取消共享 System V IPC 名字空间\n" + +#~ msgid " -n, --net unshare network namespace\n" +#~ msgstr " -n, --net 取消共享网络名字空间\n" + +#~ msgid " -p, --pid unshare pid namespace\n" +#~ msgstr " -p, --pid 取消共享 pid 名字空间\n" + +#~ msgid " -U, --user unshare user namespace\n" +#~ msgstr " -U, --user 取消共享用户名字空间\n" + +#, fuzzy +#~ msgid "cannot open %s: %m" +#~ msgstr "无法打开 %s：%m" + +#~ msgid "fread failed" +#~ msgstr "fread 失败" + #~ msgid "Minimal size is %ju" #~ msgstr "最小为 %ju" @@ -18571,9 +19614,6 @@ msgstr "输入行过长。" #~ msgid "Cannot change the type of an empty partition" #~ msgstr "无法更改空分区的类型" -#~ msgid "Illegal command" -#~ msgstr "非法命令" - #~ msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n" #~ msgstr "版权所有 (C) 1994-2002 Kevin E. Martin & aeb\n" @@ -18607,12 +19647,6 @@ msgstr "输入行过长。" #~ msgid " -h print this help text\n" #~ msgstr " -h 显示此帮助并退出\n" -#~ msgid " -v print program version\n" -#~ msgstr " -v 打印程序版本\n" - -#~ msgid "list extended partitions" -#~ msgstr "列出扩展分区" - #~ msgid "\n" #~ msgstr "\n" @@ -18666,9 +19700,6 @@ msgstr "输入行过长。" #~ msgid "System" #~ msgstr "系统" -#~ msgid "BIOS boot partition" -#~ msgstr "BIOS 启动分区" - #~ msgid "Partition %zd is already defined. Delete it before re-adding it." #~ msgstr "分区 %zd 已定义。请删除它再重新添加。" @@ -19602,9 +20633,6 @@ msgstr "输入行过长。" #~ msgid "Error writing screendump" #~ msgstr "写屏幕转储失败" -#~ msgid "Couldn't read %s" -#~ msgstr "无法读 %s" - #~ msgid "Couldn't read neither /dev/vcsa0 nor /dev/vcsa" #~ msgstr "无法读 /dev/vcsa0 或 /dev/vcsa" @@ -19985,9 +21013,6 @@ msgstr "输入行过长。" #~ msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n" #~ msgstr "ID=%02x\t起始=%d\t长度=%d\n" -#~ msgid "Usage:" -#~ msgstr "用法：" - #~ msgid "" #~ "Done\n" #~ "\n" |