diff options
| author | Karel Zak | 2016-03-10 15:19:25 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-03-10 15:19:25 +0100 |
| commit | b5ef1472826302603e2c65da2fcaa94aa971cba8 (patch) | |
| tree | c995e43ac8831d45db744363235a475758392a4a /po/zh_CN.po | |
| parent | po: update zh_CN.po (from translationproject.org) (diff) | |
| download | kernel-qcow2-util-linux-b5ef1472826302603e2c65da2fcaa94aa971cba8.tar.gz kernel-qcow2-util-linux-b5ef1472826302603e2c65da2fcaa94aa971cba8.tar.xz kernel-qcow2-util-linux-b5ef1472826302603e2c65da2fcaa94aa971cba8.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 | 5870 |
1 files changed, 2927 insertions, 2943 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 851c222f1..de2484cba 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: util-linux-2.27-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2015-08-24 12:44+0200\n" +"POT-Creation-Date: 2016-03-10 14:40+0100\n" "PO-Revision-Date: 2015-10-17 09:39+0800\n" "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -32,39 +32,41 @@ msgid "Tell the kernel about the existence of a specified partition.\n" msgstr "通知内核，存在某个指定分区。\n" #: disk-utils/addpart.c:56 disk-utils/blockdev.c:276 disk-utils/blockdev.c:420 -#: disk-utils/blockdev.c:446 disk-utils/cfdisk.c:2629 disk-utils/delpart.c:57 -#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:704 disk-utils/fdisk.c:956 +#: disk-utils/blockdev.c:446 disk-utils/cfdisk.c:2627 disk-utils/delpart.c:57 +#: disk-utils/fdformat.c:227 disk-utils/fdisk.c:710 disk-utils/fdisk.c:970 #: 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/fdisk-list.c:358 disk-utils/fsck.c:1448 +#: disk-utils/fsck.cramfs.c:149 disk-utils/fsck.cramfs.c:506 +#: disk-utils/isosize.c:134 disk-utils/mkfs.bfs.c:189 #: disk-utils/mkfs.cramfs.c:164 disk-utils/mkfs.cramfs.c:655 -#: disk-utils/mkfs.cramfs.c:782 disk-utils/mkfs.minix.c:829 -#: disk-utils/mkswap.c:216 disk-utils/mkswap.c:255 disk-utils/partx.c:953 -#: disk-utils/resizepart.c:101 disk-utils/sfdisk.c:426 disk-utils/sfdisk.c:482 -#: disk-utils/sfdisk.c:536 disk-utils/sfdisk.c:595 disk-utils/sfdisk.c:662 -#: disk-utils/sfdisk.c:696 disk-utils/sfdisk.c:1192 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 +#: disk-utils/mkfs.cramfs.c:782 disk-utils/mkfs.minix.c:823 +#: disk-utils/mkswap.c:215 disk-utils/mkswap.c:244 disk-utils/partx.c:952 +#: disk-utils/resizepart.c:101 disk-utils/sfdisk.c:630 disk-utils/sfdisk.c:686 +#: disk-utils/sfdisk.c:740 disk-utils/sfdisk.c:799 disk-utils/sfdisk.c:863 +#: disk-utils/sfdisk.c:904 disk-utils/sfdisk.c:934 disk-utils/sfdisk.c:968 +#: disk-utils/sfdisk.c:1466 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:255 login-utils/vipw.c:273 -#: 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 +#: misc-utils/findmnt.c:1121 misc-utils/logger.c:1178 misc-utils/mcookie.c:115 +#: misc-utils/uuidd.c:207 sys-utils/blkdiscard.c:183 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/fsfreeze.c:128 sys-utils/fstrim.c:72 sys-utils/hwclock.c:280 #: sys-utils/hwclock-cmos.c:638 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:270 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:2597 -#: term-utils/agetty.c:2621 term-utils/script.c:416 term-utils/script.c:422 -#: term-utils/script.c:424 term-utils/script.c:512 +#: sys-utils/ldattach.c:388 sys-utils/nsenter.c:124 sys-utils/rtcwake.c:135 +#: sys-utils/rtcwake.c:269 sys-utils/setpriv.c:230 sys-utils/setpriv.c:529 +#: sys-utils/setpriv.c:552 sys-utils/swapon.c:352 sys-utils/swapon.c:488 +#: sys-utils/switch_root.c:163 sys-utils/unshare.c:105 sys-utils/unshare.c:120 +#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2616 +#: term-utils/agetty.c:2640 term-utils/mesg.c:127 term-utils/script.c:420 +#: term-utils/script.c:426 term-utils/script.c:428 term-utils/script.c:516 #: 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:67 text-utils/tailf.c:101 text-utils/ul.c:225 +#: term-utils/wall.c:331 text-utils/colcrt.c:275 text-utils/more.c:518 +#: text-utils/rev.c:142 text-utils/tailf.c:67 text-utils/tailf.c:101 +#: text-utils/ul.c:225 #, c-format msgid "cannot open %s" msgstr "打不开 %s" @@ -218,14 +220,13 @@ msgstr "%s 失败.\n" msgid "%s succeeded.\n" msgstr "%s 成功.\n" -#: disk-utils/blockdev.c:457 misc-utils/lsblk.c:1175 misc-utils/lsblk.c:1182 +#: disk-utils/blockdev.c:457 #, c-format msgid "%s: failed to initialize sysfs handler" msgstr "%s：初始化 sysfs 处理函数失败" #: disk-utils/blockdev.c:461 #, fuzzy, c-format -#| msgid "%s: failed to read partition table" msgid "%s: failed to read partition start from sysfs" msgstr "%s：读取分区表失败" @@ -266,9 +267,9 @@ msgstr "退出" msgid "Quit program without writing partition table" msgstr "退出程序而不写入分区表" -#: disk-utils/cfdisk.c:184 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1016 -#: libfdisk/src/dos.c:2306 libfdisk/src/gpt.c:2765 libfdisk/src/sgi.c:1162 -#: libfdisk/src/sun.c:1113 +#: disk-utils/cfdisk.c:184 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1020 +#: libfdisk/src/dos.c:2308 libfdisk/src/gpt.c:2776 libfdisk/src/sgi.c:1161 +#: libfdisk/src/sun.c:1116 msgid "Type" msgstr "类型" @@ -308,399 +309,372 @@ msgstr "转储" msgid "Dump partition table to sfdisk compatible script file" msgstr "将分区表转储到与 sfdisk 兼容的脚本文件" -#: disk-utils/cfdisk.c:627 disk-utils/fdisk.c:406 +#: disk-utils/cfdisk.c:617 disk-utils/fdisk.c:412 #, c-format msgid "internal error: unsupported dialog type %d" msgstr "内部错误：不支持的对话类型 %d" -#: disk-utils/cfdisk.c:1257 +#: disk-utils/cfdisk.c:1247 #, fuzzy, c-format -#| msgid "%s unmounted" msgid "%s (mounted)" msgstr "%s 未挂载" -#: disk-utils/cfdisk.c:1277 +#: disk-utils/cfdisk.c:1267 #, fuzzy -#| msgid "partition name" msgid "Partition name:" msgstr "分区名" -#: disk-utils/cfdisk.c:1282 +#: disk-utils/cfdisk.c:1272 #, fuzzy -#| msgid "partition UUID" msgid "Partition UUID:" msgstr "分区 UUID" -#: disk-utils/cfdisk.c:1292 +#: disk-utils/cfdisk.c:1282 #, fuzzy -#| msgid "Partition type" msgid "Partition type:" msgstr "分区类型" -#: disk-utils/cfdisk.c:1299 +#: disk-utils/cfdisk.c:1289 #, fuzzy -#| msgid "Attrs" msgid "Attributes:" msgstr "属性" -#: disk-utils/cfdisk.c:1342 +#: disk-utils/cfdisk.c:1332 #, fuzzy -#| msgid "mail system" msgid "Filesystem:" msgstr "邮件系统" -#: disk-utils/cfdisk.c:1344 +#: disk-utils/cfdisk.c:1334 #, fuzzy -#| msgid "filesystem label" msgid "Filesystem label:" msgstr "文件系统标签" -#: disk-utils/cfdisk.c:1348 +#: disk-utils/cfdisk.c:1338 #, fuzzy -#| msgid "filesystem UUID" msgid "Filesystem UUID:" msgstr "文件系统 UUID" -#: disk-utils/cfdisk.c:1360 +#: disk-utils/cfdisk.c:1350 #, fuzzy -#| msgid "mountpoint" msgid "Mountpoint:" msgstr "挂载点" -#: disk-utils/cfdisk.c:1701 +#: disk-utils/cfdisk.c:1691 #, c-format msgid "Disk: %s" msgstr "磁盘：%s" -#: disk-utils/cfdisk.c:1703 +#: disk-utils/cfdisk.c:1693 #, c-format msgid "Size: %s, %ju bytes, %ju sectors" msgstr "尺寸：%s，%ju 字节，%ju 个扇区" -#: disk-utils/cfdisk.c:1706 +#: disk-utils/cfdisk.c:1696 #, c-format msgid "Label: %s, identifier: %s" msgstr "标签：%s，标识符：%s" -#: disk-utils/cfdisk.c:1709 +#: disk-utils/cfdisk.c:1699 #, c-format msgid "Label: %s" msgstr "标签：%s" -#: disk-utils/cfdisk.c:1862 +#: disk-utils/cfdisk.c:1852 #, fuzzy -#| msgid "May be followed by {M,B,G,T}iB (the \"iB\" is optional) or S for sectors." 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:1868 +#: disk-utils/cfdisk.c:1858 msgid "Please, specify size." msgstr "请指定文件大小。" -#: disk-utils/cfdisk.c:1890 +#: disk-utils/cfdisk.c:1880 #, fuzzy, c-format -#| msgid "Maximal size is %ju bytes." msgid "Minimum size is %ju bytes." msgstr "最大尺寸为 %ju 字节。" -#: disk-utils/cfdisk.c:1899 +#: disk-utils/cfdisk.c:1889 #, fuzzy, c-format -#| msgid "Maximal size is %ju bytes." msgid "Maximum size is %ju bytes." msgstr "最大尺寸为 %ju 字节。" -#: disk-utils/cfdisk.c:1906 +#: disk-utils/cfdisk.c:1896 msgid "Failed to parse size." msgstr "解析大小失败。" -#: disk-utils/cfdisk.c:1964 +#: disk-utils/cfdisk.c:1954 msgid "Select partition type" msgstr "选择分区类型" -#: disk-utils/cfdisk.c:2010 disk-utils/cfdisk.c:2040 +#: disk-utils/cfdisk.c:2000 disk-utils/cfdisk.c:2030 #, fuzzy -#| msgid "cannot write script file" msgid "Enter script file name: " msgstr "无法写脚本文件" -#: disk-utils/cfdisk.c:2011 +#: disk-utils/cfdisk.c:2001 msgid "The script file will be applied to in-memory partition table." msgstr "该脚本文件将应用于内存中的分区表。" -#: disk-utils/cfdisk.c:2020 disk-utils/cfdisk.c:2062 +#: disk-utils/cfdisk.c:2010 disk-utils/cfdisk.c:2052 #: disk-utils/fdisk-menu.c:464 disk-utils/fdisk-menu.c:502 #, fuzzy, c-format -#| msgid "cannot open %s" msgid "Cannot open %s" msgstr "打不开 %s" -#: disk-utils/cfdisk.c:2022 disk-utils/fdisk-menu.c:466 +#: disk-utils/cfdisk.c:2012 disk-utils/fdisk-menu.c:466 #, fuzzy, c-format -#| msgid "failed to read typescript file %s" msgid "Failed to parse script file %s" msgstr "读 typescript 文件 %s 失败" -#: disk-utils/cfdisk.c:2024 disk-utils/fdisk-menu.c:468 +#: disk-utils/cfdisk.c:2014 disk-utils/fdisk-menu.c:468 #, fuzzy, c-format -#| msgid "failed to read typescript file %s" msgid "Failed to apply script %s" msgstr "读 typescript 文件 %s 失败" -#: disk-utils/cfdisk.c:2041 +#: disk-utils/cfdisk.c:2031 msgid "The current in-memory partition table will be dumped to the file." msgstr "当前的内存中分区表将转储到该文件中。" -#: disk-utils/cfdisk.c:2049 disk-utils/fdisk-menu.c:490 +#: disk-utils/cfdisk.c:2039 disk-utils/fdisk-menu.c:490 #, fuzzy -#| msgid "failed to allocate GPT header" msgid "Failed to allocate script handler" msgstr "分配 GPT 头失败" -#: disk-utils/cfdisk.c:2055 +#: disk-utils/cfdisk.c:2045 #, fuzzy -#| msgid "failed to add line to output" msgid "Failed to read disk layout into script." msgstr "向输出添加行出错" -#: disk-utils/cfdisk.c:2069 +#: disk-utils/cfdisk.c:2059 msgid "Disk layout successfully dumped." msgstr "成功转储了磁盘布局。" -#: disk-utils/cfdisk.c:2072 disk-utils/fdisk-menu.c:508 +#: disk-utils/cfdisk.c:2062 disk-utils/fdisk-menu.c:508 #, fuzzy, c-format -#| msgid "failed to read typescript file %s" msgid "Failed to write script %s" msgstr "读 typescript 文件 %s 失败" -#: disk-utils/cfdisk.c:2108 +#: disk-utils/cfdisk.c:2098 msgid "Select label type" msgstr "选择标签类型" -#: disk-utils/cfdisk.c:2111 disk-utils/fdisk.c:961 +#: disk-utils/cfdisk.c:2101 disk-utils/fdisk.c:993 msgid "Device does not contain a recognized partition table." msgstr "设备不包含可识别的分区表。" -#: disk-utils/cfdisk.c:2117 +#: disk-utils/cfdisk.c:2107 msgid "Select a type to create a new label or press 'L' to load script file." msgstr "选择一种类型来创建新标签，或按“L”加载脚本文件。" # 以下三句连贯，一起翻译 -#: disk-utils/cfdisk.c:2162 +#: disk-utils/cfdisk.c:2152 #, fuzzy -#| msgid "This is cfdisk, a curses based disk partitioning program, which" msgid "This is cfdisk, a curses-based disk partitioning program." msgstr "这是 cfdisk，一款基于 curses 的磁盘分区程序，" -#: disk-utils/cfdisk.c:2163 +#: disk-utils/cfdisk.c:2153 #, fuzzy -#| msgid "allows you to create, delete and modify partitions on your hard" msgid "It lets you create, delete, and modify partitions on a block device." msgstr "您可以通过它创建、删除和修改您硬盘驱动器上的" # 以下两条注意对齐 -#: disk-utils/cfdisk.c:2165 +#: disk-utils/cfdisk.c:2155 msgid "Command Meaning" msgstr "命令 意义" -#: disk-utils/cfdisk.c:2166 +#: disk-utils/cfdisk.c:2156 msgid "------- -------" msgstr "------- -------" -#: disk-utils/cfdisk.c:2167 +#: disk-utils/cfdisk.c:2157 msgid " b Toggle bootable flag of the current partition" msgstr " b 切换当前分区的 可启动 标志" -#: disk-utils/cfdisk.c:2168 +#: disk-utils/cfdisk.c:2158 msgid " d Delete the current partition" msgstr " d 删除当前分区" -#: disk-utils/cfdisk.c:2169 +#: disk-utils/cfdisk.c:2159 msgid " h Print this screen" msgstr " h 打印此屏幕" -#: disk-utils/cfdisk.c:2170 +#: disk-utils/cfdisk.c:2160 msgid " n Create new partition from free space" msgstr " n 从空闲空间创建新分区" -#: disk-utils/cfdisk.c:2171 +#: disk-utils/cfdisk.c:2161 msgid " q Quit program without writing partition table" msgstr " q 退出程序但不写入分区表" -#: disk-utils/cfdisk.c:2172 +#: disk-utils/cfdisk.c:2162 msgid " s Fix partitions order (only when in disarray)" msgstr " s 修复分区顺序(仅磁盘阵列)" -#: disk-utils/cfdisk.c:2173 +#: disk-utils/cfdisk.c:2163 msgid " t Change the partition type" msgstr " t 更改分区类型" -#: disk-utils/cfdisk.c:2174 +#: disk-utils/cfdisk.c:2164 msgid " u Dump disk layout to sfdisk compatible script file" msgstr " u 将磁盘布局转储到兼容 sfdisk 的脚本文件" -#: disk-utils/cfdisk.c:2175 +#: disk-utils/cfdisk.c:2165 #, fuzzy -#| msgid " W Write partition table to disk (must enter upper case W)" msgid " W Write partition table to disk (you must enter uppercase W);" msgstr " W 将分区表写入磁盘(必须输入大写 W)" -#: disk-utils/cfdisk.c:2176 +#: disk-utils/cfdisk.c:2166 #, fuzzy -#| msgid " Since this might destroy data on the disk, you must" msgid " since this might destroy data on the disk, you must either" msgstr " 由于这可能破坏磁盘上的数据，您必须" -#: disk-utils/cfdisk.c:2177 +#: disk-utils/cfdisk.c:2167 #, fuzzy -#| msgid " either confirm or deny the write by entering `yes' or" msgid " confirm or deny the write by entering 'yes' or 'no'" msgstr " 通过输入“yes”或“no”来确实或拒绝" -#: disk-utils/cfdisk.c:2178 +#: disk-utils/cfdisk.c:2168 #, fuzzy -#| msgid " -V display version information and exit\n" msgid " x Display/hide extra information about a partition" msgstr " -V 显示版本信息并退出\n" -#: disk-utils/cfdisk.c:2179 +#: disk-utils/cfdisk.c:2169 msgid "Up Arrow Move cursor to the previous partition" msgstr "上箭头 光标移到上一分区" -#: disk-utils/cfdisk.c:2180 +#: disk-utils/cfdisk.c:2170 msgid "Down Arrow Move cursor to the next partition" msgstr "下箭头 光标移到下一分区" -#: disk-utils/cfdisk.c:2181 +#: disk-utils/cfdisk.c:2171 msgid "Left Arrow Move cursor to the previous menu item" msgstr "上箭头 光标移到上一菜单项" -#: disk-utils/cfdisk.c:2182 +#: disk-utils/cfdisk.c:2172 msgid "Right Arrow Move cursor to the next menu item" msgstr "下箭头 光标移到下一菜单项" -#: disk-utils/cfdisk.c:2184 +#: disk-utils/cfdisk.c:2174 msgid "Note: All of the commands can be entered with either upper or lower" msgstr "注：所有命令均可以大写或小写" -#: disk-utils/cfdisk.c:2185 +#: disk-utils/cfdisk.c:2175 #, fuzzy -#| msgid "case letters (except for Writes)." msgid "case letters (except for Write)." msgstr "字母输入(写入命令除外)。" -#: disk-utils/cfdisk.c:2187 +#: disk-utils/cfdisk.c:2177 msgid "Use lsblk(8) or partx(8) to see more details about the device." msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。" -#: disk-utils/cfdisk.c:2194 +#: disk-utils/cfdisk.c:2184 disk-utils/cfdisk.c:2442 msgid "Press a key to continue." msgstr "按下一个键继续。" -#: disk-utils/cfdisk.c:2276 +#: disk-utils/cfdisk.c:2266 msgid "Could not toggle the flag." msgstr "无法切换标志。" -#: disk-utils/cfdisk.c:2286 +#: disk-utils/cfdisk.c:2276 #, c-format msgid "Could not delete partition %zu." msgstr "无法删除分区 %zu。" -#: disk-utils/cfdisk.c:2288 disk-utils/fdisk-menu.c:597 +#: disk-utils/cfdisk.c:2278 disk-utils/fdisk-menu.c:601 #, c-format msgid "Partition %zu has been deleted." msgstr "分区 %zu 已删除。" -#: disk-utils/cfdisk.c:2309 +#: disk-utils/cfdisk.c:2299 msgid "Partition size: " msgstr "分区大小：" -#: disk-utils/cfdisk.c:2350 +#: disk-utils/cfdisk.c:2340 #, c-format msgid "Changed type of partition %zu." msgstr "已更改分区 %zu 的类型。" -#: disk-utils/cfdisk.c:2352 +#: disk-utils/cfdisk.c:2342 #, c-format msgid "The type of partition %zu is unchanged." msgstr "分区 %zu 的类型未更改。" -#: disk-utils/cfdisk.c:2369 disk-utils/cfdisk.c:2473 disk-utils/fdisk.c:953 +#: disk-utils/cfdisk.c:2359 disk-utils/cfdisk.c:2471 disk-utils/fdisk.c:967 #: disk-utils/fdisk-menu.c:538 #, fuzzy -#| msgid "Device open in read-only mode." msgid "Device is open in read-only mode." msgstr "设备以只读方式打开。" -#: disk-utils/cfdisk.c:2374 +#: disk-utils/cfdisk.c:2364 msgid "Are you sure you want to write the partition table to disk? " msgstr "您确定想将分区表写入磁盘吗？" -#: disk-utils/cfdisk.c:2376 +#: disk-utils/cfdisk.c:2366 msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog." msgstr "输入“yes”或“no”或按 ESC 取消对话框。" -#: disk-utils/cfdisk.c:2381 login-utils/lslogins.c:208 sys-utils/lscpu.c:1267 -#: sys-utils/lscpu.c:1277 +#: disk-utils/cfdisk.c:2371 login-utils/lslogins.c:208 sys-utils/lscpu.c:1313 +#: sys-utils/lscpu.c:1323 msgid "yes" msgstr "是" -#: disk-utils/cfdisk.c:2382 +#: disk-utils/cfdisk.c:2372 #, fuzzy -#| msgid "Did not write partition table to disk" msgid "Did not write partition table to disk." msgstr "不将分区表写入磁盘" -#: disk-utils/cfdisk.c:2387 +#: disk-utils/cfdisk.c:2377 #, fuzzy -#| msgid "Failed to write disklabel" msgid "Failed to write disklabel." msgstr "写磁盘标签失败" -#: disk-utils/cfdisk.c:2390 disk-utils/fdisk-menu.c:546 +#: disk-utils/cfdisk.c:2380 disk-utils/fdisk-menu.c:546 msgid "The partition table has been altered." msgstr "分区表已调整。" -#: disk-utils/cfdisk.c:2413 disk-utils/cfdisk.c:2475 +#: disk-utils/cfdisk.c:2403 disk-utils/cfdisk.c:2473 msgid "Note that partition table entries are not in disk order now." msgstr "注意，现在分区表记录没有按磁盘顺序。" -#: disk-utils/cfdisk.c:2452 +#: disk-utils/cfdisk.c:2439 +#, c-format +msgid "Device already contains %s signature, it will be removed by write command." +msgstr "" + +#: disk-utils/cfdisk.c:2450 msgid "failed to create a new disklabel" msgstr "创建新磁盘标签失败" -#: disk-utils/cfdisk.c:2460 +#: disk-utils/cfdisk.c:2458 msgid "failed to read partitions" msgstr "读分区失败" -#: disk-utils/cfdisk.c:2549 +#: disk-utils/cfdisk.c:2547 #, c-format msgid " %1$s [options] <disk>\n" msgstr " %1$s [选项] <磁盘>\n" -#: disk-utils/cfdisk.c:2552 disk-utils/fdisk.c:722 disk-utils/sfdisk.c:1430 +#: disk-utils/cfdisk.c:2550 disk-utils/fdisk.c:728 disk-utils/sfdisk.c:1729 #, fuzzy -#| msgid "%s: failed to read partition table" msgid "Display or manipulate a disk partition table.\n" msgstr "%s：读取分区表失败" -#: disk-utils/cfdisk.c:2555 +#: disk-utils/cfdisk.c:2553 #, fuzzy -#| msgid " -L --color[=<when>] colorize output (auto, always or never)\n" msgid " -L, --color[=<when>] colorize output (auto, always or never)\n" msgstr " -L --color[=<何时>] 彩色输出(auto自动，always总是或never从不)\n" -#: disk-utils/cfdisk.c:2558 +#: disk-utils/cfdisk.c:2556 #, fuzzy -#| msgid " -z --zero start with zeroed partition table\n" msgid " -z, --zero start with zeroed partition table\n" msgstr " -z, --zero 以空分区表开始\n" -#: disk-utils/cfdisk.c:2597 disk-utils/fdisk.c:863 disk-utils/sfdisk.c:1663 -#: misc-utils/cal.c:402 sys-utils/dmesg.c:1333 text-utils/hexdump.c:114 +#: disk-utils/cfdisk.c:2595 disk-utils/fdisk.c:872 disk-utils/sfdisk.c:1981 +#: misc-utils/cal.c:381 sys-utils/dmesg.c:1334 text-utils/hexdump.c:114 msgid "unsupported color mode" msgstr "不支持的颜色模式" -#: disk-utils/cfdisk.c:2615 disk-utils/fdisk.c:799 disk-utils/sfdisk.c:211 +#: disk-utils/cfdisk.c:2613 disk-utils/fdisk.c:808 disk-utils/sfdisk.c:221 msgid "failed to allocate libfdisk context" msgstr "分配 libfdisk 环境(context)失败" @@ -717,36 +691,32 @@ msgstr "通知内核忘记某个特定的分区。\n" msgid "failed to remove partition" msgstr "移除分区失败" -#: disk-utils/fdformat.c:52 +#: disk-utils/fdformat.c:53 #, c-format msgid "Formatting ... " msgstr "正在格式化 ... " -#: disk-utils/fdformat.c:67 disk-utils/fdformat.c:137 +#: disk-utils/fdformat.c:68 disk-utils/fdformat.c:138 #, c-format msgid "done\n" msgstr "完成\n" -#: disk-utils/fdformat.c:79 +#: disk-utils/fdformat.c:80 #, c-format msgid "Verifying ... " msgstr "正在验证 ... " -#: disk-utils/fdformat.c:107 +#: disk-utils/fdformat.c:108 msgid "Read: " msgstr "读: " -#: disk-utils/fdformat.c:109 +#: disk-utils/fdformat.c:110 #, fuzzy, c-format -#| msgid "Problem reading cylinder %d, expected %d, read %d\n" msgid "Problem reading track/head %u/%u, expected %d, read %d\n" msgstr "读柱面 %d 时有问题, 期望 %d, 读取 %d\n" -#: disk-utils/fdformat.c:126 +#: disk-utils/fdformat.c:127 #, fuzzy, c-format -#| msgid "" -#| "bad data in cyl %d\n" -#| "Continuing ... " msgid "" "bad data in track/head %u/%u\n" "Continuing ... " @@ -754,30 +724,28 @@ msgstr "" "柱面 %d 中有坏数据\n" "继续 ... " -#: 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:91 +#: disk-utils/fdformat.c:144 disk-utils/fsck.minix.c:182 +#: disk-utils/swaplabel.c:117 misc-utils/wipefs.c:456 +#: sys-utils/blkdiscard.c:84 sys-utils/tunelp.c:91 #, c-format msgid " %s [options] <device>\n" msgstr " %s [选项] <设备>\n" -#: disk-utils/fdformat.c:147 +#: disk-utils/fdformat.c:148 msgid "Do a low-level formatting of a floppy disk.\n" msgstr "对软盘进行低级格式化。\n" -#: disk-utils/fdformat.c:150 +#: disk-utils/fdformat.c:151 #, fuzzy -#| msgid " -a, --all all (default)\n" msgid " -f, --from <N> start at the track N (default 0)\n" msgstr " -a, --all 全部(默认)\n" -#: disk-utils/fdformat.c:151 +#: disk-utils/fdformat.c:152 #, fuzzy -#| msgid " -t, --time <time_t> time to wake\n" msgid " -t, --to <N> stop at the track N\n" msgstr " -t, --time <time_t> 指定唤醒时刻\n" -#: disk-utils/fdformat.c:152 +#: disk-utils/fdformat.c:153 msgid "" " -r, --repair <N> try to repair tracks failed during\n" " the verification (max N retries)\n" @@ -785,92 +753,81 @@ msgstr "" " -r, --repair <N> 尝试修复在验证时失败的磁道\n" " (最多尝试 N 次)\n" -#: disk-utils/fdformat.c:154 +#: disk-utils/fdformat.c:155 msgid " -n, --no-verify disable the verification after the format\n" msgstr " -n, --no-verify 禁止格式化后的验证\n" -#: disk-utils/fdformat.c:193 +#: disk-utils/fdformat.c:194 #, fuzzy -#| msgid "invalid argument: %s" msgid "invalid argument - from" msgstr "无效参数：%s" -#: disk-utils/fdformat.c:197 +#: disk-utils/fdformat.c:198 #, fuzzy -#| msgid "invalid argument: %s" msgid "invalid argument - to" msgstr "无效参数：%s" -#: disk-utils/fdformat.c:200 +#: disk-utils/fdformat.c:201 #, fuzzy -#| msgid "invalid argument: %s" msgid "invalid argument - repair" msgstr "无效参数：%s" -#: disk-utils/fdformat.c:220 disk-utils/fsck.cramfs.c:146 +#: disk-utils/fdformat.c:221 disk-utils/fsck.cramfs.c:145 #: disk-utils/mkfs.bfs.c:185 disk-utils/mkfs.cramfs.c:330 #: disk-utils/mkfs.cramfs.c:742 disk-utils/mkfs.cramfs.c:779 -#: disk-utils/mkfs.minix.c:823 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 +#: disk-utils/mkfs.minix.c:820 disk-utils/mkswap.c:241 disk-utils/partx.c:891 +#: login-utils/last.c:667 login-utils/utmpdump.c:129 misc-utils/namei.c:135 +#: misc-utils/rename.c:63 sys-utils/blkdiscard.c:186 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 +#: sys-utils/swapon.c:493 sys-utils/switch_root.c:93 +#: sys-utils/switch_root.c:133 term-utils/mesg.c:129 text-utils/more.c:509 #: text-utils/tailf.c:104 text-utils/tailf.c:281 #, fuzzy, c-format -#| msgid "stat failed" msgid "stat of %s failed" msgstr "stat 失败" -#: 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 +#: disk-utils/fdformat.c:224 disk-utils/partx.c:949 misc-utils/lsblk.c:1477 +#: sys-utils/blkdiscard.c:188 sys-utils/mountpoint.c:107 #, c-format msgid "%s: not a block device" msgstr "%s：不是一个块设备" -#: disk-utils/fdformat.c:225 -#, c-format -msgid "cannot access file %s" -msgstr "无法访问文件 %s" - -#: disk-utils/fdformat.c:231 +#: disk-utils/fdformat.c:229 #, fuzzy -#| msgid "Could not determine current format type" msgid "could not determine current format type" msgstr "不能决定当前格式类型" -#: disk-utils/fdformat.c:233 +#: disk-utils/fdformat.c:231 #, c-format msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n" msgstr "%s-面, %d 磁道, %d 秒/磁道. 总容量 %d kB.\n" -#: disk-utils/fdformat.c:234 +#: disk-utils/fdformat.c:232 msgid "Double" msgstr "双面" -#: disk-utils/fdformat.c:234 +#: disk-utils/fdformat.c:232 msgid "Single" msgstr "单面" -#: disk-utils/fdformat.c:241 +#: disk-utils/fdformat.c:239 msgid "user defined start track exceeds the medium specific maximum" msgstr "用户定义的起始磁道超出了媒体的最大指定值" -#: disk-utils/fdformat.c:243 +#: disk-utils/fdformat.c:241 msgid "user defined end track exceeds the medium specific maximum" msgstr "用户定义的结束磁道超出了媒体的最大指定值" -#: disk-utils/fdformat.c:245 +#: disk-utils/fdformat.c:243 msgid "user defined start track exceeds the user defined end track" msgstr "用户" -#: disk-utils/fdformat.c:253 misc-utils/logger.c:695 +#: disk-utils/fdformat.c:251 misc-utils/logger.c:977 #, fuzzy -#| msgid "close failed: %s" msgid "close failed" msgstr "关闭失败：%s" -#: disk-utils/fdisk.c:93 disk-utils/fdisk.c:109 +#: disk-utils/fdisk.c:92 disk-utils/fdisk.c:108 #, c-format msgid "" "\n" @@ -879,39 +836,39 @@ msgstr "" "\n" "您确实要退出吗？" -#: disk-utils/fdisk.c:156 +#: disk-utils/fdisk.c:155 #, c-format msgid "Select (default %c): " msgstr "选择 (默认 %c)：" -#: disk-utils/fdisk.c:161 +#: disk-utils/fdisk.c:160 #, c-format msgid "Using default response %c." msgstr "将使用默认回应 %c。" -#: disk-utils/fdisk.c:174 disk-utils/fdisk.c:247 disk-utils/fdisk.c:318 -#: libfdisk/src/dos.c:1189 libfdisk/src/gpt.c:2256 +#: disk-utils/fdisk.c:173 disk-utils/fdisk.c:247 disk-utils/fdisk.c:322 +#: libfdisk/src/dos.c:1189 libfdisk/src/gpt.c:2257 msgid "Value out of range." msgstr "值超出范围。" -#: disk-utils/fdisk.c:203 +#: disk-utils/fdisk.c:202 #, c-format msgid "%s (%s, default %c): " msgstr "%s (%s，默认 %c)：" -#: disk-utils/fdisk.c:206 disk-utils/fdisk.c:272 -#, c-format -msgid "%s (%s, default %ju): " +#: disk-utils/fdisk.c:205 disk-utils/fdisk.c:272 +#, fuzzy, c-format +msgid "%s (%s, default %<PRIu64>): " msgstr "%s (%s，默认 %ju)：" -#: disk-utils/fdisk.c:211 +#: disk-utils/fdisk.c:210 #, c-format msgid "%s (%c-%c, default %c): " msgstr "%s (%c-%c，默认为 %c)：" -#: disk-utils/fdisk.c:214 disk-utils/fdisk.c:274 -#, c-format -msgid "%s (%ju-%ju, default %ju): " +#: disk-utils/fdisk.c:214 disk-utils/fdisk.c:276 +#, fuzzy, c-format +msgid "%s (%<PRIu64>-%<PRIu64>, default %<PRIu64>): " msgstr "%s (%ju-%ju，默认 %ju)：" #: disk-utils/fdisk.c:217 @@ -919,84 +876,83 @@ msgstr "%s (%ju-%ju，默认 %ju)：" msgid "%s (%c-%c): " msgstr "%s (%c-%c)：" -#: disk-utils/fdisk.c:220 disk-utils/fdisk.c:276 -#, c-format -msgid "%s (%ju-%ju): " +#: disk-utils/fdisk.c:220 disk-utils/fdisk.c:279 +#, fuzzy, c-format +msgid "%s (%<PRIu64>-%<PRIu64>): " msgstr "%s (%ju-%ju): " -#: disk-utils/fdisk.c:383 disk-utils/sfdisk.c:185 +#: disk-utils/fdisk.c:389 disk-utils/sfdisk.c:195 msgid " [Y]es/[N]o: " msgstr "是[Y]/否[N]：" -#: disk-utils/fdisk.c:424 +#: disk-utils/fdisk.c:430 msgid "Partition type (type L to list all types): " msgstr "分区类型(输入 L 列出所有类型)：" -#: disk-utils/fdisk.c:425 +#: disk-utils/fdisk.c:431 msgid "Hex code (type L to list all codes): " msgstr "Hex 代码(输入 L 列出所有代码)：" -#: disk-utils/fdisk.c:522 +#: disk-utils/fdisk.c:528 msgid "DOS Compatibility flag is set (DEPRECATED!)" msgstr "已设置 DOS 兼容性标志(已废弃！)" -#: disk-utils/fdisk.c:523 +#: disk-utils/fdisk.c:529 msgid "DOS Compatibility flag is not set" msgstr "DOS 兼容性标志未设置" -#: disk-utils/fdisk.c:544 disk-utils/fdisk.c:580 +#: disk-utils/fdisk.c:550 disk-utils/fdisk.c:586 #, c-format msgid "Partition %zu does not exist yet!" msgstr "分区 %zu 还不存在！" -#: disk-utils/fdisk.c:549 disk-utils/fdisk.c:558 libfdisk/src/ask.c:999 +#: disk-utils/fdisk.c:555 disk-utils/fdisk.c:564 libfdisk/src/ask.c:995 msgid "Unknown" msgstr "未知" -#: disk-utils/fdisk.c:557 +#: disk-utils/fdisk.c:563 #, c-format msgid "Changed type of partition '%s' to '%s'." msgstr "已将分区“%s”的类型更改为“%s”。" -#: disk-utils/fdisk.c:561 +#: disk-utils/fdisk.c:567 #, c-format msgid "Type of partition %zu is unchanged: %s." msgstr "分区 %zu 的类型未更改：%s。" -#: disk-utils/fdisk.c:600 +#: disk-utils/fdisk.c:606 #, fuzzy, c-format -#| msgid "Disk: %s" msgid "%15s: %s" msgstr "磁盘：%s" -#: disk-utils/fdisk.c:657 -#, c-format +#: disk-utils/fdisk.c:663 +#, fuzzy, c-format msgid "" "\n" -"%s: offset = %ju, size = %zu bytes." +"%s: offset = %<PRIu64>, size = %zu bytes." msgstr "" "\n" "%s: 偏移 = %ju, 大小 = %zu 字节。" -#: disk-utils/fdisk.c:663 +#: disk-utils/fdisk.c:669 msgid "cannot seek" msgstr "无法 seek" -#: disk-utils/fdisk.c:668 +#: disk-utils/fdisk.c:674 msgid "cannot read" msgstr "不能读" -#: disk-utils/fdisk.c:681 libfdisk/src/bsd.c:259 libfdisk/src/dos.c:933 -#: libfdisk/src/gpt.c:2189 +#: disk-utils/fdisk.c:687 libfdisk/src/bsd.c:259 libfdisk/src/dos.c:933 +#: libfdisk/src/gpt.c:2190 msgid "First sector" msgstr "第一个扇区" -#: disk-utils/fdisk.c:708 +#: disk-utils/fdisk.c:714 #, c-format msgid "BLKGETSIZE ioctl failed on %s" msgstr "对 %s 进行 BLKGETSIZE ioctl 失败" -#: disk-utils/fdisk.c:717 +#: disk-utils/fdisk.c:723 #, c-format msgid "" " %1$s [options] <disk> change partition table\n" @@ -1005,102 +961,111 @@ msgstr "" " %1$s [选项] <磁盘> 更改分区表\n" " %1$s [选项] -l [<磁盘>] 列出分区表\n" -#: disk-utils/fdisk.c:725 +#: disk-utils/fdisk.c:731 msgid " -b, --sector-size <size> physical and logical sector size\n" msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n" -#: disk-utils/fdisk.c:726 -msgid " -B, --protect-boot don't erase bootbits when creat a new label\n" +#: disk-utils/fdisk.c:732 +#, fuzzy +msgid " -B, --protect-boot don't erase bootbits when create a new label\n" msgstr " -B, --protect-boot 创建新标签时不要擦除 bootbits \n" -#: disk-utils/fdisk.c:727 +#: disk-utils/fdisk.c:733 msgid " -c, --compatibility[=<mode>] mode is 'dos' or 'nondos' (default)\n" msgstr " -c, --compatibility[=<模式>] 模式，为“dos”或“nondos”(默认)\n" -#: disk-utils/fdisk.c:728 +#: disk-utils/fdisk.c:734 msgid " -L, --color[=<when>] colorize output (auto, always or never)\n" msgstr " -L, --color[=<时机>] 彩色输出(auto, always 或 never)\n" -#: disk-utils/fdisk.c:731 +#: disk-utils/fdisk.c:737 msgid " -l, --list display partitions end exit\n" msgstr " -l, --list 显示分区信息并退出\n" -#: disk-utils/fdisk.c:732 +#: disk-utils/fdisk.c:738 #, fuzzy -#| msgid " -o, --output <list> output columns\n" msgid " -o, --output <list> output columns\n" msgstr " -o, --output <列表> 输出列\n" -#: disk-utils/fdisk.c:733 +#: disk-utils/fdisk.c:739 msgid " -t, --type <type> recognize specified partition table type only\n" msgstr " -t, --type <类型> 只识别指定的分区表类型\n" -#: disk-utils/fdisk.c:734 +#: disk-utils/fdisk.c:740 msgid " -u, --units[=<unit>] display units: 'cylinders' or 'sectors' (default)\n" msgstr " -u, --units[=<单位>] 显示单位，“cylinders”柱面或“sectors”扇区(默认)\n" -#: disk-utils/fdisk.c:735 +#: disk-utils/fdisk.c:741 msgid " -s, --getsz display device size in 512-byte sectors [DEPRECATED]\n" msgstr " -s, --getsz 以 512-字节扇区显示设备大小[已废弃]\n" -#: disk-utils/fdisk.c:736 +#: disk-utils/fdisk.c:742 #, fuzzy -#| msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n" msgid " --bytes print SIZE in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" -#: disk-utils/fdisk.c:739 +#: disk-utils/fdisk.c:743 +#, fuzzy +msgid " -w, --wipe <mode> wipe signatures (auto, always or never)\n" +msgstr " -L, --color[=<时机>] 彩色显示消息(auto, always 或 never)\n" + +#: disk-utils/fdisk.c:746 msgid " -C, --cylinders <number> specify the number of cylinders\n" msgstr " -C, --cylinders <数字> 指定柱面数\n" -#: disk-utils/fdisk.c:740 +#: disk-utils/fdisk.c:747 msgid " -H, --heads <number> specify the number of heads\n" msgstr " -H, --heads <数字> 指定磁头数\n" -#: disk-utils/fdisk.c:741 +#: disk-utils/fdisk.c:748 msgid " -S, --sectors <number> specify the number of sectors per track\n" msgstr " -S, --sectors <数字> 指定每条磁道的扇区数\n" -#: disk-utils/fdisk.c:809 +#: disk-utils/fdisk.c:818 msgid "invalid sector size argument" msgstr "无效的 扇区大小 参数" -#: disk-utils/fdisk.c:821 +#: disk-utils/fdisk.c:830 msgid "invalid cylinders argument" msgstr "无效的 柱面数 参数" -#: disk-utils/fdisk.c:833 +#: disk-utils/fdisk.c:842 msgid "not found DOS label driver" msgstr "未找到 DOS 标签驱动" -#: disk-utils/fdisk.c:839 +#: disk-utils/fdisk.c:848 #, c-format msgid "unknown compatibility mode '%s'" msgstr "未知兼容模式“%s”" -#: disk-utils/fdisk.c:848 +#: disk-utils/fdisk.c:857 msgid "invalid heads argument" msgstr "无效的 磁头数 参数" -#: disk-utils/fdisk.c:854 +#: disk-utils/fdisk.c:863 msgid "invalid sectors argument" msgstr "无效的 扇区数 参数" -#: disk-utils/fdisk.c:880 +#: disk-utils/fdisk.c:889 #, c-format msgid "unsupported disklabel: %s" msgstr "不支持的磁盘标签：%s" -#: disk-utils/fdisk.c:905 +#: disk-utils/fdisk.c:906 disk-utils/sfdisk.c:1950 +#, fuzzy +msgid "unsupported wipe mode" +msgstr "不支持的颜色模式" + +#: disk-utils/fdisk.c:919 msgid "The device properties (sector size and geometry) should be used with one specified device only." msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。" -#: disk-utils/fdisk.c:944 +#: disk-utils/fdisk.c:958 #, c-format msgid "Welcome to fdisk (%s)." msgstr "欢迎使用 fdisk (%s)。" -#: disk-utils/fdisk.c:946 disk-utils/sfdisk.c:1238 +#: disk-utils/fdisk.c:960 disk-utils/sfdisk.c:1515 msgid "" "Changes will remain in memory only, until you decide to write them.\n" "Be careful before using the write command.\n" @@ -1108,7 +1073,21 @@ msgstr "" "更改将停留在内存中，直到您决定将更改写入磁盘。\n" "使用写入命令前请三思。\n" -#: disk-utils/fdisk.c:966 +#: disk-utils/fdisk.c:977 disk-utils/sfdisk.c:1540 +#, c-format +msgid "%s: device already contains %s signature." +msgstr "" + +#: disk-utils/fdisk.c:986 disk-utils/sfdisk.c:1549 +msgid "The signature will be removed by write command." +msgstr "" + +#: disk-utils/fdisk.c:989 disk-utils/sfdisk.c:1552 +#, fuzzy +msgid "It is strongly recommended to wipe the device with wipefs(8), in order to avoid possible collisions." +msgstr "%s：设备包含有效的“%s”签名，如果发觉错误运行了本设置，强烈建议您使用 wipefs(8)来擦除该设备，以避免潜在的冲突。" + +#: disk-utils/fdisk.c:998 msgid "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert command 'M')." msgstr "检测到混合 GPT。您需要手动同步混合 MBR (用专家命令“M”)" @@ -1153,25 +1132,22 @@ msgid "Disk identifier: %s" msgstr "磁盘标识符：%s" #: disk-utils/fdisk-list.c:107 disk-utils/fdisk-list.c:217 -#: disk-utils/fsck.c:1245 +#: disk-utils/fsck.c:1244 msgid "failed to allocate iterator" msgstr "分配迭代器失败" #: disk-utils/fdisk-list.c:113 disk-utils/fdisk-list.c:223 #, fuzzy -#| msgid "failed to initialize output table" msgid "failed to allocate output table" msgstr "初始化输出表失败" #: disk-utils/fdisk-list.c:154 disk-utils/fdisk-list.c:247 #, fuzzy -#| msgid "failed to callocate cpu set" msgid "failed to allocate output line" msgstr "分配(callocate) CPU 组 失败" #: disk-utils/fdisk-list.c:181 #, fuzzy, c-format -#| msgid "Partition %i does not start on physical sector boundary.\n" msgid "Partition %zu does not start on physical sector boundary." msgstr "分区 %i 未起始于物理扇区边界。\n" @@ -1179,37 +1155,33 @@ msgstr "分区 %i 未起始于物理扇区边界。\n" msgid "Partition table entries are not in disk order." msgstr "分区表记录没有按磁盘顺序。" -#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1011 libfdisk/src/dos.c:2300 -#: libfdisk/src/gpt.c:2761 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1107 +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2302 +#: libfdisk/src/gpt.c:2772 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1110 msgid "Start" msgstr "起点" -#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1012 libfdisk/src/dos.c:2301 -#: libfdisk/src/gpt.c:2762 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1108 +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1016 libfdisk/src/dos.c:2303 +#: libfdisk/src/gpt.c:2773 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1111 msgid "End" msgstr "末尾" -#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1013 libfdisk/src/dos.c:2302 -#: libfdisk/src/gpt.c:2763 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1109 +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1017 libfdisk/src/dos.c:2304 +#: libfdisk/src/gpt.c:2774 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1112 msgid "Sectors" msgstr "扇区" -#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2304 -#: libfdisk/src/gpt.c:2764 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1111 +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2306 +#: libfdisk/src/gpt.c:2775 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1114 msgid "Size" msgstr "大小" #: disk-utils/fdisk-list.c:265 #, fuzzy, c-format -#| msgid "Disk %s: %s, %ju bytes, %ju sectors" msgid "Unpartitioned space %s: %s, %ju bytes, %ju sectors" msgstr "Disk %s：%s，%ju 字节，%ju 个扇区" -#: disk-utils/fdisk-list.c:412 +#: disk-utils/fdisk-list.c:410 #, fuzzy, c-format -#| msgid "" -#| "\n" -#| "Available columns (for --show):\n" msgid "" "\n" "Available columns (for -o):\n" @@ -1217,9 +1189,8 @@ msgstr "" "\n" "可用列(用于 --show)：\n" -#: disk-utils/fdisk-list.c:453 +#: disk-utils/fdisk-list.c:451 #, fuzzy, c-format -#| msgid "unknown column: %s" msgid "%s unknown column: %s" msgstr "未知列: %s" @@ -1233,7 +1204,6 @@ msgstr "删除分区" #: disk-utils/fdisk-menu.c:97 #, fuzzy -#| msgid "list extended partitions" msgid "list free unpartitioned space" msgstr "列出扩展分区" @@ -1259,7 +1229,6 @@ msgstr "检查分区表" #: disk-utils/fdisk-menu.c:103 #, fuzzy -#| msgid "%s: partition table with no partitions" msgid "print information about a partition" msgstr "%s：分区表中无分区" @@ -1367,7 +1336,7 @@ msgstr "更改磁头数" msgid "change number of sectors/track" msgstr "更改扇区/磁道数" -#: disk-utils/fdisk-menu.c:164 include/pt-mbr-partnames.h:92 +#: disk-utils/fdisk-menu.c:164 include/pt-mbr-partnames.h:95 msgid "GPT" msgstr "GPT" @@ -1512,7 +1481,7 @@ msgstr "" "\n" "帮助 (专业命令)：\n" -#: disk-utils/fdisk-menu.c:370 disk-utils/sfdisk.c:973 +#: disk-utils/fdisk-menu.c:370 disk-utils/sfdisk.c:1245 #, c-format msgid "" "\n" @@ -1541,7 +1510,6 @@ msgstr "%c：未知命令" #: disk-utils/fdisk-menu.c:457 disk-utils/fdisk-menu.c:484 #, fuzzy -#| msgid "cannot write script file" msgid "Enter script file name" msgstr "无法写脚本文件" @@ -1561,48 +1529,58 @@ msgstr "成本保存了脚本。" msgid "failed to write disklabel" msgstr "写磁盘标签失败" -#: disk-utils/fdisk-menu.c:595 +#: disk-utils/fdisk-menu.c:581 +#, fuzzy +msgid "Failed to fix partitions order." +msgstr "修复分区顺序" + +#: disk-utils/fdisk-menu.c:583 +#, fuzzy +msgid "Partitions order fixed." +msgstr "未定义分区。" + +#: disk-utils/fdisk-menu.c:599 #, c-format msgid "Could not delete partition %zu" msgstr "无法删除分区 %zu" -#: disk-utils/fdisk-menu.c:619 +#: disk-utils/fdisk-menu.c:623 msgid "Changing display/entry units to cylinders (DEPRECATED!)." msgstr "将显示/记录单位更改为柱面(已废弃！)。" -#: disk-utils/fdisk-menu.c:621 +#: disk-utils/fdisk-menu.c:625 msgid "Changing display/entry units to sectors." msgstr "将显示/记录单位更改为盲区。" -#: disk-utils/fdisk-menu.c:631 disk-utils/fdisk-menu.c:794 +#: disk-utils/fdisk-menu.c:635 disk-utils/fdisk-menu.c:798 msgid "Leaving nested disklabel." msgstr "离开嵌套的磁盘标签。" -#: disk-utils/fdisk-menu.c:671 +#: disk-utils/fdisk-menu.c:675 msgid "Entering protective/hybrid MBR disklabel." msgstr "进入 保护/混合 MBR 磁盘标签。" -#: disk-utils/fdisk-menu.c:687 +#: disk-utils/fdisk-menu.c:691 msgid "New UUID (in 8-4-4-4-12 format)" msgstr "新 UUID (以 8-4-4-4-12 格式)" -#: disk-utils/fdisk-menu.c:702 +#: disk-utils/fdisk-menu.c:706 msgid "New name" msgstr "新名称" -#: disk-utils/fdisk-menu.c:765 +#: disk-utils/fdisk-menu.c:769 msgid "Entering nested BSD disklabel." msgstr "进入嵌套的 BSD 磁盘标签。" -#: disk-utils/fdisk-menu.c:951 +#: disk-utils/fdisk-menu.c:955 msgid "Number of cylinders" msgstr "柱面数" -#: disk-utils/fdisk-menu.c:955 +#: disk-utils/fdisk-menu.c:959 msgid "Number of heads" msgstr "磁头数" -#: disk-utils/fdisk-menu.c:959 +#: disk-utils/fdisk-menu.c:963 msgid "Number of sectors" msgstr "扇区数" @@ -1616,9 +1594,9 @@ msgstr "%s 已经挂载\n" msgid "%s is not mounted\n" msgstr "%s 未挂载\n" -#: 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:270 libfdisk/src/bsd.c:646 +#: disk-utils/fsck.c:329 disk-utils/fsck.cramfs.c:168 +#: disk-utils/fsck.cramfs.c:175 disk-utils/fsck.cramfs.c:229 +#: disk-utils/fsck.cramfs.c:247 disk-utils/sfdisk.c:295 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:191 login-utils/last.c:228 login-utils/sulogin.c:689 #: sys-utils/setpriv.c:239 term-utils/setterm.c:725 term-utils/setterm.c:782 @@ -1676,148 +1654,143 @@ msgstr "%s：第 %d 行解析出错 -- 忽略" msgid "%s: failed to parse fstab" msgstr "%s：解析 fstab 失败" -#: disk-utils/fsck.c:680 login-utils/login.c:979 login-utils/sulogin.c:1061 +#: disk-utils/fsck.c:679 login-utils/login.c:967 login-utils/sulogin.c:1059 #: login-utils/vipw.c:203 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 +#: sys-utils/swapon.c:302 sys-utils/unshare.c:218 sys-utils/unshare.c:412 +#: term-utils/script.c:774 msgid "fork failed" msgstr "fork 失败" -#: disk-utils/fsck.c:687 +#: disk-utils/fsck.c:686 #, c-format msgid "%s: execute failed" msgstr "%s：执行失败" -#: disk-utils/fsck.c:775 +#: disk-utils/fsck.c:774 msgid "wait: no more child process?!?" msgstr "等待：没有剩余子进程了？！？" -#: 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 +#: disk-utils/fsck.c:777 sys-utils/flock.c:343 sys-utils/swapon.c:334 +#: sys-utils/unshare.c:396 sys-utils/unshare.c:417 msgid "waitpid failed" msgstr "waitpid 失败" -#: disk-utils/fsck.c:796 +#: disk-utils/fsck.c:795 #, c-format msgid "Warning... %s for device %s exited with signal %d." msgstr "警告... 对设备 %2$s 的 %1$s 以信号 %3$d 退出。" -#: disk-utils/fsck.c:802 +#: disk-utils/fsck.c:801 #, c-format msgid "%s %s: status is %x, should never happen." msgstr "%s %s：状态为 %x，这不应该发生。" -#: disk-utils/fsck.c:848 +#: disk-utils/fsck.c:847 #, c-format msgid "Finished with %s (exit status %d)\n" msgstr "以 %s 结束(退出状态为 %d)\n" -#: disk-utils/fsck.c:926 +#: disk-utils/fsck.c:925 #, 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:992 +#: disk-utils/fsck.c:991 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:1108 +#: disk-utils/fsck.c:1107 #, 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:1120 +#: disk-utils/fsck.c:1119 #, c-format msgid "%s: skipping nonexistent device\n" msgstr "%s：将跳过不存在的设备\n" -#: disk-utils/fsck.c:1125 +#: disk-utils/fsck.c:1124 #, 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:1142 +#: disk-utils/fsck.c:1141 #, c-format msgid "%s: skipping unknown filesystem type\n" msgstr "%s：跳过未知的文件系统类型\n" -#: disk-utils/fsck.c:1156 +#: disk-utils/fsck.c:1155 #, c-format msgid "cannot check %s: fsck.%s not found" msgstr "无法检查 %s：找不到 fsck.%s" -#: disk-utils/fsck.c:1260 +#: disk-utils/fsck.c:1259 msgid "Checking all file systems.\n" msgstr "正在检查所有文件系统。\n" # pass number 是fstab中定义的，不为0则每次检测 -#: disk-utils/fsck.c:1351 +#: disk-utils/fsck.c:1350 #, c-format msgid "--waiting-- (pass %d)\n" msgstr "--等待中-- (第 %d 遍)\n" -#: disk-utils/fsck.c:1376 +#: disk-utils/fsck.c:1375 #, c-format msgid " %s [options] -- [fs-options] [<filesystem> ...]\n" msgstr " %s [选项] -- [文件系统选项] [<文件系统> ...]\n" -#: disk-utils/fsck.c:1380 +#: disk-utils/fsck.c:1379 #, fuzzy -#| msgid "Checking all file systems.\n" msgid "Check and repair a Linux filesystem.\n" msgstr "正在检查所有文件系统。\n" -#: disk-utils/fsck.c:1383 +#: disk-utils/fsck.c:1382 msgid " -A check all filesystems\n" msgstr " -A 检查所有文件系统\n" -#: disk-utils/fsck.c:1384 +#: disk-utils/fsck.c:1383 msgid " -C [<fd>] display progress bar; file descriptor is for GUIs\n" msgstr " -C [<fd>] 显示进度条；文件描述符 fd 用于图形用户界面\n" -#: disk-utils/fsck.c:1385 +#: disk-utils/fsck.c:1384 msgid " -l lock the device to guarantee exclusive access\n" msgstr " -l 锁定设备以确保独占访问\n" -#: disk-utils/fsck.c:1386 +#: disk-utils/fsck.c:1385 msgid " -M do not check mounted filesystems\n" msgstr " -M 不检查已挂臷的文件系统\n" -#: disk-utils/fsck.c:1387 +#: disk-utils/fsck.c:1386 msgid " -N do not execute, just show what would be done\n" msgstr " -N 不执行，只显示将执行的操作\n" -#: disk-utils/fsck.c:1388 +#: disk-utils/fsck.c:1387 msgid " -P check filesystems in parallel, including root\n" msgstr " -P 并行检查文件系统，包括 root\n" -#: disk-utils/fsck.c:1389 +#: disk-utils/fsck.c:1388 msgid " -R skip root filesystem; useful only with '-A'\n" msgstr " -R 跳过根文件系统；只在指定 '-A' 时有用\n" -#: disk-utils/fsck.c:1390 +#: disk-utils/fsck.c:1389 #, fuzzy -#| msgid " -r report statistics for each device checked\n" msgid "" " -r [<fd>] report statistics for each device checked;\n" " file descriptor is for GUIs\n" msgstr " -r 报告对每个已检查设备的统计\n" -#: disk-utils/fsck.c:1392 +#: disk-utils/fsck.c:1391 msgid " -s serialize the checking operations\n" msgstr " -s 串行化检查操作\n" -#: disk-utils/fsck.c:1393 +#: disk-utils/fsck.c:1392 msgid " -T do not show the title on startup\n" msgstr " -T 启动时不显示标题\n" -#: disk-utils/fsck.c:1394 +#: disk-utils/fsck.c:1393 #, fuzzy -#| msgid "" -#| " -t <type> specify filesystem types to be checked;\n" -#| " <type> is allowed to be a comma-separated list\n" msgid "" " -t <type> specify filesystem types to be checked;\n" " <type> is allowed to be a comma-separated list\n" @@ -1825,429 +1798,417 @@ msgstr "" " -t <类型> 指定要检查的文件系统类型；\n" " <类型> 可以是以英文逗号分隔的列表\n" -#: disk-utils/fsck.c:1396 +#: disk-utils/fsck.c:1395 msgid " -V explain what is being done\n" msgstr " -V 解释正在进行的操作\n" -#: disk-utils/fsck.c:1397 +#: disk-utils/fsck.c:1396 msgid " -? display this help and exit\n" msgstr " -? 显示此帮助并退出\n" -#: disk-utils/fsck.c:1400 +#: disk-utils/fsck.c:1399 msgid "See the specific fsck.* commands for available fs-options." msgstr "参见特定的 fsck.* 命令了解可用的文件系统选项。" -#: disk-utils/fsck.c:1439 +#: disk-utils/fsck.c:1438 msgid "too many devices" msgstr "设备过多" -#: disk-utils/fsck.c:1451 +#: disk-utils/fsck.c:1450 msgid "Is /proc mounted?" msgstr "/proc 挂载了吗？" -#: disk-utils/fsck.c:1459 +#: disk-utils/fsck.c:1458 #, c-format msgid "must be root to scan for matching filesystems: %s" msgstr "必须以 root 用户进行匹配文件系统扫描：%s" -#: disk-utils/fsck.c:1463 +#: disk-utils/fsck.c:1462 #, c-format msgid "couldn't find matching filesystem: %s" msgstr "找不到匹配的文件系统：%s" -#: disk-utils/fsck.c:1471 disk-utils/fsck.c:1566 misc-utils/kill.c:367 +#: disk-utils/fsck.c:1470 disk-utils/fsck.c:1565 misc-utils/kill.c:363 #: sys-utils/eject.c:279 msgid "too many arguments" msgstr "参数过多" -#: disk-utils/fsck.c:1526 disk-utils/fsck.c:1529 +#: disk-utils/fsck.c:1525 disk-utils/fsck.c:1528 #, fuzzy -#| msgid "invalid argument: %s" msgid "invalid argument of -r" msgstr "无效参数：%s" -#: disk-utils/fsck.c:1577 +#: disk-utils/fsck.c:1576 #, fuzzy, c-format -#| msgid "invalid argument: %s" msgid "invalid argument of -r: %d" msgstr "无效参数：%s" -#: disk-utils/fsck.c:1619 +#: disk-utils/fsck.c:1618 msgid "the -l option can be used with one device only -- ignore" msgstr "-l 选项只能用于一个设备 -- 忽略" -#: disk-utils/fsck.cramfs.c:108 +#: disk-utils/fsck.cramfs.c:107 #, c-format msgid " %s [options] <file>\n" msgstr " %s [选项] <文件>\n" -#: disk-utils/fsck.cramfs.c:111 +#: disk-utils/fsck.cramfs.c:110 msgid "Check and repair a compressed ROM filesystem.\n" msgstr "检查并修复压缩的 ROM 文件系统。\n" -#: disk-utils/fsck.cramfs.c:114 +#: disk-utils/fsck.cramfs.c:113 msgid " -a for compatibility only, ignored\n" msgstr " -a 纯兼容性选项，忽略\n" -#: disk-utils/fsck.cramfs.c:115 +#: disk-utils/fsck.cramfs.c:114 msgid " -v, --verbose be more verbose\n" msgstr " -v, --verbose 更详尽\n" -#: disk-utils/fsck.cramfs.c:116 +#: disk-utils/fsck.cramfs.c:115 msgid " -y for compatibility only, ignored\n" msgstr " -y 纯兼容性选项，忽略\n" -#: disk-utils/fsck.cramfs.c:117 +#: disk-utils/fsck.cramfs.c:116 msgid " -b, --blocksize <size> use this blocksize, defaults to page size\n" msgstr " -b, --blocksize <大小> 使用指定的块大小，默认为页的大小\n" -#: disk-utils/fsck.cramfs.c:118 +#: disk-utils/fsck.cramfs.c:117 msgid " --extract[=<dir>] test uncompression, optionally extract into <dir>\n" msgstr " --extract[=<目录>] 测试解压，可指定解压到<目录>\n" -#: disk-utils/fsck.cramfs.c:156 +#: disk-utils/fsck.cramfs.c:155 #, c-format msgid "ioctl failed: unable to determine device size: %s" msgstr "ioctl 失败：无法确定设备大小：%s" -#: disk-utils/fsck.cramfs.c:162 +#: disk-utils/fsck.cramfs.c:161 #, c-format msgid "not a block device or file: %s" msgstr "不是一个块设备或文件：%s" -#: disk-utils/fsck.cramfs.c:165 disk-utils/fsck.cramfs.c:201 +#: disk-utils/fsck.cramfs.c:164 disk-utils/fsck.cramfs.c:200 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:718 libfdisk/src/bsd.c:890 +#: disk-utils/fsck.cramfs.c:173 disk-utils/fsck.cramfs.c:227 +#: disk-utils/fsck.cramfs.c:243 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 上定位失败" -#: disk-utils/fsck.cramfs.c:180 disk-utils/fsck.cramfs.c:182 +#: disk-utils/fsck.cramfs.c:179 disk-utils/fsck.cramfs.c:181 msgid "superblock magic not found" msgstr "超级块魔数(magic)未找到" -#: disk-utils/fsck.cramfs.c:185 +#: disk-utils/fsck.cramfs.c:184 #, c-format msgid "cramfs endianness is %s\n" msgstr "cramfs 大小端为 %s\n" -#: disk-utils/fsck.cramfs.c:186 +#: disk-utils/fsck.cramfs.c:185 msgid "big" msgstr "大端" -#: disk-utils/fsck.cramfs.c:186 +#: disk-utils/fsck.cramfs.c:185 msgid "little" msgstr "小端" -#: disk-utils/fsck.cramfs.c:190 +#: disk-utils/fsck.cramfs.c:189 msgid "unsupported filesystem features" msgstr "不支持的文件系统特性" -#: disk-utils/fsck.cramfs.c:194 +#: disk-utils/fsck.cramfs.c:193 #, c-format msgid "superblock size (%d) too small" msgstr "超级块尺寸(%d)过小" -#: disk-utils/fsck.cramfs.c:199 +#: disk-utils/fsck.cramfs.c:198 msgid "zero file count" msgstr "零文件计数" -#: disk-utils/fsck.cramfs.c:203 +#: disk-utils/fsck.cramfs.c:202 msgid "file extends past end of filesystem" msgstr "警告：文件超过了文件系统终点" -#: disk-utils/fsck.cramfs.c:205 +#: disk-utils/fsck.cramfs.c:204 msgid "old cramfs format" msgstr "旧的 cramfs 格式" -#: disk-utils/fsck.cramfs.c:214 +#: disk-utils/fsck.cramfs.c:213 msgid "unable to test CRC: old cramfs format" msgstr "无法检测 CRC：旧的 cramfs 格式" -#: disk-utils/fsck.cramfs.c:267 +#: disk-utils/fsck.cramfs.c:266 msgid "crc error" msgstr "crc 错误" -#: disk-utils/fsck.cramfs.c:297 disk-utils/fsck.minix.c:545 +#: disk-utils/fsck.cramfs.c:296 disk-utils/fsck.minix.c:544 msgid "seek failed" msgstr "定位失败" -#: disk-utils/fsck.cramfs.c:301 +#: disk-utils/fsck.cramfs.c:300 msgid "read romfs failed" msgstr "读取 romfs 失败" -#: disk-utils/fsck.cramfs.c:333 +#: disk-utils/fsck.cramfs.c:332 msgid "root inode is not directory" msgstr "根 inode 不是一个目录" -#: disk-utils/fsck.cramfs.c:337 +#: disk-utils/fsck.cramfs.c:336 #, c-format msgid "bad root offset (%lu)" msgstr "错误的根偏移(%lu)" -#: disk-utils/fsck.cramfs.c:355 +#: disk-utils/fsck.cramfs.c:354 msgid "data block too large" msgstr "数据块过大" -#: disk-utils/fsck.cramfs.c:359 +#: disk-utils/fsck.cramfs.c:358 #, c-format msgid "decompression error: %s" msgstr "解压出错：%s" -#: disk-utils/fsck.cramfs.c:385 +#: disk-utils/fsck.cramfs.c:384 #, fuzzy, c-format -#| msgid " hole at %ld (%zd)\n" msgid " hole at %lu (%zu)\n" msgstr " 位于 %ld 的空洞(%zd)\n" -#: disk-utils/fsck.cramfs.c:392 disk-utils/fsck.cramfs.c:547 +#: disk-utils/fsck.cramfs.c:391 disk-utils/fsck.cramfs.c:546 #, fuzzy, c-format -#| msgid " uncompressing block at %ld to %ld (%ld)\n" msgid " uncompressing block at %lu to %lu (%lu)\n" msgstr " 正在将 %ld 处的块解压到 %ld (%ld)\n" -#: disk-utils/fsck.cramfs.c:399 +#: disk-utils/fsck.cramfs.c:398 #, c-format msgid "non-block (%ld) bytes" msgstr "非块(%ld)字节 " -#: disk-utils/fsck.cramfs.c:403 +#: disk-utils/fsck.cramfs.c:402 #, c-format msgid "non-size (%ld vs %ld) bytes" 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:360 +#: disk-utils/fsck.cramfs.c:408 disk-utils/fsck.cramfs.c:512 +#: disk-utils/swaplabel.c:104 misc-utils/uuidd.c:376 sys-utils/fallocate.c:382 +#: sys-utils/setpriv.c:535 sys-utils/setpriv.c:558 sys-utils/swapon.c:370 #: term-utils/ttymsg.c:175 #, c-format msgid "write failed: %s" msgstr "写失败：%s" -#: disk-utils/fsck.cramfs.c:421 +#: disk-utils/fsck.cramfs.c:420 #, c-format msgid "lchown failed: %s" msgstr "lchown 失败：%s" -#: disk-utils/fsck.cramfs.c:425 +#: disk-utils/fsck.cramfs.c:424 #, c-format msgid "chown failed: %s" msgstr "chown 失败：%s" -#: disk-utils/fsck.cramfs.c:430 +#: disk-utils/fsck.cramfs.c:429 #, c-format msgid "utime failed: %s" msgstr "utime 失败：%s" -#: disk-utils/fsck.cramfs.c:442 +#: disk-utils/fsck.cramfs.c:441 #, c-format msgid "directory inode has zero offset and non-zero size: %s" msgstr "目录 inode 偏移为 0，大小不为 0：%s" -#: disk-utils/fsck.cramfs.c:457 +#: disk-utils/fsck.cramfs.c:456 #, c-format msgid "mkdir failed: %s" msgstr "mkdir 失败：%s" -#: disk-utils/fsck.cramfs.c:473 +#: disk-utils/fsck.cramfs.c:472 msgid "filename length is zero" msgstr "文件名长度为 0" -#: disk-utils/fsck.cramfs.c:475 +#: disk-utils/fsck.cramfs.c:474 msgid "bad filename length" msgstr "文件名长度有误" -#: disk-utils/fsck.cramfs.c:481 +#: disk-utils/fsck.cramfs.c:480 msgid "bad inode offset" msgstr "inode 偏移有误" -#: disk-utils/fsck.cramfs.c:496 +#: disk-utils/fsck.cramfs.c:495 msgid "file inode has zero offset and non-zero size" msgstr "文件 inode 偏移为 0，大小不为 0" -#: disk-utils/fsck.cramfs.c:499 +#: disk-utils/fsck.cramfs.c:498 msgid "file inode has zero size and non-zero offset" msgstr "文件 inode 大小为 0，偏移不为 0" -#: disk-utils/fsck.cramfs.c:528 +#: disk-utils/fsck.cramfs.c:527 msgid "symbolic link has zero offset" msgstr "符号链接偏移为 0" -#: disk-utils/fsck.cramfs.c:530 +#: disk-utils/fsck.cramfs.c:529 msgid "symbolic link has zero size" msgstr "符号链接大小为 0" -#: disk-utils/fsck.cramfs.c:539 +#: disk-utils/fsck.cramfs.c:538 #, c-format msgid "size error in symlink: %s" msgstr "符号链接大小出错：%s" -#: disk-utils/fsck.cramfs.c:553 +#: disk-utils/fsck.cramfs.c:552 #, c-format msgid "symlink failed: %s" msgstr "symlink 失败：%s" -#: disk-utils/fsck.cramfs.c:566 +#: disk-utils/fsck.cramfs.c:565 #, c-format msgid "special file has non-zero offset: %s" msgstr "特殊文件的偏移不为 0：%s" -#: disk-utils/fsck.cramfs.c:576 +#: disk-utils/fsck.cramfs.c:575 #, c-format msgid "fifo has non-zero size: %s" msgstr "FIFO 的大小不为 0：%s" -#: disk-utils/fsck.cramfs.c:582 +#: disk-utils/fsck.cramfs.c:581 #, c-format msgid "socket has non-zero size: %s" msgstr "套接字的大小不为 0：%s" -#: disk-utils/fsck.cramfs.c:585 +#: disk-utils/fsck.cramfs.c:584 #, c-format msgid "bogus mode: %s (%o)" msgstr "伪(bogus)模式：%s (%o)" -#: disk-utils/fsck.cramfs.c:594 +#: disk-utils/fsck.cramfs.c:593 #, c-format msgid "mknod failed: %s" msgstr "mknod 失败：%s" -#: disk-utils/fsck.cramfs.c:626 +#: disk-utils/fsck.cramfs.c:625 #, c-format msgid "directory data start (%lu) < sizeof(struct cramfs_super) + start (%zu)" msgstr "目录数据起点(%lu) < sizeof(struct cramfs_super) + 起点 (%zu)" -#: disk-utils/fsck.cramfs.c:630 +#: disk-utils/fsck.cramfs.c:629 #, c-format msgid "directory data end (%lu) != file data start (%lu)" msgstr "目录数据终点 (%lu) != 文件数据起点 (%lu)" -#: disk-utils/fsck.cramfs.c:635 +#: disk-utils/fsck.cramfs.c:634 msgid "invalid file data offset" msgstr "无效的文件数据偏移" -#: disk-utils/fsck.cramfs.c:682 disk-utils/mkfs.cramfs.c:720 +#: disk-utils/fsck.cramfs.c:681 disk-utils/mkfs.cramfs.c:720 msgid "invalid blocksize argument" msgstr "无效的 块大小 参数" -#: disk-utils/fsck.cramfs.c:703 +#: disk-utils/fsck.cramfs.c:702 #, c-format msgid "%s: OK\n" msgstr "%s：OK\n" -#: disk-utils/fsck.minix.c:185 +#: disk-utils/fsck.minix.c:184 #, fuzzy -#| msgid "Checking all file systems.\n" msgid "Check the consistency of a Minix filesystem.\n" msgstr "正在检查所有文件系统。\n" -#: disk-utils/fsck.minix.c:187 +#: disk-utils/fsck.minix.c:186 #, fuzzy -#| msgid " -l list all filenames\n" msgid " -l, --list list all filenames\n" msgstr " -l 列出所有文件名\n" -#: disk-utils/fsck.minix.c:188 +#: disk-utils/fsck.minix.c:187 #, fuzzy -#| msgid " -a automatic repair\n" msgid " -a, --auto automatic repair\n" msgstr " -a 自动修复\n" -#: disk-utils/fsck.minix.c:189 +#: disk-utils/fsck.minix.c:188 #, fuzzy -#| msgid " -r interactive repair\n" msgid " -r, --repair interactive repair\n" msgstr " -r 交互式修复\n" -#: disk-utils/fsck.minix.c:190 +#: disk-utils/fsck.minix.c:189 #, fuzzy -#| msgid " -v, --verbose verbose mode\n" msgid " -v, --verbose be verbose\n" msgstr " -v, --verbose 详尽模式\n" -#: disk-utils/fsck.minix.c:191 +#: disk-utils/fsck.minix.c:190 #, fuzzy -#| msgid " -s output super-block information\n" msgid " -s, --super output super-block information\n" msgstr " -s 输出超级块信息\n" -#: disk-utils/fsck.minix.c:192 +#: disk-utils/fsck.minix.c:191 #, fuzzy -#| msgid " -m activate mode not cleared warnings\n" msgid " -m, --uncleared activate mode not cleared warnings\n" msgstr " -m 激活 模式未清除 警告\n" -#: disk-utils/fsck.minix.c:193 +#: disk-utils/fsck.minix.c:192 #, fuzzy -#| msgid " -f force check\n" 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:253 +#: disk-utils/fsck.minix.c:252 #, c-format msgid "%s (y/n)? " msgstr "%s (是/否)? " -#: disk-utils/fsck.minix.c:253 +#: disk-utils/fsck.minix.c:252 #, c-format msgid "%s (n/y)? " msgstr "%s (否/是)? " -#: disk-utils/fsck.minix.c:270 +#: disk-utils/fsck.minix.c:269 #, c-format msgid "y\n" msgstr "是\n" -#: disk-utils/fsck.minix.c:272 +#: disk-utils/fsck.minix.c:271 #, c-format msgid "n\n" msgstr "否\n" -#: disk-utils/fsck.minix.c:288 +#: disk-utils/fsck.minix.c:287 #, c-format msgid "%s is mounted.\t " msgstr "%s 已经挂载.\t" -#: disk-utils/fsck.minix.c:290 +#: disk-utils/fsck.minix.c:289 msgid "Do you really want to continue" msgstr "你确认要继续" -#: disk-utils/fsck.minix.c:294 +#: disk-utils/fsck.minix.c:293 #, c-format msgid "check aborted.\n" msgstr "检查失败.\n" -#: disk-utils/fsck.minix.c:310 disk-utils/fsck.minix.c:331 +#: disk-utils/fsck.minix.c:309 disk-utils/fsck.minix.c:330 #, c-format msgid "Zone nr < FIRSTZONE in file `%s'." msgstr "nr 区 < 文件“%s”中的 FIRSTZONE。" -#: disk-utils/fsck.minix.c:313 disk-utils/fsck.minix.c:334 +#: disk-utils/fsck.minix.c:312 disk-utils/fsck.minix.c:333 #, c-format msgid "Zone nr >= ZONES in file `%s'." msgstr "nr 区 >= 文件“%s”中的 FIRSTZONE。" -#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:338 +#: disk-utils/fsck.minix.c:316 disk-utils/fsck.minix.c:337 msgid "Remove block" msgstr "删除块" -#: disk-utils/fsck.minix.c:354 +#: disk-utils/fsck.minix.c:353 #, c-format msgid "Read error: unable to seek to block in file '%s'\n" msgstr "读取错误: 不能在文件 '%s' 中定位到该块\n" -#: disk-utils/fsck.minix.c:360 +#: disk-utils/fsck.minix.c:359 #, c-format msgid "Read error: bad block in file '%s'\n" msgstr "读取错误: 文件 '%s' 中有坏块\n" -#: disk-utils/fsck.minix.c:372 +#: disk-utils/fsck.minix.c:371 #, c-format msgid "" "Internal error: trying to write bad block\n" @@ -2256,107 +2217,107 @@ msgstr "" "内部错误: 试图写坏块\n" "写请求忽略\n" -#: disk-utils/fsck.minix.c:378 +#: disk-utils/fsck.minix.c:377 msgid "seek failed in write_block" msgstr "在 write_block 中定位失败" -#: disk-utils/fsck.minix.c:381 +#: disk-utils/fsck.minix.c:380 #, c-format msgid "Write error: bad block in file '%s'\n" msgstr "写入错误: 文件 '%s' 中有坏块\n" -#: disk-utils/fsck.minix.c:496 +#: disk-utils/fsck.minix.c:495 msgid "seek failed in write_super_block" msgstr "在 write_super_block 中定位失败" -#: disk-utils/fsck.minix.c:498 +#: disk-utils/fsck.minix.c:497 msgid "unable to write super-block" msgstr "不能写超级块" -#: disk-utils/fsck.minix.c:511 +#: disk-utils/fsck.minix.c:510 msgid "Unable to write inode map" msgstr "不能写 inode map" -#: disk-utils/fsck.minix.c:514 +#: disk-utils/fsck.minix.c:513 msgid "Unable to write zone map" msgstr "不能写 zone map" -#: disk-utils/fsck.minix.c:517 +#: disk-utils/fsck.minix.c:516 msgid "Unable to write inodes" msgstr "不能写 inodes" -#: disk-utils/fsck.minix.c:549 +#: disk-utils/fsck.minix.c:548 msgid "unable to alloc buffer for superblock" msgstr "无法为超级块分配缓冲区" -#: disk-utils/fsck.minix.c:552 +#: disk-utils/fsck.minix.c:551 msgid "unable to read super block" msgstr "不能读超级块" -#: disk-utils/fsck.minix.c:574 +#: disk-utils/fsck.minix.c:573 msgid "bad magic number in super-block" msgstr "超级块中的魔数数字损坏" -#: disk-utils/fsck.minix.c:576 +#: disk-utils/fsck.minix.c:575 msgid "Only 1k blocks/zones supported" msgstr "只支持 1k 块/区" -#: disk-utils/fsck.minix.c:578 +#: disk-utils/fsck.minix.c:577 msgid "bad s_imap_blocks field in super-block" msgstr "不正确的 s_imap_blocks 域在超级块中" -#: disk-utils/fsck.minix.c:581 +#: disk-utils/fsck.minix.c:580 msgid "bad s_zmap_blocks field in super-block" msgstr "不正确的 s_zmap_blocks 域在超级块中" -#: disk-utils/fsck.minix.c:597 +#: disk-utils/fsck.minix.c:596 msgid "Unable to allocate buffer for inode map" msgstr "不能为 inode map 分配缓冲区" -#: disk-utils/fsck.minix.c:600 +#: disk-utils/fsck.minix.c:599 msgid "Unable to allocate buffer for zone map" msgstr "不能为 zone map 分配缓冲区" -#: disk-utils/fsck.minix.c:603 +#: disk-utils/fsck.minix.c:602 msgid "Unable to allocate buffer for inodes" msgstr "不能为 inodes 分配缓冲区" -#: disk-utils/fsck.minix.c:606 +#: disk-utils/fsck.minix.c:605 msgid "Unable to allocate buffer for inode count" msgstr "不能为 inode count 分配缓冲区" -#: disk-utils/fsck.minix.c:609 +#: disk-utils/fsck.minix.c:608 msgid "Unable to allocate buffer for zone count" msgstr "不能为 zone count 分配缓冲区" -#: disk-utils/fsck.minix.c:613 +#: disk-utils/fsck.minix.c:612 msgid "Unable to read inode map" msgstr "不能读 inode map" -#: disk-utils/fsck.minix.c:617 +#: disk-utils/fsck.minix.c:616 msgid "Unable to read zone map" msgstr "不能读 zone map" -#: disk-utils/fsck.minix.c:621 +#: disk-utils/fsck.minix.c:620 msgid "Unable to read inodes" msgstr "不能读 inodes" -#: disk-utils/fsck.minix.c:623 +#: disk-utils/fsck.minix.c:622 #, c-format msgid "Warning: Firstzone != Norm_firstzone\n" msgstr "警告: Firstzone != Norm_firstzone\n" -#: disk-utils/fsck.minix.c:628 +#: disk-utils/fsck.minix.c:627 #, c-format msgid "%ld inodes\n" msgstr "%ld inodes\n" -#: disk-utils/fsck.minix.c:629 +#: disk-utils/fsck.minix.c:628 #, c-format msgid "%ld blocks\n" msgstr "%ld 块\n" -#: disk-utils/fsck.minix.c:630 disk-utils/mkfs.minix.c:568 +#: disk-utils/fsck.minix.c:629 disk-utils/mkfs.minix.c:566 #, c-format msgid "Firstdatazone=%jd (%jd)\n" msgstr "Firstdatazone=%jd (%jd)\n" @@ -2414,8 +2375,8 @@ msgid "Block has been used before. Now in file `%s'." msgstr "块已经被使用, 现在在文件 `%s' 中." #: 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 +#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1132 +#: disk-utils/fsck.minix.c:1179 disk-utils/fsck.minix.c:1188 msgid "Clear" msgstr "清除" @@ -2428,118 +2389,118 @@ msgstr "文件中块 %d `%s' 标记为没有使用." msgid "Correct" msgstr "正确" -#: disk-utils/fsck.minix.c:945 disk-utils/fsck.minix.c:1018 +#: disk-utils/fsck.minix.c:945 disk-utils/fsck.minix.c:1019 #, c-format msgid "The directory '%s' contains a bad inode number for file '%.*s'." msgstr "目录 '%s' 包含了一个不正确的 inode number 文件 '%.*s'. " -#: disk-utils/fsck.minix.c:947 disk-utils/fsck.minix.c:1020 +#: disk-utils/fsck.minix.c:947 disk-utils/fsck.minix.c:1021 msgid " Remove" msgstr " 删除" -#: disk-utils/fsck.minix.c:963 disk-utils/fsck.minix.c:1036 +#: disk-utils/fsck.minix.c:963 disk-utils/fsck.minix.c:1037 #, c-format msgid "%s: bad directory: '.' isn't first\n" msgstr "%s: 不正确的目录: '.' 不是第一个\n" -#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1045 +#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1046 #, c-format msgid "%s: bad directory: '..' isn't second\n" msgstr "%s: 不正确的目录: '.' 不是第二个\n" -#: disk-utils/fsck.minix.c:1079 disk-utils/fsck.minix.c:1096 +#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1097 msgid "internal error" msgstr "内部错误" -#: disk-utils/fsck.minix.c:1082 disk-utils/fsck.minix.c:1099 +#: disk-utils/fsck.minix.c:1083 disk-utils/fsck.minix.c:1100 #, c-format msgid "%s: bad directory: size < 32" msgstr "%s: 不正确的目录: 大小 < 32" -#: disk-utils/fsck.minix.c:1111 +#: disk-utils/fsck.minix.c:1112 msgid "seek failed in bad_zone" msgstr "bad_zone 中定位失败" -#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1177 +#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1178 #, c-format msgid "Inode %lu mode not cleared." msgstr "Inode %lu 模式未清除。" -#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1186 +#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1187 #, c-format msgid "Inode %lu not used, marked used in the bitmap." msgstr "Inode %lu 未使用，但在位图(bitmap)中标记为已使用。" -#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1192 +#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1193 #, c-format msgid "Inode %lu used, marked unused in the bitmap." msgstr "Inode %lu 已使用，但在位图(bitmap)中标记为未使用。" -#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1193 +#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1194 msgid "Set" msgstr "设置" -#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197 +#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1198 #, 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:1144 disk-utils/fsck.minix.c:1200 +#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1201 msgid "Set i_nlinks to count" msgstr "将 i_nlinks 设为计数" -#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1212 +#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213 #, c-format msgid "Zone %lu: marked in use, no file uses it." msgstr "%lu 区：标记为使用，但没有文件使用它。" -#: disk-utils/fsck.minix.c:1158 disk-utils/fsck.minix.c:1214 +#: disk-utils/fsck.minix.c:1159 disk-utils/fsck.minix.c:1215 msgid "Unmark" msgstr "清标记" -#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219 +#: disk-utils/fsck.minix.c:1164 disk-utils/fsck.minix.c:1220 #, c-format msgid "Zone %lu: in use, counted=%d\n" msgstr "区 %lu：使用中，已计数=%d\n" -#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1222 +#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1223 #, c-format msgid "Zone %lu: not in use, counted=%d\n" msgstr "区 %lu：未使用，已计数=%d\n" -#: disk-utils/fsck.minix.c:1270 +#: disk-utils/fsck.minix.c:1271 msgid "bad inode size" msgstr "inode 大小有误" -#: disk-utils/fsck.minix.c:1272 +#: disk-utils/fsck.minix.c:1273 msgid "bad v2 inode size" msgstr "v2 inode 大小有误" -#: disk-utils/fsck.minix.c:1317 +#: disk-utils/fsck.minix.c:1318 msgid "need terminal for interactive repairs" msgstr "需要终端来进行交互式修复" -#: disk-utils/fsck.minix.c:1321 +#: disk-utils/fsck.minix.c:1322 #, c-format msgid "cannot open %s: %s" msgstr "无法打开 %s：%s" -#: disk-utils/fsck.minix.c:1332 +#: disk-utils/fsck.minix.c:1333 #, c-format msgid "%s is clean, no check.\n" msgstr "%s 是干净的，不检查。\n" -#: disk-utils/fsck.minix.c:1335 +#: disk-utils/fsck.minix.c:1336 #, c-format msgid "Forcing filesystem check on %s.\n" msgstr "强制在 %s 上进行文件系统检查。\n" -#: disk-utils/fsck.minix.c:1337 +#: disk-utils/fsck.minix.c:1338 #, c-format msgid "Filesystem on %s is dirty, needs checking.\n" msgstr "%s 上的文件系统有问题，需要检查。\n" -#: disk-utils/fsck.minix.c:1369 +#: disk-utils/fsck.minix.c:1370 #, c-format msgid "" "\n" @@ -2548,12 +2509,12 @@ msgstr "" "\n" "已使用 %6ld inodes(%ld%%)\n" -#: disk-utils/fsck.minix.c:1375 +#: disk-utils/fsck.minix.c:1376 #, c-format msgid "%6ld zones used (%ld%%)\n" msgstr "已使用 %6ld 区(%ld%%)\n" -#: disk-utils/fsck.minix.c:1377 +#: disk-utils/fsck.minix.c:1378 #, c-format msgid "" "\n" @@ -2576,7 +2537,7 @@ msgstr "" "------\n" "%6d 个文件\n" -#: disk-utils/fsck.minix.c:1391 +#: disk-utils/fsck.minix.c:1392 #, c-format msgid "" "----------------------------\n" @@ -2587,11 +2548,11 @@ msgstr "" "文件系统已经更改\n" "----------------\n" -#: disk-utils/fsck.minix.c:1403 disk-utils/mkfs.minix.c:843 -#: 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 +#: disk-utils/fsck.minix.c:1404 disk-utils/mkfs.minix.c:837 +#: disk-utils/mkswap.c:539 disk-utils/partx.c:1004 disk-utils/resizepart.c:112 +#: login-utils/utmpdump.c:388 sys-utils/dmesg.c:657 sys-utils/wdctl.c:346 +#: sys-utils/wdctl.c:411 term-utils/script.c:272 term-utils/script.c:348 +#: text-utils/pg.c:1248 msgid "write failed" msgstr "写失败" @@ -2622,7 +2583,6 @@ msgstr " %s [选项] <iso9660镜像文件>\n" #: disk-utils/isosize.c:174 #, fuzzy -#| msgid "%s: might not be an ISO filesystem" msgid "Show the length of an ISO-9660 filesystem.\n" msgstr "%s：可能不是 ISO 文件系统" @@ -2688,102 +2648,94 @@ msgstr "卷名过长" msgid "fsname name too long" msgstr "fsname 名过长" -#: disk-utils/mkfs.bfs.c:188 -#, c-format -msgid "%s is not a block special device" -msgstr "%s 不是一个块特殊设备" - -#: disk-utils/mkfs.bfs.c:196 +#: disk-utils/mkfs.bfs.c:193 msgid "invalid block-count" msgstr "无效的块计数" -#: disk-utils/mkfs.bfs.c:202 +#: disk-utils/mkfs.bfs.c:199 #, c-format msgid "cannot get size of %s" msgstr "无法获得 %s 的大小" -#: disk-utils/mkfs.bfs.c:207 +#: disk-utils/mkfs.bfs.c:204 #, c-format msgid "blocks argument too large, max is %llu" msgstr "块参数过大，最大值是 %llu" -#: disk-utils/mkfs.bfs.c:222 +#: disk-utils/mkfs.bfs.c:219 msgid "too many inodes - max is 512" msgstr "inodes 过多 - 最多 512" -#: disk-utils/mkfs.bfs.c:232 +#: disk-utils/mkfs.bfs.c:229 #, c-format msgid "not enough space, need at least %llu blocks" msgstr "空间不足，至少需要 %llu 个块" -#: disk-utils/mkfs.bfs.c:244 +#: disk-utils/mkfs.bfs.c:241 #, c-format msgid "Device: %s\n" msgstr "设备：%s\n" -#: disk-utils/mkfs.bfs.c:245 +#: disk-utils/mkfs.bfs.c:242 #, c-format msgid "Volume: <%-6s>\n" msgstr "卷：<%-6s>\n" -#: disk-utils/mkfs.bfs.c:246 +#: disk-utils/mkfs.bfs.c:243 #, c-format msgid "FSname: <%-6s>\n" msgstr "文件系统名：<%-6s>\n" -#: disk-utils/mkfs.bfs.c:247 +#: disk-utils/mkfs.bfs.c:244 #, c-format msgid "BlockSize: %d\n" msgstr "块大小：%d\n" -#: disk-utils/mkfs.bfs.c:249 +#: disk-utils/mkfs.bfs.c:246 #, fuzzy, c-format -#| msgid "Inodes: %lu (in 1 block)\n" msgid "Inodes: %ld (in 1 block)\n" msgstr "Inodes：%lu (在 1 个块中)\n" -#: disk-utils/mkfs.bfs.c:252 +#: disk-utils/mkfs.bfs.c:249 #, fuzzy, c-format -#| msgid "Inodes: %lu (in %llu blocks)\n" msgid "Inodes: %ld (in %llu blocks)\n" msgstr "Inodes：%lu (在 %llu 个块中)\n" -#: disk-utils/mkfs.bfs.c:254 +#: disk-utils/mkfs.bfs.c:251 #, fuzzy, c-format -#| msgid "Blocks: %lld\n" msgid "Blocks: %llu\n" msgstr "块：%lld\n" -#: disk-utils/mkfs.bfs.c:255 +#: disk-utils/mkfs.bfs.c:252 #, c-format msgid "Inode end: %d, Data end: %d\n" msgstr "Inode 终点：%d，数据终点：%d\n" -#: disk-utils/mkfs.bfs.c:260 +#: disk-utils/mkfs.bfs.c:257 msgid "error writing superblock" msgstr "写超级块出错" -#: disk-utils/mkfs.bfs.c:281 +#: disk-utils/mkfs.bfs.c:278 msgid "error writing root inode" msgstr "写 根 inode 出错" -#: disk-utils/mkfs.bfs.c:286 +#: disk-utils/mkfs.bfs.c:283 msgid "error writing inode" msgstr "写 inode 出错" -#: disk-utils/mkfs.bfs.c:289 +#: disk-utils/mkfs.bfs.c:286 msgid "seek error" msgstr "定位出错" -#: disk-utils/mkfs.bfs.c:295 +#: disk-utils/mkfs.bfs.c:292 msgid "error writing . entry" msgstr "写 . 记录出错" -#: disk-utils/mkfs.bfs.c:299 +#: disk-utils/mkfs.bfs.c:296 msgid "error writing .. entry" msgstr "写 .. 记录出错" -#: disk-utils/mkfs.bfs.c:302 +#: disk-utils/mkfs.bfs.c:299 #, c-format msgid "error closing %s" msgstr "关闭 %s 出错" @@ -2795,7 +2747,6 @@ msgstr " %s [选项] [-t <类型>] [文件系统选项] <设备> [<大小>]\n" #: disk-utils/mkfs.c:48 #, fuzzy -#| msgid "Linux filesystem" msgid "Make a Linux filesystem.\n" msgstr "Linux 文件系统" @@ -2842,14 +2793,14 @@ msgstr "" msgid " -h, --help display this help text and exit\n" msgstr " -h, --help 显示此帮助并退出\n" -#: 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:825 login-utils/sulogin.c:829 schedutils/chrt.c:336 +#: disk-utils/mkfs.c:139 lib/exec_shell.c:49 login-utils/newgrp.c:233 +#: login-utils/su-common.c:651 login-utils/su-common.c:986 +#: login-utils/sulogin.c:825 login-utils/sulogin.c:829 schedutils/chrt.c:516 #: 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:580 -#: sys-utils/setarch.c:314 sys-utils/setarch.c:389 sys-utils/setsid.c:117 -#: 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 +#: sys-utils/nsenter.c:407 sys-utils/prlimit.c:644 sys-utils/rtcwake.c:579 +#: sys-utils/setarch.c:324 sys-utils/setarch.c:399 sys-utils/setsid.c:117 +#: sys-utils/swapon.c:326 sys-utils/switch_root.c:243 sys-utils/unshare.c:453 +#: term-utils/script.c:575 text-utils/pg.c:1375 #, c-format msgid "failed to execute %s" msgstr "执行 %s 失败" @@ -2974,7 +2925,6 @@ msgstr "ROM 镜像" #: disk-utils/mkfs.cramfs.c:885 #, fuzzy, c-format -#| msgid "warning: filenames truncated to 255 bytes." msgid "warning: filenames truncated to %u bytes." msgstr "警告：文件名被截短为 255 个字节。" @@ -3004,109 +2954,102 @@ msgid "" "that some device files will be wrong." msgstr "警告：设备号被截短为 %u 位。几乎可以肯定某些设备文件将出错。" -#: disk-utils/mkfs.minix.c:136 +#: disk-utils/mkfs.minix.c:135 #, fuzzy, c-format -#| msgid "Usage: %s [options] device [block-count]\n" msgid " %s [options] /dev/name [blocks]\n" msgstr "Usage: %s [选项] 设备 [块数]\n" -#: disk-utils/mkfs.minix.c:138 +#: disk-utils/mkfs.minix.c:137 #, fuzzy -#| msgid " -v print program version\n" msgid " -1 use Minix version 1\n" msgstr " -v 打印程序版本\n" -#: disk-utils/mkfs.minix.c:139 +#: disk-utils/mkfs.minix.c:138 #, fuzzy -#| msgid " -v print program version\n" msgid " -2, -v use Minix version 2\n" msgstr " -v 打印程序版本\n" -#: disk-utils/mkfs.minix.c:140 +#: disk-utils/mkfs.minix.c:139 #, fuzzy -#| msgid " -v print program version\n" msgid " -3 use Minix version 3\n" msgstr " -v 打印程序版本\n" -#: disk-utils/mkfs.minix.c:141 +#: disk-utils/mkfs.minix.c:140 #, fuzzy -#| msgid "failed to parse maximum length of filenames" msgid " -n, --namelength <num> maximum length of filenames\n" msgstr "解析文件名最大长度失败" -#: disk-utils/mkfs.minix.c:142 +#: disk-utils/mkfs.minix.c:141 #, fuzzy -#| msgid " -C, --cylinders <number> specify the number of cylinders\n" msgid " -i, --inodes <num> number of inodes for the filesystem\n" msgstr " -C, --cylinders <数字> 指定柱面数\n" -#: disk-utils/mkfs.minix.c:143 +#: disk-utils/mkfs.minix.c:142 #, fuzzy -#| msgid " -u --unlock remove a lock\n" msgid " -c, --check check the device for bad blocks\n" msgstr " -u --unlock 移除锁\n" -#: disk-utils/mkfs.minix.c:144 +#: disk-utils/mkfs.minix.c:143 msgid " -l, --badblocks <file> list of bad blocks from file\n" msgstr " -l, --badblocks <文件> 列出文件中的坏块\n" -#: disk-utils/mkfs.minix.c:188 +#: disk-utils/mkfs.minix.c:187 #, c-format msgid "%s: seek to boot block failed in write_tables" msgstr "%s：在 write_tables 中定位到启动块失败" -#: disk-utils/mkfs.minix.c:191 +#: disk-utils/mkfs.minix.c:190 #, c-format msgid "%s: unable to clear boot sector" msgstr "%s：无法清除启动扇区" -#: disk-utils/mkfs.minix.c:193 +#: disk-utils/mkfs.minix.c:192 #, c-format msgid "%s: seek failed in write_tables" msgstr "%s：在 write_tables 中定位失败" -#: disk-utils/mkfs.minix.c:196 +#: disk-utils/mkfs.minix.c:195 #, c-format msgid "%s: unable to write super-block" msgstr "%s：无法写超级块" -#: disk-utils/mkfs.minix.c:199 +#: disk-utils/mkfs.minix.c:198 #, c-format msgid "%s: unable to write inode map" msgstr "%s：无法写 inode map" -#: disk-utils/mkfs.minix.c:202 +#: disk-utils/mkfs.minix.c:201 #, c-format msgid "%s: unable to write zone map" msgstr "%s：无法写 zone map" -#: disk-utils/mkfs.minix.c:205 +#: disk-utils/mkfs.minix.c:204 #, c-format msgid "%s: unable to write inodes" msgstr "%s：无法写 inodes" -#: disk-utils/mkfs.minix.c:210 +#: disk-utils/mkfs.minix.c:209 #, c-format msgid "%s: seek failed in write_block" msgstr "%s：在 write_block 中定位失败" -#: disk-utils/mkfs.minix.c:213 +#: disk-utils/mkfs.minix.c:212 #, c-format msgid "%s: write failed in write_block" msgstr "%s：在 write_block 中写入失败" -#: disk-utils/mkfs.minix.c:222 disk-utils/mkfs.minix.c:297 -#: disk-utils/mkfs.minix.c:346 +#: disk-utils/mkfs.minix.c:221 disk-utils/mkfs.minix.c:296 +#: disk-utils/mkfs.minix.c:345 #, c-format msgid "%s: too many bad blocks" msgstr "%s：坏块太多" -#: disk-utils/mkfs.minix.c:230 +#: disk-utils/mkfs.minix.c:229 #, c-format msgid "%s: not enough good blocks" msgstr "%s：好块不够" -#: disk-utils/mkfs.minix.c:546 +#: disk-utils/mkfs.minix.c:544 #, c-format msgid "" "First data block at %jd, which is too far (max %d).\n" @@ -3115,24 +3058,24 @@ msgstr "" "第一个数据块位于 %jd，过远(最大为 %d)。\n" "请尝试通过传递 --inodes <数值> 来指定更少的 inode" -#: disk-utils/mkfs.minix.c:566 +#: disk-utils/mkfs.minix.c:564 #, c-format msgid "%lu inode\n" msgid_plural "%lu inodes\n" msgstr[0] "%lu 个 inode\n" -#: disk-utils/mkfs.minix.c:567 +#: disk-utils/mkfs.minix.c:565 #, c-format msgid "%lu block\n" msgid_plural "%lu blocks\n" msgstr[0] "%lu 个块\n" -#: disk-utils/mkfs.minix.c:569 +#: disk-utils/mkfs.minix.c:568 #, c-format msgid "Zonesize=%zu\n" msgstr "Zonesize=%zu\n" -#: disk-utils/mkfs.minix.c:570 +#: disk-utils/mkfs.minix.c:569 #, c-format msgid "" "Maxsize=%zu\n" @@ -3141,130 +3084,123 @@ msgstr "" "Maxsize=%zu\n" "\n" -#: disk-utils/mkfs.minix.c:583 +#: disk-utils/mkfs.minix.c:582 #, c-format msgid "%s: seek failed during testing of blocks" msgstr "%s：在测试块时定位失败" -#: disk-utils/mkfs.minix.c:590 +#: disk-utils/mkfs.minix.c:589 #, c-format msgid "Weird values in do_check: probably bugs\n" msgstr "do_check 中的值异常：可能有 bug\n" -#: disk-utils/mkfs.minix.c:623 +#: disk-utils/mkfs.minix.c:622 #, c-format msgid "%s: seek failed in check_blocks" msgstr "%s：在 check_blocks 中定位失败" -#: disk-utils/mkfs.minix.c:633 +#: disk-utils/mkfs.minix.c:632 #, c-format msgid "%s: bad blocks before data-area: cannot make fs" msgstr "%s：数据区前有坏块：无法创建文件系统" -#: disk-utils/mkfs.minix.c:640 disk-utils/mkfs.minix.c:664 +#: disk-utils/mkfs.minix.c:639 disk-utils/mkfs.minix.c:663 #, c-format msgid "%d bad block\n" msgid_plural "%d bad blocks\n" msgstr[0] "%d 个坏块\n" -#: disk-utils/mkfs.minix.c:649 +#: disk-utils/mkfs.minix.c:648 #, c-format msgid "%s: can't open file of bad blocks" msgstr "%s: 打不开坏块文件" -#: disk-utils/mkfs.minix.c:654 +#: disk-utils/mkfs.minix.c:653 #, c-format msgid "badblock number input error on line %d\n" msgstr "第 %d 行坏块数输入错误\n" -#: disk-utils/mkfs.minix.c:655 +#: disk-utils/mkfs.minix.c:654 #, c-format msgid "%s: cannot read badblocks file" msgstr "%s: 打不开 badblocks 文件" -#: disk-utils/mkfs.minix.c:699 -#, c-format -msgid "%s: device is misaligned" -msgstr "%s：设备未正确对齐" - -#: disk-utils/mkfs.minix.c:701 +#: disk-utils/mkfs.minix.c:698 #, c-format msgid "block size smaller than physical sector size of %s" msgstr "块尺寸比 %s 的物理扇区尺寸小" -#: disk-utils/mkfs.minix.c:704 +#: disk-utils/mkfs.minix.c:701 #, c-format msgid "cannot determine size of %s" msgstr "无法确定 %s 的大小" -#: disk-utils/mkfs.minix.c:712 +#: disk-utils/mkfs.minix.c:709 #, c-format msgid "%s: requested blocks (%llu) exceeds available (%llu) blocks\n" msgstr "%s：重复的块 (%llu) 超出可用的 (%llu) 块\n" -#: disk-utils/mkfs.minix.c:715 +#: disk-utils/mkfs.minix.c:712 #, c-format msgid "%s: number of blocks too small" msgstr "%s：块数太小" -#: disk-utils/mkfs.minix.c:730 disk-utils/mkfs.minix.c:736 +#: disk-utils/mkfs.minix.c:727 disk-utils/mkfs.minix.c:733 #, fuzzy, c-format -#| msgid "unsupported argument: %s" msgid "unsupported name length: %d" msgstr "不支持的参数：%s" -#: disk-utils/mkfs.minix.c:739 +#: disk-utils/mkfs.minix.c:736 #, fuzzy, c-format -#| msgid "unsupported filesystem features" msgid "unsupported minix file system version: %d" msgstr "不支持的文件系统特性" -#: disk-utils/mkfs.minix.c:774 +#: disk-utils/mkfs.minix.c:771 msgid "-v is ambiguous, use '-2' instead" msgstr "-v 含义不清，请转用“-2”" -#: disk-utils/mkfs.minix.c:785 +#: disk-utils/mkfs.minix.c:782 msgid "failed to parse maximum length of filenames" msgstr "解析文件名最大长度失败" -#: disk-utils/mkfs.minix.c:789 +#: disk-utils/mkfs.minix.c:786 msgid "failed to parse number of inodes" msgstr "解析 inode 数 失败" -#: disk-utils/mkfs.minix.c:813 +#: disk-utils/mkfs.minix.c:810 msgid "failed to parse number of blocks" msgstr "解析块数失败" -#: disk-utils/mkfs.minix.c:820 +#: disk-utils/mkfs.minix.c:817 #, c-format msgid "%s is mounted; will not make a filesystem here!" msgstr "%s 已挂载；将不会在此创建文件系统！" -#: disk-utils/mkswap.c:81 +#: disk-utils/mkswap.c:80 #, c-format msgid "Bad user-specified page size %u" msgstr "用户指定的页大小 %u 有误" -#: disk-utils/mkswap.c:84 +#: disk-utils/mkswap.c:83 #, c-format msgid "Using user-specified page size %d, instead of the system value %d" msgstr "将使用用户指定的页大小 %d 来取代系统值 %d" -#: disk-utils/mkswap.c:125 +#: disk-utils/mkswap.c:124 msgid "Label was truncated." msgstr "标签已截短。" -#: disk-utils/mkswap.c:133 +#: disk-utils/mkswap.c:132 #, c-format msgid "no label, " msgstr "无标签，" -#: disk-utils/mkswap.c:141 +#: disk-utils/mkswap.c:140 #, c-format msgid "no uuid\n" msgstr "无 uuid\n" -#: disk-utils/mkswap.c:148 +#: disk-utils/mkswap.c:147 #, c-format msgid "" "\n" @@ -3275,11 +3211,11 @@ msgstr "" "用法\n" " %s [选项] 设备 [大小]\n" -#: disk-utils/mkswap.c:153 +#: disk-utils/mkswap.c:152 msgid "Set up a Linux swap area.\n" msgstr "设置 Linux 交换区。\n" -#: disk-utils/mkswap.c:156 +#: disk-utils/mkswap.c:155 #, c-format msgid "" "\n" @@ -3306,389 +3242,392 @@ msgstr "" " -h, --help 显示此帮助并退出\n" "\n" -#: disk-utils/mkswap.c:175 +#: disk-utils/mkswap.c:174 #, fuzzy, c-format -#| msgid "too many bad pages" msgid "too many bad pages: %lu" msgstr "坏页过多" -#: disk-utils/mkswap.c:196 +#: disk-utils/mkswap.c:195 msgid "seek failed in check_blocks" msgstr "check_blocks (检查块)时定位失败" -#: disk-utils/mkswap.c:204 +#: disk-utils/mkswap.c:203 #, c-format msgid "%lu bad page\n" msgid_plural "%lu bad pages\n" msgstr[0] "%lu 个坏页\n" -#: disk-utils/mkswap.c:229 +#: disk-utils/mkswap.c:228 msgid "unable to alloc new libblkid probe" msgstr "无法分配新的 libblkid 探针" -#: disk-utils/mkswap.c:231 +#: disk-utils/mkswap.c:230 msgid "unable to assign device to libblkid probe" msgstr "无法将设备分配给 libblkid 探针" -#: disk-utils/mkswap.c:249 +#: disk-utils/mkswap.c:247 #, c-format msgid "warning: checking bad blocks from swap file is not supported: %s" msgstr "警告：不支持检查交换区的坏块：%s" -#: disk-utils/mkswap.c:259 -#, c-format -msgid "warning: %s is misaligned" -msgstr "警告：%s 未正确对齐" - -#: disk-utils/mkswap.c:271 disk-utils/mkswap.c:297 disk-utils/mkswap.c:344 +#: disk-utils/mkswap.c:261 disk-utils/mkswap.c:287 disk-utils/mkswap.c:334 msgid "unable to rewind swap-device" msgstr "无法倒回(rewind)交换设备" -#: disk-utils/mkswap.c:300 +#: disk-utils/mkswap.c:290 msgid "unable to erase bootbits sectors" msgstr "不能擦除 bootbits 扇区" -#: disk-utils/mkswap.c:316 +#: disk-utils/mkswap.c:306 #, c-format msgid "%s: warning: wiping old %s signature." msgstr "%s：警告，将擦除旧的 %s 签名。" -#: disk-utils/mkswap.c:321 +#: disk-utils/mkswap.c:311 #, c-format msgid "%s: warning: don't erase bootbits sectors" msgstr "%s：警告，不要擦除 bootbits 扇区" -#: disk-utils/mkswap.c:324 +#: disk-utils/mkswap.c:314 #, c-format msgid " (%s partition table detected). " msgstr " (检测到 %s 分区表)。" -#: disk-utils/mkswap.c:326 +#: disk-utils/mkswap.c:316 #, c-format msgid " (compiled without libblkid). " msgstr " (编译时未链接 libblkid)。" -#: disk-utils/mkswap.c:327 +#: disk-utils/mkswap.c:317 #, c-format msgid "Use -f to force.\n" msgstr "使用 -f 选项强制执行。\n" -#: disk-utils/mkswap.c:349 +#: disk-utils/mkswap.c:339 #, c-format msgid "%s: unable to write signature page" msgstr "%s：无法写签名页" -#: disk-utils/mkswap.c:390 +#: disk-utils/mkswap.c:380 msgid "parsing page size failed" msgstr "解析页大小失败" -#: disk-utils/mkswap.c:396 +#: disk-utils/mkswap.c:386 msgid "parsing version number failed" msgstr "解析版本号失败" -#: disk-utils/mkswap.c:399 +#: disk-utils/mkswap.c:389 #, c-format msgid "swapspace version %d is not supported" msgstr "不支持交换空间版本 %d" -#: disk-utils/mkswap.c:405 +#: disk-utils/mkswap.c:395 #, c-format msgid "warning: ignoring -U (UUIDs are unsupported by %s)" msgstr "警告：将忽略 -U 选项(%s 不支持 UUID)" -#: disk-utils/mkswap.c:424 +#: disk-utils/mkswap.c:414 msgid "only one device argument is currently supported" msgstr "当前只支持一个设备参数" -#: disk-utils/mkswap.c:431 +#: disk-utils/mkswap.c:421 msgid "error: parsing UUID failed" msgstr "错误：解析 UUID 失败" -#: disk-utils/mkswap.c:440 +#: disk-utils/mkswap.c:430 msgid "error: Nowhere to set up swap on?" msgstr "错误：没有设置交换空间的地方？" -#: disk-utils/mkswap.c:446 +#: disk-utils/mkswap.c:436 msgid "invalid block count argument" msgstr "无效的 块计数 参数" -#: disk-utils/mkswap.c:455 +#: disk-utils/mkswap.c:445 #, fuzzy, c-format -#| msgid "error: size %llu KiB is larger than device size %llu KiB" -msgid "error: size %llu KiB is larger than device size %ju KiB" +msgid "error: size %llu KiB is larger than device size %<PRIu64> KiB" msgstr "错误：尺寸 %llu KiB 大于设备尺寸 %llu KiB" -#: disk-utils/mkswap.c:461 +#: disk-utils/mkswap.c:451 #, c-format msgid "error: swap area needs to be at least %ld KiB" msgstr "错误：交换区至少需要 %ld KiB" -#: disk-utils/mkswap.c:466 +#: disk-utils/mkswap.c:456 #, c-format msgid "warning: truncating swap area to %llu KiB" msgstr "警告：将把交换区截短为 %llu KiB" -#: disk-utils/mkswap.c:471 +#: disk-utils/mkswap.c:461 #, c-format msgid "error: %s is mounted; will not make swapspace" msgstr "错误：%s 已挂载；将不会创建交换空间" -#: disk-utils/mkswap.c:488 +#: disk-utils/mkswap.c:468 sys-utils/swapon.c:499 +#, c-format +msgid "%s: insecure permissions %04o, %04o suggested." +msgstr "%s：不安全的权限 %04o，建议使用 %04o。" + +#: disk-utils/mkswap.c:472 sys-utils/swapon.c:504 +#, c-format +msgid "%s: insecure file owner %d, 0 (root) suggested." +msgstr "%s：不安全的文件拥有者 %d，建议使用 0(root)。" + +#: disk-utils/mkswap.c:487 msgid "Unable to set up swap-space: unreadable" msgstr "无法设置交换空间：不可读" -#: disk-utils/mkswap.c:493 +#: disk-utils/mkswap.c:492 #, fuzzy, c-format -#| msgid "Setting up swapspace version %d, size = %llu KiB\n" -msgid "Setting up swapspace version %d, size = %s (%ju bytes)\n" +msgid "Setting up swapspace version %d, size = %s (%<PRIu64> bytes)\n" msgstr "正在设置交换空间版本 %d，大小 = %llu KiB\n" -#: disk-utils/mkswap.c:513 +#: disk-utils/mkswap.c:512 #, c-format msgid "%s: unable to obtain selinux file label" msgstr "%s：无法获得 selinux 文件标签" -#: disk-utils/mkswap.c:516 +#: disk-utils/mkswap.c:515 msgid "unable to matchpathcon()" msgstr "无法执行 matchpathcon()" -#: disk-utils/mkswap.c:519 +#: disk-utils/mkswap.c:518 msgid "unable to create new selinux context" msgstr "无法创建新的 selinux 环境(context)" -#: disk-utils/mkswap.c:521 +#: disk-utils/mkswap.c:520 msgid "couldn't compute selinux context" msgstr "无法计算 selinux 环境(context)" -#: disk-utils/mkswap.c:527 +#: disk-utils/mkswap.c:526 #, c-format msgid "unable to relabel %s to %s" msgstr "无法将 %s 标签改为 %s" -#: disk-utils/partx.c:87 +#: disk-utils/partx.c:86 msgid "partition number" msgstr "分区号" -#: disk-utils/partx.c:88 +#: disk-utils/partx.c:87 msgid "start of the partition in sectors" msgstr "分区起点(扇区数)" -#: disk-utils/partx.c:89 +#: disk-utils/partx.c:88 msgid "end of the partition in sectors" msgstr "分区终点(扇区数)" -#: disk-utils/partx.c:90 +#: disk-utils/partx.c:89 msgid "number of sectors" msgstr "扇区数" -#: disk-utils/partx.c:91 +#: disk-utils/partx.c:90 msgid "human readable size" msgstr "易读形式的大小" -#: disk-utils/partx.c:92 +#: disk-utils/partx.c:91 msgid "partition name" msgstr "分区名" -#: disk-utils/partx.c:93 misc-utils/findmnt.c:132 misc-utils/lsblk.c:169 +#: disk-utils/partx.c:92 misc-utils/findmnt.c:132 misc-utils/lsblk.c:168 msgid "partition UUID" msgstr "分区 UUID" -#: disk-utils/partx.c:94 +#: disk-utils/partx.c:93 msgid "partition table type (dos, gpt, ...)" msgstr "分区表类型(dos、gpt、...)" -#: disk-utils/partx.c:95 misc-utils/lsblk.c:170 +#: disk-utils/partx.c:94 misc-utils/lsblk.c:169 msgid "partition flags" msgstr "分区标志" -#: disk-utils/partx.c:96 +#: disk-utils/partx.c:95 msgid "partition type (a string, a UUID, or hex)" msgstr "分区类型(字符串，UUID 或十六进制数)" -#: disk-utils/partx.c:115 sys-utils/losetup.c:493 +#: disk-utils/partx.c:114 sys-utils/losetup.c:503 msgid "failed to initialize loopcxt" msgstr "初始化 loopcxt 失败" -#: disk-utils/partx.c:119 +#: disk-utils/partx.c:118 #, c-format msgid "%s: failed to find unused loop device" msgstr "%s：查找未使用的回环设备失败" -#: disk-utils/partx.c:123 +#: disk-utils/partx.c:122 #, c-format msgid "Trying to use '%s' for the loop device\n" msgstr "尝试将“%s”用作回环设备\n" -#: disk-utils/partx.c:127 +#: disk-utils/partx.c:126 #, c-format msgid "%s: failed to set backing file" msgstr "%s：设置后备文件失败" -#: disk-utils/partx.c:132 sys-utils/losetup.c:690 +#: disk-utils/partx.c:131 sys-utils/losetup.c:711 #, c-format msgid "%s: failed to set up loop device" msgstr "%s：设置回环设备失败" -#: 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 +#: disk-utils/partx.c:161 login-utils/lslogins.c:322 misc-utils/findmnt.c:401 +#: misc-utils/lsblk.c:354 misc-utils/lslocks.c:319 sys-utils/losetup.c:107 +#: sys-utils/lscpu.c:339 sys-utils/lsipc.c:231 sys-utils/lsns.c:187 +#: sys-utils/prlimit.c:277 sys-utils/swapon.c:136 sys-utils/wdctl.c:151 +#: sys-utils/zramctl.c:145 #, c-format msgid "unknown column: %s" msgstr "未知列: %s" -#: disk-utils/partx.c:209 +#: disk-utils/partx.c:208 #, c-format msgid "%s: failed to get partition number" msgstr "%s：获取分区号失败" -#: disk-utils/partx.c:274 +#: disk-utils/partx.c:273 #, c-format msgid "%s: error deleting partition %d" msgstr "%s：删除分区 %d 出错" -#: disk-utils/partx.c:276 +#: disk-utils/partx.c:275 #, c-format msgid "%s: error deleting partitions %d-%d" msgstr "%s：删除分区 %d-%d 出错" -#: disk-utils/partx.c:300 disk-utils/partx.c:447 disk-utils/partx.c:975 +#: disk-utils/partx.c:299 disk-utils/partx.c:446 disk-utils/partx.c:974 #, c-format msgid "specified range <%d:%d> does not make sense" msgstr "指定的范围 <%d:%d> 无效" -#: disk-utils/partx.c:309 +#: disk-utils/partx.c:308 #, c-format msgid "%s: partition #%d removed\n" msgstr "%s：分区 #%d 已移除\n" -#: disk-utils/partx.c:313 +#: disk-utils/partx.c:312 #, fuzzy, c-format -#| msgid "%s: partition #%d already doesn't exist\n" msgid "%s: partition #%d doesn't exist\n" msgstr "%s：分区 #%d 已不存在\n" -#: disk-utils/partx.c:318 +#: disk-utils/partx.c:317 #, c-format msgid "%s: deleting partition #%d failed" msgstr "%s：删除分区 #%d 失败" -#: disk-utils/partx.c:338 +#: disk-utils/partx.c:337 #, c-format msgid "%s: error adding partition %d" msgstr "%s：添加分区 %d 出错" -#: disk-utils/partx.c:340 +#: disk-utils/partx.c:339 #, c-format msgid "%s: error adding partitions %d-%d" msgstr "%s：添加分区 %d-%d 出错" -#: disk-utils/partx.c:377 disk-utils/partx.c:483 +#: disk-utils/partx.c:376 disk-utils/partx.c:482 #, c-format msgid "%s: partition #%d added\n" msgstr "%s：分区 #%d 已添加\n" -#: disk-utils/partx.c:382 +#: disk-utils/partx.c:381 #, c-format msgid "%s: adding partition #%d failed" msgstr "%s：添加分区 #%d 失败" -#: disk-utils/partx.c:417 +#: disk-utils/partx.c:416 #, c-format msgid "%s: error updating partition %d" msgstr "%s：更新分区 %d 出错" -#: disk-utils/partx.c:419 +#: disk-utils/partx.c:418 #, c-format msgid "%s: error updating partitions %d-%d" msgstr "%s：更新分区 %d-%d 出错" -#: disk-utils/partx.c:456 +#: disk-utils/partx.c:455 #, c-format msgid "%s: no partition #%d" msgstr "%s：无分区 #%d" -#: disk-utils/partx.c:477 +#: disk-utils/partx.c:476 #, c-format msgid "%s: partition #%d resized\n" msgstr "%s：已调整分区 #%d 的大小\n" -#: disk-utils/partx.c:491 +#: disk-utils/partx.c:490 #, c-format msgid "%s: updating partition #%d failed" msgstr "%s：更新分区 #%d 失败" -#: disk-utils/partx.c:528 +#: disk-utils/partx.c:527 #, c-format msgid "#%2d: %9ju-%9ju (%9ju sector, %6ju MB)\n" msgid_plural "#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n" msgstr[0] "#%2d：%9ju-%9ju (%9ju 扇区%6ju MB)\n" -#: disk-utils/partx.c:547 misc-utils/findmnt.c:713 misc-utils/findmnt.c:730 -#: misc-utils/lslocks.c:405 +#: disk-utils/partx.c:546 misc-utils/findmnt.c:713 misc-utils/findmnt.c:730 +#: misc-utils/lslocks.c:382 sys-utils/lsns.c:431 msgid "failed to add line to output" msgstr "向输出添加行出错" -#: disk-utils/partx.c:610 +#: disk-utils/partx.c:609 msgid "failed to add data to output table" msgstr "向输出表添加数据出错" -#: 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:338 sys-utils/prlimit.c:297 -#: sys-utils/swapon.c:266 sys-utils/wdctl.c:259 sys-utils/zramctl.c:418 +#: disk-utils/partx.c:632 login-utils/lslogins.c:932 misc-utils/findmnt.c:1583 +#: misc-utils/lsblk.c:1861 misc-utils/lslocks.c:442 sys-utils/losetup.c:310 +#: sys-utils/lscpu.c:1486 sys-utils/lsipc.c:337 sys-utils/lsns.c:486 +#: sys-utils/prlimit.c:297 sys-utils/swapon.c:269 sys-utils/wdctl.c:259 +#: sys-utils/zramctl.c:427 msgid "failed to initialize output table" msgstr "初始化输出表失败" -#: 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 +#: disk-utils/partx.c:643 misc-utils/findmnt.c:1609 misc-utils/lsblk.c:1883 +#: misc-utils/lslocks.c:456 sys-utils/losetup.c:322 sys-utils/losetup.c:358 +#: sys-utils/lscpu.c:1491 sys-utils/lsns.c:507 sys-utils/prlimit.c:306 +#: sys-utils/swapon.c:278 sys-utils/wdctl.c:270 sys-utils/zramctl.c:436 msgid "failed to initialize output column" msgstr "初始化输出列失败" -#: disk-utils/partx.c:684 +#: disk-utils/partx.c:683 #, c-format msgid "failed to initialize blkid filter for '%s'" msgstr "初始化“%s”的 blkid 过滤器失败" -#: disk-utils/partx.c:692 +#: disk-utils/partx.c:691 #, c-format msgid "%s: failed to read partition table" msgstr "%s：读取分区表失败" -#: disk-utils/partx.c:698 +#: disk-utils/partx.c:697 #, c-format msgid "%s: partition table type '%s' detected\n" msgstr "%s：检测到分区表类型“%s”\n" -#: disk-utils/partx.c:702 +#: disk-utils/partx.c:701 #, c-format msgid "%s: partition table with no partitions" msgstr "%s：分区表中无分区" -#: disk-utils/partx.c:714 +#: disk-utils/partx.c:713 #, c-format msgid " %s [-a|-d|-s|-u] [--nr <n:m> | <partition>] <disk>\n" msgstr " %s [-a|-d|-s|-u] [--nr <n:m> | <分区>] <磁盘>\n" -#: disk-utils/partx.c:718 +#: disk-utils/partx.c:717 msgid "Tell the kernel about the presence and numbering of partitions.\n" msgstr "告知内核分区的存在和排列情况。\n" -#: disk-utils/partx.c:721 +#: disk-utils/partx.c:720 msgid " -a, --add add specified partitions or all of them\n" msgstr " -a, --add 添加指定的分区或所有分区\n" -#: disk-utils/partx.c:722 +#: disk-utils/partx.c:721 msgid " -d, --delete delete specified partitions or all of them\n" msgstr " -d, --delete 删除指定的分区或所有分区\n" -#: disk-utils/partx.c:723 +#: disk-utils/partx.c:722 msgid " -u, --update update specified partitions or all of them\n" msgstr " -u, --update 更新指定的分区或所有分区\n" -#: disk-utils/partx.c:724 +#: disk-utils/partx.c:723 msgid "" " -s, --show list partitions\n" "\n" @@ -3696,39 +3635,39 @@ msgstr "" " -s, --show 列出分区\n" "\n" -#: disk-utils/partx.c:725 misc-utils/lsblk.c:1606 +#: disk-utils/partx.c:724 misc-utils/lsblk.c:1615 msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" -#: disk-utils/partx.c:726 +#: disk-utils/partx.c:725 msgid " -g, --noheadings don't print headings for --show\n" msgstr " -g, --noheadings --show 时不打印标题\n" -#: disk-utils/partx.c:727 +#: disk-utils/partx.c:726 msgid " -n, --nr <n:m> specify the range of partitions (e.g. --nr 2:4)\n" msgstr " -n, --nr <n:m> 指定分区范围(例如：--nr 2:4)\n" -#: disk-utils/partx.c:728 +#: disk-utils/partx.c:727 msgid " -o, --output <list> define which output columns to use\n" msgstr " -o, --output <列表> 定义使用哪个输出列\n" -#: disk-utils/partx.c:729 misc-utils/lsblk.c:1620 +#: disk-utils/partx.c:728 misc-utils/lsblk.c:1629 msgid " -P, --pairs use key=\"value\" output format\n" msgstr " -P, --pairs 使用 key=“value” 输出格式\n" -#: disk-utils/partx.c:730 misc-utils/lsblk.c:1621 +#: disk-utils/partx.c:729 misc-utils/lsblk.c:1630 msgid " -r, --raw use raw output format\n" msgstr " -r, --raw 使用原生输出格式\n" -#: disk-utils/partx.c:731 +#: disk-utils/partx.c:730 msgid " -t, --type <type> specify the partition type (dos, bsd, solaris, etc.)\n" msgstr " -t, --type <类型> 指定分区类型(dos、bsd、solaris 等)\n" -#: disk-utils/partx.c:732 sys-utils/fallocate.c:91 +#: disk-utils/partx.c:731 sys-utils/fallocate.c:91 msgid " -v, --verbose verbose mode\n" msgstr " -v, --verbose 详尽模式\n" -#: disk-utils/partx.c:738 +#: disk-utils/partx.c:737 msgid "" "\n" "Available columns (for --show, --raw or --pairs):\n" @@ -3736,35 +3675,35 @@ msgstr "" "\n" "可用的列(针对 --show、--raw 或 --pairs)：\n" -#: disk-utils/partx.c:811 +#: disk-utils/partx.c:810 msgid "failed to parse --nr <M-N> range" msgstr "解析 --nr <M-N> 范围失败" -#: disk-utils/partx.c:911 +#: disk-utils/partx.c:910 msgid "--nr and <partition> are mutually exclusive" msgstr "--nr 和 <分区> 相互排斥" -#: disk-utils/partx.c:930 +#: disk-utils/partx.c:929 #, c-format msgid "partition: %s, disk: %s, lower: %d, upper: %d\n" msgstr "分区：%s，磁盘：%s，从分区：%d,到分区：%d\n" -#: disk-utils/partx.c:942 +#: disk-utils/partx.c:941 #, c-format msgid "%s: cannot delete partitions" msgstr "%s：不能删除分区" -#: disk-utils/partx.c:945 +#: disk-utils/partx.c:944 #, c-format msgid "%s: partitioned loop devices unsupported" msgstr "%s：不支持已分区的回环设备" -#: disk-utils/partx.c:962 +#: disk-utils/partx.c:961 #, c-format msgid "%s: failed to initialize blkid prober" msgstr "%s：初始化 blkid 探针失败" -#: disk-utils/raw.c:52 +#: disk-utils/raw.c:51 #, c-format msgid "" " %1$s %2$srawN <major> <minor>\n" @@ -3777,68 +3716,68 @@ msgstr "" " %1$s -q %2$srawN\n" " %1$s -qa\n" -#: disk-utils/raw.c:59 +#: disk-utils/raw.c:58 msgid "Bind a raw character device to a block device.\n" msgstr "将原生字符设备绑定到块设备。\n" -#: disk-utils/raw.c:62 +#: disk-utils/raw.c:61 msgid " -q, --query set query mode\n" msgstr " -q, --query 设置查询模式\n" -#: disk-utils/raw.c:63 +#: disk-utils/raw.c:62 msgid " -a, --all query all raw devices\n" msgstr " -a, --all 查询所有 raw 设备\n" -#: disk-utils/raw.c:165 +#: disk-utils/raw.c:164 #, c-format msgid "Device '%s' is the control raw device (use raw<N> where <N> is greater than zero)" msgstr "设备“%s”是控制原生设备(请使用 raw<N>，其中 <N> 大于 0)" -#: disk-utils/raw.c:182 +#: disk-utils/raw.c:181 #, c-format msgid "Cannot locate block device '%s'" msgstr "无法定位块设备“%s”" -#: disk-utils/raw.c:185 +#: disk-utils/raw.c:184 #, c-format msgid "Device '%s' is not a block device" msgstr "设备“%s”不是块设备" -#: disk-utils/raw.c:194 disk-utils/raw.c:197 sys-utils/ipcrm.c:351 +#: disk-utils/raw.c:193 disk-utils/raw.c:196 sys-utils/ipcrm.c:351 #: sys-utils/ipcrm.c:364 sys-utils/ipcrm.c:377 msgid "failed to parse argument" msgstr "解析参数失败" -#: disk-utils/raw.c:214 +#: disk-utils/raw.c:213 #, c-format msgid "Cannot open master raw device '%s'" msgstr "无法打开主 Raw 设备“%s”" -#: disk-utils/raw.c:229 +#: disk-utils/raw.c:228 #, c-format msgid "Cannot locate raw device '%s'" msgstr "无法定位 raw 设备“%s”" -#: disk-utils/raw.c:232 +#: disk-utils/raw.c:231 #, c-format msgid "Raw device '%s' is not a character dev" msgstr "设备“%s”不是字符设备" -#: disk-utils/raw.c:236 +#: disk-utils/raw.c:235 #, c-format msgid "Device '%s' is not a raw dev" msgstr "设备“%s”不是 raw 设备" -#: disk-utils/raw.c:246 +#: disk-utils/raw.c:245 msgid "Error querying raw device" msgstr "查询原生(raw)设备失败" -#: disk-utils/raw.c:255 disk-utils/raw.c:270 +#: disk-utils/raw.c:254 disk-utils/raw.c:269 #, c-format msgid "%sraw%d: bound to major %d, minor %d\n" msgstr "%sraw%d：绑定到主设备号 %d, 次设备号 %d\n" -#: disk-utils/raw.c:269 +#: disk-utils/raw.c:268 msgid "Error setting raw device" msgstr "设置原生(raw)设备出错" @@ -3860,69 +3799,122 @@ msgstr "%s：获取分区号 %s 的起点失败" msgid "failed to resize partition" msgstr "调整分区大小失败" -#: disk-utils/sfdisk.c:219 +#: disk-utils/sfdisk.c:229 #, fuzzy -#| msgid "failed to allocate libfdisk context" msgid "failed to allocate nested libfdisk context" msgstr "分配 libfdisk 环境(context)失败" -#: disk-utils/sfdisk.c:264 +#: disk-utils/sfdisk.c:289 #, fuzzy, c-format -#| msgid "cannot seek" msgid "cannot seek %s" msgstr "无法 seek" -#: disk-utils/sfdisk.c:274 libfdisk/src/bsd.c:723 libfdisk/src/bsd.c:894 +#: disk-utils/sfdisk.c:299 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:280 +#: disk-utils/sfdisk.c:305 #, fuzzy, c-format -#| msgid "" -#| "\n" -#| "%s: offset = %ju, size = %zu bytes." msgid "%12s (offset %5ju, size %5ju): %s" msgstr "" "\n" "%s: 偏移 = %ju, 大小 = %zu 字节。" -#: disk-utils/sfdisk.c:286 +#: disk-utils/sfdisk.c:311 #, fuzzy, c-format -#| msgid "%s: failed to create a signature backup" msgid "%s: failed to create a backup" msgstr "%s：创建签名备份失败" -#: disk-utils/sfdisk.c:306 misc-utils/wipefs.c:382 -msgid "failed to create a signature backup, $HOME undefined" +#: disk-utils/sfdisk.c:324 +#, fuzzy +msgid "failed to create a backup file, $HOME undefined" msgstr "创建签名备份失败，未定义 $HOME" -#: disk-utils/sfdisk.c:312 +#: disk-utils/sfdisk.c:350 msgid "Backup files:" msgstr "备份文件：" -#: disk-utils/sfdisk.c:328 +#: disk-utils/sfdisk.c:375 +#, fuzzy +msgid "failed to read new partition from device (ignore --move-data)" +msgstr "读取扩展分区表失败(偏移=%ju)" + +#: disk-utils/sfdisk.c:377 +#, fuzzy +msgid "failed to get size of the new partition (ignore --move-data)" +msgstr "%s：获取分区号 %s 的起点失败" + +#: disk-utils/sfdisk.c:379 +#, fuzzy +msgid "failed to get start of the new partition (ignore --move-data)" +msgstr "%s：获取分区号 %s 的起点失败" + +#: disk-utils/sfdisk.c:381 +#, fuzzy +msgid "failed to get size of the old partition (ignore --move-data)" +msgstr "%s：获取分区号 %s 的起点失败" + +#: disk-utils/sfdisk.c:383 +#, fuzzy +msgid "failed to get start of the old partition (ignore --move-data)" +msgstr "%s：获取分区号 %s 的起点失败" + +#: disk-utils/sfdisk.c:385 +msgid "begin of the partition has not been moved (ignore --move-data)" +msgstr "" + +#: disk-utils/sfdisk.c:387 +msgid "new partition is smaller than original (ignore --move-data)" +msgstr "" + +#: disk-utils/sfdisk.c:437 +msgid "Data move:" +msgstr "" + +#: disk-utils/sfdisk.c:439 +#, fuzzy, c-format +msgid " typescript file: %s" +msgstr "读 typescript 文件 %s 失败" + +#: disk-utils/sfdisk.c:440 +#, c-format +msgid " old start: %ju, new start: %ju (move %ju sectors)\n" +msgstr "" + +#: disk-utils/sfdisk.c:447 +#, fuzzy +msgid "Do you want to move partition data?" +msgstr "您想把这些写入磁盘吗？[ynq] " + +#: disk-utils/sfdisk.c:449 disk-utils/sfdisk.c:1702 +msgid "Leaving." +msgstr "离开中。" + +#: disk-utils/sfdisk.c:520 +#, fuzzy, c-format +msgid "%s: failed to move data" +msgstr "设置数据失败" + +#: disk-utils/sfdisk.c:530 #, fuzzy -#| msgid "Type of the partition %zu is unchanged." msgid "The partition table is unchanged (--no-act)." msgstr "分区 %zu 的类型未更改。" -#: disk-utils/sfdisk.c:332 +#: disk-utils/sfdisk.c:536 #, fuzzy -#| msgid "The partition table has been altered." msgid "" "\n" "The partition table has been altered." msgstr "分区表已调整。" -#: disk-utils/sfdisk.c:402 +#: disk-utils/sfdisk.c:606 #, fuzzy, c-format -#| msgid "unsupported disklabel: %s" msgid "unsupported label '%s'" msgstr "不支持的磁盘标签：%s" -#: disk-utils/sfdisk.c:405 +#: disk-utils/sfdisk.c:609 msgid "" "Id Name\n" "\n" @@ -3930,193 +3922,173 @@ msgstr "" "Id 名称\n" "\n" -#: disk-utils/sfdisk.c:435 +#: disk-utils/sfdisk.c:639 #, fuzzy -#| msgid " %s: unrecognized partition table type" msgid "unrecognized partition table type" msgstr " %s：未识别的分区表类型" -#: disk-utils/sfdisk.c:488 +#: disk-utils/sfdisk.c:692 #, c-format msgid "Cannot get size of %s" msgstr "无法获得 %s 的大小" -#: disk-utils/sfdisk.c:525 +#: disk-utils/sfdisk.c:729 #, fuzzy, c-format -#| msgid "total: %llu blocks\n" msgid "total: %ju blocks\n" msgstr "共计：%llu 个块\n" -#: disk-utils/sfdisk.c:587 disk-utils/sfdisk.c:658 disk-utils/sfdisk.c:722 -#: disk-utils/sfdisk.c:786 disk-utils/sfdisk.c:841 disk-utils/sfdisk.c:897 -#: disk-utils/sfdisk.c:1188 +#: disk-utils/sfdisk.c:791 disk-utils/sfdisk.c:859 disk-utils/sfdisk.c:900 +#: disk-utils/sfdisk.c:930 disk-utils/sfdisk.c:994 disk-utils/sfdisk.c:1058 +#: disk-utils/sfdisk.c:1113 disk-utils/sfdisk.c:1169 disk-utils/sfdisk.c:1462 #, fuzzy -#| msgid "no device specified" msgid "no disk device specified" msgstr "未指定设备" -#: disk-utils/sfdisk.c:598 +#: disk-utils/sfdisk.c:802 msgid "toggle boot flags is supported for MBR only" msgstr "开/关启动标志 只支持 MBR" -#: disk-utils/sfdisk.c:629 disk-utils/sfdisk.c:727 disk-utils/sfdisk.c:791 -#: disk-utils/sfdisk.c:846 disk-utils/sfdisk.c:902 disk-utils/sfdisk.c:1186 -#: disk-utils/sfdisk.c:1612 +#: disk-utils/sfdisk.c:833 disk-utils/sfdisk.c:879 disk-utils/sfdisk.c:999 +#: disk-utils/sfdisk.c:1063 disk-utils/sfdisk.c:1118 disk-utils/sfdisk.c:1174 +#: disk-utils/sfdisk.c:1460 disk-utils/sfdisk.c:1922 #, fuzzy -#| msgid "%s: failed to get partition number" msgid "failed to parse partition number" msgstr "%s：获取分区号失败" -#: disk-utils/sfdisk.c:634 +#: disk-utils/sfdisk.c:838 #, c-format msgid "%s: partition %d: failed to toggle bootable flag" msgstr "%s：分区 %d：开/关启动标志失败" -#: disk-utils/sfdisk.c:666 +#: disk-utils/sfdisk.c:874 disk-utils/sfdisk.c:882 +#, fuzzy, c-format +msgid "%s: partition %zu: failed to delete" +msgstr "%s：获取分区号失败" + +#: disk-utils/sfdisk.c:938 #, fuzzy -#| msgid "failed to callocate cpu set" msgid "failed to allocate dump struct" msgstr "分配(callocate) CPU 组 失败" -#: disk-utils/sfdisk.c:670 +#: disk-utils/sfdisk.c:942 #, fuzzy -#| msgid "%s: failed to read partition table" msgid "failed to dump partition table" msgstr "%s：读取分区表失败" -#: disk-utils/sfdisk.c:700 +#: disk-utils/sfdisk.c:972 #, fuzzy, c-format -#| msgid "%s: no partition #%d" msgid "%s: no partition table found" msgstr "%s：无分区 #%d" -#: disk-utils/sfdisk.c:704 +#: disk-utils/sfdisk.c:976 #, fuzzy, c-format -#| msgid "%s: partition table with no partitions" msgid "%s: partition %zu: partition table contains only %zu partitions" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:707 +#: disk-utils/sfdisk.c:979 #, fuzzy, c-format -#| msgid "Partition %zu: overlaps partition %zu." msgid "%s: partition %zu: partition is unused" msgstr "分区 %zu：与 分区 %zu 重叠。" -#: disk-utils/sfdisk.c:726 disk-utils/sfdisk.c:790 disk-utils/sfdisk.c:845 -#: disk-utils/sfdisk.c:901 +#: disk-utils/sfdisk.c:998 disk-utils/sfdisk.c:1062 disk-utils/sfdisk.c:1117 +#: disk-utils/sfdisk.c:1173 #, fuzzy -#| msgid "partition number" msgid "no partition number specified" msgstr "分区号" -#: disk-utils/sfdisk.c:732 disk-utils/sfdisk.c:796 disk-utils/sfdisk.c:851 -#: disk-utils/sfdisk.c:907 +#: disk-utils/sfdisk.c:1004 disk-utils/sfdisk.c:1068 disk-utils/sfdisk.c:1123 +#: disk-utils/sfdisk.c:1179 #, fuzzy -#| msgid "unexpected number of arguments" msgid "unexpected arguments" msgstr "参数数量异常" -#: disk-utils/sfdisk.c:747 +#: disk-utils/sfdisk.c:1019 #, fuzzy, c-format -#| msgid "%s: failed to get partition number" msgid "%s: partition %zu: failed to get partition type" msgstr "%s：获取分区号失败" -#: disk-utils/sfdisk.c:766 +#: disk-utils/sfdisk.c:1038 #, fuzzy, c-format -#| msgid "failed to parse facility '%s'" msgid "failed to parse %s partition type '%s'" msgstr "解析设施“%s”失败" -#: disk-utils/sfdisk.c:770 +#: disk-utils/sfdisk.c:1042 #, fuzzy, c-format -#| msgid "%s: partition table with no partitions" msgid "%s: partition %zu: failed to set partition type" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:808 +#: disk-utils/sfdisk.c:1080 #, fuzzy, c-format -#| msgid "%s: partition table with no partitions" msgid "%s: partition %zu: failed to get partition UUID" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:821 disk-utils/sfdisk.c:876 disk-utils/sfdisk.c:930 +#: disk-utils/sfdisk.c:1093 disk-utils/sfdisk.c:1148 disk-utils/sfdisk.c:1202 #, fuzzy -#| msgid "failed to allocate iterator" msgid "failed to allocate partition object" msgstr "分配迭代器失败" -#: disk-utils/sfdisk.c:825 +#: disk-utils/sfdisk.c:1097 #, fuzzy, c-format -#| msgid "%s: partition table with no partitions" msgid "%s: partition %zu: failed to set partition UUID" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:863 +#: disk-utils/sfdisk.c:1135 #, fuzzy, c-format -#| msgid "%s: failed to get partition number" msgid "%s: partition %zu: failed to get partition name" msgstr "%s：获取分区号失败" -#: disk-utils/sfdisk.c:880 +#: disk-utils/sfdisk.c:1152 #, fuzzy, c-format -#| msgid "%s: failed to get partition number" msgid "%s: partition %zu: failed to set partition name" msgstr "%s：获取分区号失败" -#: disk-utils/sfdisk.c:934 +#: disk-utils/sfdisk.c:1206 #, fuzzy, c-format -#| msgid "%s: partition table with no partitions" msgid "%s: partition %zu: failed to set partition attributes" msgstr "%s：分区表中无分区" -#: disk-utils/sfdisk.c:977 +#: disk-utils/sfdisk.c:1249 #, fuzzy -#| msgid "no command?" msgid " Commands:\n" msgstr "没有命令？" -#: disk-utils/sfdisk.c:979 +#: disk-utils/sfdisk.c:1251 #, fuzzy -#| msgid "write table to disk and exit" msgid " write write table to disk and exit\n" msgstr "将分区表写入磁盘并退出" -#: disk-utils/sfdisk.c:980 +#: disk-utils/sfdisk.c:1252 msgid " quit show new situation and wait for user's feedback before write\n" msgstr " quit 显示新状况并等待用户反馈后再写入\n" -#: disk-utils/sfdisk.c:981 +#: disk-utils/sfdisk.c:1253 msgid " abort exit sfdisk shell\n" msgstr " abort 退出 sfdisk shell\n" -#: disk-utils/sfdisk.c:982 +#: disk-utils/sfdisk.c:1254 #, fuzzy -#| msgid "print the partition table" msgid " print display the partition table\n" msgstr "打印分区表" -#: disk-utils/sfdisk.c:983 +#: disk-utils/sfdisk.c:1255 #, fuzzy -#| msgid " --help display this help and exit\n" msgid " help show this help text\n" msgstr " --help 显示此帮助并退出\n" -#: disk-utils/sfdisk.c:985 +#: disk-utils/sfdisk.c:1257 msgid " Ctrl-D the same as 'quit'\n" msgstr " Ctrl-D 同“quit”\n" -#: disk-utils/sfdisk.c:989 +#: disk-utils/sfdisk.c:1261 #, fuzzy -#| msgid "Output format:\n" msgid " Input format:\n" msgstr "输出格式：\n" -#: disk-utils/sfdisk.c:991 +#: disk-utils/sfdisk.c:1263 msgid " <start>, <size>, <type>, <bootable>\n" msgstr " <起始>, <大小>, <类型>, <可启动>\n" -#: disk-utils/sfdisk.c:994 +#: disk-utils/sfdisk.c:1266 msgid "" " <start> Beginning of the partition in sectors, or bytes if\n" " specified in the format <number>{K,M,G,T,P,E,Z,Y}.\n" @@ -4126,7 +4098,7 @@ msgstr "" " <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n" " 默认为第一处可用空间。\n" -#: disk-utils/sfdisk.c:999 +#: disk-utils/sfdisk.c:1271 msgid "" " <size> Size of the partition in sectors, or bytes if\n" " specified in the format <number>{K,M,G,T,P,E,Z,Y}.\n" @@ -4136,76 +4108,71 @@ msgstr "" " <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n" " 默认为所有可用空间。\n" -#: disk-utils/sfdisk.c:1004 +#: disk-utils/sfdisk.c:1276 msgid " <type> The partition type. Default is a Linux data partition.\n" msgstr " <类型> 分区类型。默认为 Linux 数据分区。\n" -#: disk-utils/sfdisk.c:1005 +#: disk-utils/sfdisk.c:1277 msgid " MBR: hex or L,S,E,X shortcuts.\n" msgstr "" -#: disk-utils/sfdisk.c:1006 +#: disk-utils/sfdisk.c:1278 msgid " GPT: UUID or L,S,H shortcuts.\n" msgstr "" -#: disk-utils/sfdisk.c:1009 +#: disk-utils/sfdisk.c:1281 msgid " <bootable> Use '*' to mark an MBR partition as bootable.\n" msgstr " <可启动> 使用“*”将 MBR 分区标记为 可启动。\n" -#: disk-utils/sfdisk.c:1013 +#: disk-utils/sfdisk.c:1285 msgid " Example:\n" msgstr "示例：\n" -#: disk-utils/sfdisk.c:1015 +#: disk-utils/sfdisk.c:1287 msgid " , 4G Creates a 4GiB partition at default start offset.\n" msgstr " , 4G 在默认起始偏移位置创建一个 4GiB 分区。\n" -#: disk-utils/sfdisk.c:1047 sys-utils/dmesg.c:1457 +#: disk-utils/sfdisk.c:1319 sys-utils/dmesg.c:1458 msgid "unsupported command" msgstr "不支持的命令" -#: disk-utils/sfdisk.c:1049 +#: disk-utils/sfdisk.c:1321 #, fuzzy, c-format -#| msgid "unsupported command" msgid "line %d: unsupported command" msgstr "不支持的命令" -#: disk-utils/sfdisk.c:1196 +#: disk-utils/sfdisk.c:1470 #, fuzzy -#| msgid "failed to allocate GPT header" msgid "failed to allocate script handler" msgstr "分配 GPT 头失败" -#: disk-utils/sfdisk.c:1212 +#: disk-utils/sfdisk.c:1486 #, c-format msgid "%s: cannot modify partition %d: no partition table was found" msgstr "%s：无法修改分区 %d：未找到分区表" -#: disk-utils/sfdisk.c:1217 +#: disk-utils/sfdisk.c:1491 #, fuzzy, c-format -#| msgid "Warning: partition %s is not contained in partition %s" msgid "%s: cannot modify partition %d: partition table contains only %zu partitions" msgstr "警告：分区 %s 未包含在分区 %s 中" -#: disk-utils/sfdisk.c:1223 +#: disk-utils/sfdisk.c:1497 #, fuzzy, c-format -#| msgid "No partition is defined yet!" msgid "warning: %s: partition %d is not defined yet" msgstr "还没有定义分区！" -#: disk-utils/sfdisk.c:1236 +#: disk-utils/sfdisk.c:1513 #, fuzzy, c-format -#| msgid "Welcome to fdisk (%s)." msgid "" "\n" "Welcome to sfdisk (%s)." msgstr "欢迎使用 fdisk (%s)。" -#: disk-utils/sfdisk.c:1244 +#: disk-utils/sfdisk.c:1521 msgid "Checking that no-one is using this disk right now ..." msgstr "请检查现在是不是有人在使用此磁盘..." -#: disk-utils/sfdisk.c:1247 +#: disk-utils/sfdisk.c:1524 msgid "" " FAILED\n" "\n" @@ -4213,13 +4180,8 @@ msgstr "" " 失败\n" "\n" -#: disk-utils/sfdisk.c:1250 +#: disk-utils/sfdisk.c:1527 #, fuzzy -#| msgid "" -#| "\n" -#| "This disk is currently in use - repartitioning is probably a bad idea.\n" -#| "Umount all file systems, and swapoff all swap partitions on this disk.\n" -#| "Use the --no-reread flag to suppress this check." msgid "" "This disk is currently in use - repartitioning is probably a bad idea.\n" "Umount all file systems, and swapoff all swap partitions on this disk.\n" @@ -4230,27 +4192,25 @@ msgstr "" "请卸载此磁盘上所有的文件系统，并关闭(swapoff)上面的交换分区。\n" "可使用 --no-reread 标志阻止此检查。" -#: disk-utils/sfdisk.c:1255 +#: disk-utils/sfdisk.c:1532 msgid "Use the --force flag to overrule all checks." msgstr "使用 --force 标志否决所有检查。" -#: disk-utils/sfdisk.c:1257 +#: disk-utils/sfdisk.c:1534 #, fuzzy -#| msgid "%s: OK\n" msgid "" " OK\n" "\n" msgstr "%s：OK\n" -#: disk-utils/sfdisk.c:1266 +#: disk-utils/sfdisk.c:1563 #, fuzzy -#| msgid "Old situation:\n" msgid "" "\n" "Old situation:" msgstr "旧状况：\n" -#: disk-utils/sfdisk.c:1283 +#: disk-utils/sfdisk.c:1581 #, c-format msgid "" "\n" @@ -4262,75 +4222,60 @@ msgstr "" "sfdisk 即将创建一个新的磁盘标签“%s”。\n" "在定义第一个分区之前使用“label: <名字>”可覆盖默认值。" -#: disk-utils/sfdisk.c:1286 +#: disk-utils/sfdisk.c:1584 #, fuzzy -#| msgid "Try `%s --help' for more information.\n" msgid "" "\n" "Type 'help' to get more information.\n" msgstr "请尝试执行“%s --help”了解更多信息。\n" -#: disk-utils/sfdisk.c:1304 +#: disk-utils/sfdisk.c:1602 #, fuzzy -#| msgid "No partitions found" msgid "All partitions used." msgstr "未找到分区" -#: disk-utils/sfdisk.c:1312 +#: disk-utils/sfdisk.c:1610 #, fuzzy -#| msgid "failed to add partition" msgid "failed to allocate partition name" msgstr "添加分区失败" -#: disk-utils/sfdisk.c:1351 +#: disk-utils/sfdisk.c:1651 #, fuzzy -#| msgid "Warning: empty partition" msgid "Ignoring partition." msgstr "警告：空分区" -#: disk-utils/sfdisk.c:1360 +#: disk-utils/sfdisk.c:1660 #, fuzzy -#| msgid "Failed to write disklabel" msgid "Failed to apply script headers, disk label not created." msgstr "写磁盘标签失败" -#: disk-utils/sfdisk.c:1372 +#: disk-utils/sfdisk.c:1671 #, fuzzy -#| msgid "failed to add partition" msgid "Failed to add partition" msgstr "添加分区失败" -#: disk-utils/sfdisk.c:1383 +#: disk-utils/sfdisk.c:1682 msgid "Script header accepted." msgstr "" -#: disk-utils/sfdisk.c:1392 +#: disk-utils/sfdisk.c:1691 #, fuzzy -#| msgid "New situation:\n" msgid "" "\n" "New situation:" msgstr "新状况：\n" -#: disk-utils/sfdisk.c:1401 +#: disk-utils/sfdisk.c:1700 #, fuzzy -#| msgid "Do you want to write this to disk? [ynq] " msgid "Do you want to write this to disk?" msgstr "您想把这些写入磁盘吗？[ynq] " -#: disk-utils/sfdisk.c:1403 -msgid "Leaving." -msgstr "离开中。" - -#: disk-utils/sfdisk.c:1413 +#: disk-utils/sfdisk.c:1712 msgid "Leaving.\n" msgstr "离开中。\n" -#: disk-utils/sfdisk.c:1426 +#: disk-utils/sfdisk.c:1725 #, fuzzy, c-format -#| msgid "" -#| " %1$s [options] [<loopdev>]\n" -#| " %1$s [options] -f | <loopdev> <file>\n" msgid "" " %1$s [options] <dev> [[-N] <part>]\n" " %1$s [options] <command>\n" @@ -4338,7 +4283,7 @@ msgstr "" " %1$s [选项] [<回环设备>]\n" " %1$s [选项] -f | <回环设备> <文件>\n" -#: disk-utils/sfdisk.c:1432 +#: disk-utils/sfdisk.c:1731 msgid "" "\n" "Commands:\n" @@ -4346,200 +4291,201 @@ msgstr "" "\n" "命令：\n" -#: disk-utils/sfdisk.c:1433 +#: disk-utils/sfdisk.c:1732 msgid " -A, --activate <dev> [<part> ...] list or set bootable MBR partitions\n" msgstr " -A, --activate <设备> [<分区> ...] 列出或设置可启动的 MBR 分区\n" -#: disk-utils/sfdisk.c:1434 +#: disk-utils/sfdisk.c:1733 msgid " -d, --dump <dev> dump partition table (usable for later input)\n" msgstr "" -#: disk-utils/sfdisk.c:1435 +#: disk-utils/sfdisk.c:1734 #, fuzzy -#| msgid " -l, --list display partitions end exit\n" msgid " -J, --json <dev> dump partition table in JSON format\n" msgstr " -l, --list 显示分区信息并退出\n" -#: disk-utils/sfdisk.c:1436 +#: disk-utils/sfdisk.c:1735 msgid " -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n" msgstr " -g, --show-geometry [<设备> ...] 列出所有或指定设备的几何属性\n" -#: disk-utils/sfdisk.c:1437 +#: disk-utils/sfdisk.c:1736 #, fuzzy -#| msgid " -l, --list display partitions end exit\n" msgid " -l, --list [<dev> ...] list partitions of each device\n" msgstr " -l, --list 显示分区信息并退出\n" -#: disk-utils/sfdisk.c:1438 +#: disk-utils/sfdisk.c:1737 msgid " -F, --list-free [<dev> ...] list unpartitions free areas of each device\n" msgstr " -F, --list-free [<设备> ...] 列出每个设备中未分区的空闲空间\n" -#: disk-utils/sfdisk.c:1439 +#: disk-utils/sfdisk.c:1738 +#, fuzzy +msgid " -r, --reorder <dev> fix partitions order (by start offset)\n" +msgstr " -a, --add 添加指定的分区或所有分区\n" + +#: disk-utils/sfdisk.c:1739 #, fuzzy -#| msgid " -l, --list list info about all or specified (default)\n" msgid " -s, --show-size [<dev> ...] list sizes of all or specified devices\n" msgstr " -l, --list 列出所有或指定的信息(默认)\n" -#: disk-utils/sfdisk.c:1440 +#: disk-utils/sfdisk.c:1740 #, fuzzy -#| msgid " -r, --raw print the raw message buffer\n" msgid " -T, --list-types print the recognized types (see -X)\n" msgstr " -r, --raw 打印原生消息缓冲区\n" -#: disk-utils/sfdisk.c:1441 +#: disk-utils/sfdisk.c:1741 #, fuzzy -#| msgid " -z --zero start with zeroed partition table\n" msgid " -V, --verify [<dev> ...] test whether partitions seem correct\n" msgstr " -z, --zero 以空分区表开始\n" -#: disk-utils/sfdisk.c:1444 +#: disk-utils/sfdisk.c:1742 +#, fuzzy +msgid " --delete <dev> [<part> ...] delete all or specified partitions\n" +msgstr " -A, --activate <设备> [<分区> ...] 列出或设置可启动的 MBR 分区\n" + +#: disk-utils/sfdisk.c:1745 msgid " --part-label <dev> <part> [<str>] print or change partition label\n" msgstr " --part-label <设备> <分区> [<字符串>] 打印或更改分区标签\n" -#: disk-utils/sfdisk.c:1445 +#: disk-utils/sfdisk.c:1746 msgid " --part-type <dev> <part> [<type>] print or change partition type\n" msgstr " --part-type <设备> <分区> [<类型>] 打印或更改分区类型\n" -#: disk-utils/sfdisk.c:1446 +#: disk-utils/sfdisk.c:1747 msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n" msgstr " --part-uuid <设备> <分区> [<uuid>] 打印或更改分区 uuid\n" -#: disk-utils/sfdisk.c:1447 +#: disk-utils/sfdisk.c:1748 msgid " --part-attrs <dev> <part> [<str>] print or change partition attributes\n" msgstr " --part-attrs <设备> <分区> [<字符串>] 打印或更改分区属性\n" -#: disk-utils/sfdisk.c:1450 +#: disk-utils/sfdisk.c:1751 #, fuzzy -#| msgid " --help display this help and exit\n" msgid " <dev> device (usually disk) path\n" msgstr " --help 显示此帮助并退出\n" -#: disk-utils/sfdisk.c:1451 +#: disk-utils/sfdisk.c:1752 #, fuzzy -#| msgid " -l, --list display partitions end exit\n" msgid " <part> partition number\n" msgstr " -l, --list 显示分区信息并退出\n" -#: disk-utils/sfdisk.c:1452 +#: disk-utils/sfdisk.c:1753 msgid " <type> partition type, GUID for GPT, hex for MBR\n" msgstr " <类型> 分区类型，GUID 对应 GPT，hex 对应 MBR\n" -#: disk-utils/sfdisk.c:1455 +#: disk-utils/sfdisk.c:1756 #, fuzzy -#| msgid " -z --zero start with zeroed partition table\n" msgid " -a, --append append partitions to existing partition table\n" msgstr " -z, --zero 以空分区表开始\n" -#: disk-utils/sfdisk.c:1456 +#: disk-utils/sfdisk.c:1757 #, fuzzy -#| msgid " -t, --type <type> recognize specified partition table type only\n" msgid " -b, --backup backup partition table sectors (see -O)\n" msgstr " -t, --type <类型> 只识别指定的分区表类型\n" -#: disk-utils/sfdisk.c:1457 +#: disk-utils/sfdisk.c:1758 #, fuzzy -#| msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n" msgid " --bytes print SIZE in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" -#: disk-utils/sfdisk.c:1458 +#: disk-utils/sfdisk.c:1759 +msgid " --move-data[=<typescript>] move partition data after relocation (requires -N)\n" +msgstr "" + +#: disk-utils/sfdisk.c:1760 #, fuzzy -#| msgid " -r, --reset reset all the counters (root only)\n" msgid " -f, --force disable all consistency checking\n" msgstr " -r, --reset 重置所有计数(限 root 用户)\n" -#: disk-utils/sfdisk.c:1459 +#: disk-utils/sfdisk.c:1761 #, fuzzy -#| msgid " -L --color[=<when>] colorize output (auto, always or never)\n" msgid " --color[=<when>] colorize output (auto, always or never)\n" msgstr " -L --color[=<何时>] 彩色输出(auto自动，always总是或never从不)\n" -#: disk-utils/sfdisk.c:1462 +#: disk-utils/sfdisk.c:1764 #, fuzzy -#| msgid " -H, --heads <number> specify the number of heads\n" msgid " -N, --partno <num> specify partition number\n" msgstr " -H, --heads <数字> 指定磁头数\n" -#: disk-utils/sfdisk.c:1463 +#: disk-utils/sfdisk.c:1765 #, fuzzy -#| msgid " -n, --no-mtab don't write to /etc/mtab\n" msgid " -n, --no-act do everything except write to device\n" msgstr " -n, --no-mtab 不写 /etc/mtab\n" -#: disk-utils/sfdisk.c:1464 +#: disk-utils/sfdisk.c:1766 #, fuzzy -#| msgid " -J --noclear do not clear the screen before prompt\n" msgid " --no-reread do not check whether the device is in use\n" msgstr " -J --noclear 提示之前不清屏\n" -#: disk-utils/sfdisk.c:1465 +#: disk-utils/sfdisk.c:1767 msgid " -O, --backup-file <path> override default backup file name\n" msgstr " -O, --backup-file <路径> 覆盖默认的备份文件名\n" -#: disk-utils/sfdisk.c:1466 +#: disk-utils/sfdisk.c:1768 #, fuzzy -#| msgid " -o, --output <list> output columns\n" msgid " -o, --output <list> output columns\n" msgstr " -o, --output <列表> 输出列\n" -#: disk-utils/sfdisk.c:1467 +#: disk-utils/sfdisk.c:1769 #, fuzzy -#| msgid " -U, --user unshare user namespace\n" msgid " -q, --quiet suppress extra info messages\n" msgstr " -U, --user 取消共享用户名字空间\n" -#: disk-utils/sfdisk.c:1468 +#: disk-utils/sfdisk.c:1770 +#, fuzzy +msgid " -w, --wipe <mode> wipe signatures (auto, always or never)\n" +msgstr " -L, --color[=<时机>] 彩色显示消息(auto, always 或 never)\n" + +#: disk-utils/sfdisk.c:1771 #, fuzzy -#| msgid " -i, --irq <num> specify parallel port irq\n" msgid " -X, --label <name> specify label type (dos, gpt, ...)\n" msgstr " -i, --irq <数字> 指定并口中断号\n" -#: disk-utils/sfdisk.c:1469 +#: disk-utils/sfdisk.c:1772 #, fuzzy -#| msgid " -t, --type <type> specify the partition type (dos, bsd, solaris, etc.)\n" msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n" msgstr " -t, --type <类型> 指定分区类型(dos、bsd、solaris 等)\n" -#: disk-utils/sfdisk.c:1471 +#: disk-utils/sfdisk.c:1774 #, fuzzy -#| msgid " --4gb ignored (for backward compatibility only)\n" msgid " -L, --Linux deprecated, only for backward compatibility\n" msgstr " --4gb 忽略(纯为兼容)\n" -#: disk-utils/sfdisk.c:1472 +#: disk-utils/sfdisk.c:1775 #, fuzzy -#| msgid " -i, --info print only info about the sampling step\n" msgid " -u, --unit S deprecated, only sector unit is supported\n" msgstr " -i, --info 只打印有关采样步骤(sampling step)的信息\n" -#: disk-utils/sfdisk.c:1476 login-utils/chfn.c:103 login-utils/chsh.c:80 +#: disk-utils/sfdisk.c:1779 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:1569 +#: disk-utils/sfdisk.c:1879 #, c-format msgid "%s is deprecated in favour of --part-type" msgstr "%s 已废弃，请改用 --part-type" -#: disk-utils/sfdisk.c:1574 +#: disk-utils/sfdisk.c:1884 msgid "--id is deprecated in favour of --part-type" msgstr "--id 已废弃，请改用 --part-type" -#: disk-utils/sfdisk.c:1599 +#: disk-utils/sfdisk.c:1909 msgid "--Linux option is unnecessary and deprecated" msgstr "--Linux 选项没必要，并且已废弃" -#: disk-utils/sfdisk.c:1625 +#: disk-utils/sfdisk.c:1938 #, fuzzy, c-format -#| msgid "unsupported argument: %s" msgid "unsupported unit '%c'" msgstr "不支持的参数：%s" -#: disk-utils/sfdisk.c:1628 include/c.h:302 +#: disk-utils/sfdisk.c:1941 include/c.h:306 #, c-format msgid "%s from %s\n" msgstr "%s，来自 %s\n" +#: disk-utils/sfdisk.c:2010 +msgid "--movedata requires -N" +msgstr "" + #: disk-utils/swaplabel.c:69 #, c-format msgid "failed to parse UUID: %s" @@ -4586,7 +4532,7 @@ msgstr "" msgid "ignore -U (UUIDs are unsupported)" msgstr "忽略 -U (不支持 UUID)" -#: include/c.h:295 +#: include/c.h:299 msgid "" "\n" "Usage:\n" @@ -4594,7 +4540,7 @@ msgstr "" "\n" "用法：\n" -#: include/c.h:296 +#: include/c.h:300 msgid "" "\n" "Options:\n" @@ -4602,15 +4548,15 @@ msgstr "" "\n" "选项：\n" -#: include/c.h:298 +#: include/c.h:302 msgid " -h, --help display this help and exit\n" msgstr " -h, --help 显示此帮助并退出\n" -#: include/c.h:299 +#: include/c.h:303 msgid " -V, --version output version information and exit\n" msgstr " -V, --version 输出版本信息并退出\n" -#: include/c.h:300 +#: include/c.h:304 #, c-format msgid "" "\n" @@ -4620,7 +4566,7 @@ msgstr "" "更多信息请参阅 %s。\n" #: include/closestream.h:42 include/closestream.h:44 login-utils/vipw.c:270 -#: login-utils/vipw.c:289 sys-utils/rtcwake.c:280 term-utils/setterm.c:813 +#: login-utils/vipw.c:289 sys-utils/rtcwake.c:279 term-utils/setterm.c:813 #: text-utils/col.c:157 msgid "write error" msgstr "写出错" @@ -4635,7 +4581,6 @@ msgstr "" #: include/optutils.h:81 #, fuzzy, c-format -#| msgid "%s: these options aremutually exclusive:" msgid "%s: these options are mutually exclusive:" msgstr "%s：以下选项相互排斥：" @@ -4811,8 +4756,8 @@ msgstr "Golden Bow" msgid "Priam Edisk" msgstr "Priam Edisk" -#: include/pt-mbr-partnames.h:44 include/pt-mbr-partnames.h:89 -#: include/pt-mbr-partnames.h:95 include/pt-mbr-partnames.h:96 +#: include/pt-mbr-partnames.h:44 include/pt-mbr-partnames.h:91 +#: include/pt-mbr-partnames.h:98 include/pt-mbr-partnames.h:99 msgid "SpeedStor" msgstr "SpeedStor" @@ -4853,172 +4798,181 @@ msgid "Linux" msgstr "Linux" #: include/pt-mbr-partnames.h:54 -msgid "OS/2 hidden C: drive" -msgstr "OS/2 隐藏的 C: 盘" +msgid "OS/2 hidden or Intel hibernation" +msgstr "" -#: include/pt-mbr-partnames.h:55 +#: include/pt-mbr-partnames.h:57 msgid "Linux extended" msgstr "Linux 扩展" -#: include/pt-mbr-partnames.h:56 include/pt-mbr-partnames.h:57 +#: include/pt-mbr-partnames.h:58 include/pt-mbr-partnames.h:59 msgid "NTFS volume set" msgstr "NTFS 卷集" -#: include/pt-mbr-partnames.h:58 +#: include/pt-mbr-partnames.h:60 msgid "Linux plaintext" msgstr "Linux 纯文本" -#: include/pt-mbr-partnames.h:59 libfdisk/src/gpt.c:203 libfdisk/src/sgi.c:63 +#: include/pt-mbr-partnames.h:61 libfdisk/src/gpt.c:204 libfdisk/src/sgi.c:63 #: libfdisk/src/sun.c:54 msgid "Linux LVM" msgstr "Linux LVM" -#: include/pt-mbr-partnames.h:60 +#: include/pt-mbr-partnames.h:62 msgid "Amoeba" msgstr "Amoeba" -#: include/pt-mbr-partnames.h:61 +#: include/pt-mbr-partnames.h:63 msgid "Amoeba BBT" msgstr "Amoeba BBT" -#: include/pt-mbr-partnames.h:62 +#: include/pt-mbr-partnames.h:64 msgid "BSD/OS" msgstr "BSD/OS" -#: include/pt-mbr-partnames.h:63 +#: include/pt-mbr-partnames.h:65 msgid "IBM Thinkpad hibernation" msgstr "IBM Thinkpad 休眠" -#: include/pt-mbr-partnames.h:64 +#: include/pt-mbr-partnames.h:66 msgid "FreeBSD" msgstr "FreeBSD" -#: include/pt-mbr-partnames.h:65 +#: include/pt-mbr-partnames.h:67 msgid "OpenBSD" msgstr "OpenBSD" -#: include/pt-mbr-partnames.h:66 +#: include/pt-mbr-partnames.h:68 msgid "NeXTSTEP" msgstr "NeXTSTEP" -#: include/pt-mbr-partnames.h:67 +#: include/pt-mbr-partnames.h:69 msgid "Darwin UFS" msgstr "Darwin UFS" -#: include/pt-mbr-partnames.h:68 +#: include/pt-mbr-partnames.h:70 msgid "NetBSD" msgstr "NetBSD" -#: include/pt-mbr-partnames.h:69 +#: include/pt-mbr-partnames.h:71 msgid "Darwin boot" msgstr "Darwin 启动" -#: include/pt-mbr-partnames.h:70 +#: include/pt-mbr-partnames.h:72 msgid "HFS / HFS+" msgstr "HFS / HFS+" -#: include/pt-mbr-partnames.h:71 +#: include/pt-mbr-partnames.h:73 msgid "BSDI fs" msgstr "BSDI fs" -#: include/pt-mbr-partnames.h:72 +#: include/pt-mbr-partnames.h:74 msgid "BSDI swap" msgstr "BSDI swap" -#: include/pt-mbr-partnames.h:73 +#: include/pt-mbr-partnames.h:75 msgid "Boot Wizard hidden" msgstr "Boot Wizard 隐藏" -#: include/pt-mbr-partnames.h:74 +#: include/pt-mbr-partnames.h:76 #, fuzzy -#| msgid "W95 FAT32 (LBA)" msgid "Acronis FAT32 LBA" msgstr "W95 FAT32 (LBA)" -#: include/pt-mbr-partnames.h:75 libfdisk/src/gpt.c:228 +#: include/pt-mbr-partnames.h:77 libfdisk/src/gpt.c:229 msgid "Solaris boot" msgstr "Solaris 启动" -#: include/pt-mbr-partnames.h:76 +#: include/pt-mbr-partnames.h:78 msgid "Solaris" msgstr "Solaris" -#: include/pt-mbr-partnames.h:77 +#: include/pt-mbr-partnames.h:79 msgid "DRDOS/sec (FAT-12)" msgstr "DRDOS/sec (FAT-12)" -#: include/pt-mbr-partnames.h:78 +#: include/pt-mbr-partnames.h:80 msgid "DRDOS/sec (FAT-16 < 32M)" msgstr "DRDOS/sec (FAT-16 < 32M)" -#: include/pt-mbr-partnames.h:79 +#: include/pt-mbr-partnames.h:81 msgid "DRDOS/sec (FAT-16)" msgstr "DRDOS/sec (FAT-16)" -#: include/pt-mbr-partnames.h:80 +#: include/pt-mbr-partnames.h:82 msgid "Syrinx" msgstr "Syrinx" -#: include/pt-mbr-partnames.h:81 +#: include/pt-mbr-partnames.h:83 msgid "Non-FS data" msgstr "非文件系统数据" -#: include/pt-mbr-partnames.h:82 +#: include/pt-mbr-partnames.h:84 msgid "CP/M / CTOS / ..." msgstr "CP/M / CTOS / ..." -#: include/pt-mbr-partnames.h:84 +#: include/pt-mbr-partnames.h:86 msgid "Dell Utility" msgstr "Dell 工具" -#: include/pt-mbr-partnames.h:85 +#: include/pt-mbr-partnames.h:87 msgid "BootIt" msgstr "BootIt" -#: include/pt-mbr-partnames.h:86 +#: include/pt-mbr-partnames.h:88 msgid "DOS access" msgstr "DOS 访问" -#: include/pt-mbr-partnames.h:88 +#: include/pt-mbr-partnames.h:90 msgid "DOS R/O" msgstr "DOS R/O" -#: include/pt-mbr-partnames.h:91 +#: include/pt-mbr-partnames.h:93 +#, fuzzy +msgid "Rufus alignment" +msgstr "第一个参数" + +#: include/pt-mbr-partnames.h:94 msgid "BeOS fs" msgstr "BeOS fs" -#: include/pt-mbr-partnames.h:93 +#: include/pt-mbr-partnames.h:96 msgid "EFI (FAT-12/16/32)" msgstr "EFI (FAT-12/16/32)" -#: include/pt-mbr-partnames.h:94 +#: include/pt-mbr-partnames.h:97 msgid "Linux/PA-RISC boot" msgstr "Linux/PA-RISC 启动" -#: include/pt-mbr-partnames.h:97 +#: include/pt-mbr-partnames.h:100 msgid "DOS secondary" msgstr "DOS 次要" -#: include/pt-mbr-partnames.h:98 +#: include/pt-mbr-partnames.h:101 msgid "VMware VMFS" msgstr "VMware VMFS" -#: include/pt-mbr-partnames.h:99 +#: include/pt-mbr-partnames.h:102 msgid "VMware VMKCORE" msgstr "VMware VMKCORE" -#: include/pt-mbr-partnames.h:100 libfdisk/src/sun.c:55 +#: include/pt-mbr-partnames.h:103 libfdisk/src/sun.c:55 msgid "Linux raid autodetect" msgstr "Linux raid 自动检测" -#: include/pt-mbr-partnames.h:103 +#: include/pt-mbr-partnames.h:106 msgid "LANstep" msgstr "LANstep" -#: include/pt-mbr-partnames.h:104 +#: include/pt-mbr-partnames.h:107 msgid "BBT" msgstr "BBT" +#: lib/blkdev.c:282 +#, c-format +msgid "warning: %s is misaligned" +msgstr "警告：%s 未正确对齐" + #: libfdisk/src/alignment.c:662 msgid "Calling ioctl() to re-read partition table." msgstr "将调用 ioctl() 来重新读分区表。" @@ -5031,24 +4985,24 @@ msgstr "重新读取分区表失败。" msgid "The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or kpartx(8)." msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 kpartx(8) 后生效。" -#: libfdisk/src/ask.c:476 libfdisk/src/ask.c:488 +#: libfdisk/src/ask.c:472 libfdisk/src/ask.c:484 #, c-format msgid "Selected partition %ju" msgstr "已选择分区 %ju" -#: libfdisk/src/ask.c:479 +#: libfdisk/src/ask.c:475 msgid "No partition is defined yet!" msgstr "还没有定义分区！" -#: libfdisk/src/ask.c:491 +#: libfdisk/src/ask.c:487 msgid "No free partition available!" msgstr "无空闲分区可用！" -#: libfdisk/src/ask.c:501 +#: libfdisk/src/ask.c:497 msgid "Partition number" msgstr "分区号" -#: libfdisk/src/ask.c:998 +#: libfdisk/src/ask.c:994 #, c-format msgid "Created a new partition %d of type '%s' and of size %s." msgstr "创建了一个新分区 %d，类型为“%s”，大小为 %s。" @@ -5071,7 +5025,7 @@ msgstr "第一个柱面" msgid "Last cylinder, +cylinders or +size{K,M,G,T,P}" msgstr "最后一个柱面, +cylinders 或 +size{K,M,G,T,P}" -#: libfdisk/src/bsd.c:297 libfdisk/src/dos.c:1166 libfdisk/src/gpt.c:2234 +#: libfdisk/src/bsd.c:297 libfdisk/src/dos.c:1166 libfdisk/src/gpt.c:2235 msgid "Last sector, +sectors or +size{K,M,G,T,P}" msgstr "上个扇区，+sectors 或 +size{K,M,G,T,P}" @@ -5086,7 +5040,6 @@ msgstr "您想创建一个 BSD 磁盘标签吗？" #: libfdisk/src/bsd.c:449 #, fuzzy -#| msgid "Disk: %s" msgid "Disk" msgstr "磁盘：%s" @@ -5094,7 +5047,7 @@ msgstr "磁盘：%s" msgid "Packname" msgstr "" -#: libfdisk/src/bsd.c:463 libfdisk/src/sun.c:1114 +#: libfdisk/src/bsd.c:463 libfdisk/src/sun.c:1117 msgid "Flags" msgstr "标志" @@ -5112,60 +5065,51 @@ msgstr " 坏扇区" #: libfdisk/src/bsd.c:476 #, fuzzy -#| msgid "bytes/sector" msgid "Bytes/Sector" msgstr "字节/扇区" #: libfdisk/src/bsd.c:481 #, fuzzy -#| msgid "tracks/cylinder" msgid "Tracks/Cylinder" msgstr "磁道/柱面" #: libfdisk/src/bsd.c:486 #, fuzzy -#| msgid "sectors/cylinder" msgid "Sectors/Cylinder" msgstr "扇区/柱面" -#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1014 libfdisk/src/dos.c:2303 -#: libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:196 libfdisk/src/sun.c:1110 +#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1018 libfdisk/src/dos.c:2305 +#: libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:196 libfdisk/src/sun.c:1113 msgid "Cylinders" msgstr "柱面" -#: libfdisk/src/bsd.c:496 libfdisk/src/sun.c:757 +#: libfdisk/src/bsd.c:496 libfdisk/src/sun.c:760 #, fuzzy -#| msgid "rpm" msgid "Rpm" msgstr "rpm" -#: libfdisk/src/bsd.c:501 libfdisk/src/sgi.c:292 libfdisk/src/sun.c:777 +#: libfdisk/src/bsd.c:501 libfdisk/src/sgi.c:292 libfdisk/src/sun.c:780 #, fuzzy -#| msgid "interleave" msgid "Interleave" msgstr "交错" #: libfdisk/src/bsd.c:506 #, fuzzy -#| msgid "trackskew" msgid "Trackskew" msgstr "磁道螺距" #: libfdisk/src/bsd.c:511 #, fuzzy -#| msgid "cylinderskew" msgid "Cylinderskew" msgstr "柱头螺距" #: libfdisk/src/bsd.c:516 #, fuzzy -#| msgid "headswitch" msgid "Headswitch" msgstr "磁头切换" #: libfdisk/src/bsd.c:521 #, fuzzy -#| msgid "track-to-track seek" msgid "Track-to-track seek" msgstr "跨磁道定位" @@ -5232,61 +5176,61 @@ msgstr "引导程序与磁盘标签重叠！" msgid "Bootstrap installed on %s." msgstr "已在 %s 上安装引导程序。" -#: libfdisk/src/bsd.c:899 +#: libfdisk/src/bsd.c:900 +#, c-format +msgid "Disklabel written to %s (don't forget to write %s disklable too)." +msgstr "" + +#: libfdisk/src/bsd.c:903 #, c-format msgid "Disklabel written to %s." msgstr "磁盘标签已写入 %s。" -#: libfdisk/src/bsd.c:905 libfdisk/src/context.c:611 +#: libfdisk/src/bsd.c:909 libfdisk/src/context.c:685 msgid "Syncing disks." msgstr "正在同步磁盘。" -#: libfdisk/src/bsd.c:946 +#: libfdisk/src/bsd.c:950 msgid "BSD label is not nested within a DOS partition." msgstr "BSD 标签未嵌套在 DOS 分区中。" -#: libfdisk/src/bsd.c:974 +#: libfdisk/src/bsd.c:978 #, c-format msgid "BSD partition '%c' linked to DOS partition %zu." msgstr "BSD 分区“%c”已链接到 DOS 分区 %zu。" -#: libfdisk/src/bsd.c:1010 +#: libfdisk/src/bsd.c:1014 msgid "Slice" msgstr "片" -#: libfdisk/src/bsd.c:1017 +#: libfdisk/src/bsd.c:1021 msgid "Fsize" msgstr "Fsize" -#: libfdisk/src/bsd.c:1018 +#: libfdisk/src/bsd.c:1022 msgid "Bsize" msgstr "Bsize" -#: libfdisk/src/bsd.c:1019 +#: libfdisk/src/bsd.c:1023 msgid "Cpg" msgstr "Cpg" -#: 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:605 +#: libfdisk/src/context.c:679 #, c-format msgid "%s: close device failed" msgstr "%s：关闭设备失败" -#: libfdisk/src/context.c:772 +#: libfdisk/src/context.c:846 msgid "cylinder" msgid_plural "cylinders" msgstr[0] "柱面" -#: libfdisk/src/context.c:773 +#: libfdisk/src/context.c:847 msgid "sector" msgid_plural "sectors" msgstr[0] "扇区" -#: libfdisk/src/context.c:1076 +#: libfdisk/src/context.c:1150 msgid "Incomplete geometry setting." msgstr "不完整的几何属性设置。" @@ -5346,7 +5290,6 @@ msgstr "将忽略空分区(%zu)" #: libfdisk/src/dos.c:664 #, fuzzy, c-format -#| msgid "Building a new DOS disklabel with disk identifier 0x%08x.\n" msgid "Created a new DOS disklabel with disk identifier 0x%08x." msgstr "使用磁盘标识符 0x%08x 创建新的 DOS 磁盘标签。\n" @@ -5378,8 +5321,8 @@ msgstr "分区表 %3$zu 的无效标志 0x%1$02x%2$02x 将通过写入来更正" msgid "Start sector %ju out of range." msgstr "起始扇区 %ju 超出范围。" -#: libfdisk/src/dos.c:1026 libfdisk/src/gpt.c:2115 libfdisk/src/sgi.c:840 -#: libfdisk/src/sun.c:514 +#: libfdisk/src/dos.c:1026 libfdisk/src/gpt.c:2116 libfdisk/src/sgi.c:840 +#: libfdisk/src/sun.c:517 #, c-format msgid "Partition %zu is already defined. Delete it before re-adding it." msgstr "分区 %zu 已经定义过。请删除后再重新添加它。" @@ -5389,7 +5332,7 @@ msgstr "分区 %zu 已经定义过。请删除后再重新添加它。" msgid "Sector %llu is already allocated." msgstr "扇区 %llu 已经分配." -#: libfdisk/src/dos.c:1133 libfdisk/src/gpt.c:2125 +#: libfdisk/src/dos.c:1133 libfdisk/src/gpt.c:2126 msgid "No free sectors available." msgstr "无空闲扇区可用。" @@ -5468,9 +5411,8 @@ msgstr "分配的总扇区数 %llu 大于最大值 %llu。" msgid "Remaining %lld unallocated %ld-byte sectors." msgstr "剩余 %lld 未分配的 %ld字节 扇区。" -#: libfdisk/src/dos.c:1534 libfdisk/src/dos.c:1953 +#: libfdisk/src/dos.c:1534 libfdisk/src/dos.c:1956 #, fuzzy -#| msgid "Extended partition not where expected" msgid "Extended partition already exists." msgstr "扩展分区位置异常" @@ -5482,130 +5424,123 @@ msgstr "已创建分区达到最大数量。" msgid "All primary partitions are in use." msgstr "所有主分区都在使用中。" -#: libfdisk/src/dos.c:1591 +#: libfdisk/src/dos.c:1591 libfdisk/src/dos.c:1602 #, fuzzy -#| msgid "All primary partitions are in use." msgid "All space for primary partitions is in use." msgstr "所有主分区都在使用中。" #. TRANSLATORS: Try to keep this within 80 characters. -#: libfdisk/src/dos.c:1602 +#: libfdisk/src/dos.c:1605 #, fuzzy -#| msgid "If you want to create more than four partitions, you must replace a primary partition with an extended partition first." msgid "To create more partitions, first replace a primary with an extended partition." msgstr "要想创建多于 4 个分区，您需要先将一个主分区替换为扩展分区。" -#: libfdisk/src/dos.c:1607 +#: libfdisk/src/dos.c:1610 msgid "All logical partitions are in use. Adding a primary partition." msgstr "所有逻辑分区都在使用中。将添加一个主分区。" -#: libfdisk/src/dos.c:1629 +#: libfdisk/src/dos.c:1632 msgid "Partition type" msgstr "分区类型" -#: libfdisk/src/dos.c:1633 +#: libfdisk/src/dos.c:1636 #, c-format msgid "%zu primary, %d extended, %zu free" msgstr "%zu个主分区，%d个扩展分区，%zu空闲" -#: libfdisk/src/dos.c:1638 +#: libfdisk/src/dos.c:1641 msgid "primary" msgstr "主分区" -#: libfdisk/src/dos.c:1640 +#: libfdisk/src/dos.c:1643 msgid "extended" msgstr "扩展分区" -#: libfdisk/src/dos.c:1640 +#: libfdisk/src/dos.c:1643 msgid "container for logical partitions" msgstr "逻辑分区容器" -#: libfdisk/src/dos.c:1642 +#: libfdisk/src/dos.c:1645 msgid "logical" msgstr "逻辑分区" -#: libfdisk/src/dos.c:1642 +#: libfdisk/src/dos.c:1645 msgid "numbered from 5" msgstr "从 5 开始编号" -#: libfdisk/src/dos.c:1680 +#: libfdisk/src/dos.c:1683 #, c-format msgid "Invalid partition type `%c'." msgstr "无效的分区类型“%c”。" -#: libfdisk/src/dos.c:1698 +#: libfdisk/src/dos.c:1701 #, c-format msgid "Cannot write sector %jd: seek failed" msgstr "写扇区 %jd 失败：定位失败" -#: libfdisk/src/dos.c:1851 libfdisk/src/gpt.c:1097 +#: libfdisk/src/dos.c:1854 libfdisk/src/gpt.c:1089 #, fuzzy -#| msgid "Disk identifier: %s" msgid "Disk identifier" msgstr "磁盘标识符：%s" -#: libfdisk/src/dos.c:1958 +#: libfdisk/src/dos.c:1961 msgid "Type 0 means free space to many systems. Having partitions of type 0 is probably unwise." msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。" -#: libfdisk/src/dos.c:1963 -msgid "Cannot change type of the extended partition which is already used by logical partitons. Delete logical partitions first." +#: libfdisk/src/dos.c:1966 +msgid "Cannot change type of the extended partition which is already used by logical partitions. Delete logical partitions first." msgstr "" -#: libfdisk/src/dos.c:2142 +#: libfdisk/src/dos.c:2145 libfdisk/src/gpt.c:2681 msgid "Nothing to do. Ordering is correct already." msgstr "无须操作。顺序已经是正确的了。" -#: libfdisk/src/dos.c:2171 libfdisk/src/gpt.c:2680 -msgid "Done." -msgstr "完成。" - -#: libfdisk/src/dos.c:2192 +#: libfdisk/src/dos.c:2194 #, c-format msgid "Partition %zu: no data area." msgstr "分区 %zu：无数据区。" -#: libfdisk/src/dos.c:2222 +#: libfdisk/src/dos.c:2224 msgid "New beginning of data" msgstr "新数据起点" -#: libfdisk/src/dos.c:2278 +#: libfdisk/src/dos.c:2280 #, c-format msgid "Partition %zu: is an extended partition." msgstr "分区 %zu：是一个扩展分区。" -#: libfdisk/src/dos.c:2284 +#: libfdisk/src/dos.c:2286 #, c-format msgid "The bootable flag on partition %zu is enabled now." msgstr "分区 %zu 的 可启动 标志已启用。" -#: libfdisk/src/dos.c:2285 +#: libfdisk/src/dos.c:2287 #, c-format msgid "The bootable flag on partition %zu is disabled now." msgstr "分区 %zu 的 可启动 标志已禁用。" -#: libfdisk/src/dos.c:2298 libfdisk/src/gpt.c:2760 libfdisk/src/sgi.c:1155 -#: libfdisk/src/sun.c:1106 +#: libfdisk/src/dos.c:2300 libfdisk/src/gpt.c:2771 libfdisk/src/sgi.c:1154 +#: libfdisk/src/sun.c:1109 msgid "Device" msgstr "设备" -#: libfdisk/src/dos.c:2299 libfdisk/src/sun.c:41 +#: libfdisk/src/dos.c:2301 libfdisk/src/sun.c:41 msgid "Boot" msgstr "启动" -#: libfdisk/src/dos.c:2305 libfdisk/src/sgi.c:1161 libfdisk/src/sun.c:1112 +#: libfdisk/src/dos.c:2307 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1115 msgid "Id" msgstr "Id" -#: libfdisk/src/dos.c:2309 +#: libfdisk/src/dos.c:2311 msgid "Start-C/H/S" msgstr "始-C/H/S" -#: libfdisk/src/dos.c:2310 +#: libfdisk/src/dos.c:2312 msgid "End-C/H/S" msgstr "终-C/H/S" -#: libfdisk/src/dos.c:2311 libfdisk/src/gpt.c:2770 libfdisk/src/sgi.c:1163 +#: libfdisk/src/dos.c:2313 libfdisk/src/gpt.c:2781 libfdisk/src/sgi.c:1162 msgid "Attrs" msgstr "属性" @@ -5627,25 +5562,21 @@ msgstr "BIOS 启动" #: libfdisk/src/gpt.c:168 #, fuzzy -#| msgid "BIOS boot partition" msgid "Sony boot partition" msgstr "BIOS 启动分区" #: libfdisk/src/gpt.c:169 #, fuzzy -#| msgid "BIOS boot partition" msgid "Lenovo boot partition" msgstr "BIOS 启动分区" #: libfdisk/src/gpt.c:172 #, fuzzy -#| msgid "PPC PReP Boot" msgid "PowerPC PReP boot" msgstr "PPC PReP Boot" #: libfdisk/src/gpt.c:175 #, fuzzy -#| msgid "BIOS boot" msgid "ONIE boot" msgstr "BIOS 启动" @@ -5707,7 +5638,6 @@ msgstr "Linux root (x86)" #: libfdisk/src/gpt.c:196 #, fuzzy -#| msgid "Linux root (x86)" msgid "Linux root (ARM)" msgstr "Linux root (x86)" @@ -5717,493 +5647,497 @@ msgstr "Linux root (x86-64)" #: libfdisk/src/gpt.c:198 #, fuzzy -#| msgid "Linux root (x86-64)" msgid "Linux root (ARM-64)" msgstr "Linux root (x86-64)" #: libfdisk/src/gpt.c:199 +#, fuzzy +msgid "Linux root\t(IA-64)" +msgstr "Linux root (x86-64)" + +#: libfdisk/src/gpt.c:200 msgid "Linux reserved" msgstr "Linux 保留" -#: libfdisk/src/gpt.c:200 +#: libfdisk/src/gpt.c:201 msgid "Linux home" msgstr "Linux home" -#: libfdisk/src/gpt.c:201 libfdisk/src/sgi.c:64 +#: libfdisk/src/gpt.c:202 libfdisk/src/sgi.c:64 msgid "Linux RAID" msgstr "Linux RAID" -#: libfdisk/src/gpt.c:202 +#: libfdisk/src/gpt.c:203 msgid "Linux extended boot" msgstr "Linux 扩展启动" -#: libfdisk/src/gpt.c:210 +#: libfdisk/src/gpt.c:211 msgid "FreeBSD data" msgstr "FreeBSD 数据" -#: libfdisk/src/gpt.c:211 +#: libfdisk/src/gpt.c:212 msgid "FreeBSD boot" msgstr "FreeBSD 启动" -#: libfdisk/src/gpt.c:212 +#: libfdisk/src/gpt.c:213 msgid "FreeBSD swap" msgstr "FreeBSD 交换" -#: libfdisk/src/gpt.c:213 +#: libfdisk/src/gpt.c:214 msgid "FreeBSD UFS" msgstr "FreeBSD UFS" -#: libfdisk/src/gpt.c:214 +#: libfdisk/src/gpt.c:215 msgid "FreeBSD ZFS" msgstr "FreeBSD ZFS" -#: libfdisk/src/gpt.c:215 +#: libfdisk/src/gpt.c:216 msgid "FreeBSD Vinum" msgstr "FreeBSD Vinum" -#: libfdisk/src/gpt.c:218 +#: libfdisk/src/gpt.c:219 msgid "Apple HFS/HFS+" msgstr "Apple HFS/HFS+" -#: libfdisk/src/gpt.c:219 +#: libfdisk/src/gpt.c:220 msgid "Apple UFS" msgstr "Apple UFS" -#: libfdisk/src/gpt.c:220 +#: libfdisk/src/gpt.c:221 msgid "Apple RAID" msgstr "Apple RAID" -#: libfdisk/src/gpt.c:221 +#: libfdisk/src/gpt.c:222 msgid "Apple RAID offline" msgstr "Apple RAID 离线" -#: libfdisk/src/gpt.c:222 +#: libfdisk/src/gpt.c:223 msgid "Apple boot" msgstr "Apple 启动" -#: libfdisk/src/gpt.c:223 +#: libfdisk/src/gpt.c:224 msgid "Apple label" msgstr "Apple 标签" -#: libfdisk/src/gpt.c:224 +#: libfdisk/src/gpt.c:225 msgid "Apple TV recovery" msgstr "Apple TV 恢复" -#: libfdisk/src/gpt.c:225 +#: libfdisk/src/gpt.c:226 msgid "Apple Core storage" msgstr "Apple Core 存储" -#: libfdisk/src/gpt.c:229 +#: libfdisk/src/gpt.c:230 msgid "Solaris root" msgstr "Solaris root" -#: libfdisk/src/gpt.c:231 +#: libfdisk/src/gpt.c:232 msgid "Solaris /usr & Apple ZFS" msgstr "Solaris /usr & Apple ZFS" -#: libfdisk/src/gpt.c:232 +#: libfdisk/src/gpt.c:233 msgid "Solaris swap" msgstr "Solaris 交换" -#: libfdisk/src/gpt.c:233 +#: libfdisk/src/gpt.c:234 msgid "Solaris backup" msgstr "Solaris 备份" -#: libfdisk/src/gpt.c:234 +#: libfdisk/src/gpt.c:235 msgid "Solaris /var" msgstr "Solaris /var" -#: libfdisk/src/gpt.c:235 +#: libfdisk/src/gpt.c:236 msgid "Solaris /home" msgstr "Solaris /home" -#: libfdisk/src/gpt.c:236 +#: libfdisk/src/gpt.c:237 msgid "Solaris alternate sector" msgstr "Solaris 备选扇区" -#: libfdisk/src/gpt.c:237 +#: libfdisk/src/gpt.c:238 msgid "Solaris reserved 1" msgstr "Solaris 保留 1" -#: libfdisk/src/gpt.c:238 +#: libfdisk/src/gpt.c:239 msgid "Solaris reserved 2" msgstr "Solaris 保留 2" -#: libfdisk/src/gpt.c:239 +#: libfdisk/src/gpt.c:240 msgid "Solaris reserved 3" msgstr "Solaris 保留 3" -#: libfdisk/src/gpt.c:240 +#: libfdisk/src/gpt.c:241 msgid "Solaris reserved 4" msgstr "Solaris 保留 4" -#: libfdisk/src/gpt.c:241 +#: libfdisk/src/gpt.c:242 msgid "Solaris reserved 5" msgstr "Solaris 保留 5" -#: libfdisk/src/gpt.c:244 +#: libfdisk/src/gpt.c:245 msgid "NetBSD swap" msgstr "NetBSD 交换" -#: libfdisk/src/gpt.c:245 +#: libfdisk/src/gpt.c:246 msgid "NetBSD FFS" msgstr "NetBSD FFS" -#: libfdisk/src/gpt.c:246 +#: libfdisk/src/gpt.c:247 msgid "NetBSD LFS" msgstr "NetBSD LFS" -#: libfdisk/src/gpt.c:247 +#: libfdisk/src/gpt.c:248 msgid "NetBSD concatenated" msgstr "NetBSD concatenated" -#: libfdisk/src/gpt.c:248 +#: libfdisk/src/gpt.c:249 msgid "NetBSD encrypted" msgstr "NetBSD 加密" -#: libfdisk/src/gpt.c:249 +#: libfdisk/src/gpt.c:250 msgid "NetBSD RAID" msgstr "NetBSD RAID" -#: libfdisk/src/gpt.c:252 +#: libfdisk/src/gpt.c:253 msgid "ChromeOS kernel" msgstr "ChromeOS 内核" -#: libfdisk/src/gpt.c:253 +#: libfdisk/src/gpt.c:254 msgid "ChromeOS root fs" msgstr "ChromeOS 根文件系统" -#: libfdisk/src/gpt.c:254 +#: libfdisk/src/gpt.c:255 msgid "ChromeOS reserved" msgstr "ChromeOS 保留" -#: libfdisk/src/gpt.c:257 +#: libfdisk/src/gpt.c:258 msgid "MidnightBSD data" msgstr "MidnightBSD 数据" -#: libfdisk/src/gpt.c:258 +#: libfdisk/src/gpt.c:259 msgid "MidnightBSD boot" msgstr "MidnightBSD 启动" -#: libfdisk/src/gpt.c:259 +#: libfdisk/src/gpt.c:260 msgid "MidnightBSD swap" msgstr "MidnightBSD 交换" -#: libfdisk/src/gpt.c:260 +#: libfdisk/src/gpt.c:261 msgid "MidnightBSD UFS" msgstr "MidnightBSD UFS" -#: libfdisk/src/gpt.c:261 +#: libfdisk/src/gpt.c:262 msgid "MidnightBSD ZFS" msgstr "MidnightBSD ZFS" -#: libfdisk/src/gpt.c:262 +#: libfdisk/src/gpt.c:263 msgid "MidnightBSD Vinum" msgstr "MidnightBSD Vinum" -#: libfdisk/src/gpt.c:265 +#: libfdisk/src/gpt.c:266 msgid "Ceph Journal" msgstr "" -#: libfdisk/src/gpt.c:266 +#: libfdisk/src/gpt.c:267 msgid "Ceph Encrypted Journal" msgstr "" -#: libfdisk/src/gpt.c:267 +#: libfdisk/src/gpt.c:268 msgid "Ceph OSD" msgstr "" -#: libfdisk/src/gpt.c:268 +#: libfdisk/src/gpt.c:269 msgid "Ceph crypt OSD" msgstr "" -#: libfdisk/src/gpt.c:269 +#: libfdisk/src/gpt.c:270 msgid "Ceph disk in creation" msgstr "" -#: libfdisk/src/gpt.c:270 +#: libfdisk/src/gpt.c:271 msgid "Ceph crypt disk in creation" msgstr "" -#: libfdisk/src/gpt.c:273 +#: libfdisk/src/gpt.c:274 #, fuzzy -#| msgid "FreeBSD data" msgid "OpenBSD data" msgstr "FreeBSD 数据" -#: libfdisk/src/gpt.c:276 +#: libfdisk/src/gpt.c:277 #, fuzzy -#| msgid "Linux filesystem" msgid "QNX6 file system" msgstr "Linux 文件系统" -#: libfdisk/src/gpt.c:279 +#: libfdisk/src/gpt.c:280 #, fuzzy -#| msgid "delete a partition" msgid "Plan 9 partition" msgstr "删除分区" -#: libfdisk/src/gpt.c:544 +#: libfdisk/src/gpt.c:545 msgid "failed to allocate GPT header" msgstr "分配 GPT 头失败" -#: libfdisk/src/gpt.c:626 +#: libfdisk/src/gpt.c:628 msgid "First LBA specified by script is out of range." msgstr "" -#: libfdisk/src/gpt.c:637 +#: libfdisk/src/gpt.c:640 msgid "Last LBA specified by script is out of range." msgstr "" -#: libfdisk/src/gpt.c:771 +#: libfdisk/src/gpt.c:774 #, 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:789 +#: libfdisk/src/gpt.c:792 msgid "gpt: stat() failed" msgstr "gpt：stat() 失败" -#: libfdisk/src/gpt.c:799 +#: libfdisk/src/gpt.c:802 #, c-format msgid "gpt: cannot handle files with mode %o" msgstr "gpt：无法操作模式为 %o 的文件" -#: libfdisk/src/gpt.c:1066 +#: libfdisk/src/gpt.c:1058 msgid "GPT Header" msgstr "GPT 头" -#: libfdisk/src/gpt.c:1071 +#: libfdisk/src/gpt.c:1063 msgid "GPT Entries" msgstr "GPT 记录项" -#: libfdisk/src/gpt.c:1104 +#: libfdisk/src/gpt.c:1096 #, fuzzy -#| msgid "First LBA: %ju" msgid "First LBA" msgstr "第一个 LBA：%ju" -#: libfdisk/src/gpt.c:1109 +#: libfdisk/src/gpt.c:1101 #, fuzzy -#| msgid "Last LBA: %ju" msgid "Last LBA" msgstr "上个 LBA: %ju" #. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header. -#: libfdisk/src/gpt.c:1115 +#: libfdisk/src/gpt.c:1107 #, fuzzy -#| msgid "Alternative LBA: %ju" msgid "Alternative LBA" msgstr "替代 LBA：%ju" #. TRANSLATORS: The start of the array of partition entries. -#: libfdisk/src/gpt.c:1121 +#: libfdisk/src/gpt.c:1113 #, fuzzy -#| msgid "Partitions entries LBA: %ju" msgid "Partition entries LBA" msgstr "分区记录项 LBA：%ju" -#: libfdisk/src/gpt.c:1126 +#: libfdisk/src/gpt.c:1118 #, fuzzy -#| msgid "Allocated partition entries: %u" msgid "Allocated partition entries" msgstr "已分配的分区项：%u" -#: libfdisk/src/gpt.c:1441 +#: libfdisk/src/gpt.c:1433 msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used." msgstr "备份 GPT 表损坏，但主表似乎正常，将使用它。" -#: libfdisk/src/gpt.c:1450 +#: libfdisk/src/gpt.c:1442 msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used." msgstr "主 GPT 表损坏，但备份似乎正常，将使用它。" -#: libfdisk/src/gpt.c:1624 +#: libfdisk/src/gpt.c:1616 #, fuzzy, c-format -#| msgid "unsupported argument: %s" msgid "unsupported GPT attribute bit '%s'" msgstr "不支持的参数：%s" -#: libfdisk/src/gpt.c:1719 +#: libfdisk/src/gpt.c:1711 #, c-format msgid "Partition UUID changed from %s to %s." msgstr "分区 UUID 已从 %s 更改为 %s。" -#: libfdisk/src/gpt.c:1727 +#: libfdisk/src/gpt.c:1719 #, c-format msgid "Partition name changed from '%s' to '%.*s'." msgstr "分区名已由“%s”改为“%.*s”。" -#: libfdisk/src/gpt.c:1913 +#: libfdisk/src/gpt.c:1748 +#, fuzzy +msgid "The begin of the partition overflows FirstUsableLBA." +msgstr "启动分区不存在。" + +#: libfdisk/src/gpt.c:1755 +#, fuzzy +msgid "The end of the partition overflows LastUsableLBA." +msgstr "分区终点(扇区数)" + +#: libfdisk/src/gpt.c:1914 msgid "The device contains hybrid MBR -- writing GPT only. You have to sync the MBR manually." msgstr "该设备包含混合 MBR -- 将只写入 GPT。您需要手动同步 MBR。" -#: libfdisk/src/gpt.c:1950 +#: libfdisk/src/gpt.c:1951 msgid "Disk does not contain a valid backup header." msgstr "磁盘不含有效的备用磁头。" -#: libfdisk/src/gpt.c:1955 +#: libfdisk/src/gpt.c:1956 msgid "Invalid primary header CRC checksum." msgstr "无效的主磁头 CRC 校验和。" -#: libfdisk/src/gpt.c:1959 +#: libfdisk/src/gpt.c:1960 msgid "Invalid backup header CRC checksum." msgstr "无效的备份磁头 CRC 校验和。" -#: libfdisk/src/gpt.c:1964 +#: libfdisk/src/gpt.c:1965 msgid "Invalid partition entry checksum." msgstr "无效的分区记录校验和。" -#: libfdisk/src/gpt.c:1969 +#: libfdisk/src/gpt.c:1970 msgid "Invalid primary header LBA sanity checks." msgstr "无效的主磁头 LBA 完整性检查。" -#: libfdisk/src/gpt.c:1973 +#: libfdisk/src/gpt.c:1974 msgid "Invalid backup header LBA sanity checks." msgstr "无效的备用磁头 LBA 完整性检查。" -#: libfdisk/src/gpt.c:1978 +#: libfdisk/src/gpt.c:1979 msgid "MyLBA mismatch with real position at primary header." msgstr "MyLBA 不匹配，真正位置在主磁头。" -#: libfdisk/src/gpt.c:1982 +#: libfdisk/src/gpt.c:1983 msgid "MyLBA mismatch with real position at backup header." msgstr "MyLBA 不匹配，真正位置在备份磁头。" -#: libfdisk/src/gpt.c:1987 +#: libfdisk/src/gpt.c:1988 msgid "Disk is too small to hold all data." msgstr "磁盘太小，放不下所有数据。" -#: libfdisk/src/gpt.c:1997 +#: libfdisk/src/gpt.c:1998 msgid "Primary and backup header mismatch." msgstr "主磁头和备份磁头不匹配。" -#: libfdisk/src/gpt.c:2003 +#: libfdisk/src/gpt.c:2004 #, c-format msgid "Partition %u overlaps with partition %u." msgstr "分区 %u 与 %u 重叠。" -#: libfdisk/src/gpt.c:2010 +#: libfdisk/src/gpt.c:2011 #, c-format msgid "Partition %u is too big for the disk." msgstr "分区 %u 对于该磁盘而言过大。" -#: libfdisk/src/gpt.c:2017 +#: libfdisk/src/gpt.c:2018 #, c-format msgid "Partition %u ends before it starts." msgstr "分区 %u 结束于起点之前。" -#: libfdisk/src/gpt.c:2026 +#: libfdisk/src/gpt.c:2027 msgid "No errors detected." msgstr "未检测到错误。" -#: libfdisk/src/gpt.c:2027 +#: libfdisk/src/gpt.c:2028 #, c-format msgid "Header version: %s" msgstr "磁头版本：%s" -#: libfdisk/src/gpt.c:2028 +#: libfdisk/src/gpt.c:2029 #, c-format msgid "Using %u out of %d partitions." msgstr "使用着 %2$d 个分区中的 %1$u 个。" -#: libfdisk/src/gpt.c:2039 +#: libfdisk/src/gpt.c:2040 #, 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:2047 +#: libfdisk/src/gpt.c:2048 #, c-format msgid "%d error detected." msgid_plural "%d errors detected." msgstr[0] "检测到 %d 个错误。" -#: libfdisk/src/gpt.c:2121 +#: libfdisk/src/gpt.c:2122 msgid "All partitions are already in use." msgstr "所有分区均已占用。" -#: libfdisk/src/gpt.c:2176 libfdisk/src/gpt.c:2201 +#: libfdisk/src/gpt.c:2177 libfdisk/src/gpt.c:2202 #, c-format msgid "Sector %ju already used." msgstr "扇区 %ju 已使用。" -#: libfdisk/src/gpt.c:2262 +#: libfdisk/src/gpt.c:2263 #, c-format msgid "Could not create partition %zu" msgstr "无法创建分区 %zu" -#: libfdisk/src/gpt.c:2269 +#: libfdisk/src/gpt.c:2270 #, c-format msgid "The last usable GPT sector is %ju, but %ju is requested." msgstr "" -#: libfdisk/src/gpt.c:2276 +#: libfdisk/src/gpt.c:2277 #, c-format msgid "The first usable GPT sector is %ju, but %ju is requested." msgstr "" -#: libfdisk/src/gpt.c:2408 +#: libfdisk/src/gpt.c:2409 #, c-format msgid "Created a new GPT disklabel (GUID: %s)." msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。" -#: libfdisk/src/gpt.c:2426 +#: libfdisk/src/gpt.c:2427 msgid "Enter new disk UUID (in 8-4-4-4-12 format)" msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)" -#: libfdisk/src/gpt.c:2433 +#: libfdisk/src/gpt.c:2434 msgid "Failed to parse your UUID." msgstr "解析您的 UUID 失败。" -#: libfdisk/src/gpt.c:2447 +#: libfdisk/src/gpt.c:2448 #, c-format msgid "Disk identifier changed from %s to %s." msgstr "将磁盘标识从 %s 更改为 %s 失败。" -#: libfdisk/src/gpt.c:2553 +#: libfdisk/src/gpt.c:2554 #, fuzzy, c-format -#| msgid "The type of partition %zu is unchanged." msgid "The attributes on partition %zu changed to 0x%016<PRIx64>." msgstr "分区 %zu 的类型未更改。" -#: libfdisk/src/gpt.c:2600 +#: libfdisk/src/gpt.c:2602 msgid "Enter GUID specific bit" msgstr "输入 GUID 特定位" -#: libfdisk/src/gpt.c:2615 +#: libfdisk/src/gpt.c:2617 #, c-format msgid "failed to toggle unsupported bit %lu" msgstr "开/关不支持的位 %lu 失败" -#: libfdisk/src/gpt.c:2628 +#: libfdisk/src/gpt.c:2630 #, c-format msgid "The GUID specific bit %d on partition %zu is enabled now." msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。" -#: libfdisk/src/gpt.c:2629 +#: libfdisk/src/gpt.c:2631 #, c-format msgid "The GUID specific bit %d on partition %zu is disabled now." msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。" -#: libfdisk/src/gpt.c:2633 +#: libfdisk/src/gpt.c:2635 #, c-format msgid "The %s flag on partition %zu is enabled now." msgstr "分区 %2$zu 上的标志 %1$s 现已启用。" -#: libfdisk/src/gpt.c:2634 +#: libfdisk/src/gpt.c:2636 #, c-format msgid "The %s flag on partition %zu is disabled now." msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。" -#: libfdisk/src/gpt.c:2767 +#: libfdisk/src/gpt.c:2778 msgid "Type-UUID" msgstr "类型-UUID" -#: libfdisk/src/gpt.c:2768 +#: libfdisk/src/gpt.c:2779 msgid "UUID" msgstr "UUID" -#: libfdisk/src/gpt.c:2769 login-utils/chfn.c:151 login-utils/chfn.c:153 +#: libfdisk/src/gpt.c:2780 login-utils/chfn.c:151 login-utils/chfn.c:153 #: login-utils/chfn.c:308 msgid "Name" msgstr "名称" @@ -6212,14 +6146,13 @@ msgstr "名称" msgid "Free space" msgstr "剩余空间" -#: libfdisk/src/partition.c:1102 +#: libfdisk/src/partition.c:1124 #, fuzzy, c-format -#| msgid "failed to resize partition" 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 +#: libfdisk/src/parttype.c:259 misc-utils/findmnt.c:680 schedutils/chrt.c:196 +#: schedutils/ionice.c:79 sys-utils/hwclock.c:332 msgid "unknown" msgstr "未知" @@ -6291,21 +6224,18 @@ msgstr "在第二扇区创建了 SGI 信息。" msgid "Detected an SGI disklabel with wrong checksum." msgstr "检测到校验和错误的 sgi 磁盘标签。" -#: libfdisk/src/sgi.c:282 libfdisk/src/sun.c:767 +#: libfdisk/src/sgi.c:282 libfdisk/src/sun.c:770 #, fuzzy -#| msgid "Number of physical cylinders" msgid "Physical cylinders" msgstr "物理柱面数" -#: libfdisk/src/sgi.c:287 libfdisk/src/sun.c:772 +#: libfdisk/src/sgi.c:287 libfdisk/src/sun.c:775 #, fuzzy -#| msgid "Extra sectors per cylinder" msgid "Extra sects/cyl" msgstr "每个柱面的额外扇区数" #: libfdisk/src/sgi.c:297 #, fuzzy -#| msgid "Bootfile: %s" msgid "Bootfile" msgstr "启动文件：%s" @@ -6349,7 +6279,7 @@ msgstr "启动文件已更改为“%s”。" msgid "More than one entire disk entry present." msgstr "存在超过一个整磁盘记录。" -#: libfdisk/src/sgi.c:604 libfdisk/src/sun.c:455 +#: libfdisk/src/sgi.c:604 libfdisk/src/sun.c:458 msgid "No partitions defined." msgstr "未定义分区。" @@ -6410,7 +6340,7 @@ msgstr "整个磁盘已经被分区覆盖。" msgid "You got a partition overlap on the disk. Fix it first!" msgstr "磁盘上有重叠分区。请先修复它！" -#: libfdisk/src/sgi.c:876 libfdisk/src/sun.c:541 +#: libfdisk/src/sgi.c:876 libfdisk/src/sun.c:544 #, c-format msgid "First %s" msgstr "起始 %s" @@ -6419,29 +6349,29 @@ msgstr "起始 %s" 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:915 libfdisk/src/sun.c:636 +#: libfdisk/src/sgi.c:915 libfdisk/src/sun.c:639 #, 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:987 libfdisk/src/sun.c:242 +#: libfdisk/src/sgi.c:986 libfdisk/src/sun.c:241 #, 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:1053 +#: libfdisk/src/sgi.c:1052 msgid "Created a new SGI disklabel." msgstr "创建新的SGI 磁盘标签。" -#: libfdisk/src/sgi.c:1072 +#: libfdisk/src/sgi.c:1071 msgid "Sorry, only for non-empty partitions you can change the tag." msgstr "抱歉，只有非空分区才能更改标志(tag)。" -#: libfdisk/src/sgi.c:1078 +#: libfdisk/src/sgi.c:1077 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:1087 +#: libfdisk/src/sgi.c:1086 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)能违反这一规定。您确定要将这一分区标记成其他类型吗？" @@ -6520,49 +6450,49 @@ msgstr "磁头" msgid "Sectors/track" msgstr "扇区/磁道" -#: libfdisk/src/sun.c:299 +#: libfdisk/src/sun.c:297 msgid "Created a new Sun disklabel." msgstr "创建新的 Sun 磁盘标签。" -#: libfdisk/src/sun.c:413 +#: libfdisk/src/sun.c:416 #, c-format msgid "Partition %u doesn't end on cylinder boundary." msgstr "分区 %u 未结束在柱面边界上。" -#: libfdisk/src/sun.c:432 +#: libfdisk/src/sun.c:435 #, c-format msgid "Partition %u overlaps with others in sectors %u-%u." msgstr "分区 %u 在扇区 %u-%u 与其他分区重叠。" -#: libfdisk/src/sun.c:460 +#: libfdisk/src/sun.c:463 #, c-format msgid "Unused gap - sectors 0-%u." msgstr "未使用的间隙 - 扇区 0-%u。" -#: libfdisk/src/sun.c:462 libfdisk/src/sun.c:468 +#: libfdisk/src/sun.c:465 libfdisk/src/sun.c:471 #, c-format msgid "Unused gap - sectors %u-%u." msgstr "未使用的间隙 - 扇区 %u-%u。" -#: libfdisk/src/sun.c:525 +#: libfdisk/src/sun.c:528 msgid "Other partitions already cover the whole disk. Delete some/shrink them before retry." msgstr "其他分区已覆盖了整个磁盘。删除几个分区或压缩它们，然后重试。" -#: libfdisk/src/sun.c:590 +#: libfdisk/src/sun.c:593 #, c-format msgid "Sector %d is already allocated" msgstr "扇区 %d 已分配" -#: libfdisk/src/sun.c:597 +#: libfdisk/src/sun.c:600 msgid "It is highly recommended that the third partition covers the whole disk and is of type `Whole disk'" msgstr "强烈建议让第三个分区覆盖整个磁盘，并设为“整盘”类型" -#: libfdisk/src/sun.c:607 +#: libfdisk/src/sun.c:610 #, c-format msgid "Aligning the first sector from %u to %u to be on cylinder boundary." msgstr "将把从 %u 到 %u 的首个扇区对齐到柱面边界。" -#: libfdisk/src/sun.c:682 +#: libfdisk/src/sun.c:685 #, c-format msgid "" "You haven't covered the whole disk with the 3rd partition, but your value\n" @@ -6572,50 +6502,47 @@ msgstr "" "您没有使第三个分区覆盖整个磁盘，但是值 %lu %s 覆盖了其他分区。\n" "您的记录已经更改为 %lu %s" -#: libfdisk/src/sun.c:723 +#: libfdisk/src/sun.c:726 #, c-format msgid "If you want to maintain SunOS/Solaris compatibility, consider leaving this partition as Whole disk (5), starting at 0, with %u sectors" msgstr "如果您想与 SunOS/Solaris 兼容，请保持此分区为 整盘 (5)，以 0 开始，大小为 %u 个扇区" -#: libfdisk/src/sun.c:747 +#: libfdisk/src/sun.c:750 #, fuzzy -#| msgid "Label ID: %s" msgid "Label ID" msgstr "标签 ID：%s" -#: libfdisk/src/sun.c:752 +#: libfdisk/src/sun.c:755 #, fuzzy -#| msgid "Volume ID: %s" msgid "Volume ID" msgstr "卷 ID：%s" -#: libfdisk/src/sun.c:762 +#: libfdisk/src/sun.c:765 #, fuzzy -#| msgid "Number of alternate cylinders" msgid "Alternate cylinders" msgstr "备用柱面的数量" -#: libfdisk/src/sun.c:868 +#: libfdisk/src/sun.c:871 msgid "Number of alternate cylinders" msgstr "备用柱面的数量" -#: libfdisk/src/sun.c:893 +#: libfdisk/src/sun.c:896 msgid "Extra sectors per cylinder" msgstr "每个柱面的额外扇区数" -#: libfdisk/src/sun.c:917 +#: libfdisk/src/sun.c:920 msgid "Interleave factor" msgstr "交错系数" -#: libfdisk/src/sun.c:941 +#: libfdisk/src/sun.c:944 msgid "Rotation speed (rpm)" msgstr "转速(转/分)" -#: libfdisk/src/sun.c:965 +#: libfdisk/src/sun.c:968 msgid "Number of physical cylinders" msgstr "物理柱面数" -#: libfdisk/src/sun.c:1034 +#: libfdisk/src/sun.c:1037 msgid "" "Consider leaving partition 3 as Whole disk (5),\n" "as SunOS/Solaris expects it and even Linux likes it.\n" @@ -6623,7 +6550,7 @@ msgstr "" "考虑保持分区 3 为 整盘 (5)，\n" "这是 SunOS/Solaris 的规定，Linux 也建议这么做。\n" -#: libfdisk/src/sun.c:1045 +#: libfdisk/src/sun.c:1048 msgid "" "It is highly recommended that the partition at offset 0\n" "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n" @@ -6635,12 +6562,12 @@ msgstr "" "和启动锁。\n" "您确信要把该分区标记为 Linux 交换分区吗？" -#: lib/pager.c:102 +#: lib/pager.c:103 #, c-format msgid "waitpid failed (%s)" msgstr "waitpid 失败(%s)" -#: lib/path.c:209 sys-utils/lscpu.c:1543 +#: lib/path.c:209 sys-utils/lscpu.c:1591 msgid "failed to callocate cpu set" msgstr "分配(callocate) CPU 组 失败" @@ -6665,7 +6592,6 @@ msgstr "%s：无法探测设备" #: lib/swapprober.c:32 #, fuzzy, c-format -#| msgid "%s: ambivalent probing result, use wipefs(8)" msgid "%s: ambiguous probing result; use wipefs(8)" msgstr "%s：探测结果矛盾，使用 wipefs(8)" @@ -6686,7 +6612,6 @@ msgstr " %s [选项] [<用户名>]\n" #: login-utils/chfn.c:94 #, fuzzy -#| msgid "Changing finger information for %s.\n" msgid "Change your finger information.\n" msgstr "正在更改 %s 的 finger 信息。\n" @@ -6806,7 +6731,6 @@ msgstr "Finger 信息未更改。\n" #: login-utils/chsh.c:73 #, fuzzy -#| msgid "Changing shell for %s.\n" msgid "Change your login shell.\n" msgstr "正在更改 %s 的 shell。\n" @@ -6899,8 +6823,8 @@ msgstr "shell 已更改。\n" msgid "Usage: %s <passwordfile> <username>...\n" msgstr "用法：%s <密码文件> <用户名>...\n" -#: login-utils/last.c:152 login-utils/lslogins.c:1226 sys-utils/dmesg.c:1193 -#: sys-utils/lsipc.c:269 +#: login-utils/last.c:152 login-utils/lslogins.c:1230 sys-utils/dmesg.c:1194 +#: sys-utils/lsipc.c:268 #, c-format msgid "unknown time format: %s" msgstr "未知时间格式: %s" @@ -6993,12 +6917,12 @@ msgstr "" "\n" "%s 开始 %s" -#: login-utils/last.c:934 +#: login-utils/last.c:937 msgid "failed to parse number" msgstr "解析数字失败" -#: login-utils/last.c:955 login-utils/last.c:960 login-utils/last.c:965 -#: sys-utils/rtcwake.c:485 +#: login-utils/last.c:958 login-utils/last.c:963 login-utils/last.c:968 +#: sys-utils/rtcwake.c:484 #, c-format msgid "invalid time value \"%s\"" msgstr "无效的时间值\"%s\"" @@ -7022,104 +6946,104 @@ msgid "user attribute not changed: %s" msgstr "用户属性未更改：%s" #. TRANSLATORS: The standard value for %u is 60. -#: login-utils/login.c:181 +#: login-utils/login.c:179 #, c-format msgid "timed out after %u seconds" msgstr "%u 秒后超时" -#: login-utils/login.c:289 +#: login-utils/login.c:285 #, c-format msgid "FATAL: can't reopen tty: %m" msgstr "致命：无法重新打开 tty：%m" -#: login-utils/login.c:295 +#: login-utils/login.c:291 #, c-format msgid "FATAL: %s is not a terminal" msgstr "致命：%s 不是终端" -#: login-utils/login.c:313 +#: login-utils/login.c:309 #, c-format msgid "chown (%s, %lu, %lu) failed: %m" msgstr "chown (%s, %lu, %lu) 失败：%m" -#: login-utils/login.c:317 +#: login-utils/login.c:313 #, c-format msgid "chmod (%s, %u) failed: %m" msgstr "chmod (%s, %u) 失败：%m" -#: login-utils/login.c:378 +#: login-utils/login.c:374 msgid "FATAL: bad tty" msgstr "致命：坏的 tty" -#: login-utils/login.c:396 +#: login-utils/login.c:392 #, c-format msgid "FATAL: %s: change permissions failed: %m" msgstr "致命：%s：更改权限失败：%m" -#: login-utils/login.c:532 +#: login-utils/login.c:528 #, c-format msgid "Last login: %.*s " msgstr "上次登录：%.*s " -#: login-utils/login.c:534 +#: login-utils/login.c:530 #, c-format msgid "from %.*s\n" msgstr "来自 %.*s\n" -#: login-utils/login.c:537 +#: login-utils/login.c:533 #, c-format msgid "on %.*s\n" msgstr "于 %.*s\n" -#: login-utils/login.c:555 +#: login-utils/login.c:551 msgid "write lastlog failed" msgstr "写 lastlog 失败" -#: login-utils/login.c:655 +#: login-utils/login.c:651 #, c-format msgid "DIALUP AT %s BY %s" msgstr "DIALUP AT %s BY %s" -#: login-utils/login.c:660 +#: login-utils/login.c:656 #, c-format msgid "ROOT LOGIN ON %s FROM %s" msgstr "ROOT LOGIN ON %s FROM %s" -#: login-utils/login.c:663 +#: login-utils/login.c:659 #, c-format msgid "ROOT LOGIN ON %s" msgstr "ROOT LOGIN ON %s" -#: login-utils/login.c:666 +#: login-utils/login.c:662 #, c-format msgid "LOGIN ON %s BY %s FROM %s" msgstr "LOGIN ON %s BY %s FROM %s" -#: login-utils/login.c:669 +#: login-utils/login.c:665 #, c-format msgid "LOGIN ON %s BY %s" msgstr "LOGIN ON %s BY %s" -#: login-utils/login.c:730 +#: login-utils/login.c:718 msgid "login: " msgstr "登录：" -#: login-utils/login.c:756 +#: login-utils/login.c:744 #, c-format msgid "PAM failure, aborting: %s" msgstr "PAM 失败，将中止：%s" -#: login-utils/login.c:757 +#: login-utils/login.c:745 #, c-format msgid "Couldn't initialize PAM: %s" msgstr "无法初始化 PAM：%s" -#: login-utils/login.c:828 +#: login-utils/login.c:816 #, c-format 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:1050 +#: login-utils/login.c:824 login-utils/sulogin.c:1048 #, c-format msgid "" "Login incorrect\n" @@ -7128,17 +7052,17 @@ msgstr "" "登录不正确\n" "\n" -#: login-utils/login.c:851 +#: login-utils/login.c:839 #, c-format msgid "TOO MANY LOGIN TRIES (%u) FROM %s FOR %s, %s" msgstr "TOO MANY LOGIN TRIES (%u) FROM %s FOR %s, %s" -#: login-utils/login.c:857 +#: login-utils/login.c:845 #, c-format msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s" msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s" -#: login-utils/login.c:865 +#: login-utils/login.c:853 #, c-format msgid "" "\n" @@ -7147,7 +7071,7 @@ msgstr "" "\n" "登录不正确\n" -#: login-utils/login.c:893 login-utils/login.c:1237 login-utils/login.c:1260 +#: login-utils/login.c:881 login-utils/login.c:1228 login-utils/login.c:1251 msgid "" "\n" "Session setup problem, abort." @@ -7155,75 +7079,74 @@ msgstr "" "\n" "会话设置问题，中止。" -#: login-utils/login.c:894 +#: login-utils/login.c:882 #, c-format msgid "NULL user name in %s:%d. Abort." msgstr "%s:%d 中是空(NULL)用户名。中止。" -#: login-utils/login.c:1031 +#: login-utils/login.c:1019 #, c-format msgid "TIOCSCTTY failed: %m" msgstr "TIOCSCTTY 失败：%m" -#: login-utils/login.c:1179 +#: login-utils/login.c:1170 #, c-format msgid "login: -h is for superuser only\n" msgstr "login：-h 是超级用户专用选项\n" -#: login-utils/login.c:1194 +#: login-utils/login.c:1185 #, c-format msgid "Usage: login [-p] [-h <host>] [-H] [[-f] <username>]\n" msgstr "用法：login [-p] [-h <主机>] [-H] [[-f] <用户名>]\n" -#: login-utils/login.c:1196 +#: login-utils/login.c:1187 #, fuzzy -#| msgid "You are using shadow passwords on this system.\n" msgid "Begin a session on the system.\n" msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n" -#: login-utils/login.c:1238 +#: login-utils/login.c:1229 #, c-format msgid "Invalid user name \"%s\" in %s:%d. Abort." msgstr "%2$s:%3$d 中是无效用户名“%1$s”。中止。" -#: login-utils/login.c:1259 +#: login-utils/login.c:1250 #, c-format msgid "groups initialization failed: %m" msgstr "组初始化失败：%m" -#: login-utils/login.c:1284 +#: login-utils/login.c:1275 msgid "setgid() failed" msgstr "setgid() 失败" -#: login-utils/login.c:1314 +#: login-utils/login.c:1305 #, c-format msgid "You have new mail.\n" msgstr "有您的新邮件。\n" -#: login-utils/login.c:1316 +#: login-utils/login.c:1307 #, c-format msgid "You have mail.\n" msgstr "有您的邮件。\n" -#: login-utils/login.c:1330 +#: login-utils/login.c:1321 msgid "setuid() failed" msgstr "setuid() 失败" -#: login-utils/login.c:1336 login-utils/sulogin.c:763 +#: login-utils/login.c:1327 login-utils/sulogin.c:763 #, c-format msgid "%s: change directory failed" msgstr "%s：更改目录失败" -#: login-utils/login.c:1343 login-utils/sulogin.c:764 +#: login-utils/login.c:1334 login-utils/sulogin.c:764 #, c-format msgid "Logging in with home = \"/\".\n" msgstr "以 home = “/” 登录。\n" -#: login-utils/login.c:1372 +#: login-utils/login.c:1363 msgid "couldn't exec shell script" msgstr "无法执行(exec) shell 脚本" -#: login-utils/login.c:1374 +#: login-utils/login.c:1365 msgid "no shell" msgstr "无 shell" @@ -7236,11 +7159,11 @@ msgstr "%s：%s 包含无效的数字值：%s" msgid "hush login status: restore original IDs failed" msgstr "静默(hush)登录状态：恢复原 ID 失败" -#: login-utils/lslogins.c:207 sys-utils/lscpu.c:1267 sys-utils/lscpu.c:1277 +#: login-utils/lslogins.c:207 sys-utils/lscpu.c:1313 sys-utils/lscpu.c:1323 msgid "no" msgstr "否" -#: login-utils/lslogins.c:216 misc-utils/lsblk.c:182 +#: login-utils/lslogins.c:216 misc-utils/lsblk.c:181 msgid "user name" msgstr "用户名" @@ -7443,29 +7366,29 @@ msgid "Running processes" msgstr "运行中的进程" #: login-utils/lslogins.c:287 misc-utils/findmnt.c:160 misc-utils/lsblk.c:231 -#: sys-utils/lsipc.c:204 +#: sys-utils/lsipc.c:203 #, c-format msgid "too many columns specified, the limit is %zu columns" msgstr "指定了过多的列，限制是 %zu 列" -#: login-utils/lslogins.c:355 sys-utils/lsipc.c:473 +#: login-utils/lslogins.c:355 sys-utils/lsipc.c:472 msgid "unsupported time type" msgstr "不支持的时间类型" -#: login-utils/lslogins.c:652 +#: login-utils/lslogins.c:656 msgid "failed to get supplementary groups" msgstr "获得附属组失败" -#: login-utils/lslogins.c:1077 +#: login-utils/lslogins.c:1081 msgid "internal error: unknown column" msgstr "内部错误：未知的列" -#: login-utils/lslogins.c:1081 sys-utils/lsipc.c:520 sys-utils/lsipc.c:642 -#: sys-utils/lsipc.c:697 sys-utils/lsipc.c:855 sys-utils/lsipc.c:1053 +#: login-utils/lslogins.c:1085 sys-utils/lsipc.c:519 sys-utils/lsipc.c:641 +#: sys-utils/lsipc.c:696 sys-utils/lsipc.c:854 sys-utils/lsipc.c:1052 msgid "failed to set data" msgstr "设置数据失败" -#: login-utils/lslogins.c:1175 +#: login-utils/lslogins.c:1179 #, c-format msgid "" "\n" @@ -7474,107 +7397,106 @@ msgstr "" "\n" "上次的日志：\n" -#: 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:1651 sys-utils/lsipc.c:277 sys-utils/readprofile.c:104 -#: sys-utils/rtcwake.c:95 term-utils/setterm.c:388 text-utils/line.c:30 +#: login-utils/lslogins.c:1238 login-utils/nologin.c:26 +#: misc-utils/lslocks.c:492 misc-utils/mcookie.c:82 misc-utils/uuidd.c:70 +#: misc-utils/uuidgen.c:25 sys-utils/dmesg.c:264 sys-utils/ipcmk.c:66 +#: sys-utils/lscpu.c:1705 sys-utils/lsipc.c:276 sys-utils/readprofile.c:104 +#: sys-utils/rtcwake.c:94 term-utils/setterm.c:388 text-utils/line.c:30 #, c-format msgid " %s [options]\n" msgstr " %s [选项]\n" -#: login-utils/lslogins.c:1237 +#: login-utils/lslogins.c:1241 msgid "Display information about known users in the system.\n" msgstr "" -#: login-utils/lslogins.c:1240 +#: login-utils/lslogins.c:1244 msgid " -a, --acc-expiration display info about passwords expiration\n" msgstr " -a, --acc-expiration 显示关于密码过期的信息\n" -#: login-utils/lslogins.c:1241 +#: login-utils/lslogins.c:1245 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:1242 sys-utils/lsipc.c:296 +#: login-utils/lslogins.c:1246 sys-utils/lsipc.c:295 msgid " -e, --export display in an export-able output format\n" msgstr " -e, --export 以可导出的格式显示\n" -#: login-utils/lslogins.c:1243 +#: login-utils/lslogins.c:1247 msgid " -f, --failed display data about the users' last failed logins\n" msgstr " -f, --failed 显示有关该用户上次登录失败的数据\n" -#: login-utils/lslogins.c:1244 +#: login-utils/lslogins.c:1248 #, fuzzy -#| msgid " -G, --groups-info display information about groups\n" msgid " -G, --supp-groups display information about groups\n" msgstr " -G, --groups-info 显示关于组的信息\n" -#: login-utils/lslogins.c:1245 +#: login-utils/lslogins.c:1249 msgid " -g, --groups=<groups> display users belonging to a group in <groups>\n" msgstr " -g, --groups=<groups> 显示属于<groups>中的组的用户\n" -#: login-utils/lslogins.c:1246 +#: login-utils/lslogins.c:1250 msgid " -L, --last show info about the users' last login sessions\n" msgstr " -L, --last 显示关于该用户上次登录会话的信息\n" -#: login-utils/lslogins.c:1247 +#: login-utils/lslogins.c:1251 msgid " -l, --logins=<logins> display only users from <logins>\n" msgstr " -l, --logins=<登录方式> 只显示以指定<登录方式>登录的用户\n" -#: login-utils/lslogins.c:1248 sys-utils/lsipc.c:298 +#: login-utils/lslogins.c:1252 sys-utils/lsipc.c:297 msgid " -n, --newline display each piece of information on a new line\n" msgstr " -n, --newline 逐行显示每一部分信息\n" -#: login-utils/lslogins.c:1249 sys-utils/lsipc.c:291 +#: login-utils/lslogins.c:1253 sys-utils/lsipc.c:290 msgid " --noheadings don't print headings\n" msgstr " --noheadings 不打印标题\n" -#: login-utils/lslogins.c:1250 sys-utils/lsipc.c:292 +#: login-utils/lslogins.c:1254 sys-utils/lsipc.c:291 msgid " --notruncate don't truncate output\n" msgstr " --notruncate 不截断输出\n" -#: login-utils/lslogins.c:1251 sys-utils/lsipc.c:300 +#: login-utils/lslogins.c:1255 sys-utils/lsipc.c:299 msgid " -o, --output[=<list>] define the columns to output\n" msgstr " -o, --output[=<列表>] 定义要输出的列\n" -#: login-utils/lslogins.c:1252 +#: login-utils/lslogins.c:1256 msgid " -p, --pwd display information related to login by password.\n" msgstr " -p, --pwd 显示与 用密码登录 相关的信息。\n" -#: login-utils/lslogins.c:1253 sys-utils/lsipc.c:302 +#: login-utils/lslogins.c:1257 sys-utils/lsipc.c:301 msgid " -r, --raw display in raw mode\n" msgstr " -r, --raw 以原始方式显示\n" -#: login-utils/lslogins.c:1254 +#: login-utils/lslogins.c:1258 msgid " -s, --system-accs display system accounts\n" msgstr " -s, --system-accs 显示系统帐户\n" -#: login-utils/lslogins.c:1255 sys-utils/lsipc.c:293 +#: login-utils/lslogins.c:1259 sys-utils/lsipc.c:292 msgid " --time-format=<type> display dates in short, full or iso format\n" msgstr " --time-format=<格式> 以短、长或 iso 格式显示日期\n" -#: login-utils/lslogins.c:1256 +#: login-utils/lslogins.c:1260 msgid " -u, --user-accs display user accounts\n" msgstr " -u, --user-accs 显示用户帐户\n" -#: login-utils/lslogins.c:1257 +#: login-utils/lslogins.c:1261 msgid " -Z, --context display SELinux contexts\n" msgstr " -Z, --context 显示 SELinux 环境\n" -#: login-utils/lslogins.c:1258 +#: login-utils/lslogins.c:1262 msgid " -z, --print0 delimit user entries with a nul character\n" msgstr " -z, --print0 用空字符(nul)分隔用户记录项\n" -#: login-utils/lslogins.c:1259 +#: login-utils/lslogins.c:1263 msgid " --wtmp-file <path> set an alternate path for wtmp\n" msgstr " --wtmp-file <路径> 设置 wtmp 的可选路径\n" -#: login-utils/lslogins.c:1260 +#: login-utils/lslogins.c:1264 msgid " --btmp-file <path> set an alternate path for btmp\n" msgstr " --btmp-file <路径> 设置 btmp 的可选路径\n" -#: login-utils/lslogins.c:1265 misc-utils/findmnt.c:1262 -#: sys-utils/lscpu.c:1668 +#: login-utils/lslogins.c:1269 misc-utils/findmnt.c:1263 +#: sys-utils/lscpu.c:1722 #, c-format msgid "" "\n" @@ -7583,23 +7505,21 @@ msgstr "" "\n" "可用的列：\n" -#: login-utils/lslogins.c:1448 +#: login-utils/lslogins.c:1452 msgid "failed to request selinux state" msgstr "请求 selinux 状态失败" -#: login-utils/lslogins.c:1462 login-utils/lslogins.c:1466 +#: login-utils/lslogins.c:1466 login-utils/lslogins.c:1470 msgid "Only one user may be specified. Use -l for multiple users." msgstr "只能指定一个用户。多用户请使用 -l。" #: login-utils/newgrp.c:49 login-utils/newgrp.c:55 #, fuzzy -#| msgid "failed to get terminal attributes" msgid "could not set terminal attributes" msgstr "取终端属性失败" #: login-utils/newgrp.c:57 #, fuzzy -#| msgid "setgid() failed" msgid "getline() failed" msgstr "setgid() 失败" @@ -7640,11 +7560,11 @@ msgstr "权限不足" msgid "setuid failed" msgstr "setuid 失败" -#: login-utils/nologin.c:28 +#: login-utils/nologin.c:29 msgid "Politely refuse a login.\n" msgstr "" -#: login-utils/nologin.c:74 +#: login-utils/nologin.c:77 #, c-format msgid "This account is currently not available.\n" msgstr "此帐户目前不可用。\n" @@ -7668,13 +7588,12 @@ msgid "cannot block signals" msgstr "无法阻塞信号" #: login-utils/su-common.c:335 login-utils/su-common.c:343 -#: login-utils/su-common.c:349 term-utils/script.c:762 +#: login-utils/su-common.c:349 misc-utils/uuidd.c:408 term-utils/script.c:765 msgid "cannot set signal handler" msgstr "无法设置信号处理函数" #: login-utils/su-common.c:374 #, fuzzy -#| msgid "%s (core dumped)\n" msgid " (core dumped)" msgstr "%s (核心已转储)\n" @@ -7792,44 +7711,44 @@ msgstr " -f, --fast 向shell 传递 -f 选项(csh 或 tcsh) msgid " -s, --shell <shell> run <shell> if /etc/shells allows it\n" msgstr " -s, --shell <shell> 若 /etc/shells 允许，运行<shell>\n" -#: login-utils/su-common.c:809 login-utils/su-common.c:824 -#, c-format -msgid "group %s does not exist" -msgstr "组 %s 不存在" - -#: login-utils/su-common.c:818 +#: login-utils/su-common.c:756 #, c-format msgid "specifying more than %d supplemental group is not possible" msgid_plural "specifying more than %d supplemental groups is not possible" msgstr[0] "不能指定多于 %d 个补充组" -#: login-utils/su-common.c:868 +#: login-utils/su-common.c:762 +#, c-format +msgid "group %s does not exist" +msgstr "组 %s 不存在" + +#: login-utils/su-common.c:880 msgid "ignoring --preserve-environment, it's mutually exclusive with --login" msgstr "将忽略 --preserve-environment，它与 --login 互斥。" -#: login-utils/su-common.c:879 +#: login-utils/su-common.c:891 msgid "options --{shell,fast,command,session-command,login} and --user are mutually exclusive" msgstr "选项 --{shell,fast,command,session-command,login} 和 --user 互斥" -#: login-utils/su-common.c:883 +#: login-utils/su-common.c:895 msgid "no command was specified" msgstr "没有指定命令" -#: login-utils/su-common.c:897 +#: login-utils/su-common.c:909 msgid "only root can specify alternative groups" msgstr "只有 root 用户能指定替代组" -#: login-utils/su-common.c:904 +#: login-utils/su-common.c:916 #, c-format msgid "user %s does not exist" msgstr "用户 %s 不存在" -#: login-utils/su-common.c:950 +#: login-utils/su-common.c:956 #, c-format msgid "using restricted shell %s" msgstr "将使用受限 shell %s" -#: login-utils/su-common.c:974 +#: login-utils/su-common.c:980 #, c-format msgid "warning: cannot change directory to %s" msgstr "警告：无法更改到 %s 目录" @@ -7884,7 +7803,6 @@ msgstr "指定 root 的维护密码\n" #: login-utils/sulogin.c:574 #, fuzzy, c-format -#| msgid "Press Enter for maintenance" msgid "Press Enter for maintenance\n" msgstr "按 Enter 键进行维护" @@ -7920,24 +7838,24 @@ msgstr "" " -t, --timeout <秒数> 等待密码的最大时间(默认：无限制)\n" " -e, --force 如果 getpwnam(3) 失败，直接检查密码文件\n" -#: login-utils/sulogin.c:893 misc-utils/findmnt.c:1471 sys-utils/wdctl.c:523 +#: login-utils/sulogin.c:896 misc-utils/findmnt.c:1472 sys-utils/wdctl.c:523 #: term-utils/wall.c:135 msgid "invalid timeout argument" msgstr "无效的 timeout 超时参数" -#: login-utils/sulogin.c:915 +#: login-utils/sulogin.c:918 msgid "only superuser can run this program" msgstr "只有超级用户能运行此程序" -#: login-utils/sulogin.c:958 +#: login-utils/sulogin.c:961 msgid "cannot open console" msgstr "打不开终端" -#: login-utils/sulogin.c:965 +#: login-utils/sulogin.c:968 msgid "cannot open password database" msgstr "无法打开密码数据库" -#: login-utils/sulogin.c:1047 +#: login-utils/sulogin.c:1045 #, c-format msgid "" "Can not execute su shell\n" @@ -7946,7 +7864,7 @@ msgstr "" "无法执行 su shell\n" "\n" -#: login-utils/sulogin.c:1054 +#: login-utils/sulogin.c:1052 msgid "" "Timed out\n" "\n" @@ -7954,6 +7872,15 @@ msgstr "" "超时\n" "\n" +#: login-utils/sulogin.c:1084 +#, fuzzy +msgid "" +"Can not wait on su shell\n" +"\n" +msgstr "" +"无法执行 su shell\n" +"\n" + #: login-utils/utmpdump.c:166 text-utils/tailf.c:165 #, c-format msgid "%s: cannot add inotify watch." @@ -8060,115 +7987,118 @@ msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n" msgid "Would you like to edit %s now [y/n]? " msgstr "您想现在编辑 %s 吗[y/n]？" -#: misc-utils/cal.c:387 +#: misc-utils/cal.c:363 #, fuzzy -#| msgid "invalid length argument" msgid "invalid month argument" msgstr "无效的长度参数" -#: misc-utils/cal.c:392 +#: misc-utils/cal.c:371 msgid "invalid week argument" msgstr "无效的 周 参数" -#: misc-utils/cal.c:394 -msgid "illegal week value: use 1-53" +#: misc-utils/cal.c:373 +#, fuzzy +msgid "illegal week value: use 1-54" msgstr "非法的 周 值：请使用 1-53" -#: misc-utils/cal.c:430 +#: misc-utils/cal.c:409 msgid "illegal day value" msgstr "日 值不合法" -#: misc-utils/cal.c:432 misc-utils/cal.c:448 +#: misc-utils/cal.c:411 misc-utils/cal.c:427 #, c-format msgid "illegal day value: use 1-%d" msgstr "日 值不合法：请使用 1-%d" -#: misc-utils/cal.c:435 misc-utils/cal.c:437 +#: misc-utils/cal.c:414 misc-utils/cal.c:416 msgid "illegal month value: use 1-12" msgstr "月份值不合法：请使用 1-12" -#: misc-utils/cal.c:440 misc-utils/cal.c:444 +#: misc-utils/cal.c:419 misc-utils/cal.c:423 msgid "illegal year value" msgstr "年份值不合法" -#: misc-utils/cal.c:442 +#: misc-utils/cal.c:421 msgid "illegal year value: use positive integer" msgstr "年份值不合法：请使用正整数" -#: misc-utils/cal.c:473 misc-utils/cal.c:486 +#: misc-utils/cal.c:452 misc-utils/cal.c:465 #, c-format msgid "illegal week value: year %d doesn't have week %d" msgstr "非法的 周 值：%d 年没有第 %d 周" -#: misc-utils/cal.c:627 +#: misc-utils/cal.c:609 #, c-format msgid "%s" msgstr "%s" -#: misc-utils/cal.c:633 +#: misc-utils/cal.c:615 #, c-format msgid "%d" msgstr "%d" -#: misc-utils/cal.c:639 +#: misc-utils/cal.c:621 #, c-format msgid "%s %d" msgstr "%s %d" -#: misc-utils/cal.c:942 +#: misc-utils/cal.c:925 #, c-format msgid " %s [options] [[[day] month] year]\n" msgstr " %s [选项] [[[日] 月] 年]\n" -#: misc-utils/cal.c:945 +#: misc-utils/cal.c:928 msgid "Display a calendar, or some part of it.\n" msgstr "显示日历或部分日历。\n" -#: misc-utils/cal.c:946 +#: misc-utils/cal.c:929 msgid "Without any arguments, display the current month.\n" msgstr "不带参数时，显示当月日历。\n" -#: misc-utils/cal.c:949 +#: misc-utils/cal.c:932 msgid " -1, --one show only a single month (default)\n" msgstr " -1, --one 只显示一个月(默认)\n" -#: misc-utils/cal.c:950 +#: misc-utils/cal.c:933 msgid " -3, --three show three months spanning the date\n" msgstr " -3, --three 显示该日期前后三个月\n" -#: misc-utils/cal.c:951 +#: misc-utils/cal.c:934 #, fuzzy -#| msgid " -3, --three show three months spanning the date\n" msgid " -n, --months <num> show num months starting with date's month\n" msgstr " -3, --three 显示该日期前后三个月\n" -#: misc-utils/cal.c:952 +#: misc-utils/cal.c:935 +#, fuzzy +msgid " -S, --span span the date when displaying multiple months\n" +msgstr " -r, --raw 以原始方式显示\n" + +#: misc-utils/cal.c:936 msgid " -s, --sunday Sunday as first day of week\n" msgstr " -s, --sunday 周日作为一周的第一天\n" -#: misc-utils/cal.c:953 +#: misc-utils/cal.c:937 msgid " -m, --monday Monday as first day of week\n" msgstr " -m, --monday 周一作为一周的第一天\n" -#: misc-utils/cal.c:954 +#: misc-utils/cal.c:938 msgid " -j, --julian output Julian dates\n" msgstr " -j, --julian 输出儒略日期\n" -#: misc-utils/cal.c:955 +#: misc-utils/cal.c:939 msgid " -y, --year show the whole year\n" msgstr " -y, --year 显示全年\n" -#: misc-utils/cal.c:956 +#: misc-utils/cal.c:940 #, fuzzy -#| msgid " -y, --year show the whole year\n" msgid " -Y, --twelve show the next twelve months\n" msgstr " -y, --year 显示全年\n" -#: misc-utils/cal.c:957 +#: misc-utils/cal.c:941 msgid " -w, --week[=<num>] show US or ISO-8601 week numbers\n" msgstr " -w, --week[=<数字>] 显示美国或 ISO-8601 周数\n" -#: misc-utils/cal.c:958 +#: misc-utils/cal.c:942 msgid " --color[=<when>] colorize messages (auto, always or never)\n" msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n" @@ -8179,7 +8109,6 @@ msgstr " %s [选项] {LABEL,UUID,PARTUUID,PARTLABEL}=<值>\n" #: misc-utils/findfs.c:32 #, fuzzy -#| msgid "Forcing filesystem check on %s.\n" msgid "Find a filesystem by label or UUID.\n" msgstr "强制在 %s 上进行文件系统检查。\n" @@ -8196,7 +8125,7 @@ msgstr "源设备" msgid "mountpoint" msgstr "挂载点" -#: misc-utils/findmnt.c:125 misc-utils/lsblk.c:162 +#: misc-utils/findmnt.c:125 misc-utils/lsblk.c:161 msgid "filesystem type" msgstr "文件系统类型" @@ -8216,7 +8145,7 @@ msgstr "FS 的特定挂载选项" msgid "filesystem label" msgstr "文件系统标签" -#: misc-utils/findmnt.c:130 misc-utils/lsblk.c:165 +#: misc-utils/findmnt.c:130 misc-utils/lsblk.c:164 msgid "filesystem UUID" msgstr "文件系统 UUID" @@ -8224,7 +8153,7 @@ msgstr "文件系统 UUID" msgid "partition label" msgstr "分区标签" -#: misc-utils/findmnt.c:133 misc-utils/lsblk.c:161 +#: misc-utils/findmnt.c:133 misc-utils/lsblk.c:160 msgid "major:minor device number" msgstr "主:次 设备号" @@ -8311,7 +8240,7 @@ msgid "%s: parse error at line %d" msgstr "%s：第 %d 行解析出错" #: misc-utils/findmnt.c:836 misc-utils/findmnt.c:1099 sys-utils/eject.c:719 -#: sys-utils/mount.c:650 +#: sys-utils/mount.c:653 msgid "failed to initialize libmount table" msgstr "初始化 libmount table 失败" @@ -8322,8 +8251,8 @@ msgstr "不能读 %s" #: 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:230 sys-utils/swapon.c:260 -#: sys-utils/swapon.c:689 sys-utils/umount.c:275 +#: sys-utils/swapoff.c:152 sys-utils/swapon.c:233 sys-utils/swapon.c:263 +#: sys-utils/swapon.c:693 sys-utils/umount.c:275 msgid "failed to initialize libmount iterator" msgstr "无法初始化 libmount 迭代器" @@ -8335,13 +8264,8 @@ msgstr "初始化 libmount tabdiff 失败" msgid "poll() failed" msgstr "poll() 失败" -#: misc-utils/findmnt.c:1209 +#: misc-utils/findmnt.c:1210 #, 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" msgid "" " %1$s [options]\n" " %1$s [options] <device> | <mountpoint>\n" @@ -8353,21 +8277,20 @@ msgstr "" " %1$s [选项] <设备> <挂臷点>\n" " %1$s [选项] [--source <设备>] [--target <挂臷点>]\n" -#: misc-utils/findmnt.c:1216 +#: misc-utils/findmnt.c:1217 #, fuzzy -#| msgid "Linux filesystem" msgid "Find a (mounted) filesystem.\n" msgstr "Linux 文件系统" -#: misc-utils/findmnt.c:1219 +#: misc-utils/findmnt.c:1220 msgid " -s, --fstab search in static table of filesystems\n" msgstr " -s, --fstab 在文件系统表态表中搜索\n" -#: misc-utils/findmnt.c:1220 +#: misc-utils/findmnt.c:1221 msgid " -m, --mtab search in table of mounted filesystems\n" msgstr " -m, --mtab 在已挂载文件系统表中搜索\n" -#: misc-utils/findmnt.c:1221 +#: misc-utils/findmnt.c:1222 msgid "" " -k, --kernel search in kernel table of mounted\n" " filesystems (default)\n" @@ -8375,43 +8298,43 @@ msgstr "" " -k, --kernel 在已挂载文件系统的内核表中搜索\n" " (默认)\n" -#: misc-utils/findmnt.c:1224 +#: misc-utils/findmnt.c:1225 msgid " -p, --poll[=<list>] monitor changes in table of mounted filesystems\n" msgstr " -p, --poll[=<列表>] 监测已挂臷文件系统表的改变\n" -#: misc-utils/findmnt.c:1225 +#: misc-utils/findmnt.c:1226 msgid " -w, --timeout <num> upper limit in milliseconds that --poll will block\n" msgstr " -w, --timeout <数字> --poll 阻塞的时间上限(毫秒)\n" -#: misc-utils/findmnt.c:1228 +#: misc-utils/findmnt.c:1229 msgid " -A, --all disable all built-in filters, print all filesystems\n" msgstr " -A, --all 禁用所有内置过滤器，打印所有文件系统\n" -#: misc-utils/findmnt.c:1229 +#: misc-utils/findmnt.c:1230 msgid " -a, --ascii use ASCII chars for tree formatting\n" msgstr " -a, --ascii 用 ASCII 字符格式化树\n" -#: misc-utils/findmnt.c:1230 +#: misc-utils/findmnt.c:1231 msgid " -b, --bytes print sizes in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n" -#: misc-utils/findmnt.c:1231 +#: misc-utils/findmnt.c:1232 msgid " -C, --nocanonicalize don't canonicalize when comparing paths\n" msgstr " -c, --no-canonicalize 在比较路径时不对路径规范化\n" -#: misc-utils/findmnt.c:1232 +#: misc-utils/findmnt.c:1233 msgid " -c, --canonicalize canonicalize printed paths\n" msgstr " -c, --no-canonicalize 对打印的路径规范化\n" -#: misc-utils/findmnt.c:1233 +#: misc-utils/findmnt.c:1234 msgid " -D, --df imitate the output of df(1)\n" msgstr " -D, --df 仿照 df(1) 输出\n" -#: misc-utils/findmnt.c:1234 +#: misc-utils/findmnt.c:1235 msgid " -d, --direction <word> direction of search, 'forward' or 'backward'\n" msgstr " -d, --direction <单词> 搜索方向，“forward”(往前)或“backward”(往回)\n" -#: misc-utils/findmnt.c:1235 +#: misc-utils/findmnt.c:1236 msgid "" " -e, --evaluate convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n" " to device names\n" @@ -8419,57 +8342,56 @@ msgstr "" " -e, --evaluate 将标签(LABEL,UUID,PARTUUID,PARTLABEL) 转换为\n" " 设备名\n" -#: misc-utils/findmnt.c:1237 +#: misc-utils/findmnt.c:1238 msgid " -F, --tab-file <path> alternative file for -s, -m or -k options\n" msgstr " -F, --tab-file <路径> -s, -m 或 -k 选项的替代文件\n" -#: misc-utils/findmnt.c:1238 +#: misc-utils/findmnt.c:1239 msgid " -f, --first-only print the first found filesystem only\n" msgstr " -f, --first-only 只打印找到的第一个文件系统\n" -#: misc-utils/findmnt.c:1239 +#: misc-utils/findmnt.c:1240 msgid " -i, --invert invert the sense of matching\n" msgstr " -i, --invert 反转搜索的匹配\n" -#: misc-utils/findmnt.c:1240 misc-utils/lslocks.c:521 +#: misc-utils/findmnt.c:1241 misc-utils/lslocks.c:498 sys-utils/lsns.c:594 #, fuzzy -#| msgid " -r, --raw use raw output format\n" msgid " -J, --json use JSON output format\n" msgstr " -r, --raw 使用原生输出格式\n" -#: misc-utils/findmnt.c:1241 +#: misc-utils/findmnt.c:1242 sys-utils/lsns.c:595 msgid " -l, --list use list format output\n" msgstr " -l, --list 使用列表格式的输出\n" -#: misc-utils/findmnt.c:1242 +#: misc-utils/findmnt.c:1243 msgid " -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n" msgstr " -N, --task <tid> 使用替代的名字空间(/proc/<tid>/mountinfo 文件)\n" -#: misc-utils/findmnt.c:1243 +#: misc-utils/findmnt.c:1244 msgid " -n, --noheadings don't print column headings\n" msgstr " -n, --noheadings 不打印列标题\n" -#: misc-utils/findmnt.c:1244 +#: misc-utils/findmnt.c:1245 msgid " -O, --options <list> limit the set of filesystems by mount options\n" msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n" -#: misc-utils/findmnt.c:1245 +#: misc-utils/findmnt.c:1246 msgid " -o, --output <list> the output columns to be shown\n" msgstr " -o, --output <列表> 要显示的列\n" -#: misc-utils/findmnt.c:1246 +#: misc-utils/findmnt.c:1247 msgid " -P, --pairs use key=\"value\" output format\n" msgstr " -P, --pairs 使用 键=“值”的输出格式\n" -#: misc-utils/findmnt.c:1247 +#: misc-utils/findmnt.c:1248 msgid " -R, --submounts print all submounts for the matching filesystems\n" msgstr " -R, --submounts 打印匹配文件系统的所有子挂载(submount)\n" -#: misc-utils/findmnt.c:1248 +#: misc-utils/findmnt.c:1249 msgid " -r, --raw use raw output format\n" msgstr " -r, --raw 使用原生输出格式\n" -#: misc-utils/findmnt.c:1249 +#: misc-utils/findmnt.c:1250 msgid "" " -S, --source <string> the device to mount (by name, maj:min, \n" " LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n" @@ -8477,79 +8399,73 @@ msgstr "" " -S, --source <字符串> 要挂载的设备(按 名称, 主:次设备号, \n" " LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n" -#: misc-utils/findmnt.c:1251 +#: misc-utils/findmnt.c:1252 #, fuzzy -#| msgid " -T, --target <string> the mountpoint to use\n" msgid " -T, --target <path> the path to the filesystem to use\n" msgstr " -T, --target <字符串> 要使用的挂载点\n" -#: misc-utils/findmnt.c:1252 +#: misc-utils/findmnt.c:1253 #, fuzzy -#| msgid " -r, --root [=<dir>] set the root directory\n" msgid " -M, --mountpoint <dir> the mountpoint directory\n" msgstr " -r, --root [=<目录>] 设置根目录\n" -#: misc-utils/findmnt.c:1253 +#: misc-utils/findmnt.c:1254 msgid " -t, --types <list> limit the set of filesystems by FS types\n" msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n" -#: misc-utils/findmnt.c:1254 +#: misc-utils/findmnt.c:1255 msgid " -U, --uniq ignore filesystems with duplicate target\n" msgstr " -U, --uniq 忽略目标重复的文件系统\n" -#: misc-utils/findmnt.c:1255 misc-utils/lslocks.c:526 +#: misc-utils/findmnt.c:1256 misc-utils/lslocks.c:503 sys-utils/lsns.c:600 msgid " -u, --notruncate don't truncate text in columns\n" msgstr " -u, --notruncate 不截断列中的文本\n" -#: misc-utils/findmnt.c:1256 +#: misc-utils/findmnt.c:1257 msgid " -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n" msgstr " -v, --nofsroot 对绑定式或 btrfs 挂载不打印[/dir]\n" -#: misc-utils/findmnt.c:1376 +#: misc-utils/findmnt.c:1377 #, c-format msgid "unknown direction '%s'" msgstr "未知方向“%s”" -#: misc-utils/findmnt.c:1448 +#: misc-utils/findmnt.c:1449 msgid "invalid TID argument" msgstr "无效的 TID 参数" -#: misc-utils/findmnt.c:1511 +#: misc-utils/findmnt.c:1512 msgid "--poll accepts only one file, but more specified by --tab-file" msgstr "--poll 只接受一个文件，但用 --tab-file 指定了多个" -#: misc-utils/findmnt.c:1515 +#: misc-utils/findmnt.c:1516 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:1565 +#: misc-utils/findmnt.c:1566 msgid "failed to initialize libmount cache" msgstr "初始化 libmount 缓存失败" -#: misc-utils/findmnt.c:1602 +#: misc-utils/findmnt.c:1603 #, c-format msgid "%s column is requested, but --poll is not enabled" msgstr "请示了 %s 列，但未启用 --poll" -#: misc-utils/getopt.c:234 +#: misc-utils/getopt.c:237 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "请尝试执行“%s --help”了解更多信息。\n" -#: misc-utils/getopt.c:285 +#: misc-utils/getopt.c:288 msgid "empty long option after -l or --long argument" msgstr "-l 或 --long 参数后的长选项为空" -#: misc-utils/getopt.c:310 +#: misc-utils/getopt.c:313 msgid "unknown shell after -s or --shell argument" msgstr "-s 或 --shell 参数后是未知的 shell" -#: misc-utils/getopt.c:317 +#: misc-utils/getopt.c:320 #, fuzzy, c-format -#| msgid "" -#| " %1$s optstring parameters\n" -#| " %1$s [options] [--] optstring parameters\n" -#| " %1$s [options] -o|--options optstring [options] [--] parameters\n" msgid "" " %1$s <optstring> <parameters>\n" " %1$s [options] [--] <optstring> <parameters>\n" @@ -8559,89 +8475,79 @@ msgstr "" " %1$s [options] [--] 选项字符串 参数\n" " %1$s [options] -o|--options 选项字符串 [选项] [--] 参数\n" -#: misc-utils/getopt.c:323 +#: misc-utils/getopt.c:326 #, fuzzy -#| msgid "all mount options" msgid "Parse command options.\n" msgstr "全部挂臷选项" -#: misc-utils/getopt.c:326 +#: misc-utils/getopt.c:329 #, fuzzy -#| msgid " -a, --alternative Allow long options starting with single -\n" msgid " -a, --alternative allow long options starting with single -\n" msgstr " -a, --alternative 允许长选项以 - 开始\n" -#: misc-utils/getopt.c:327 +#: misc-utils/getopt.c:330 #, fuzzy -#| msgid " -l, --longoptions <longopts> Long options to be recognized\n" msgid " -l, --longoptions <longopts> the long options to be recognized\n" msgstr " -l, --longoptions <长选项> 要识别的长选项\n" -#: misc-utils/getopt.c:328 +#: misc-utils/getopt.c:331 #, fuzzy -#| msgid " -n, --name <progname> The name under which errors are reported\n" msgid " -n, --name <progname> the name under which errors are reported\n" msgstr " -n, --name <程序名> 将错误报告给的程序名\n" -#: misc-utils/getopt.c:329 +#: misc-utils/getopt.c:332 #, fuzzy -#| msgid " -o, --options <optstring> Short options to be recognized\n" msgid " -o, --options <optstring> the short options to be recognized\n" msgstr " -o, --options <选项字符串> 要识别的短选项\n" -#: misc-utils/getopt.c:330 +#: misc-utils/getopt.c:333 #, fuzzy -#| msgid " -q, --quiet Disable error reporting by getopt(3)\n" msgid " -q, --quiet disable error reporting by getopt(3)\n" msgstr " -q, --quiet 禁止 getopt(3) 的错误报告\n" -#: misc-utils/getopt.c:331 +#: misc-utils/getopt.c:334 #, fuzzy -#| msgid " -Q, --quiet-output No normal output\n" msgid " -Q, --quiet-output no normal output\n" msgstr " -Q, --quiet-output 无正常输出\n" -#: misc-utils/getopt.c:332 +#: misc-utils/getopt.c:335 #, fuzzy -#| msgid " -s, --shell <shell> Set shell quoting conventions\n" msgid " -s, --shell <shell> set quoting conventions to those of <shell>\n" msgstr " -s, --shell <shell> 设置 shell 引用规则\n" -#: misc-utils/getopt.c:333 +#: misc-utils/getopt.c:336 #, fuzzy -#| msgid " -T, --test Test for getopt(1) version\n" msgid " -T, --test test for getopt(1) version\n" msgstr " -T, --test 测试 getopt(1) 版本\n" -#: misc-utils/getopt.c:334 +#: misc-utils/getopt.c:337 #, fuzzy -#| msgid " -u, --unquoted Do not quote the output\n" msgid " -u, --unquoted do not quote the output\n" msgstr " -u, --unquoted 不引用输出\n" -#: misc-utils/getopt.c:388 misc-utils/getopt.c:444 +#: misc-utils/getopt.c:391 misc-utils/getopt.c:447 msgid "missing optstring argument" msgstr "缺少 optstring 参数" -#: misc-utils/getopt.c:439 +#: misc-utils/getopt.c:442 msgid "internal error, contact the author." msgstr "内部错误，请联系作者。" -#: misc-utils/kill.c:238 +#: misc-utils/kill.c:234 #, c-format msgid "unknown signal %s; valid signals:" msgstr "未知信号 %s；有效信号为：" -#: misc-utils/kill.c:306 +#: misc-utils/kill.c:302 #, c-format msgid " %s [options] <pid>|<name>...\n" msgstr " %s [选项] <pid>|<名称> ...\n" -#: misc-utils/kill.c:309 +#: misc-utils/kill.c:305 msgid "Forcibly terminate a process.\n" msgstr "" -#: misc-utils/kill.c:312 +#: misc-utils/kill.c:308 msgid "" " -a, --all do not restrict the name-to-pid conversion to processes\n" " with the same uid as the present process\n" @@ -8649,316 +8555,326 @@ msgstr "" " -a, --all 不限于只对和当前进程的 uid 相同的进程进行\n" " 名称-pid 转换\n" -#: misc-utils/kill.c:314 +#: misc-utils/kill.c:310 msgid " -s, --signal <signal> send this <signal> instead of SIGTERM\n" msgstr " -s, --signal <信号> 发送指定的<信号>而非 SIGTERM\n" -#: misc-utils/kill.c:316 +#: misc-utils/kill.c:312 msgid " -q, --queue <value> use sigqueue(2), not kill(2), and pass <value> as data\n" msgstr " -q, --queue <值> 使用 sigqueue(2) 代替 kill(2)，并传递<值>数据\n" -#: misc-utils/kill.c:318 +#: misc-utils/kill.c:314 msgid " -p, --pid print pids without signaling them\n" msgstr " -p, --pid 打印 pid 而不向它们发送信号\n" -#: misc-utils/kill.c:319 +#: misc-utils/kill.c:315 msgid " -l, --list[=<signal>] list signal names, or convert a signal number to a name\n" msgstr " -l, --list [=<信号>] 列出信号名，或将一个信号数值转换为名称\n" -#: misc-utils/kill.c:320 +#: misc-utils/kill.c:316 msgid " -L, --table list signal names and numbers\n" msgstr " -L, --table 列出信号名和数值\n" -#: misc-utils/kill.c:321 +#: misc-utils/kill.c:317 msgid " --verbose print pids that will be signaled\n" msgstr " --verbose 打印将收到信号的 pid\n" -#: misc-utils/kill.c:371 misc-utils/kill.c:380 +#: misc-utils/kill.c:367 misc-utils/kill.c:376 #, c-format msgid "unknown signal: %s" msgstr "未知信号：%s" -#: misc-utils/kill.c:391 misc-utils/kill.c:394 misc-utils/kill.c:403 -#: misc-utils/kill.c:415 misc-utils/kill.c:438 +#: misc-utils/kill.c:387 misc-utils/kill.c:390 misc-utils/kill.c:399 +#: misc-utils/kill.c:411 misc-utils/kill.c:434 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s 和 %s 相互排斥" -#: misc-utils/kill.c:400 misc-utils/kill.c:442 misc-utils/rename.c:174 -#: sys-utils/ipcrm.c:160 term-utils/agetty.c:793 term-utils/agetty.c:802 +#: misc-utils/kill.c:396 misc-utils/kill.c:438 misc-utils/rename.c:174 +#: sys-utils/ipcrm.c:160 term-utils/agetty.c:794 term-utils/agetty.c:803 msgid "not enough arguments" msgstr "参数不够" -#: misc-utils/kill.c:413 +#: misc-utils/kill.c:409 #, c-format msgid "option '%s' requires an argument" msgstr "“%s”选项需要一个参数" -#: 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:306 term-utils/setterm.c:320 term-utils/setterm.c:331 -#: term-utils/setterm.c:339 term-utils/setterm.c:354 term-utils/setterm.c:368 -#: term-utils/setterm.c:381 term-utils/setterm.c:543 term-utils/setterm.c:548 -#: term-utils/setterm.c:553 term-utils/setterm.c:558 term-utils/setterm.c:582 -#: term-utils/setterm.c:587 term-utils/setterm.c:592 term-utils/setterm.c:597 -#: term-utils/setterm.c:602 term-utils/setterm.c:607 term-utils/setterm.c:615 -#: term-utils/setterm.c:648 +#: misc-utils/kill.c:414 sys-utils/eject.c:205 sys-utils/eject.c:230 +#: sys-utils/losetup.c:573 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:306 term-utils/setterm.c:320 +#: term-utils/setterm.c:331 term-utils/setterm.c:339 term-utils/setterm.c:354 +#: term-utils/setterm.c:368 term-utils/setterm.c:381 term-utils/setterm.c:543 +#: term-utils/setterm.c:548 term-utils/setterm.c:553 term-utils/setterm.c:558 +#: term-utils/setterm.c:582 term-utils/setterm.c:587 term-utils/setterm.c:592 +#: term-utils/setterm.c:597 term-utils/setterm.c:602 term-utils/setterm.c:607 +#: term-utils/setterm.c:615 term-utils/setterm.c:648 msgid "argument error" msgstr "参数出错" -#: misc-utils/kill.c:435 +#: misc-utils/kill.c:431 #, c-format msgid "invalid signal name or number: %s" msgstr "无效的信号名或数字：%s" -#: misc-utils/kill.c:452 +#: misc-utils/kill.c:448 #, c-format msgid "sending signal %d to pid %d\n" msgstr "将信号 %d 发送给 pid %d\n" -#: misc-utils/kill.c:465 +#: misc-utils/kill.c:461 #, c-format msgid "sending signal to %s failed" msgstr "向 %s 发送信号失败" -#: misc-utils/kill.c:481 +#: misc-utils/kill.c:477 msgid "use of 'kill --pid' option as command name is deprecated" msgstr "将“kill --pid”选项当作命令的做法已经废弃" -#: misc-utils/kill.c:515 +#: misc-utils/kill.c:511 #, c-format msgid "cannot find process \"%s\"" msgstr "找不到进程“%s”" -#: misc-utils/logger.c:204 +#: misc-utils/logger.c:222 #, c-format msgid "unknown facility name: %s" msgstr "未知设施名称：%s" -#: misc-utils/logger.c:210 +#: misc-utils/logger.c:228 #, c-format msgid "unknown priority name: %s" msgstr "未知优先级名称：%s" -#: misc-utils/logger.c:222 +#: misc-utils/logger.c:240 #, c-format msgid "openlog %s: pathname too long" msgstr "openlog %s：路径名过长" -#: misc-utils/logger.c:245 +#: misc-utils/logger.c:267 #, c-format msgid "socket %s" msgstr "套接字 %s" -#: misc-utils/logger.c:279 +#: misc-utils/logger.c:306 #, c-format msgid "failed to resolve name %s port %s: %s" msgstr "解析名称 %s 端口 %s 失败：%s" -#: misc-utils/logger.c:296 +#: misc-utils/logger.c:323 #, c-format msgid "failed to connect to %s port %s" msgstr "连接 %s 端口 %s 失败" -#: misc-utils/logger.c:323 +#: misc-utils/logger.c:353 #, c-format msgid "maximum input lines (%d) exceeded" msgstr "超过了最大输入行数(%d)" -#: misc-utils/logger.c:480 +#: misc-utils/logger.c:488 +#, fuzzy +msgid "send message failed" +msgstr "创建消息队列失败" + +#: misc-utils/logger.c:559 +#, c-format +msgid "structured data ID '%s' is not unique" +msgstr "" + +#: misc-utils/logger.c:573 +#, c-format +msgid "--sd-id no specified for --sd-param %s" +msgstr "" + +#: misc-utils/logger.c:744 #, fuzzy -#| msgid "fallocate failed" msgid "localtime() failed" msgstr "fallocate 失败" -#: misc-utils/logger.c:490 +#: misc-utils/logger.c:754 #, fuzzy, c-format -#| msgid "field %s is too long" msgid "hostname '%s' is too long" msgstr "字段 %s 过长" -#: misc-utils/logger.c:496 +#: misc-utils/logger.c:760 #, fuzzy, c-format -#| msgid "field %s is too long" msgid "tag '%s' is too long" msgstr "字段 %s 过长" -#: misc-utils/logger.c:550 +#: misc-utils/logger.c:823 #, fuzzy, c-format -#| msgid "unknown argument: %s" msgid "ignoring unknown option argument: %s" msgstr "未知参数：%s" -#: misc-utils/logger.c:562 +#: misc-utils/logger.c:835 #, fuzzy, c-format -#| msgid "invalid argument to --auto/-a option" msgid "invalid argument: %s: using automatic errors" msgstr "--auto/-a 选项参数无效" -#: misc-utils/logger.c:702 +#: misc-utils/logger.c:984 #, c-format msgid " %s [options] [<message>]\n" msgstr " %s [选项] [<消息>]\n" -#: misc-utils/logger.c:705 +#: misc-utils/logger.c:987 #, fuzzy -#| msgid "Unable to set system clock.\n" msgid "Enter messages into the system log.\n" msgstr "无法设置系统时钟。\n" -#: misc-utils/logger.c:708 +#: misc-utils/logger.c:990 #, fuzzy -#| msgid " -i, --id log the process ID too\n" msgid " -i log the logger command's PID\n" msgstr " -i, --id 也记录进程 ID\n" -#: misc-utils/logger.c:709 +#: misc-utils/logger.c:991 msgid " --id[=<id>] log the given <id>, or otherwise the PID\n" msgstr "" -#: misc-utils/logger.c:710 +#: misc-utils/logger.c:992 #, fuzzy -#| msgid " -f, --file <file> log the contents of this file\n" msgid " -f, --file <file> log the contents of this file\n" msgstr " -f, --file <文件> 记录此文件的内容\n" -#: misc-utils/logger.c:711 +#: misc-utils/logger.c:993 #, fuzzy -#| msgid " -n, --skip-login do not prompt for login\n" msgid " -e, --skip-empty do not log empty lines when processing files\n" msgstr " -n, --skip-login 不提示登录\n" -#: misc-utils/logger.c:712 +#: misc-utils/logger.c:994 #, fuzzy -#| msgid " --nohints do not print hints\n" msgid " --no-act do everything except the write the log\n" msgstr " --nohints 不打印提示信息\n" -#: misc-utils/logger.c:713 +#: misc-utils/logger.c:995 #, fuzzy -#| msgid " -p, --priority <prio> mark given message with this priority\n" msgid " -p, --priority <prio> mark given message with this priority\n" msgstr " -p, --priority <级别> 将指定消息标记为此优先级\n" -#: misc-utils/logger.c:714 +#: misc-utils/logger.c:996 msgid " --octet-count use rfc6587 octet counting\n" msgstr "" -#: misc-utils/logger.c:715 +#: misc-utils/logger.c:997 #, fuzzy -#| msgid " --prio-prefix look for a prefix on every line read from stdin\n" msgid " --prio-prefix look for a prefix on every line read from stdin\n" msgstr " --prio-prefix 在从 stdin 读取的每一行上查找前缀\n" -#: misc-utils/logger.c:716 +#: misc-utils/logger.c:998 #, fuzzy -#| msgid " -s, --stderr output message to standard error as well\n" msgid " -s, --stderr output message to standard error as well\n" msgstr " -s, --stderr 也向标准错误输出消息\n" -#: misc-utils/logger.c:717 +#: misc-utils/logger.c:999 #, fuzzy -#| msgid " -v, --verbose verbose messages\n" msgid " -S, --size <size> maximum size for a single message\n" msgstr " -v, --verbose 输出详尽消息\n" -#: misc-utils/logger.c:718 +#: misc-utils/logger.c:1000 #, fuzzy -#| msgid " -t, --tag <tag> mark every line with this tag\n" msgid " -t, --tag <tag> mark every line with this tag\n" msgstr " -t, --tag <标志> 用此标志标记每一行\n" -#: misc-utils/logger.c:719 +#: misc-utils/logger.c:1001 #, fuzzy -#| msgid " -n, --server <name> write to this remote syslog server\n" msgid " -n, --server <name> write to this remote syslog server\n" msgstr " -n, --server <名称> 写入此远程 syslog 服务器\n" -#: misc-utils/logger.c:720 +#: misc-utils/logger.c:1002 #, fuzzy -#| msgid " -P, --port <number> use this UDP port\n" msgid " -P, --port <number> use this UDP port\n" msgstr " -P, --port <数字> 使用此 UDP 端口\n" -#: misc-utils/logger.c:721 +#: misc-utils/logger.c:1003 #, fuzzy -#| msgid " -T, --tcp use TCP only\n" msgid " -T, --tcp use TCP only\n" msgstr " -T, --tcp 只使用 TCP\n" -#: misc-utils/logger.c:722 +#: misc-utils/logger.c:1004 #, fuzzy -#| msgid " -d, --udp use UDP only\n" msgid " -d, --udp use UDP only\n" msgstr " -d, --udp 只使用 UDP\n" -#: misc-utils/logger.c:723 +#: misc-utils/logger.c:1005 msgid " --rfc3164 use the obsolete BSD syslog protocol\n" msgstr "" -#: misc-utils/logger.c:724 +#: misc-utils/logger.c:1006 msgid "" " --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:726 +#: misc-utils/logger.c:1008 +#, fuzzy +msgid " --sd-id <id> rfc5424 structured data ID\n" +msgstr " --rgid <gid> 设置实际 gid\n" + +#: misc-utils/logger.c:1009 +msgid " --sd-param <data> rfc5424 structured data name=value\n" +msgstr "" + +#: misc-utils/logger.c:1010 #, fuzzy -#| msgid " --rgid <gid> set real gid\n" msgid " --msgid <msgid> set rfc5424 message id field\n" msgstr " --rgid <gid> 设置实际 gid\n" -#: misc-utils/logger.c:727 +#: misc-utils/logger.c:1011 #, fuzzy -#| msgid " -u, --socket <socket> write to this Unix socket\n" msgid " -u, --socket <socket> write to this Unix socket\n" msgstr " -u, --socket <套接字> 写入此 Unix 套接字\n" -#: misc-utils/logger.c:728 +#: misc-utils/logger.c:1012 msgid "" " --socket-errors[=<on|off|auto>]\n" " print connection errors when using Unix sockets\n" msgstr "" -#: misc-utils/logger.c:731 +#: misc-utils/logger.c:1015 msgid " --journald[=<file>] write journald entry\n" msgstr " --journald[=<文件>] 写 journald 记录\n" -#: misc-utils/logger.c:813 +#: misc-utils/logger.c:1102 #, c-format msgid "file %s" msgstr "文件 %s" -#: misc-utils/logger.c:828 +#: misc-utils/logger.c:1117 #, fuzzy -#| msgid "failed to parse pid" msgid "failed to parse id" msgstr "解析 pid 失败" -#: misc-utils/logger.c:846 +#: misc-utils/logger.c:1135 #, fuzzy -#| msgid "failed to parse size" msgid "failed to parse message size" msgstr "解析大小失败" -#: misc-utils/logger.c:881 +#: misc-utils/logger.c:1170 msgid "--msgid cannot contain space" msgstr "" -#: misc-utils/logger.c:909 +#: misc-utils/logger.c:1192 +#, fuzzy, c-format +msgid "invalid structured data ID: '%s'" +msgstr "无效参数：%s" + +#: misc-utils/logger.c:1197 +#, fuzzy, c-format +msgid "invalid structured data parameter: '%s'" +msgstr "无效的超时参数：%s" + +#: misc-utils/logger.c:1208 msgid "--file <file> and <message> are mutually exclusive, message is ignored" msgstr "" -#: misc-utils/logger.c:916 +#: misc-utils/logger.c:1215 msgid "journald entry could not be written" msgstr "" #: misc-utils/look.c:357 #, fuzzy, c-format -#| msgid " %s [options] string [file]\n" msgid " %s [options] <string> [<file>...]\n" msgstr " %s [选项] 字符串 [文件]\n" @@ -8968,19 +8884,16 @@ msgstr "" #: misc-utils/look.c:363 #, fuzzy -#| msgid " -a, --alternative Allow long options starting with single -\n" msgid " -a, --alternative use the alternative dictionary\n" msgstr " -a, --alternative 允许长选项以 - 开始\n" #: misc-utils/look.c:364 #, fuzzy -#| msgid " -c, --chars <num> number of output characters before sleep\n" -msgid " -d, --alphanum compare only alphanumeric characters\n" +msgid " -d, --alphanum compare only blanks and alphanumeric characters\n" msgstr " -c, --chars <数字> 睡眠前输出的字符数\n" #: misc-utils/look.c:365 #, fuzzy -#| msgid " -s, --inverse inverse dependencies\n" msgid " -f, --ignore-case ignore case differences when comparing\n" msgstr " -s, --inverse 反向依赖\n" @@ -8988,302 +8901,291 @@ msgstr " -s, --inverse 反向依赖\n" msgid " -t, --terminate <char> define the string-termination character\n" msgstr "" -#: misc-utils/lsblk.c:158 +#: misc-utils/lsblk.c:157 msgid "device name" msgstr "设备名" -#: misc-utils/lsblk.c:159 +#: misc-utils/lsblk.c:158 msgid "internal kernel device name" msgstr "内部内核设备名称" -#: misc-utils/lsblk.c:160 +#: misc-utils/lsblk.c:159 msgid "internal parent kernel device name" msgstr "内部上级内核设备名称" -#: misc-utils/lsblk.c:163 sys-utils/zramctl.c:82 +#: misc-utils/lsblk.c:162 sys-utils/zramctl.c:83 msgid "where the device is mounted" msgstr "设备挂载位置" -#: misc-utils/lsblk.c:164 +#: misc-utils/lsblk.c:163 msgid "filesystem LABEL" msgstr "文件系统标签" -#: misc-utils/lsblk.c:167 +#: misc-utils/lsblk.c:166 msgid "partition type UUID" msgstr "分区类型 UUID" -#: misc-utils/lsblk.c:168 +#: misc-utils/lsblk.c:167 msgid "partition LABEL" msgstr "分区 LABEL" -#: misc-utils/lsblk.c:172 +#: misc-utils/lsblk.c:171 msgid "read-ahead of the device" msgstr "该设备的预读(read-ahead)" -#: misc-utils/lsblk.c:173 sys-utils/losetup.c:73 +#: misc-utils/lsblk.c:172 sys-utils/losetup.c:75 msgid "read-only device" msgstr "只读设备" -#: misc-utils/lsblk.c:174 +#: misc-utils/lsblk.c:173 msgid "removable device" msgstr "可移动设备" -#: misc-utils/lsblk.c:175 +#: misc-utils/lsblk.c:174 msgid "removable or hotplug device (usb, pcmcia, ...)" msgstr "" -#: misc-utils/lsblk.c:176 +#: misc-utils/lsblk.c:175 msgid "rotational device" msgstr "转动设备" -#: misc-utils/lsblk.c:177 +#: misc-utils/lsblk.c:176 msgid "adds randomness" msgstr "添加随机性" -#: misc-utils/lsblk.c:178 +#: misc-utils/lsblk.c:177 msgid "device identifier" msgstr "设备标识符" -#: misc-utils/lsblk.c:179 +#: misc-utils/lsblk.c:178 msgid "disk serial number" msgstr "磁盘序列号" -#: misc-utils/lsblk.c:180 +#: misc-utils/lsblk.c:179 msgid "size of the device" msgstr "磁盘容量" -#: misc-utils/lsblk.c:181 +#: misc-utils/lsblk.c:180 msgid "state of the device" msgstr "设备的状态" -#: misc-utils/lsblk.c:183 +#: misc-utils/lsblk.c:182 msgid "group name" msgstr "组名" -#: misc-utils/lsblk.c:184 +#: misc-utils/lsblk.c:183 msgid "device node permissions" msgstr "设备节点权限" -#: misc-utils/lsblk.c:185 +#: misc-utils/lsblk.c:184 msgid "alignment offset" msgstr "对齐偏移量" -#: misc-utils/lsblk.c:186 +#: misc-utils/lsblk.c:185 msgid "minimum I/O size" msgstr "最小 I/O 大小" -#: misc-utils/lsblk.c:187 +#: misc-utils/lsblk.c:186 msgid "optimal I/O size" msgstr "最优 I/O 大小" -#: misc-utils/lsblk.c:188 +#: misc-utils/lsblk.c:187 msgid "physical sector size" msgstr "物理扇区大小" -#: misc-utils/lsblk.c:189 +#: misc-utils/lsblk.c:188 msgid "logical sector size" msgstr "逻辑扇区大小" -#: misc-utils/lsblk.c:190 +#: misc-utils/lsblk.c:189 msgid "I/O scheduler name" msgstr "I/O 调度器名称" -#: misc-utils/lsblk.c:191 +#: misc-utils/lsblk.c:190 msgid "request queue size" msgstr "请求队列大小" -#: misc-utils/lsblk.c:192 +#: misc-utils/lsblk.c:191 msgid "device type" msgstr "设备类型" -#: misc-utils/lsblk.c:193 +#: misc-utils/lsblk.c:192 msgid "discard alignment offset" msgstr "忽略对齐偏移量" -#: misc-utils/lsblk.c:194 +#: misc-utils/lsblk.c:193 msgid "discard granularity" msgstr "忽略粒度" -#: misc-utils/lsblk.c:195 +#: misc-utils/lsblk.c:194 msgid "discard max bytes" msgstr "忽略最大字节数" -#: misc-utils/lsblk.c:196 +#: misc-utils/lsblk.c:195 msgid "discard zeroes data" msgstr "忽略零数据" -#: misc-utils/lsblk.c:197 +#: misc-utils/lsblk.c:196 msgid "write same max bytes" msgstr "写相同的最大字节数" -#: misc-utils/lsblk.c:198 +#: misc-utils/lsblk.c:197 msgid "unique storage identifier" msgstr "惟一存储标识符" -#: misc-utils/lsblk.c:199 +#: misc-utils/lsblk.c:198 msgid "Host:Channel:Target:Lun for SCSI" msgstr "SCSI 的 Host:Channel:Target:Lun" -#: misc-utils/lsblk.c:200 +#: misc-utils/lsblk.c:199 msgid "device transport type" msgstr "设备传输类型" -#: misc-utils/lsblk.c:201 +#: misc-utils/lsblk.c:200 msgid "de-duplicated chain of subsystems" msgstr "" -#: misc-utils/lsblk.c:202 +#: misc-utils/lsblk.c:201 msgid "device revision" msgstr "设备修订版本" -#: misc-utils/lsblk.c:203 +#: misc-utils/lsblk.c:202 msgid "device vendor" msgstr "设备制造商" -#: misc-utils/lsblk.c:1161 +#: misc-utils/lsblk.c:433 sys-utils/mount.c:102 sys-utils/swapon-common.c:19 +#: sys-utils/umount.c:46 #, c-format -msgid "%s: failed to get device path" -msgstr "%s：获取设备路径失败" - -#: misc-utils/lsblk.c:1169 -#, c-format -msgid "%s: unknown device name" -msgstr "%s：未知设备名称" - -#: misc-utils/lsblk.c:1206 -#, c-format -msgid "%s: failed to get dm name" -msgstr "%s：获取 dm 名称失败" +msgid "%s: parse error: ignore entry at line %d." +msgstr "%s：解析出错：忽略第 %d 行的记录。" -#: misc-utils/lsblk.c:1255 +#: misc-utils/lsblk.c:1268 msgid "failed to open device directory in sysfs" msgstr "打开 sysfs 中的设备目录失败" -#: misc-utils/lsblk.c:1445 +#: misc-utils/lsblk.c:1454 #, c-format msgid "%s: failed to compose sysfs path" msgstr "%s：组成 sysfs 路径失败" -#: misc-utils/lsblk.c:1451 +#: misc-utils/lsblk.c:1460 #, c-format msgid "%s: failed to read link" msgstr "%s：读链接失败" -#: misc-utils/lsblk.c:1473 +#: misc-utils/lsblk.c:1482 #, c-format msgid "%s: failed to get sysfs name" msgstr "%s：获取 sysfs 名称失败" -#: misc-utils/lsblk.c:1482 +#: misc-utils/lsblk.c:1491 #, c-format msgid "%s: failed to get whole-disk device number" msgstr "%s：获取 整盘 设备号失败" -#: misc-utils/lsblk.c:1534 misc-utils/lsblk.c:1536 misc-utils/lsblk.c:1561 -#: misc-utils/lsblk.c:1563 +#: misc-utils/lsblk.c:1543 misc-utils/lsblk.c:1545 misc-utils/lsblk.c:1570 +#: misc-utils/lsblk.c:1572 #, c-format msgid "failed to parse list '%s'" msgstr "解析列表“%s”失败" #. TRANSLATORS: The standard value for %d is 256. -#: misc-utils/lsblk.c:1541 +#: misc-utils/lsblk.c:1550 #, 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:1568 +#: misc-utils/lsblk.c:1577 #, c-format msgid "the list of included devices is too large (limit is %d devices)" msgstr "包含设备列表过大(限制为 %d 台设备)" -#: misc-utils/lsblk.c:1599 sys-utils/wdctl.c:174 +#: misc-utils/lsblk.c:1608 sys-utils/wdctl.c:174 #, c-format msgid " %s [options] [<device> ...]\n" msgstr " %s [选项] [<设备> ...]\n" -#: misc-utils/lsblk.c:1602 +#: misc-utils/lsblk.c:1611 #, fuzzy -#| msgid "%s: not a block device" msgid "List information about block devices.\n" msgstr "%s：不是一个块设备" -#: misc-utils/lsblk.c:1605 +#: misc-utils/lsblk.c:1614 msgid " -a, --all print all devices\n" msgstr " -a, --all 打印所有设备\n" -#: misc-utils/lsblk.c:1607 +#: misc-utils/lsblk.c:1616 msgid " -d, --nodeps don't print slaves or holders\n" msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n" -#: misc-utils/lsblk.c:1608 +#: misc-utils/lsblk.c:1617 msgid " -D, --discard print discard capabilities\n" msgstr " -D, --discard 打印时丢弃能力\n" -#: misc-utils/lsblk.c:1609 +#: misc-utils/lsblk.c:1618 msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n" msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认：内存盘)\n" -#: misc-utils/lsblk.c:1610 +#: misc-utils/lsblk.c:1619 msgid " -f, --fs output info about filesystems\n" msgstr " -f, --fs 输出文件系统信息\n" -#: misc-utils/lsblk.c:1611 +#: misc-utils/lsblk.c:1620 msgid " -i, --ascii use ascii characters only\n" msgstr " -i, --ascii 只使用 ascii 字符\n" -#: misc-utils/lsblk.c:1612 +#: misc-utils/lsblk.c:1621 msgid " -I, --include <list> show only devices with specified major numbers\n" msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n" -#: misc-utils/lsblk.c:1613 +#: misc-utils/lsblk.c:1622 #, fuzzy -#| msgid " -r, --raw use raw output format\n" msgid " -J, --json use JSON output format\n" msgstr " -r, --raw 使用原生输出格式\n" -#: misc-utils/lsblk.c:1614 +#: misc-utils/lsblk.c:1623 msgid " -l, --list use list format output\n" msgstr " -l, --list 使用列表格式的输出\n" -#: misc-utils/lsblk.c:1615 +#: misc-utils/lsblk.c:1624 msgid " -m, --perms output info about permissions\n" msgstr " -m, --perms 输出权限信息\n" -#: misc-utils/lsblk.c:1616 +#: misc-utils/lsblk.c:1625 msgid " -n, --noheadings don't print headings\n" msgstr " -n, --noheadings 不打印标题\n" -#: misc-utils/lsblk.c:1617 +#: misc-utils/lsblk.c:1626 msgid " -o, --output <list> output columns\n" msgstr " -o, --output <列表> 输出列\n" -#: misc-utils/lsblk.c:1618 +#: misc-utils/lsblk.c:1627 msgid " -O, --output-all output all columns\n" msgstr " -O, --output-all 输出所有列\n" -#: misc-utils/lsblk.c:1619 +#: misc-utils/lsblk.c:1628 msgid " -p, --paths print complete device path\n" msgstr " -p, --paths 打印完整设备路径\n" -#: misc-utils/lsblk.c:1622 +#: misc-utils/lsblk.c:1631 msgid " -s, --inverse inverse dependencies\n" msgstr " -s, --inverse 反向依赖\n" -#: misc-utils/lsblk.c:1623 +#: misc-utils/lsblk.c:1632 msgid " -S, --scsi output info about SCSI devices\n" msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n" -#: misc-utils/lsblk.c:1624 +#: misc-utils/lsblk.c:1633 msgid " -t, --topology output info about topology\n" msgstr " -t, --topology 输出拓扑信息\n" -#: misc-utils/lsblk.c:1625 +#: misc-utils/lsblk.c:1634 msgid " -x, --sort <column> sort output by <column>\n" msgstr " -x, --sort <列> 按<列>对输出排序\n" -#: misc-utils/lsblk.c:1630 misc-utils/lslocks.c:532 sys-utils/prlimit.c:196 -#: sys-utils/zramctl.c:478 +#: misc-utils/lsblk.c:1639 misc-utils/lslocks.c:509 sys-utils/lsns.c:607 +#: sys-utils/prlimit.c:196 sys-utils/zramctl.c:487 #, c-format msgid "" "\n" @@ -9292,15 +9194,11 @@ msgstr "" "\n" "可用列(用于 --output)：\n" -#: misc-utils/lsblk.c:1643 +#: misc-utils/lsblk.c:1652 #, c-format msgid "failed to access sysfs directory: %s" msgstr "无法访问 sysfs 目录：%s" -#: misc-utils/lsblk.c:1840 -msgid "the sort column has to be among the output columns" -msgstr "排序列必须是输出的列" - #: misc-utils/lslocks.c:73 msgid "command of the process holding the lock" msgstr "持有锁的进程命令" @@ -9341,58 +9239,53 @@ msgstr "锁定文件的路径" msgid "PID of the process blocking the lock" msgstr "阻塞锁的进程的 PID" -#: misc-utils/lslocks.c:265 +#: misc-utils/lslocks.c:242 msgid "failed to parse ID" msgstr "解析 ID 失败" -#: misc-utils/lslocks.c:287 sys-utils/nsenter.c:227 +#: misc-utils/lslocks.c:264 sys-utils/nsenter.c:227 msgid "failed to parse pid" msgstr "解析 pid 失败" -#: misc-utils/lslocks.c:290 +#: misc-utils/lslocks.c:267 msgid "(unknown)" msgstr "(未知)" -#: misc-utils/lslocks.c:299 +#: misc-utils/lslocks.c:276 msgid "failed to parse start" msgstr "解析 起点 失败" -#: misc-utils/lslocks.c:306 +#: misc-utils/lslocks.c:283 msgid "failed to parse end" msgstr "解析 终点 失败" -#: misc-utils/lslocks.c:518 +#: misc-utils/lslocks.c:495 #, fuzzy -#| msgid "Unable to set system clock.\n" msgid "List local system locks.\n" msgstr "无法设置系统时钟。\n" -#: misc-utils/lslocks.c:522 +#: misc-utils/lslocks.c:499 sys-utils/lsns.c:596 #, fuzzy -#| msgid " -n, --noheadings don't print headings\n" msgid " -n, --noheadings don't print headings\n" msgstr " -n, --noheadings 不打印标题\n" -#: misc-utils/lslocks.c:523 +#: misc-utils/lslocks.c:500 sys-utils/lsns.c:597 #, fuzzy -#| msgid " -o, --output <list> define which output columns to use\n" msgid " -o, --output <list> define which output columns to use\n" msgstr " -o, --output <列表> 定义使用哪个输出列\n" -#: misc-utils/lslocks.c:524 +#: misc-utils/lslocks.c:501 #, fuzzy -#| msgid " -p, --pid <pid>... act on these already running processes\n" msgid " -p, --pid <pid> display only locks held by this process\n" msgstr " -p, --pid <pid>... 对这些已运行的进程操作\n" -#: misc-utils/lslocks.c:525 +#: misc-utils/lslocks.c:502 sys-utils/lsns.c:599 #, fuzzy -#| msgid " -r, --raw use raw output format\n" msgid " -r, --raw use the raw output format\n" msgstr " -r, --raw 使用原生输出格式\n" -#: misc-utils/lslocks.c:579 schedutils/chrt.c:260 schedutils/ionice.c:177 -#: schedutils/taskset.c:163 sys-utils/prlimit.c:586 +#: misc-utils/lslocks.c:556 schedutils/chrt.c:440 schedutils/ionice.c:177 +#: schedutils/taskset.c:163 sys-utils/lsns.c:674 sys-utils/prlimit.c:586 msgid "invalid PID argument" msgstr "无效的 PID 参数" @@ -9423,7 +9316,7 @@ msgstr[0] "从 %2$s 获得 %1$zu 字节\n" msgid "closing %s failed" msgstr "关闭 %s 失败" -#: misc-utils/mcookie.c:166 sys-utils/blkdiscard.c:120 sys-utils/fstrim.c:320 +#: misc-utils/mcookie.c:166 sys-utils/blkdiscard.c:146 sys-utils/fstrim.c:320 #: text-utils/hexdump.c:117 msgid "failed to parse length" msgstr "解析长度失败" @@ -9438,26 +9331,26 @@ msgid "Got %d byte from %s\n" msgid_plural "Got %d bytes from %s\n" msgstr[0] "从 %2$s 获取到 %1$d 字节\n" -#: misc-utils/namei.c:186 +#: misc-utils/namei.c:90 #, c-format msgid "failed to read symlink: %s" msgstr "读符号链接失败：%s" -#: misc-utils/namei.c:379 +#: misc-utils/namei.c:283 #, c-format msgid "%s - No such file or directory\n" msgstr "%s - 无此文件或目录\n" -#: misc-utils/namei.c:429 +#: misc-utils/namei.c:333 #, c-format msgid " %s [options] <pathname>...\n" msgstr " %s [选项] <路径名> ...\n" -#: misc-utils/namei.c:432 +#: misc-utils/namei.c:336 msgid "Follow a pathname until a terminal point is found.\n" msgstr "" -#: misc-utils/namei.c:435 +#: misc-utils/namei.c:339 msgid "" " -h, --help displays this help text\n" " -V, --version output version information and exit\n" @@ -9477,11 +9370,21 @@ msgstr "" " -n, --nosymlinks 不显示符号链接\n" " -v, --vertical 竖直对齐 模式 和 拥有者\n" -#: misc-utils/namei.c:504 +#: misc-utils/namei.c:408 msgid "pathname argument is missing" msgstr "缺少 路径名 参数" -#: misc-utils/namei.c:528 +#: misc-utils/namei.c:414 sys-utils/lsns.c:739 +#, fuzzy +msgid "failed to allocate UID cache" +msgstr "分配 GPT 头失败" + +#: misc-utils/namei.c:417 +#, fuzzy +msgid "failed to allocate GID cache" +msgstr "分配 GPT 头失败" + +#: misc-utils/namei.c:439 #, c-format msgid "%s: exceeded limit of symlinks" msgstr "%s：超过了符号链接限制" @@ -9518,7 +9421,6 @@ msgstr " %s [选项] <表达式> <替换> <文件>...\n" #: misc-utils/rename.c:122 #, fuzzy -#| msgid "ttyname failed" msgid "Rename files.\n" msgstr "ttyname 失败" @@ -9530,205 +9432,264 @@ msgstr " -v, --verbose 解释正在进行的操作\n" msgid " -s, --symlink act on the target of symlinks\n" msgstr " -s, --symlink 在符号链接的目标上执行\n" -#: misc-utils/uuidd.c:76 +#: misc-utils/uuidd.c:72 msgid "A daemon for generating UUIDs.\n" msgstr "" +#: misc-utils/uuidd.c:74 +#, fuzzy +msgid " -p, --pid <path> path to pid file\n" +msgstr " -T, --target <字符串> 要使用的挂载点\n" + +#: misc-utils/uuidd.c:75 +#, fuzzy +msgid " -s, --socket <path> path to socket\n" +msgstr " -u, --socket <套接字> 写入此 Unix 套接字\n" + +#: misc-utils/uuidd.c:76 +#, fuzzy +msgid " -T, --timeout <sec> specify inactivity timeout\n" +msgstr " -t, --timeout <数字> 登录进程超时(秒)\n" + +#: misc-utils/uuidd.c:77 +#, fuzzy +msgid " -k, --kill kill running daemon\n" +msgstr " -a, --all 卸载所有文件系统\n" + +#: misc-utils/uuidd.c:78 +#, fuzzy +msgid " -r, --random test random-based generation\n" +msgstr " -c, --creator 显示创建者和拥有者\n" + #: misc-utils/uuidd.c:79 -msgid "" -" -p, --pid <path> path to pid file\n" -" -s, --socket <path> path to socket\n" -" -T, --timeout <sec> specify inactivity timeout\n" -" -k, --kill kill running daemon\n" -" -r, --random test random-based generation\n" -" -t, --time test time-based generation\n" -" -n, --uuids <num> request number of uuids\n" -" -P, --no-pid do not create pid file\n" -" -F, --no-fork do not daemonize using double-fork\n" -" -S, --socket-activation do not create listening socket\n" -" -d, --debug run in debugging mode\n" -" -q, --quiet turn on quiet mode\n" -" -V, --version output version information and exit\n" -" -h, --help display this help and exit\n" -"\n" -msgstr "" -" -p, --pid <路径> pid 文件路径\n" -" -s, --socket <路径> 套接字路径\n" -" -T, --timeout <秒数> 指定不活动超时\n" -" -k, --kill 杀死运行进程\n" -" -r, --random 测试基于随机数的生成方法\n" -" -t, --time 测试基于时间的生成方法\n" -" -n, --uuids <数字> 指定 uuid 号\n" -" -P, --no-pid 不创建 pid 文件\n" -" -F, --no-fork 不使用双 fork 变成守护进程\n" -" -S, --socket-activation 不创建侦听套接字\n" -" -d, --debug 以调试模式运行\n" -" -q, --quiet 打开安静模式\n" -" -V, --version 输出版本信息并退出\n" -" -h, --help 显示此帮助并退出\n" -"\n" +#, fuzzy +msgid " -t, --time test time-based generation\n" +msgstr " -t, --time <毫秒数> 驱动等待时间(毫秒)\n" + +#: misc-utils/uuidd.c:80 +#, fuzzy +msgid " -n, --uuids <num> request number of uuids\n" +msgstr " -H, --heads <数字> 指定磁头数\n" + +#: misc-utils/uuidd.c:81 +#, fuzzy +msgid " -P, --no-pid do not create pid file\n" +msgstr " -i, --noissue 不显示预登录消息(issue)文件\n" -#: misc-utils/uuidd.c:133 +#: misc-utils/uuidd.c:82 +#, fuzzy +msgid " -F, --no-fork do not daemonize using double-fork\n" +msgstr " -F, --no-fork 执行 <程序> 前不 fork\n" + +#: misc-utils/uuidd.c:83 +#, fuzzy +msgid " -S, --socket-activation do not create listening socket\n" +msgstr "同时指定了 --socket-activation 和 --socket。将忽略 --socket" + +#: misc-utils/uuidd.c:84 +#, fuzzy +msgid " -d, --debug run in debugging mode\n" +msgstr " -d, --debug 向标准错误打印详尽消息\n" + +#: misc-utils/uuidd.c:85 +#, fuzzy +msgid " -q, --quiet turn on quiet mode\n" +msgstr " -U, --user 取消共享用户名字空间\n" + +#: misc-utils/uuidd.c:118 msgid "bad arguments" msgstr "参数错误" -#: misc-utils/uuidd.c:140 +#: misc-utils/uuidd.c:125 msgid "socket" msgstr "套接字" -#: misc-utils/uuidd.c:151 +#: misc-utils/uuidd.c:136 msgid "connect" msgstr "连接" -#: misc-utils/uuidd.c:171 +#: misc-utils/uuidd.c:156 msgid "write" msgstr "写" -#: misc-utils/uuidd.c:179 +#: misc-utils/uuidd.c:164 msgid "read count" msgstr "读计数" -#: misc-utils/uuidd.c:185 +#: misc-utils/uuidd.c:170 msgid "bad response length" msgstr "响应长度错误" -#: misc-utils/uuidd.c:239 +#: misc-utils/uuidd.c:221 #, c-format msgid "cannot lock %s" msgstr "无法锁定 %s" -#: misc-utils/uuidd.c:263 +#: misc-utils/uuidd.c:246 msgid "couldn't create unix stream socket" msgstr "无法创建 unix 流套接字" -#: misc-utils/uuidd.c:288 +#: misc-utils/uuidd.c:271 #, c-format msgid "couldn't bind unix socket %s" msgstr "无法绑定 unix 套接字 %s" -#: misc-utils/uuidd.c:325 +#: misc-utils/uuidd.c:298 +#, fuzzy +msgid "receiving signal failed" +msgstr "向 %s 发送信号失败" + +#: misc-utils/uuidd.c:311 +msgid "timed out" +msgstr "已超时" + +#: misc-utils/uuidd.c:345 +#, fuzzy +msgid "cannot not setup timer" +msgstr "无法设置 组 id" + +#: misc-utils/uuidd.c:353 #, c-format msgid "uuidd daemon is already running at pid %s" msgstr "uuidd 守护进程已运行，pid 为 %s" -#: misc-utils/uuidd.c:336 +#: misc-utils/uuidd.c:362 #, c-format msgid "couldn't listen on unix socket %s" msgstr "无法侦听 unix 套接字 %s" -#: misc-utils/uuidd.c:346 +#: misc-utils/uuidd.c:372 #, c-format msgid "could not truncate file: %s" msgstr "无法截短文件：%s" -#: misc-utils/uuidd.c:364 -msgid "no or too many file descriptors received" +#: misc-utils/uuidd.c:387 +#, fuzzy +msgid "sd_listen_fds() failed" +msgstr "settimeofday() 失败" + +#: misc-utils/uuidd.c:390 +msgid "no file descriptors received, check systemctl status uuidd.socket" +msgstr "" + +#: misc-utils/uuidd.c:393 +#, fuzzy +msgid "too many file descriptors received, check uuidd.socket" msgstr "未收到或收到过多的文件描述符" -#: misc-utils/uuidd.c:385 text-utils/column.c:387 +#: misc-utils/uuidd.c:421 term-utils/script.c:450 +#, fuzzy +msgid "poll failed" +msgstr "poll() 失败" + +#: misc-utils/uuidd.c:426 +#, fuzzy, c-format +msgid "timeout [%d sec]\n" +msgstr "%u 秒后超时" + +#: misc-utils/uuidd.c:444 text-utils/column.c:414 msgid "read failed" msgstr "read 失败" -#: misc-utils/uuidd.c:387 +#: misc-utils/uuidd.c:446 #, c-format msgid "error reading from client, len = %d" msgstr "从客户端读取出错，长度 = %d" -#: misc-utils/uuidd.c:396 +#: misc-utils/uuidd.c:455 #, c-format msgid "operation %d, incoming num = %d\n" msgstr "操作 %d，接收数 = %d\n" -#: misc-utils/uuidd.c:399 +#: misc-utils/uuidd.c:458 #, c-format msgid "operation %d\n" msgstr "操作 %d\n" -#: misc-utils/uuidd.c:415 +#: misc-utils/uuidd.c:474 #, c-format msgid "Generated time UUID: %s\n" msgstr "已生成时间 UUID：%s\n" -#: misc-utils/uuidd.c:425 +#: misc-utils/uuidd.c:484 #, c-format msgid "Generated random UUID: %s\n" msgstr "已生成随机 UUID：%s\n" -#: misc-utils/uuidd.c:434 +#: misc-utils/uuidd.c:493 #, c-format msgid "Generated time UUID %s and %d following\n" msgid_plural "Generated time UUID %s and %d following\n" msgstr[0] "已生成时间 UUID %s 和后续 %d 个\n" -#: misc-utils/uuidd.c:455 +#: misc-utils/uuidd.c:514 #, c-format msgid "Generated %d UUID:\n" msgid_plural "Generated %d UUIDs:\n" msgstr[0] "已生成 %d 个 UUID：\n" -#: misc-utils/uuidd.c:469 +#: misc-utils/uuidd.c:528 #, c-format msgid "Invalid operation %d\n" msgstr "无效操作 %d\n" -#: misc-utils/uuidd.c:481 +#: misc-utils/uuidd.c:540 #, c-format msgid "Unexpected reply length from server %d" msgstr "服务器 %d 响应长度异常" -#: misc-utils/uuidd.c:543 +#: misc-utils/uuidd.c:602 msgid "failed to parse --uuids" msgstr "解析 --uuids 失败" -#: misc-utils/uuidd.c:560 +#: misc-utils/uuidd.c:619 msgid "uuidd has been built without support for socket activation" msgstr "uuidd 构建时没有添加套接字激活支持" -#: misc-utils/uuidd.c:579 +#: misc-utils/uuidd.c:638 msgid "failed to parse --timeout" msgstr "解析 --timeout 失败" -#: misc-utils/uuidd.c:598 +#: misc-utils/uuidd.c:657 msgid "Both --socket-activation and --socket specified. Ignoring --socket." msgstr "同时指定了 --socket-activation 和 --socket。将忽略 --socket" -#: misc-utils/uuidd.c:605 misc-utils/uuidd.c:633 +#: misc-utils/uuidd.c:664 misc-utils/uuidd.c:692 #, c-format msgid "error calling uuidd daemon (%s)" msgstr "调用 uuidd 守护进程(%s)出错" -#: misc-utils/uuidd.c:606 misc-utils/uuidd.c:634 +#: misc-utils/uuidd.c:665 misc-utils/uuidd.c:693 msgid "unexpected error" msgstr "意外错误" -#: misc-utils/uuidd.c:614 +#: misc-utils/uuidd.c:673 #, c-format msgid "%s and %d subsequent UUID\n" msgid_plural "%s and %d subsequent UUIDs\n" msgstr[0] "%s 和 %d 个后续 UUID\n" -#: misc-utils/uuidd.c:618 +#: misc-utils/uuidd.c:677 #, c-format msgid "List of UUIDs:\n" msgstr "UUID 列表：\n" -#: misc-utils/uuidd.c:650 +#: misc-utils/uuidd.c:709 #, c-format msgid "couldn't kill uuidd running at pid %d" msgstr "无法运行 pid 为 %d 的 uuidd" -#: misc-utils/uuidd.c:655 +#: misc-utils/uuidd.c:714 #, c-format msgid "Killed uuidd running at pid %d.\n" msgstr "已杀死运行 pid 为 %d 的 uuidd。\n" -#: misc-utils/uuidgen.c:36 +#: misc-utils/uuidgen.c:28 #, fuzzy -#| msgid "Create a new label" msgid "Create a new UUID value.\n" msgstr "新建空磁盘标签" -#: misc-utils/uuidgen.c:39 +#: misc-utils/uuidgen.c:31 msgid "" " -r, --random generate random-based uuid\n" " -t, --time generate time-based uuid\n" @@ -9744,7 +9705,6 @@ msgstr "" #: misc-utils/whereis.c:189 #, fuzzy, c-format -#| msgid " %s [options] [<file>...]\n" msgid " %s [options] [-BMS <dir>... -f] <name>\n" msgstr " %s [选项] [<文件>...]\n" @@ -9762,13 +9722,11 @@ msgstr " -B <目录> 定义二进制文件查找路径\n" #: misc-utils/whereis.c:197 #, fuzzy -#| msgid " -m search only for manuals\n" msgid " -m search only for manuals and infos\n" msgstr " -m 只搜索 man 手册\n" #: misc-utils/whereis.c:198 #, fuzzy -#| msgid " -M <dirs> define man lookup path\n" msgid " -M <dirs> define man and info lookup path\n" msgstr " -M <目录> 定义 man 手册查找路径\n" @@ -9794,59 +9752,62 @@ msgstr " -l 输出有效查找路径\n" #: misc-utils/whereis.c:619 #, fuzzy -#| msgid "pathname argument is missing" msgid "option -f is missing" msgstr "缺少 路径名 参数" -#: misc-utils/wipefs.c:195 +#: misc-utils/wipefs.c:196 msgid "partition table" msgstr "分区表" -#: misc-utils/wipefs.c:268 +#: misc-utils/wipefs.c:269 #, c-format msgid "error: %s: probing initialization failed" msgstr "错误：%s：探测初始化失败" -#: misc-utils/wipefs.c:312 +#: misc-utils/wipefs.c:313 #, c-format msgid "%s: failed to erase %s magic string at offset 0x%08jx" msgstr "%1$s：擦除位于偏移 0x%3$08jx 处的魔数字符串 %2$s 失败" -#: misc-utils/wipefs.c:318 +#: misc-utils/wipefs.c:319 #, c-format msgid "%s: %zd byte was erased at offset 0x%08jx (%s): " msgid_plural "%s: %zd bytes were erased at offset 0x%08jx (%s): " msgstr[0] "%s：%zd 个字节已擦除，位置偏移为 0x%08jx (%s)：" -#: misc-utils/wipefs.c:347 +#: misc-utils/wipefs.c:348 #, c-format msgid "%s: failed to create a signature backup" msgstr "%s：创建签名备份失败" -#: misc-utils/wipefs.c:360 +#: misc-utils/wipefs.c:361 #, c-format msgid "%s: calling ioctl to re-read partition table: %m\n" msgstr "%s：将调用 ioctl 来重新读分区表：%m\n" -#: misc-utils/wipefs.c:410 +#: misc-utils/wipefs.c:385 +msgid "failed to create a signature backup, $HOME undefined" +msgstr "创建签名备份失败，未定义 $HOME" + +#: misc-utils/wipefs.c:414 #, c-format msgid "%s: ignoring nested \"%s\" partition table on non-whole disk device" msgstr "%s：忽略 非整盘 设备上的嵌套分区表“%s”" -#: misc-utils/wipefs.c:427 +#: misc-utils/wipefs.c:431 #, c-format msgid "%s: offset 0x%jx not found" msgstr "%s：找不到偏移 0x%jx" -#: misc-utils/wipefs.c:431 +#: misc-utils/wipefs.c:435 msgid "Use the --force option to force erase." msgstr "使用 --force 选项强制擦除。" -#: misc-utils/wipefs.c:455 +#: misc-utils/wipefs.c:459 msgid "Wipe signatures from a device.\n" msgstr "" -#: misc-utils/wipefs.c:458 +#: misc-utils/wipefs.c:462 msgid "" " -a, --all wipe all magic strings (BE CAREFUL!)\n" " -b, --backup create a signature backup in $HOME\n" @@ -9869,39 +9830,27 @@ msgstr "" " -t, --types <列表> 限制文件系统、RAID 或分区表的集合\n" " -V, --version 输出版本信息并退出\n" -#: misc-utils/wipefs.c:529 +#: misc-utils/wipefs.c:533 msgid "invalid offset argument" msgstr "无效的 偏移 参数" -#: misc-utils/wipefs.c:554 +#: misc-utils/wipefs.c:558 msgid "The --backup option is meaningless in this context" msgstr "--backup 在此环境中无意义" -#: schedutils/chrt.c:60 +#: schedutils/chrt.c:125 #, fuzzy -#| msgid "" -#| "\n" -#| "Sets or gets the IO scheduling class and priority of processes.\n" msgid "Show or change the real-time scheduling attributes of a process.\n" msgstr "" "\n" "设置或获取进程的 IO 调度类别和优先级。\n" -#: schedutils/chrt.c:62 -#, fuzzy -#| msgid "" -#| "\n" -#| "chrt - manipulate real-time attributes of a process\n" -#| "\n" -#| "Set policy:\n" -#| " chrt [options] [<policy>] <priority> [-p <pid> | <command> [<arg>...]]\n" -#| "\n" -#| "Get policy:\n" -#| " chrt [options] -p <pid>\n" +#: schedutils/chrt.c:127 +#, fuzzy msgid "" "Set policy:\n" " chrt [options] <priority> <command> [<arg>...]\n" -" chrt [options] -p <priority> <pid>\n" +" chrt [options] --pid <priority> <pid>\n" msgstr "" "\n" "chrt - 实时操纵进程的属性\n" @@ -9912,158 +9861,193 @@ msgstr "" "获得策略：\n" " chrt [选项] -p <pid>\n" -#: schedutils/chrt.c:66 +#: schedutils/chrt.c:131 msgid "" "Get policy:\n" " chrt [options] -p <pid>\n" msgstr "" -#: schedutils/chrt.c:70 +#: schedutils/chrt.c:135 #, fuzzy -#| msgid "Resource options:\n" msgid "Policy options:\n" msgstr "资源选项：\n" -#: schedutils/chrt.c:71 +#: schedutils/chrt.c:136 #, fuzzy -#| msgid " -n, --noparity set parity to none\n" msgid " -b, --batch set policy to SCHED_BATCH\n" msgstr " -n, --noparity 设为无校验位\n" -#: schedutils/chrt.c:72 +#: schedutils/chrt.c:137 +#, fuzzy +msgid " -d, --deadline set policy to SCHED_DEADLINE\n" +msgstr " -n, --noparity 设为无校验位\n" + +#: schedutils/chrt.c:138 #, fuzzy -#| msgid " -n, --noparity set parity to none\n" msgid " -f, --fifo set policy to SCHED_FIFO\n" msgstr " -n, --noparity 设为无校验位\n" -#: schedutils/chrt.c:73 +#: schedutils/chrt.c:139 #, fuzzy -#| msgid " -n, --noparity set parity to none\n" msgid " -i, --idle set policy to SCHED_IDLE\n" msgstr " -n, --noparity 设为无校验位\n" -#: schedutils/chrt.c:74 +#: schedutils/chrt.c:140 #, fuzzy -#| msgid " -o, --oddparity set parity to odd\n" msgid " -o, --other set policy to SCHED_OTHER\n" msgstr " -o, --oddparity 设为偶检验\n" -#: schedutils/chrt.c:75 +#: schedutils/chrt.c:141 #, fuzzy -#| msgid " -1, --one show only a single month (default)\n" 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:144 +#, fuzzy +msgid "Scheduling options:\n" +msgstr "资源选项：\n" -#: schedutils/chrt.c:80 +#: schedutils/chrt.c:145 #, fuzzy -#| msgid "" -#| "\n" -#| "Scheduling flags:\n" -#| " -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n" -msgid " -R, --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n" +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:83 +#: schedutils/chrt.c:146 +msgid " -T, --sched-runtime <ns> runtime parameter for DEADLINE\n" +msgstr "" + +#: schedutils/chrt.c:147 +msgid " -P, --sched-period <ns> period parameter for DEADLINE\n" +msgstr "" + +#: schedutils/chrt.c:148 +msgid " -D, --sched-deadline <ns> deadline parameter for DEADLINE\n" +msgstr "" + +#: schedutils/chrt.c:151 #, fuzzy -#| msgid "Resource options:\n" msgid "Other options:\n" msgstr "资源选项：\n" -#: schedutils/chrt.c:84 +#: schedutils/chrt.c:152 msgid " -a, --all-tasks operate on all the tasks (threads) for a given pid\n" msgstr "" -#: schedutils/chrt.c:85 +#: schedutils/chrt.c:153 #, fuzzy -#| msgid " -T, --ctime show human readable timestamp\n" msgid " -m, --max show min and max valid priorities\n" msgstr " -T, --ctime 显示易读的时间戳\n" -#: schedutils/chrt.c:86 +#: schedutils/chrt.c:154 #, fuzzy -#| msgid " -p, --pid print pids without signaling them\n" msgid " -p, --pid operate on existing given pid\n" msgstr " -p, --pid 打印 pid 而不向它们发送信号\n" -#: schedutils/chrt.c:87 +#: schedutils/chrt.c:155 #, fuzzy -#| msgid " -v, --verbose say what is being done\n" msgid " -v, --verbose display status information\n" msgstr " -v, --verbose 打印当前进行的操作\n" -#: schedutils/chrt.c:108 +#: schedutils/chrt.c:215 schedutils/chrt.c:230 #, c-format msgid "failed to get pid %d's policy" msgstr "无法获得 pid %d 的策略" -#: schedutils/chrt.c:111 +#: schedutils/chrt.c:233 #, c-format -msgid "pid %d's new scheduling policy: " +msgid "failed to get pid %d's attributes" +msgstr "获取 pid %d 的属性失败" + +#: schedutils/chrt.c:244 +#, fuzzy, c-format +msgid "pid %d's new scheduling policy: %s" msgstr "pid %d 的新调度策略：" -#: schedutils/chrt.c:113 -#, c-format -msgid "pid %d's current scheduling policy: " +#: schedutils/chrt.c:246 +#, fuzzy, c-format +msgid "pid %d's current scheduling policy: %s" msgstr "pid %d 的当前调度策略：" -#: schedutils/chrt.c:146 -msgid "unknown scheduling policy" -msgstr "未知的调度策略" - -#: schedutils/chrt.c:150 -#, c-format -msgid "failed to get pid %d's attributes" -msgstr "获取 pid %d 的属性失败" - -#: schedutils/chrt.c:153 +#: schedutils/chrt.c:253 #, c-format msgid "pid %d's new scheduling priority: %d\n" msgstr "pid %d 的新调度策略：%d\n" -#: schedutils/chrt.c:156 +#: schedutils/chrt.c:255 #, c-format msgid "pid %d's current scheduling priority: %d\n" msgstr "pid %d 的当前调度优先级：%d\n" -#: schedutils/chrt.c:191 +#: schedutils/chrt.c:260 #, c-format -msgid "SCHED_%s min/max priority\t: %d/%d\n" -msgstr "SCHED_%s 最小/最大优先级\t：%d/%d\n" +msgid "pid %d's new runtime/deadline/period parameters: %ju/%ju/%ju\n" +msgstr "" -#: schedutils/chrt.c:194 -#, c-format -msgid "SCHED_%s not supported?\n" -msgstr "SCHED_%s 不支持？\n" +#: schedutils/chrt.c:263 +#, fuzzy, c-format +msgid "pid %d's current runtime/deadline/period parameters: %ju/%ju/%ju\n" +msgstr "pid %d 的当前调度优先级：%d\n" -#: schedutils/chrt.c:289 schedutils/chrt.c:322 +#: schedutils/chrt.c:277 schedutils/chrt.c:358 msgid "cannot obtain the list of tasks" msgstr "无法获取任务列表" -#: schedutils/chrt.c:301 -msgid "invalid priority argument" -msgstr "无效的 优先级 参数" +#: schedutils/chrt.c:311 +#, c-format +msgid "SCHED_%s min/max priority\t: %d/%d\n" +msgstr "SCHED_%s 最小/最大优先级\t：%d/%d\n" -#: 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:314 +#, c-format +msgid "SCHED_%s not supported?\n" +msgstr "SCHED_%s 不支持？\n" -#: schedutils/chrt.c:325 +#: schedutils/chrt.c:362 #, c-format msgid "failed to set tid %d's policy" msgstr "设置 tid %d 策略失败" -#: schedutils/chrt.c:328 +#: schedutils/chrt.c:367 #, c-format msgid "failed to set pid %d's policy" msgstr "设置 pid %d 的策略失败" +#: schedutils/chrt.c:449 +#, fuzzy +msgid "invalid runtime argument" +msgstr "无效的 时间 参数" + +#: schedutils/chrt.c:452 +#, fuzzy +msgid "invalid period argument" +msgstr "无效的 速度 参数" + +#: schedutils/chrt.c:455 +#, fuzzy +msgid "invalid deadline argument" +msgstr "无效的 磁头数 参数" + +#: schedutils/chrt.c:479 +msgid "invalid priority argument" +msgstr "无效的 优先级 参数" + +#: schedutils/chrt.c:483 +#, fuzzy +msgid "--reset-on-fork option is supported for SCHED_FIFO and SCHED_RR policies only" +msgstr "SCHED_RESET_ON_FORK 标志只支持 SCHED_FIFO 和 SCHED_RR 策略" + +#: schedutils/chrt.c:488 +msgid "--sched-{runtime,deadline,period} options are supported for SCHED_DEADLINE only" +msgstr "" + +#: schedutils/chrt.c:503 +#, fuzzy +msgid "SCHED_DEADLINE is unsupported" +msgstr "SCHED_%s 不支持？\n" + #: schedutils/ionice.c:76 msgid "ioprio_get failed" msgstr "ioprio_get 失败" @@ -10092,9 +10076,6 @@ msgstr "" #: schedutils/ionice.c:110 #, fuzzy -#| msgid "" -#| "\n" -#| "Sets or gets the IO scheduling class and priority of processes.\n" msgid "Show or change the I/O-scheduling class and priority of a process.\n" msgstr "" "\n" @@ -10279,146 +10260,156 @@ msgstr "解析 CPU 列表失败：%s" msgid "failed to parse CPU mask: %s" msgstr "解析 CPU 掩码失败：%s" -#: sys-utils/blkdiscard.c:56 +#: sys-utils/blkdiscard.c:69 +#, fuzzy, c-format +msgid "%s: Zero-filled %<PRIu64> bytes from the offset %<PRIu64>\n" +msgstr "%1$s：已忽略从偏移 %3$<PRIu64> 位置开始的 %2$<PRIu64> 个字节\n" + +#: sys-utils/blkdiscard.c:74 #, c-format msgid "%s: Discarded %<PRIu64> bytes from the offset %<PRIu64>\n" msgstr "%1$s：已忽略从偏移 %3$<PRIu64> 位置开始的 %2$<PRIu64> 个字节\n" -#: sys-utils/blkdiscard.c:66 +#: sys-utils/blkdiscard.c:87 msgid "Discard the content of sectors on a device.\n" msgstr "" -#: sys-utils/blkdiscard.c:69 +#: sys-utils/blkdiscard.c:90 #, fuzzy -#| msgid "" -#| " -o, --offset <num> offset in bytes to discard from\n" -#| " -l, --length <num> length of bytes to discard from the offset\n" -#| " -s, --secure perform secure discard\n" -#| " -v, --verbose print aligned length and offset\n" -msgid "" -" -o, --offset <num> offset in bytes to discard from\n" -" -l, --length <num> length of bytes to discard from the offset\n" -" -p, --step <num> size of the discard iterations within the offset\n" -" -s, --secure perform secure discard\n" -" -v, --verbose print aligned length and offset\n" -msgstr "" -" -o, --offset <数字> 要忽略部分的字节偏移量\n" -" -l, --length <数字> 从偏移位置开始要忽略的字节长度\n" -" -s, --secure 执行安全忽略\n" -" -v, --verbose 打印对齐的长度和偏移\n" - -#: sys-utils/blkdiscard.c:124 sys-utils/fstrim.c:324 sys-utils/losetup.c:547 +msgid " -o, --offset <num> offset in bytes to discard from\n" +msgstr " -o, --offset <数字> 开始丢弃的偏移量(字节)\n" + +#: sys-utils/blkdiscard.c:91 +#, fuzzy +msgid " -l, --length <num> length of bytes to discard from the offset\n" +msgstr " -l, --length <数字> 要丢弃的字符数\n" + +#: sys-utils/blkdiscard.c:92 +#, fuzzy +msgid " -p, --step <num> size of the discard iterations within the offset\n" +msgstr " -o, --offset <数字> 范围操作的偏移量(字节数)\n" + +#: sys-utils/blkdiscard.c:93 +#, fuzzy +msgid " -s, --secure perform secure discard\n" +msgstr " --securebits <位> 设置安全位\n" + +#: sys-utils/blkdiscard.c:94 +#, fuzzy +msgid " -z, --zeroout zero-fill rather than discard\n" +msgstr " -n --nonblock 失败而不等待\n" + +#: sys-utils/blkdiscard.c:95 +#, fuzzy +msgid " -v, --verbose print aligned length and offset\n" +msgstr " -v, --verbose 解释正在进行的操作\n" + +#: sys-utils/blkdiscard.c:150 sys-utils/fstrim.c:324 sys-utils/losetup.c:557 #: text-utils/hexdump.c:124 msgid "failed to parse offset" msgstr "解析偏移失败" -#: sys-utils/blkdiscard.c:128 +#: sys-utils/blkdiscard.c:154 #, fuzzy -#| msgid "failed to parse size" msgid "failed to parse step" msgstr "解析大小失败" -#: sys-utils/blkdiscard.c:143 sys-utils/zramctl.c:616 sys-utils/zramctl.c:641 +#: sys-utils/blkdiscard.c:172 sys-utils/zramctl.c:625 sys-utils/zramctl.c:650 msgid "no device specified" msgstr "未指定设备" -#: sys-utils/blkdiscard.c:148 sys-utils/fallocate.c:351 +#: sys-utils/blkdiscard.c:177 sys-utils/fallocate.c:351 #: sys-utils/fsfreeze.c:122 sys-utils/fstrim.c:346 msgid "unexpected number of arguments" msgstr "参数数量异常" -#: sys-utils/blkdiscard.c:162 +#: sys-utils/blkdiscard.c:191 #, c-format msgid "%s: BLKGETSIZE64 ioctl failed" msgstr "%s：BLKGETSIZE64 ioctl 失败" -#: sys-utils/blkdiscard.c:164 +#: sys-utils/blkdiscard.c:193 #, c-format msgid "%s: BLKSSZGET ioctl failed" msgstr "%s：BLKSSZGET ioctl 失败" -#: sys-utils/blkdiscard.c:168 +#: sys-utils/blkdiscard.c:197 #, c-format msgid "%s: offset %<PRIu64> is not aligned to sector size %i" msgstr "" -#: sys-utils/blkdiscard.c:173 +#: sys-utils/blkdiscard.c:202 #, c-format msgid "%s: offset is greater than device size" msgstr "%s：偏移量超过设备大小" -#: sys-utils/blkdiscard.c:182 +#: sys-utils/blkdiscard.c:211 #, c-format msgid "%s: length %<PRIu64> is not aligned to sector size %i" msgstr "" -#: sys-utils/blkdiscard.c:194 +#: sys-utils/blkdiscard.c:224 +#, fuzzy, c-format +msgid "%s: BLKZEROOUT ioctl failed" +msgstr "%s：BLKSSZGET ioctl 失败" + +#: sys-utils/blkdiscard.c:228 #, c-format msgid "%s: BLKSECDISCARD ioctl failed" msgstr "%s：BLKSECDISCARD ioctl 失败" -#: sys-utils/blkdiscard.c:197 +#: sys-utils/blkdiscard.c:232 #, c-format msgid "%s: BLKDISCARD ioctl failed" msgstr "%s：BLKDISCARD ioctl 失败" #: sys-utils/chcpu.c:87 sys-utils/chcpu.c:179 #, fuzzy, c-format -#| msgid "CPU %d does not exist" msgid "CPU %u does not exist" msgstr "CPU %d 不存在" #: sys-utils/chcpu.c:92 #, fuzzy, c-format -#| msgid "CPU %d is not hot pluggable" msgid "CPU %u is not hot pluggable" msgstr "CPU %d 不可热插拔" #: sys-utils/chcpu.c:98 #, fuzzy, c-format -#| msgid "CPU %d is already enabled\n" msgid "CPU %u is already enabled\n" msgstr "CPU %d 已经启用\n" #: sys-utils/chcpu.c:102 #, fuzzy, c-format -#| msgid "CPU %d is already disabled\n" msgid "CPU %u is already disabled\n" msgstr "CPU %d 已经禁用\n" #: sys-utils/chcpu.c:110 #, fuzzy, c-format -#| msgid "CPU %d enable failed (CPU is deconfigured)" msgid "CPU %u enable failed (CPU is deconfigured)" msgstr "启用 CPU %d 失败(CPU 已解除配置)" #: sys-utils/chcpu.c:113 #, fuzzy, c-format -#| msgid "CPU %d enable failed" msgid "CPU %u enable failed" msgstr "启用 CPU %d 失败" #: sys-utils/chcpu.c:116 #, fuzzy, c-format -#| msgid "CPU %d enabled\n" msgid "CPU %u enabled\n" msgstr "已启用 CPU %d\n" #: sys-utils/chcpu.c:119 #, fuzzy, c-format -#| msgid "CPU %d disable failed (last enabled CPU)" msgid "CPU %u disable failed (last enabled CPU)" msgstr "禁用 CPU %d 失败(上次启用的 CPU)" #: sys-utils/chcpu.c:125 #, fuzzy, c-format -#| msgid "CPU %d disable failed" msgid "CPU %u disable failed" msgstr "禁用 CPU %d 失败" #: sys-utils/chcpu.c:128 #, fuzzy, c-format -#| msgid "CPU %d disabled\n" msgid "CPU %u disabled\n" msgstr "CPU %d 已禁用\n" @@ -10459,49 +10450,41 @@ msgstr "成功设置了竖直分派模式\n" #: sys-utils/chcpu.c:184 #, fuzzy, c-format -#| msgid "CPU %d is not configurable" msgid "CPU %u is not configurable" msgstr "CPU %d 是不可配置的" #: sys-utils/chcpu.c:190 #, fuzzy, c-format -#| msgid "CPU %d is already configured\n" msgid "CPU %u is already configured\n" msgstr "CPU %d 已经配置\n" #: sys-utils/chcpu.c:194 #, fuzzy, c-format -#| msgid "CPU %d is already deconfigured\n" msgid "CPU %u is already deconfigured\n" msgstr "CPU %d 已经解除配置\n" #: sys-utils/chcpu.c:199 #, fuzzy, c-format -#| msgid "CPU %d deconfigure failed (CPU is enabled)" msgid "CPU %u deconfigure failed (CPU is enabled)" msgstr "CPU %d 解除配置失败(CPU 已启用)" #: sys-utils/chcpu.c:206 #, fuzzy, c-format -#| msgid "CPU %d configure failed" msgid "CPU %u configure failed" msgstr "CPU %d 配置失败" #: sys-utils/chcpu.c:209 #, fuzzy, c-format -#| msgid "CPU %d configured\n" msgid "CPU %u configured\n" msgstr "CPU %d 已配置\n" #: sys-utils/chcpu.c:213 #, fuzzy, c-format -#| msgid "CPU %d deconfigure failed" msgid "CPU %u deconfigure failed" msgstr "CPU %d 解除配置失败" #: sys-utils/chcpu.c:216 #, fuzzy, c-format -#| msgid "CPU %d deconfigured\n" msgid "CPU %u deconfigured\n" msgstr "CPU %d 已解除配置\n" @@ -10554,16 +10537,34 @@ msgstr "" msgid "unsupported argument: %s" msgstr "不支持的参数：%s" -#: sys-utils/ctrlaltdel.c:21 +#: sys-utils/ctrlaltdel.c:27 #, fuzzy, c-format -#| msgid " %s <hard|soft>\n" msgid " %s hard|soft\n" msgstr " %s <hard|soft>\n" -#: sys-utils/ctrlaltdel.c:60 +#: sys-utils/ctrlaltdel.c:30 +#, c-format +msgid "Set the function of the Ctrl-Alt-Del combination.\n" +msgstr "" + +#: sys-utils/ctrlaltdel.c:51 +msgid "implicit" +msgstr "" + +#: sys-utils/ctrlaltdel.c:52 +#, fuzzy, c-format +msgid "unexpected value in %s: %ju" +msgstr "%s 上的文件结尾异常" + +#: sys-utils/ctrlaltdel.c:63 msgid "You must be root to set the Ctrl-Alt-Del behavior" msgstr "只有 root 用户才能设置 Ctrl-Alt-Del 行为" +#: sys-utils/ctrlaltdel.c:71 sys-utils/ipcrm.c:392 sys-utils/ipcrm.c:416 +#, c-format +msgid "unknown argument: %s" +msgstr "未知参数：%s" + #: sys-utils/dmesg.c:110 msgid "system is unusable" msgstr "系统无法使用" @@ -10729,7 +10730,8 @@ msgid " -e, --reltime show local time and time delta in readable f msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n" #: sys-utils/dmesg.c:292 -msgid " -T, --ctime show human readable timestamp\n" +#, fuzzy +msgid " -T, --ctime show human readable timestamp (may be inaccurate!)\n" msgstr " -T, --ctime 显示易读的时间戳\n" #: sys-utils/dmesg.c:293 @@ -10787,25 +10789,24 @@ msgstr "未知设施“%s”" msgid "cannot mmap: %s" msgstr "无法 mmap：%s" -#: sys-utils/dmesg.c:1356 +#: sys-utils/dmesg.c:1357 msgid "invalid buffer size argument" msgstr "无效的 缓冲区大小 参数" -#: sys-utils/dmesg.c:1411 +#: sys-utils/dmesg.c:1412 msgid "--show-delta is ignored when used together with iso8601 time format" msgstr "--show-delta 与 iso8601 时间格式共用时将忽略" -#: sys-utils/dmesg.c:1434 +#: sys-utils/dmesg.c:1435 #, fuzzy -#| msgid "--raw could be used together with --level or --facility only when read messages from /dev/kmsg" 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:1444 +#: sys-utils/dmesg.c:1445 msgid "read kernel buffer failed" msgstr "读取内核缓冲区失败" -#: sys-utils/dmesg.c:1463 +#: sys-utils/dmesg.c:1464 msgid "klogctl failed" msgstr "klogctl 失败" @@ -10816,7 +10817,6 @@ msgstr " %s [选项] [<设备>|<挂臷点>]\n" #: sys-utils/eject.c:137 #, fuzzy -#| msgid "removable device" msgid "Eject removable media.\n" msgstr "可移动设备" @@ -10882,7 +10882,6 @@ msgstr "CD-ROM 自动弹出命令失败" #: sys-utils/eject.c:340 #, fuzzy -#| msgid "CD-ROM drive is not ready" msgid "CD-ROM door lock is not supported" msgstr "CD-ROM 驱动器未就绪" @@ -11016,7 +11015,7 @@ msgstr "默认设备：“%s”" msgid "using default device `%s'" msgstr "使用默认设备“%s”" -#: sys-utils/eject.c:886 sys-utils/rtcwake.c:376 +#: sys-utils/eject.c:886 sys-utils/rtcwake.c:375 #, c-format msgid "%s: unable to find device" msgstr "%s：找不到设备" @@ -11186,7 +11185,8 @@ msgid " -z, --zero-range zero and ensure allocation of a range\n" msgstr " -z, --zero-range 清零并保证分配某个范围\n" #: sys-utils/fallocate.c:126 -msgid "keep size mode (-n option) unsupported" +#, fuzzy +msgid "fallocate failed: keep size mode is unsupported" msgstr "不支持保持大小模式(-n 选项)" #: sys-utils/fallocate.c:127 @@ -11221,10 +11221,6 @@ msgstr "指定的偏移值无效" #: sys-utils/flock.c:53 #, fuzzy, c-format -#| msgid "" -#| " %1$s [options] <file|directory> <command> [<arguments>...]\n" -#| " %1$s [options] <file|directory> -c <command>\n" -#| " %1$s [options] <file descriptor number>\n" msgid "" " %1$s [options] <file>|<directory> <command> [<argument>...]\n" " %1$s [options] <file>|<directory> -c <command>\n" @@ -11240,55 +11236,46 @@ msgstr "" #: sys-utils/flock.c:62 #, fuzzy -#| msgid " -s --shared get a shared lock\n" msgid " -s, --shared get a shared lock\n" msgstr " -s --shared 获得共享锁\n" #: sys-utils/flock.c:63 #, fuzzy -#| msgid " -x --exclusive get an exclusive lock (default)\n" msgid " -x, --exclusive get an exclusive lock (default)\n" msgstr " -x --exclusive 获得排他锁(默认)\n" #: sys-utils/flock.c:64 #, fuzzy -#| msgid " -u --unlock remove a lock\n" msgid " -u, --unlock remove a lock\n" msgstr " -u --unlock 移除锁\n" #: sys-utils/flock.c:65 #, fuzzy -#| msgid " -n --nonblock fail rather than wait\n" msgid " -n, --nonblock fail rather than wait\n" msgstr " -n --nonblock 失败而不等待\n" #: sys-utils/flock.c:66 #, fuzzy -#| msgid " -w --timeout <secs> wait for a limited amount of time\n" msgid " -w, --timeout <secs> wait for a limited amount of time\n" msgstr " -w --timeout <秒数> 等待一段时间\n" #: sys-utils/flock.c:67 #, fuzzy -#| msgid " -E --conflict-exit-code <number> exit code after conflict or timeout\n" msgid " -E, --conflict-exit-code <number> exit code after conflict or timeout\n" msgstr " -E --conflict-exit-code <数字> 冲突或超时后的退出代码\n" #: sys-utils/flock.c:68 #, fuzzy -#| msgid " -o --close close file descriptor before running command\n" msgid " -o, --close close file descriptor before running command\n" msgstr " -o --close 在运行命令前关闭文件描述符\n" #: sys-utils/flock.c:69 #, fuzzy -#| msgid " -c --command <command> run a single command string through the shell\n" msgid " -c, --command <command> run a single command string through the shell\n" msgstr " -c --command <命令> 通过 shell 运行一条命令\n" #: sys-utils/flock.c:70 #, fuzzy -#| msgid " -v, --verbose be more verbose\n" msgid " --verbose increase verbosity\n" msgstr " -v, --verbose 更详尽\n" @@ -11312,7 +11299,6 @@ msgstr "%s 需要惟一的命令行参数" #: sys-utils/flock.c:236 #, fuzzy -#| msgid "flag description" msgid "bad file descriptor" msgstr "标志描述" @@ -11322,13 +11308,11 @@ msgstr "需要文件描述符、文件或目录" #: sys-utils/flock.c:253 #, fuzzy -#| msgid "cannot set group id" msgid "cannot set up timer" msgstr "无法设置 组 id" #: sys-utils/flock.c:263 #, fuzzy -#| msgid "failed to set data" msgid "failed to get lock" msgstr "设置数据失败" @@ -11343,7 +11327,6 @@ msgstr "" #: sys-utils/flock.c:322 #, fuzzy, c-format -#| msgid "suspend mode: off; executing %s\n" msgid "%s: executing %s\n" msgstr "挂起模式：关；正在执行 %s\n" @@ -11399,7 +11382,7 @@ msgstr "%s：FITRIM ioctl 失败" msgid "%s: %s (%<PRIu64> bytes) trimmed\n" msgstr "%s：%s (%<PRIu64> 字节) 已修剪\n" -#: sys-utils/fstrim.c:203 sys-utils/swapon.c:685 sys-utils/umount.c:330 +#: sys-utils/fstrim.c:203 sys-utils/swapon.c:689 sys-utils/umount.c:330 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" @@ -11451,15 +11434,15 @@ msgstr "%s：不支持丢弃操作" msgid "Assuming hardware clock is kept in %s time.\n" msgstr "将假设硬件时钟保持为 %s 时间。\n" -#: sys-utils/hwclock.c:245 sys-utils/hwclock.c:335 +#: sys-utils/hwclock.c:245 sys-utils/hwclock.c:332 msgid "UTC" msgstr "UTC" -#: sys-utils/hwclock.c:245 sys-utils/hwclock.c:334 +#: sys-utils/hwclock.c:245 sys-utils/hwclock.c:331 msgid "local" msgstr "当地" -#: sys-utils/hwclock.c:319 +#: sys-utils/hwclock.c:316 msgid "" "Warning: unrecognized third line in adjtime file\n" "(Expected: `UTC' or `LOCAL' or nothing.)" @@ -11467,109 +11450,108 @@ msgstr "" "警告：adjtime 文件第三行无法识别\n" "(应为：“UTC”或“LOCAL”或空)" -#: sys-utils/hwclock.c:328 +#: sys-utils/hwclock.c:325 #, c-format msgid "Last drift adjustment done at %ld seconds after 1969\n" msgstr "上次漂移调整完成于1969(年)后 %ld 秒\n" -#: sys-utils/hwclock.c:330 +#: sys-utils/hwclock.c:327 #, c-format msgid "Last calibration done at %ld seconds after 1969\n" msgstr "上次校准完成于1969(年)后 %ld 秒\n" -#: sys-utils/hwclock.c:332 +#: sys-utils/hwclock.c:329 #, c-format msgid "Hardware clock is on %s time\n" msgstr "硬件时钟为 %s 时间\n" -#: sys-utils/hwclock.c:359 +#: sys-utils/hwclock.c:356 #, c-format msgid "Waiting for clock tick...\n" msgstr "正在等等时钟滴答...\n" -#: sys-utils/hwclock.c:365 +#: sys-utils/hwclock.c:362 #, c-format msgid "...synchronization failed\n" msgstr "...同步失败\n" -#: sys-utils/hwclock.c:367 +#: sys-utils/hwclock.c:364 #, c-format msgid "...got clock tick\n" msgstr "...已获取时钟滴答\n" -#: sys-utils/hwclock.c:423 +#: sys-utils/hwclock.c:420 #, 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:432 +#: sys-utils/hwclock.c:429 #, 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:466 +#: sys-utils/hwclock.c:463 #, 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:494 +#: sys-utils/hwclock.c:491 #, 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:500 +#: sys-utils/hwclock.c:497 #, c-format msgid "Clock not changed - testing only.\n" msgstr "时钟未更改 - 纯测试。\n" -#: sys-utils/hwclock.c:604 +#: sys-utils/hwclock.c:601 #, c-format msgid "sleeping ~%d usec\n" msgstr "将睡眠 ~%d 微秒\n" -#: sys-utils/hwclock.c:615 -#, c-format -msgid "time jumped backward %.6f seconds to %ld.%06d - retargeting\n" +#: sys-utils/hwclock.c:612 +#, fuzzy, c-format +msgid "time jumped backward %.6f seconds to %ld.%06ld - retargeting\n" msgstr "时间回溯 %.6f 秒到了 %ld.%06d - 将重新定位\n" -#: sys-utils/hwclock.c:623 -#, c-format -msgid "%ld.%06d < %ld.%06d (%.6f)\n" +#: sys-utils/hwclock.c:620 +#, fuzzy, c-format +msgid "%ld.%06ld < %ld.%06ld (%.6f)\n" msgstr "%ld.%06d < %ld.%06d (%.6f)\n" -#: sys-utils/hwclock.c:639 +#: sys-utils/hwclock.c:636 #, fuzzy, c-format -msgid "missed it - %ld.%06d is too far past %ld.%06d (%.6f > %.6f)\n" +msgid "missed it - %ld.%06ld is too far past %ld.%06ld (%.6f > %.6f)\n" msgstr "错过了 - %ld.%06d 落后 %ld.%06d 太久(%.6f > %.6f)\n" -#: sys-utils/hwclock.c:667 -#, c-format +#: sys-utils/hwclock.c:664 +#, fuzzy, c-format msgid "" -"%ld.%06d is close enough to %ld.%06d (%.6f < %.6f)\n" -"Set RTC to %ld (%ld + %d; refsystime = %ld.%06d)\n" +"%ld.%06ld is close enough to %ld.%06ld (%.6f < %.6f)\n" +"Set RTC to %ld (%ld + %d; refsystime = %ld.%06ld)\n" msgstr "" "%ld.%06d 距 %ld.%06d 太近(%.6f < %.6f)\n" "请将 RTC 设为 %ld (%ld + %d; refsystime = %ld.%06d)\n" -#: sys-utils/hwclock.c:689 +#: sys-utils/hwclock.c:686 msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095)." msgstr "硬件时钟寄存器包含的值无效(如一个月的第 50 天)或超出了程序能处理的范围(如2095年)。" -#: sys-utils/hwclock.c:699 -#, fuzzy, c-format -#| msgid "%s %.6f seconds\n" -msgid "%s .%06d seconds\n" -msgstr "%s %.6f 秒\n" +#: sys-utils/hwclock.c:696 +#, c-format +msgid "%4d-%.2d-%.2d %02d:%02d:%02d.%06ld%+02d:%02d\n" +msgstr "" -#: sys-utils/hwclock.c:730 +#: sys-utils/hwclock.c:729 msgid "No --date option specified." msgstr "未指定 --date 选项。" -#: sys-utils/hwclock.c:736 +#: sys-utils/hwclock.c:735 msgid "--date argument too long" msgstr "--date 的参数过长" -#: sys-utils/hwclock.c:743 +#: sys-utils/hwclock.c:742 msgid "" "The value of the --date option is not a valid date.\n" "In particular, it contains quotation marks." @@ -11577,21 +11559,21 @@ msgstr "" "--date 选项的参数不是有效的日期。\n" "具体说，它包含了引号。" -#: sys-utils/hwclock.c:751 +#: sys-utils/hwclock.c:750 #, c-format msgid "Issuing date command: %s\n" msgstr "正在发出 date 命令：%s\n" -#: sys-utils/hwclock.c:755 +#: sys-utils/hwclock.c:754 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed" msgstr "无法在 /bin/sh shell 中运行“date”程序。popen() 失败" -#: sys-utils/hwclock.c:763 +#: sys-utils/hwclock.c:762 #, c-format msgid "response from date command = %s\n" msgstr "date 命令的响应为 %s\n" -#: sys-utils/hwclock.c:765 +#: sys-utils/hwclock.c:764 #, c-format msgid "" "The date command issued by %s returned unexpected results.\n" @@ -11606,7 +11588,7 @@ msgstr "" "响应为：\n" " %s" -#: sys-utils/hwclock.c:776 +#: sys-utils/hwclock.c:775 #, c-format msgid "" "The date command issued by %s returned something other than an integer where the converted time value was expected.\n" @@ -11621,65 +11603,64 @@ msgstr "" "响应为：\n" " %s\n" -#: sys-utils/hwclock.c:788 +#: sys-utils/hwclock.c:787 #, c-format msgid "date string %s equates to %ld seconds since 1969.\n" msgstr "数据字符串 %s 等价于 1969年后 %ld 秒。\n" -#: sys-utils/hwclock.c:826 +#: sys-utils/hwclock.c:825 msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it." msgstr "硬件时钟不包含有效时间，因此无法从它来设置系统时间。" -#: sys-utils/hwclock.c:845 sys-utils/hwclock.c:932 +#: sys-utils/hwclock.c:844 sys-utils/hwclock.c:931 #, c-format msgid "Calling settimeofday:\n" msgstr "正在调用 settimeofday：\n" -#: sys-utils/hwclock.c:846 sys-utils/hwclock.c:934 +#: sys-utils/hwclock.c:845 sys-utils/hwclock.c:933 #, 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:848 sys-utils/hwclock.c:936 +#: sys-utils/hwclock.c:847 sys-utils/hwclock.c:935 #, c-format msgid "\ttz.tz_minuteswest = %d\n" msgstr "\ttz.tz_minuteswest = %d\n" -#: sys-utils/hwclock.c:852 sys-utils/hwclock.c:940 +#: sys-utils/hwclock.c:851 sys-utils/hwclock.c:939 #, c-format msgid "Not setting system clock because running in test mode.\n" msgstr "将不设置系统时钟，因为正以测试方式运行。\n" -#: sys-utils/hwclock.c:868 sys-utils/hwclock.c:964 +#: sys-utils/hwclock.c:867 sys-utils/hwclock.c:963 msgid "Must be superuser to set system clock." msgstr "只能以超级用户身份来设置系统时钟。" -#: sys-utils/hwclock.c:871 sys-utils/hwclock.c:967 +#: sys-utils/hwclock.c:870 sys-utils/hwclock.c:966 msgid "settimeofday() failed" msgstr "settimeofday() 失败" -#: sys-utils/hwclock.c:907 +#: sys-utils/hwclock.c:906 #, c-format msgid "Current system time: %ld = %s\n" msgstr "当前系统时间：%ld = %s\n" -#: sys-utils/hwclock.c:933 +#: sys-utils/hwclock.c:932 #, c-format msgid "\tUTC: %s\n" msgstr "\tUTC：%s\n" -#: sys-utils/hwclock.c:998 +#: sys-utils/hwclock.c:997 #, fuzzy, c-format -#| msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n" msgid "Not adjusting drift factor because the --update-drift option was not used.\n" msgstr "将不调整漂移系数，因为之前硬件时钟包含垃圾内容。\n" -#: sys-utils/hwclock.c:1002 +#: sys-utils/hwclock.c:1001 #, c-format msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n" msgstr "将不调整漂移系数，因为之前硬件时钟包含垃圾内容。\n" -#: sys-utils/hwclock.c:1007 +#: sys-utils/hwclock.c:1006 #, c-format msgid "" "Not adjusting drift factor because last calibration time is zero,\n" @@ -11688,13 +11669,12 @@ msgstr "" "将不调整漂移系数，因为上次校准时间为零，\n" "历史有问题；需要启动校准。\n" -#: sys-utils/hwclock.c:1013 +#: sys-utils/hwclock.c:1012 #, fuzzy, c-format -#| msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n" msgid "Not adjusting drift factor because it has been less than four hours since the last calibration.\n" msgstr "将不调整漂移系数，因为从上次校准还不到一天。\n" -#: sys-utils/hwclock.c:1051 +#: sys-utils/hwclock.c:1050 #, c-format msgid "" "Clock drift factor was calculated as %f seconds/day.\n" @@ -11703,34 +11683,31 @@ msgstr "" "时钟漂移系数会按 %f 秒/天计算。\n" "系数过大，将重置为 0。\n" -#: sys-utils/hwclock.c:1058 +#: sys-utils/hwclock.c:1057 #, fuzzy, c-format -#| msgid "" -#| "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n" -#| "Adjusting drift factor by %f seconds/day\n" msgid "" "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:1101 +#: sys-utils/hwclock.c:1100 #, c-format msgid "Time since last adjustment is %d second\n" msgid_plural "Time since last adjustment is %d seconds\n" msgstr[0] "距上次调整的时间为 %d 秒\n" -#: sys-utils/hwclock.c:1105 +#: sys-utils/hwclock.c:1104 #, c-format -msgid "Calculated Hardware Clock drift is %ld.%06d seconds\n" +msgid "Calculated Hardware Clock drift is %ld.%06ld seconds\n" msgstr "" -#: sys-utils/hwclock.c:1135 +#: sys-utils/hwclock.c:1134 #, c-format msgid "Not updating adjtime file because of testing mode.\n" msgstr "将不更新 adjtime 文件，因为正以测试方式运行。\n" -#: sys-utils/hwclock.c:1136 +#: sys-utils/hwclock.c:1135 #, c-format msgid "" "Would have written the following to %s:\n" @@ -11739,55 +11716,55 @@ msgstr "" "若执行，将向 %s 写入以下内容：\n" "%s" -#: sys-utils/hwclock.c:1145 +#: sys-utils/hwclock.c:1144 #, c-format msgid "Could not open file with the clock adjustment parameters in it (%s) for writing" msgstr "无法打开包含时钟调整参数(%s)的文件来写入" -#: sys-utils/hwclock.c:1151 sys-utils/hwclock.c:1158 +#: sys-utils/hwclock.c:1150 sys-utils/hwclock.c:1157 #, c-format msgid "Could not update file with the clock adjustment parameters (%s) in it" msgstr "无法更新包含时钟调整参数(%s)的文件" -#: sys-utils/hwclock.c:1166 +#: sys-utils/hwclock.c:1165 msgid "Drift adjustment parameters not updated." msgstr "漂移调整参数未更新。" -#: sys-utils/hwclock.c:1202 +#: sys-utils/hwclock.c:1201 msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it." msgstr "硬件时间不包含有效时间，程序无法调整它。" -#: sys-utils/hwclock.c:1210 +#: sys-utils/hwclock.c:1209 #, c-format msgid "Not setting clock because last adjustment time is zero, so history is bad.\n" msgstr "将不设置时钟，因为上次调整时间为零，历史有误。\n" -#: sys-utils/hwclock.c:1214 +#: sys-utils/hwclock.c:1213 #, c-format msgid "Not setting clock because drift factor %f is far too high.\n" msgstr "将不设置时钟，因为上次漂移系数 %f 过高。\n" -#: sys-utils/hwclock.c:1243 +#: sys-utils/hwclock.c:1242 #, c-format msgid "No usable clock interface found.\n" msgstr "未找到可用的时钟接口。\n" -#: sys-utils/hwclock.c:1367 +#: sys-utils/hwclock.c:1366 #, c-format msgid "Needed adjustment is less than one second, so not setting clock.\n" msgstr "需要的调整不到一秒，将不设置时钟。\n" -#: sys-utils/hwclock.c:1390 sys-utils/hwclock.c:1396 +#: sys-utils/hwclock.c:1389 sys-utils/hwclock.c:1395 #, c-format msgid "Unable to set system clock.\n" msgstr "无法设置系统时钟。\n" -#: sys-utils/hwclock.c:1404 +#: sys-utils/hwclock.c:1403 #, 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:1433 +#: sys-utils/hwclock.c:1432 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" @@ -11797,38 +11774,38 @@ msgstr "" "这版 hwclock 程序不是为 Alpha 计算机编译的(因此目前也不打算在 Alpha\n" " 计算机上运行)。未执行任何操作。" -#: sys-utils/hwclock.c:1450 +#: sys-utils/hwclock.c:1449 msgid "Unable to get the epoch value from the kernel." msgstr "无法从内核获取纪元(epoch)值。" -#: sys-utils/hwclock.c:1452 +#: sys-utils/hwclock.c:1451 #, c-format msgid "Kernel is assuming an epoch value of %lu\n" msgstr "内核假设纪元(epoch)值为 %lu\n" -#: sys-utils/hwclock.c:1457 +#: sys-utils/hwclock.c:1456 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:1461 -#, c-format -msgid "Not setting the epoch to %d - testing only.\n" +#: sys-utils/hwclock.c:1460 +#, fuzzy, c-format +msgid "Not setting the epoch to %lu - testing only.\n" msgstr "不会将纪元(epoch)设置为 %d - 纯测试。\n" -#: sys-utils/hwclock.c:1465 +#: sys-utils/hwclock.c:1464 #, c-format msgid "Unable to set the epoch value in the kernel.\n" msgstr "无法设置内核中的纪元(epoch)值。\n" -#: sys-utils/hwclock.c:1558 +#: sys-utils/hwclock.c:1557 msgid " hwclock [function] [option...]\n" msgstr " hwclock [功能] [选项...]\n" -#: sys-utils/hwclock.c:1561 +#: sys-utils/hwclock.c:1560 msgid "Query or set the hardware clock.\n" msgstr "" -#: sys-utils/hwclock.c:1563 +#: sys-utils/hwclock.c:1562 msgid "" "\n" "Functions:\n" @@ -11836,12 +11813,8 @@ msgstr "" "\n" "功能：\n" -#: sys-utils/hwclock.c:1564 +#: sys-utils/hwclock.c:1563 #, fuzzy -#| msgid "" -#| " -h, --help show this help text and exit\n" -#| " -r, --show read hardware clock and print result\n" -#| " --set set the RTC to the time given with --date\n" msgid "" " -h, --help show this help text and exit\n" " -r, --show read hardware clock and print result\n" @@ -11852,7 +11825,7 @@ msgstr "" " -r, --show 读取硬件时钟并打印结果\n" " --set 将 RTC 设置为 --date 指定的时间\n" -#: sys-utils/hwclock.c:1568 +#: sys-utils/hwclock.c:1567 msgid "" " -s, --hctosys set the system time from the hardware clock\n" " -w, --systohc set the hardware clock from the current system time\n" @@ -11866,11 +11839,11 @@ msgstr "" " --adjust 根据自上次时钟设置或调整后的系统漂移\n" " 来调整 RTC\n" -#: sys-utils/hwclock.c:1573 +#: sys-utils/hwclock.c:1572 msgid " -c, --compare periodically compare the system clock with the CMOS clock\n" msgstr " -c, --compare 定期将系统时钟与 CMOS 时钟相比较\n" -#: sys-utils/hwclock.c:1575 +#: sys-utils/hwclock.c:1574 msgid "" " --getepoch print out the kernel's hardware clock epoch value\n" " --setepoch set the kernel's hardware clock epoch value to the \n" @@ -11880,7 +11853,7 @@ msgstr "" " --setepoch 将内核的硬件时钟纪元(epoch)值设置为\n" " --epoch 选项指定的值\n" -#: sys-utils/hwclock.c:1579 +#: sys-utils/hwclock.c:1578 msgid "" " --predict predict RTC reading at time given with --date\n" " -V, --version display version information and exit\n" @@ -11888,7 +11861,7 @@ msgstr "" " --predict 预测 --date 选项所指定时刻读取到的 RTC 值\n" " -V, --version 显示版本信息并退出\n" -#: sys-utils/hwclock.c:1583 +#: sys-utils/hwclock.c:1582 msgid "" " -u, --utc the hardware clock is kept in UTC\n" " --localtime the hardware clock is kept in local time\n" @@ -11896,11 +11869,11 @@ msgstr "" " -u, --utc 硬件时钟保持为 UTC 时间\n" " --localtime 硬件时钟保持为本地时间\n" -#: sys-utils/hwclock.c:1586 +#: sys-utils/hwclock.c:1585 msgid " -f, --rtc <file> special /dev/... file to use instead of default\n" msgstr " -f, --rtc <文件> 代替默认文件的特殊 /dev/... 文件\n" -#: sys-utils/hwclock.c:1589 +#: sys-utils/hwclock.c:1588 #, c-format msgid "" " --directisa access the ISA bus directly instead of %s\n" @@ -11914,13 +11887,8 @@ msgstr "" " --date <时间> 指定要设置的硬件时钟时间\n" " --epoch <年> 指定作为硬件纪元(epoch)值起始的年份\n" -#: sys-utils/hwclock.c:1595 +#: sys-utils/hwclock.c:1594 #, fuzzy, c-format -#| msgid "" -#| " --noadjfile do not access %s; this requires the use of\n" -#| " either --utc or --localtime\n" -#| " --adjfile <file> specifies the path to the adjust file;\n" -#| " the default is %s\n" msgid "" " --update-drift update drift factor in %1$s (requires\n" " --set or --systohc)\n" @@ -11933,7 +11901,7 @@ msgstr "" " --adjfile <文件> 指定调整文件的路径；\n" " 默认为 %s\n" -#: sys-utils/hwclock.c:1601 +#: sys-utils/hwclock.c:1600 msgid "" " --test do not update anything, just show what would happen\n" " -D, --debug debugging mode\n" @@ -11943,7 +11911,7 @@ msgstr "" " -D, --debug 调试模式\n" "\n" -#: sys-utils/hwclock.c:1604 +#: sys-utils/hwclock.c:1603 msgid "" " -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n" " tell hwclock the type of Alpha you have (see hwclock(8))\n" @@ -11953,38 +11921,37 @@ msgstr "" " 告知 hwclock 您使用的 Alpha 类型(参阅 hwclock(8))\n" "\n" -#: sys-utils/hwclock.c:1730 +#: sys-utils/hwclock.c:1729 msgid "Unable to connect to audit system" msgstr "无法连接到审计系统" -#: sys-utils/hwclock.c:1828 +#: sys-utils/hwclock.c:1827 msgid "invalid epoch argument" msgstr "无效的纪元(epoch)参数" -#: sys-utils/hwclock.c:1865 +#: sys-utils/hwclock.c:1864 #, fuzzy -#| msgid "Sorry, only the superuser can change the Hardware Clock." msgid "Sorry, only the superuser can use the Hardware Clock." msgstr "抱歉，只有超级用户才能设置硬件时钟。" -#: sys-utils/hwclock.c:1878 +#: sys-utils/hwclock.c:1877 #, c-format msgid "%s takes no non-option arguments. You supplied %d.\n" msgstr "%s 不接受无选项的参数。您提供了 %d。\n" -#: sys-utils/hwclock.c:1887 +#: sys-utils/hwclock.c:1886 msgid "With --noadjfile, you must specify either --utc or --localtime" msgstr "指定 --noadjfile 时，您必须指定 --utc 或 --localtime" -#: sys-utils/hwclock.c:1900 +#: sys-utils/hwclock.c:1899 msgid "No usable set-to time. Cannot set clock." msgstr "无可用的待设置时间。无法设置时钟。" -#: sys-utils/hwclock.c:1924 +#: sys-utils/hwclock.c:1923 msgid "Cannot access the Hardware Clock via any known method." msgstr "无法通过已知的任何方式访问硬件时钟。" -#: sys-utils/hwclock.c:1927 +#: sys-utils/hwclock.c:1926 msgid "Use the --debug option to see the details of our search for an access method." msgstr "请使用 --debug 选项来观察程序搜索访问方法的详情。" @@ -12020,7 +11987,6 @@ msgstr "cmos_read()：写控制地址 %X 失败" #: sys-utils/hwclock-cmos.c:328 #, fuzzy, c-format -#| msgid "cmos_read(): read data address %X failed" msgid "cmos_read(): read from data address %X failed" msgstr "cmos_read()：读数据地址 %X 失败" @@ -12114,8 +12080,8 @@ msgid "ioctl(RTC_EPOCH_READ) to %s failed" msgstr "对 %s 进行 ioctl(RTC_EPOCH_READ) 失败" #: sys-utils/hwclock-rtc.c:435 -#, c-format -msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n" +#, fuzzy, c-format +msgid "we have read epoch %lu from %s with RTC_EPOCH_READ ioctl.\n" msgstr "我们从 %2$s 通过 ioctl 读取到纪元(epoch)值 %1$ld。\n" #: sys-utils/hwclock-rtc.c:455 @@ -12125,7 +12091,6 @@ msgstr "纪元(epoch)值不能小于 1900。您要求了 %ld" #: sys-utils/hwclock-rtc.c:474 #, fuzzy, c-format -#| msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n" msgid "setting epoch to %lu with RTC_EPOCH_SET ioctl to %s.\n" msgstr "正通过 RTC_EPOCH_SET ioctl 对 %2$s 设置纪元(epoch)值 %1$ld。\n" @@ -12149,7 +12114,6 @@ msgstr " -M, --shmem <尺寸> 创建大小为指定<尺寸>的共享内存 #: sys-utils/ipcmk.c:73 #, fuzzy -#| msgid " -S, --semaphore <nsems> create semaphore array with <nsems> elements\n" msgid " -S, --semaphore <number> create semaphore array with <number> elements\n" msgstr " -S, --semaphore <nsems> 创建包含 <nsems> 个元素的信号量数组\n" @@ -12161,7 +12125,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:566 sys-utils/zramctl.c:556 +#: sys-utils/ipcmk.c:110 sys-utils/losetup.c:581 sys-utils/zramctl.c:565 msgid "failed to parse size" msgstr "解析大小失败" @@ -12198,7 +12162,6 @@ msgstr "信号量 id：%d\n" #: sys-utils/ipcrm.c:50 #, fuzzy, c-format -#| msgid " %s [options] <file>...\n" msgid "" " %1$s [options]\n" " %1$s shm|msg|sem <id>...\n" @@ -12314,112 +12277,106 @@ msgstr "内核未做信号量的相关配置" msgid "kernel not configured for message queues" msgstr "内核未做消息的相关配置" -#: sys-utils/ipcrm.c:392 sys-utils/ipcrm.c:416 -#, c-format -msgid "unknown argument: %s" -msgstr "未知参数：%s" - -#: sys-utils/ipcs.c:53 +#: sys-utils/ipcs.c:52 #, c-format msgid "" " %1$s [resource-option...] [output-option]\n" " %1$s -m|-q|-s -i <id>\n" msgstr "" -#: sys-utils/ipcs.c:57 sys-utils/lsipc.c:280 +#: sys-utils/ipcs.c:56 sys-utils/lsipc.c:279 msgid "Show information on IPC facilities.\n" msgstr "" -#: sys-utils/ipcs.c:60 +#: sys-utils/ipcs.c:59 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/lsipc.c:283 +#: sys-utils/ipcs.c:64 sys-utils/lsipc.c:282 msgid "Resource options:\n" msgstr "资源选项：\n" -#: sys-utils/ipcs.c:66 sys-utils/lsipc.c:284 +#: sys-utils/ipcs.c:65 sys-utils/lsipc.c:283 msgid " -m, --shmems shared memory segments\n" msgstr " -m, --shmems 共享内存段\n" -#: sys-utils/ipcs.c:67 sys-utils/lsipc.c:285 +#: sys-utils/ipcs.c:66 sys-utils/lsipc.c:284 msgid " -q, --queues message queues\n" msgstr " -q, --queues 消息队列\n" -#: sys-utils/ipcs.c:68 sys-utils/lsipc.c:286 +#: sys-utils/ipcs.c:67 sys-utils/lsipc.c:285 msgid " -s, --semaphores semaphores\n" msgstr " -s, --semaphores 信号量\n" -#: sys-utils/ipcs.c:69 +#: sys-utils/ipcs.c:68 msgid " -a, --all all (default)\n" msgstr " -a, --all 全部(默认)\n" -#: sys-utils/ipcs.c:72 +#: sys-utils/ipcs.c:71 #, fuzzy -#| msgid "Output format:\n" msgid "Output options:\n" msgstr "输出格式：\n" -#: sys-utils/ipcs.c:73 +#: sys-utils/ipcs.c:72 msgid " -t, --time show attach, detach and change times\n" msgstr " -t, --time 显示附加、脱离和更改时间\n" -#: sys-utils/ipcs.c:74 +#: sys-utils/ipcs.c:73 msgid " -p, --pid show PIDs of creator and last operator\n" msgstr " -p, --pid 显示创建者和最后操作者的 PID\n" -#: sys-utils/ipcs.c:75 +#: sys-utils/ipcs.c:74 msgid " -c, --creator show creator and owner\n" msgstr " -c, --creator 显示创建者和拥有者\n" -#: sys-utils/ipcs.c:76 +#: sys-utils/ipcs.c:75 msgid " -l, --limits show resource limits\n" msgstr " -l, --limits 显示资源限制\n" -#: sys-utils/ipcs.c:77 +#: sys-utils/ipcs.c:76 msgid " -u, --summary show status summary\n" msgstr " -u, --summary 显示状态摘要\n" -#: sys-utils/ipcs.c:78 +#: sys-utils/ipcs.c:77 msgid " --human show sizes in human-readable format\n" msgstr " --human 以易读格式显示大小\n" -#: sys-utils/ipcs.c:79 +#: sys-utils/ipcs.c:78 msgid " -b, --bytes show sizes in bytes\n" msgstr " -b, --bytes 以字节数显示大小\n" -#: sys-utils/ipcs.c:165 +#: sys-utils/ipcs.c:164 msgid "when using an ID, a single resource must be specified" msgstr "使用 ID 时，必须指定一个资源" -#: sys-utils/ipcs.c:203 +#: sys-utils/ipcs.c:202 #, c-format msgid "------ Shared Memory Limits --------\n" msgstr "---------- 同享内存限制 ------------\n" -#: sys-utils/ipcs.c:206 +#: sys-utils/ipcs.c:205 #, c-format msgid "max number of segments = %ju\n" msgstr "最大段数 = %ju\n" -#: sys-utils/ipcs.c:208 +#: sys-utils/ipcs.c:207 msgid "max seg size" msgstr "最大段大小" -#: sys-utils/ipcs.c:210 +#: sys-utils/ipcs.c:209 msgid "max total shared memory" msgstr "最大总共享内存" -#: sys-utils/ipcs.c:213 +#: sys-utils/ipcs.c:212 msgid "min seg size" msgstr "最小段大小" -#: sys-utils/ipcs.c:225 +#: sys-utils/ipcs.c:224 #, c-format msgid "kernel not configured for shared memory\n" msgstr "内核未做共享内存的相关配置\n" -#: sys-utils/ipcs.c:229 +#: sys-utils/ipcs.c:228 #, c-format msgid "------ Shared Memory Status --------\n" msgstr "---------- 共享内存状态 ------------\n" @@ -12434,7 +12391,7 @@ msgstr "---------- 共享内存状态 ------------\n" #. "pages swapped = %ld\n" #. "swap performance = %ld attempts, %ld successes\n" #. -#: sys-utils/ipcs.c:241 +#: sys-utils/ipcs.c:240 #, c-format msgid "" "segments allocated %d\n" @@ -12449,303 +12406,303 @@ msgstr "" "页交换 %ld\n" "交换性能：%ld 次尝试\t %ld 次成功\n" -#: sys-utils/ipcs.c:258 +#: sys-utils/ipcs.c:257 #, c-format msgid "------ Shared Memory Segment Creators/Owners --------\n" msgstr "------------- 共享内存段创建者/拥有者 ---------------\n" -#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:266 sys-utils/ipcs.c:273 -#: sys-utils/ipcs.c:279 +#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:265 sys-utils/ipcs.c:272 +#: sys-utils/ipcs.c:278 msgid "shmid" msgstr "shmid" -#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:279 sys-utils/ipcs.c:383 -#: sys-utils/ipcs.c:398 sys-utils/ipcs.c:484 sys-utils/ipcs.c:502 +#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:278 sys-utils/ipcs.c:382 +#: sys-utils/ipcs.c:397 sys-utils/ipcs.c:483 sys-utils/ipcs.c:501 msgid "perms" msgstr "权限" -#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:383 sys-utils/ipcs.c:484 +#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:382 sys-utils/ipcs.c:483 msgid "cuid" msgstr "cuid" -#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:383 sys-utils/ipcs.c:484 +#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:382 sys-utils/ipcs.c:483 msgid "cgid" msgstr "cgid" -#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:383 sys-utils/ipcs.c:484 +#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:382 sys-utils/ipcs.c:483 msgid "uid" msgstr "uid" -#: sys-utils/ipcs.c:260 sys-utils/ipcs.c:383 sys-utils/ipcs.c:484 +#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:382 sys-utils/ipcs.c:483 msgid "gid" msgstr "gid" -#: sys-utils/ipcs.c:264 +#: sys-utils/ipcs.c:263 #, c-format msgid "------ Shared Memory Attach/Detach/Change Times --------\n" msgstr "------------ 共享内存 添加/脱离/更改 时间 --------------\n" -#: sys-utils/ipcs.c:266 sys-utils/ipcs.c:273 sys-utils/ipcs.c:279 -#: sys-utils/ipcs.c:389 sys-utils/ipcs.c:398 sys-utils/ipcs.c:490 -#: sys-utils/ipcs.c:496 sys-utils/ipcs.c:502 +#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:272 sys-utils/ipcs.c:278 +#: sys-utils/ipcs.c:388 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489 +#: sys-utils/ipcs.c:495 sys-utils/ipcs.c:501 msgid "owner" msgstr "拥有者" -#: sys-utils/ipcs.c:266 +#: sys-utils/ipcs.c:265 msgid "attached" msgstr "已连上" -#: sys-utils/ipcs.c:266 +#: sys-utils/ipcs.c:265 msgid "detached" msgstr "已断开" -#: sys-utils/ipcs.c:267 +#: sys-utils/ipcs.c:266 msgid "changed" msgstr "已更改" -#: sys-utils/ipcs.c:271 +#: sys-utils/ipcs.c:270 #, c-format msgid "------ Shared Memory Creator/Last-op PIDs --------\n" msgstr "-------- 共享内存 创建者/上次修改者 PID ----------\n" -#: sys-utils/ipcs.c:273 +#: sys-utils/ipcs.c:272 msgid "cpid" msgstr "cpid" -#: sys-utils/ipcs.c:273 +#: sys-utils/ipcs.c:272 msgid "lpid" msgstr "lpid" -#: sys-utils/ipcs.c:277 +#: sys-utils/ipcs.c:276 #, c-format msgid "------ Shared Memory Segments --------\n" msgstr "------------ 共享内存段 --------------\n" -#: sys-utils/ipcs.c:279 sys-utils/ipcs.c:398 sys-utils/ipcs.c:502 +#: sys-utils/ipcs.c:278 sys-utils/ipcs.c:397 sys-utils/ipcs.c:501 msgid "key" msgstr "键" -#: sys-utils/ipcs.c:280 sys-utils/ipcs.c:503 +#: sys-utils/ipcs.c:279 sys-utils/ipcs.c:502 msgid "size" msgstr "大小" -#: sys-utils/ipcs.c:280 sys-utils/prlimit.c:75 sys-utils/prlimit.c:78 -#: sys-utils/prlimit.c:81 sys-utils/prlimit.c:82 sys-utils/prlimit.c:90 +#: sys-utils/ipcs.c:279 sys-utils/prlimit.c:75 sys-utils/prlimit.c:76 +#: sys-utils/prlimit.c:78 sys-utils/prlimit.c:79 sys-utils/prlimit.c:81 +#: sys-utils/prlimit.c:82 sys-utils/prlimit.c:86 sys-utils/prlimit.c:90 msgid "bytes" msgstr "字节" -#: sys-utils/ipcs.c:281 +#: sys-utils/ipcs.c:280 msgid "nattch" msgstr "连接数" -#: sys-utils/ipcs.c:281 +#: sys-utils/ipcs.c:280 msgid "status" msgstr "状态" -#: sys-utils/ipcs.c:305 sys-utils/ipcs.c:307 sys-utils/ipcs.c:309 -#: sys-utils/ipcs.c:421 sys-utils/ipcs.c:423 sys-utils/ipcs.c:527 -#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:531 sys-utils/ipcs.c:585 -#: sys-utils/ipcs.c:587 sys-utils/ipcs.c:616 sys-utils/ipcs.c:618 -#: sys-utils/ipcs.c:620 sys-utils/ipcs.c:644 +#: sys-utils/ipcs.c:304 sys-utils/ipcs.c:306 sys-utils/ipcs.c:308 +#: sys-utils/ipcs.c:420 sys-utils/ipcs.c:422 sys-utils/ipcs.c:526 +#: sys-utils/ipcs.c:528 sys-utils/ipcs.c:530 sys-utils/ipcs.c:584 +#: sys-utils/ipcs.c:586 sys-utils/ipcs.c:615 sys-utils/ipcs.c:617 +#: sys-utils/ipcs.c:619 sys-utils/ipcs.c:643 msgid "Not set" msgstr "未设置" -#: sys-utils/ipcs.c:335 sys-utils/lsipc.c:993 sys-utils/lsipc.c:999 +#: sys-utils/ipcs.c:334 sys-utils/lsipc.c:992 sys-utils/lsipc.c:998 msgid "dest" msgstr "目标" -#: sys-utils/ipcs.c:336 sys-utils/lsipc.c:994 sys-utils/lsipc.c:1007 +#: sys-utils/ipcs.c:335 sys-utils/lsipc.c:993 sys-utils/lsipc.c:1006 msgid "locked" msgstr "已锁定" -#: sys-utils/ipcs.c:355 +#: sys-utils/ipcs.c:354 #, c-format msgid "------ Semaphore Limits --------\n" msgstr "--------- 信号量限制 -----------\n" -#: sys-utils/ipcs.c:358 +#: sys-utils/ipcs.c:357 #, c-format msgid "max number of arrays = %d\n" msgstr "最大数组数量 = %d\n" -#: sys-utils/ipcs.c:359 +#: sys-utils/ipcs.c:358 #, c-format msgid "max semaphores per array = %d\n" msgstr "每个数组的最大信号量数目 = %d\n" -#: sys-utils/ipcs.c:360 +#: sys-utils/ipcs.c:359 #, c-format msgid "max semaphores system wide = %d\n" msgstr "系统最大信号量数 = %d\n" -#: sys-utils/ipcs.c:361 +#: sys-utils/ipcs.c:360 #, c-format msgid "max ops per semop call = %d\n" msgstr "每次信号量调用最大操作数 = %d\n" -#: sys-utils/ipcs.c:362 +#: sys-utils/ipcs.c:361 #, fuzzy, c-format -#| msgid "semaphore max value = %d\n" msgid "semaphore max value = %u\n" msgstr "信号量最大值 = %d\n" -#: sys-utils/ipcs.c:371 +#: sys-utils/ipcs.c:370 #, c-format msgid "kernel not configured for semaphores\n" msgstr "内核未做信号量的相关配置\n" -#: sys-utils/ipcs.c:374 +#: sys-utils/ipcs.c:373 #, c-format msgid "------ Semaphore Status --------\n" msgstr "--------- 信号量状态 -----------\n" -#: sys-utils/ipcs.c:375 +#: sys-utils/ipcs.c:374 #, c-format msgid "used arrays = %d\n" msgstr "已使用数组 = %d\n" -#: sys-utils/ipcs.c:376 +#: sys-utils/ipcs.c:375 #, c-format msgid "allocated semaphores = %d\n" msgstr "已分配信号量数 = %d\n" -#: sys-utils/ipcs.c:381 +#: sys-utils/ipcs.c:380 #, c-format msgid "------ Semaphore Arrays Creators/Owners --------\n" msgstr "----------- 信号量数组创建者/拥有者 ------------\n" -#: sys-utils/ipcs.c:383 sys-utils/ipcs.c:389 sys-utils/ipcs.c:398 +#: sys-utils/ipcs.c:382 sys-utils/ipcs.c:388 sys-utils/ipcs.c:397 msgid "semid" msgstr "semid" -#: sys-utils/ipcs.c:387 +#: sys-utils/ipcs.c:386 #, c-format msgid "------ Semaphore Operation/Change Times --------\n" msgstr "------------ 信号量 操作/更改 时间 -------------\n" -#: sys-utils/ipcs.c:389 +#: sys-utils/ipcs.c:388 msgid "last-op" msgstr "上一操作" -#: sys-utils/ipcs.c:389 +#: sys-utils/ipcs.c:388 msgid "last-changed" msgstr "上次更改" -#: sys-utils/ipcs.c:396 +#: sys-utils/ipcs.c:395 #, c-format msgid "------ Semaphore Arrays --------\n" msgstr "--------- 信号量数组 -----------\n" -#: sys-utils/ipcs.c:398 +#: sys-utils/ipcs.c:397 msgid "nsems" msgstr "nsems" -#: sys-utils/ipcs.c:457 +#: sys-utils/ipcs.c:456 #, c-format msgid "------ Messages Limits --------\n" msgstr "---------- 消息限制 -----------\n" -#: sys-utils/ipcs.c:458 +#: sys-utils/ipcs.c:457 #, c-format msgid "max queues system wide = %d\n" msgstr "系统最大队列数量 = %d\n" -#: sys-utils/ipcs.c:460 +#: sys-utils/ipcs.c:459 msgid "max size of message" msgstr "最大消息尺寸" -#: sys-utils/ipcs.c:462 +#: sys-utils/ipcs.c:461 msgid "default max size of queue" msgstr "默认的队列最大尺寸" -#: sys-utils/ipcs.c:469 +#: sys-utils/ipcs.c:468 #, c-format msgid "kernel not configured for message queues\n" msgstr "内核未做消息的相关配置\n" -#: sys-utils/ipcs.c:472 +#: sys-utils/ipcs.c:471 #, c-format msgid "------ Messages Status --------\n" msgstr "---------- 消息状态 -----------\n" -#: sys-utils/ipcs.c:474 +#: sys-utils/ipcs.c:473 #, c-format msgid "allocated queues = %d\n" msgstr "已分配队列数 = %d\n" -#: sys-utils/ipcs.c:475 +#: sys-utils/ipcs.c:474 #, c-format msgid "used headers = %d\n" msgstr "已用消息头(header)数 = %d\n" -#: sys-utils/ipcs.c:477 +#: sys-utils/ipcs.c:476 msgid "used space" msgstr "已用空间" -#: sys-utils/ipcs.c:478 +#: sys-utils/ipcs.c:477 msgid " bytes\n" msgstr " 字节\n" -#: sys-utils/ipcs.c:482 +#: sys-utils/ipcs.c:481 #, c-format msgid "------ Message Queues Creators/Owners --------\n" msgstr "---------- 消息队列 创建者/拥有者 ------------\n" -#: sys-utils/ipcs.c:484 sys-utils/ipcs.c:490 sys-utils/ipcs.c:496 -#: sys-utils/ipcs.c:502 +#: sys-utils/ipcs.c:483 sys-utils/ipcs.c:489 sys-utils/ipcs.c:495 +#: sys-utils/ipcs.c:501 msgid "msqid" msgstr "msqid" -#: sys-utils/ipcs.c:488 +#: sys-utils/ipcs.c:487 #, c-format msgid "------ Message Queues Send/Recv/Change Times --------\n" msgstr "----------- 消息队列 发送/接收/更改 时间 ------------\n" -#: sys-utils/ipcs.c:490 +#: sys-utils/ipcs.c:489 msgid "send" msgstr "发送" -#: sys-utils/ipcs.c:490 +#: sys-utils/ipcs.c:489 msgid "recv" msgstr "接收" -#: sys-utils/ipcs.c:490 +#: sys-utils/ipcs.c:489 msgid "change" msgstr "更改" -#: sys-utils/ipcs.c:494 +#: sys-utils/ipcs.c:493 #, c-format msgid "------ Message Queues PIDs --------\n" msgstr "--------- 消息队列 PID -----------\n" -#: sys-utils/ipcs.c:496 +#: sys-utils/ipcs.c:495 msgid "lspid" msgstr "lspid" -#: sys-utils/ipcs.c:496 +#: sys-utils/ipcs.c:495 msgid "lrpid" msgstr "lrpid" -#: sys-utils/ipcs.c:500 +#: sys-utils/ipcs.c:499 #, c-format msgid "------ Message Queues --------\n" msgstr "--------- 消息队列 -----------\n" -#: sys-utils/ipcs.c:503 +#: sys-utils/ipcs.c:502 msgid "used-bytes" msgstr "已用字节数" -#: sys-utils/ipcs.c:504 +#: sys-utils/ipcs.c:503 msgid "messages" msgstr "消息" -#: sys-utils/ipcs.c:569 sys-utils/ipcs.c:599 sys-utils/ipcs.c:632 -#: sys-utils/lsipc.c:553 sys-utils/lsipc.c:739 sys-utils/lsipc.c:896 +#: sys-utils/ipcs.c:568 sys-utils/ipcs.c:598 sys-utils/ipcs.c:631 +#: sys-utils/lsipc.c:552 sys-utils/lsipc.c:738 sys-utils/lsipc.c:895 #, c-format msgid "id %d not found" msgstr "找不到 id %d" -#: sys-utils/ipcs.c:573 +#: sys-utils/ipcs.c:572 #, c-format msgid "" "\n" @@ -12754,45 +12711,45 @@ msgstr "" "\n" "共享内存段 shmid=%d\n" -#: sys-utils/ipcs.c:574 +#: sys-utils/ipcs.c:573 #, c-format msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n" msgstr "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n" -#: sys-utils/ipcs.c:577 +#: sys-utils/ipcs.c:576 #, c-format msgid "mode=%#o\taccess_perms=%#o\n" msgstr "模式=%#o\t访问权限=%#o\n" -#: sys-utils/ipcs.c:579 +#: sys-utils/ipcs.c:578 msgid "size=" msgstr "大小=" -#: sys-utils/ipcs.c:579 +#: sys-utils/ipcs.c:578 msgid "bytes=" msgstr "字节数=" -#: sys-utils/ipcs.c:581 +#: sys-utils/ipcs.c:580 #, c-format msgid "lpid=%u\tcpid=%u\tnattch=%jd\n" msgstr "lpid=%u\tcpid=%u\tnattch=%jd\n" -#: sys-utils/ipcs.c:584 +#: sys-utils/ipcs.c:583 #, c-format msgid "att_time=%-26.24s\n" msgstr "附加时间=%-26.24s\n" -#: sys-utils/ipcs.c:586 +#: sys-utils/ipcs.c:585 #, c-format msgid "det_time=%-26.24s\n" msgstr "脱离时间=%-26.24s\n" -#: sys-utils/ipcs.c:588 sys-utils/ipcs.c:619 +#: sys-utils/ipcs.c:587 sys-utils/ipcs.c:618 #, c-format msgid "change_time=%-26.24s\n" msgstr "更改时间=%-26.24s\n" -#: sys-utils/ipcs.c:603 +#: sys-utils/ipcs.c:602 #, c-format msgid "" "\n" @@ -12801,38 +12758,38 @@ msgstr "" "\n" "消息队列 msqid=%d\n" -#: sys-utils/ipcs.c:604 +#: sys-utils/ipcs.c:603 #, c-format msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n" msgstr "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\t模式=%#o\n" -#: sys-utils/ipcs.c:608 +#: sys-utils/ipcs.c:607 msgid "csize=" msgstr "csize=" -#: sys-utils/ipcs.c:608 +#: sys-utils/ipcs.c:607 msgid "cbytes=" msgstr "cbytes=" -#: sys-utils/ipcs.c:610 +#: sys-utils/ipcs.c:609 msgid "qsize=" msgstr "qsize=" -#: sys-utils/ipcs.c:610 +#: sys-utils/ipcs.c:609 msgid "qbytes=" msgstr "qbytes=" -#: sys-utils/ipcs.c:615 +#: sys-utils/ipcs.c:614 #, c-format msgid "send_time=%-26.24s\n" msgstr "发送时间=%-26.24s\n" -#: sys-utils/ipcs.c:617 +#: sys-utils/ipcs.c:616 #, c-format msgid "rcv_time=%-26.24s\n" msgstr "接收时间=%-26.24s\n" -#: sys-utils/ipcs.c:636 +#: sys-utils/ipcs.c:635 #, c-format msgid "" "\n" @@ -12841,48 +12798,48 @@ msgstr "" "\n" "信号量数组 semid=%d\n" -#: sys-utils/ipcs.c:637 +#: sys-utils/ipcs.c:636 #, c-format msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n" msgstr "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n" -#: sys-utils/ipcs.c:640 +#: sys-utils/ipcs.c:639 #, c-format msgid "mode=%#o, access_perms=%#o\n" msgstr "模式=%#o，访问权限=%#o\n" -#: sys-utils/ipcs.c:642 +#: sys-utils/ipcs.c:641 #, c-format msgid "nsems = %ju\n" msgstr "nsems = %ju\n" -#: sys-utils/ipcs.c:643 +#: sys-utils/ipcs.c:642 #, c-format msgid "otime = %-26.24s\n" msgstr "otime = %-26.24s\n" -#: sys-utils/ipcs.c:645 +#: sys-utils/ipcs.c:644 #, c-format msgid "ctime = %-26.24s\n" msgstr "ctime = %-26.24s\n" -#: sys-utils/ipcs.c:648 +#: sys-utils/ipcs.c:647 msgid "semnum" msgstr "semnum" -#: sys-utils/ipcs.c:648 +#: sys-utils/ipcs.c:647 msgid "value" msgstr "值" -#: sys-utils/ipcs.c:648 +#: sys-utils/ipcs.c:647 msgid "ncount" msgstr "ncount" -#: sys-utils/ipcs.c:648 +#: sys-utils/ipcs.c:647 msgid "zcount" msgstr "zcount" -#: sys-utils/ipcs.c:648 +#: sys-utils/ipcs.c:647 msgid "pid" msgstr "pid" @@ -12985,7 +12942,6 @@ msgstr "无效的 速度 参数" #: sys-utils/ldattach.c:343 #, fuzzy -#| msgid "invalid heads argument" msgid "invalid pause argument" msgstr "无效的 磁头数 参数" @@ -13019,7 +12975,6 @@ msgstr "无法设置 %s 的终端属性" #: sys-utils/ldattach.c:459 #, fuzzy, c-format -#| msgid "cannot create directory %s" msgid "cannot write intro command to %s" msgstr "无法创建 %s 目录" @@ -13031,68 +12986,72 @@ msgstr "无法设置行规则" msgid "cannot daemonize" msgstr "无法转为守护进程" -#: sys-utils/losetup.c:66 +#: sys-utils/losetup.c:68 msgid "autoclear flag set" msgstr "已设置 自动清除 标志" -#: sys-utils/losetup.c:67 +#: sys-utils/losetup.c:69 msgid "device backing file" msgstr "设备后备文件" -#: sys-utils/losetup.c:68 +#: sys-utils/losetup.c:70 msgid "backing file inode number" msgstr "后备文件 inode 号" -#: sys-utils/losetup.c:69 +#: sys-utils/losetup.c:71 msgid "backing file major:minor device number" msgstr "后备文件 主:次 设备号" -#: sys-utils/losetup.c:70 +#: sys-utils/losetup.c:72 msgid "loop device name" msgstr "回环设备名" -#: sys-utils/losetup.c:71 +#: sys-utils/losetup.c:73 msgid "offset from the beginning" msgstr "起始位置偏移" -#: sys-utils/losetup.c:72 +#: sys-utils/losetup.c:74 msgid "partscan flag set" msgstr "已设置 partscan 标志" -#: sys-utils/losetup.c:74 +#: sys-utils/losetup.c:76 msgid "size limit of the file in bytes" msgstr "文件的大小限制(字节数)" -#: sys-utils/losetup.c:75 +#: sys-utils/losetup.c:77 msgid "loop device major:minor number" msgstr "回环设备 主:次 设备号" -#: sys-utils/losetup.c:132 sys-utils/losetup.c:144 +#: sys-utils/losetup.c:78 +msgid "access backing file with direct-io" +msgstr "" + +#: sys-utils/losetup.c:135 sys-utils/losetup.c:147 #, c-format msgid ", offset %ju" msgstr "，偏移 %ju" -#: sys-utils/losetup.c:135 sys-utils/losetup.c:147 +#: sys-utils/losetup.c:138 sys-utils/losetup.c:150 #, c-format msgid ", sizelimit %ju" msgstr "，大小限制 %ju" -#: sys-utils/losetup.c:155 +#: sys-utils/losetup.c:158 #, c-format msgid ", encryption %s (type %u)" msgstr "，加密 %s(类型 %u)" -#: sys-utils/losetup.c:196 +#: sys-utils/losetup.c:199 #, c-format msgid "%s: detach failed" msgstr "%s：断开失败" -#: 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 +#: sys-utils/losetup.c:329 sys-utils/lscpu.c:1508 sys-utils/prlimit.c:229 +#: sys-utils/swapon.c:165 sys-utils/wdctl.c:215 sys-utils/zramctl.c:348 msgid "failed to initialize output line" msgstr "初始化输出行失败" -#: sys-utils/losetup.c:375 +#: sys-utils/losetup.c:381 #, c-format msgid "" " %1$s [options] [<loopdev>]\n" @@ -13101,81 +13060,84 @@ msgstr "" " %1$s [选项] [<回环设备>]\n" " %1$s [选项] -f | <回环设备> <文件>\n" -#: sys-utils/losetup.c:380 +#: sys-utils/losetup.c:386 msgid "Set up and control loop devices.\n" msgstr "" -#: sys-utils/losetup.c:383 +#: sys-utils/losetup.c:389 msgid " -a, --all list all used devices\n" msgstr " -a, --all 列出所有使用的设备\n" -#: sys-utils/losetup.c:384 +#: sys-utils/losetup.c:390 msgid " -d, --detach <loopdev>... detach one or more devices\n" msgstr " -d, --detach <回环设备>... 断开一台或多台设备\n" -#: sys-utils/losetup.c:385 +#: sys-utils/losetup.c:391 msgid " -D, --detach-all detach all used devices\n" msgstr " -D, --detach-all 断开所有使用的设备\n" -#: sys-utils/losetup.c:386 +#: sys-utils/losetup.c:392 msgid " -f, --find find first unused device\n" msgstr " -f, --find 查找第一个未使用的设备\n" -#: sys-utils/losetup.c:387 +#: sys-utils/losetup.c:393 msgid " -c, --set-capacity <loopdev> resize the device\n" msgstr " -c, --set-capacity <回环设备> 改变设备容量\n" -#: sys-utils/losetup.c:388 +#: sys-utils/losetup.c:394 msgid " -j, --associated <file> list all devices associated with <file>\n" msgstr " -j, --associated <文件> 列出所有与 <文件> 相关的设备\n" -#: sys-utils/losetup.c:392 +#: sys-utils/losetup.c:398 msgid " -o, --offset <num> start at offset <num> into file\n" msgstr " -o, --offset <数字> 在文件偏移量 <数字> 处开始\n" -#: sys-utils/losetup.c:393 +#: sys-utils/losetup.c:399 msgid " --sizelimit <num> device is limited to <num> bytes of the file\n" msgstr " --sizelimit <数字> 设备限制为了文件的<数字>个字节\n" -#: sys-utils/losetup.c:394 +#: sys-utils/losetup.c:400 msgid " -P, --partscan create a partitioned loop device\n" msgstr " -P, --partscan 创建带分区的回环设备\n" -#: sys-utils/losetup.c:395 +#: sys-utils/losetup.c:401 msgid " -r, --read-only set up a read-only loop device\n" msgstr " -r, --read-only 创建只读的回环设备\n" -#: sys-utils/losetup.c:396 +#: sys-utils/losetup.c:402 +msgid " --direct-io[=<on|off>] open backing file with O_DIRECT\n" +msgstr "" + +#: sys-utils/losetup.c:403 msgid " --show print device name after setup (with -f)\n" msgstr " --show 设置后打印设备名(加 -f 选项)\n" -#: sys-utils/losetup.c:397 +#: sys-utils/losetup.c:404 msgid " -v, --verbose verbose mode\n" msgstr " -v, --verbose 详尽模式\n" -#: sys-utils/losetup.c:401 +#: sys-utils/losetup.c:408 msgid " -l, --list list info about all or specified (default)\n" msgstr " -l, --list 列出所有或指定的信息(默认)\n" -#: sys-utils/losetup.c:402 +#: sys-utils/losetup.c:409 msgid " -O, --output <cols> specify columns to output for --list\n" msgstr " -O, --output <列> 指定 --list 选项要输出的列\n" -#: sys-utils/losetup.c:403 +#: sys-utils/losetup.c:410 msgid " -n, --noheadings don't print headings for --list output\n" msgstr " -n, --noheadings --list 输出时不打印标题\n" -#: sys-utils/losetup.c:404 +#: sys-utils/losetup.c:411 msgid " --raw use raw --list output format\n" msgstr " --raw 使用原生 --list 输出格式\n" -#: sys-utils/losetup.c:405 +#: sys-utils/losetup.c:412 #, fuzzy -#| msgid " --raw use raw --list output format\n" msgid " -J, --json use JSON --list output format\n" msgstr " --raw 使用原生 --list 输出格式\n" -#: sys-utils/losetup.c:411 +#: sys-utils/losetup.c:418 msgid "" "\n" "Available --list columns:\n" @@ -13183,155 +13145,160 @@ msgstr "" "\n" "可用的 --list 列：\n" -#: sys-utils/losetup.c:431 +#: sys-utils/losetup.c:438 #, 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:435 +#: sys-utils/losetup.c:442 #, 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:508 sys-utils/losetup.c:518 sys-utils/losetup.c:616 -#: sys-utils/losetup.c:630 sys-utils/losetup.c:706 +#: sys-utils/losetup.c:518 sys-utils/losetup.c:528 sys-utils/losetup.c:637 +#: sys-utils/losetup.c:651 sys-utils/losetup.c:729 #, c-format msgid "%s: failed to use device" msgstr "%s：使用设备失败" -#: sys-utils/losetup.c:627 +#: sys-utils/losetup.c:648 msgid "no loop device specified" msgstr "未指定回环设备" -#: sys-utils/losetup.c:635 +#: sys-utils/losetup.c:656 msgid "no file specified" msgstr "未指定文件" -#: sys-utils/losetup.c:642 +#: sys-utils/losetup.c:663 #, c-format msgid "the options %s are allowed during loop device setup only" msgstr "选项 %s 只允许在设置回环设备时使用" -#: sys-utils/losetup.c:647 +#: sys-utils/losetup.c:668 msgid "the option --offset is not allowed in this context" msgstr "此环境下不允许使用 --offset 选项" -#: sys-utils/losetup.c:667 sys-utils/losetup.c:726 +#: sys-utils/losetup.c:688 sys-utils/losetup.c:749 msgid "cannot find an unused loop device" msgstr "找不到未使用的回环设备" -#: sys-utils/losetup.c:677 +#: sys-utils/losetup.c:698 #, c-format msgid "%s: failed to use backing file" msgstr "%s：使用后备文件失败" -#: sys-utils/losetup.c:747 +#: sys-utils/losetup.c:770 #, c-format msgid "%s: set capacity failed" msgstr "%s：设置容量失败" -#: sys-utils/lscpu.c:93 +#: sys-utils/losetup.c:777 +#, fuzzy, c-format +msgid "%s: set direct io failed" +msgstr "%s：更改目录失败" + +#: sys-utils/lscpu.c:97 msgid "none" msgstr "无" -#: sys-utils/lscpu.c:94 +#: sys-utils/lscpu.c:98 msgid "para" msgstr "半" -#: sys-utils/lscpu.c:95 +#: sys-utils/lscpu.c:99 msgid "full" msgstr "完全" -#: sys-utils/lscpu.c:96 +#: sys-utils/lscpu.c:100 msgid "container" msgstr "容器" -#: sys-utils/lscpu.c:157 +#: sys-utils/lscpu.c:161 msgid "horizontal" msgstr "水平" -#: sys-utils/lscpu.c:158 +#: sys-utils/lscpu.c:162 msgid "vertical" msgstr "竖直" -#: sys-utils/lscpu.c:307 +#: sys-utils/lscpu.c:314 msgid "logical CPU number" msgstr "逻辑 CPU 数量" -#: sys-utils/lscpu.c:308 +#: sys-utils/lscpu.c:315 msgid "logical core number" msgstr "逻辑核心数量" -#: sys-utils/lscpu.c:309 +#: sys-utils/lscpu.c:316 msgid "logical socket number" msgstr "逻辑(CPU)座数量" -#: sys-utils/lscpu.c:310 +#: sys-utils/lscpu.c:317 msgid "logical NUMA node number" msgstr "逻辑 NUMA 节点数量" -#: sys-utils/lscpu.c:311 +#: sys-utils/lscpu.c:318 msgid "logical book number" msgstr "逻辑 book 数" -#: sys-utils/lscpu.c:312 +#: sys-utils/lscpu.c:319 msgid "shows how caches are shared between CPUs" msgstr "显示 CPU 间是如何共享缓存的" -#: sys-utils/lscpu.c:313 +#: sys-utils/lscpu.c:320 msgid "CPU dispatching mode on virtual hardware" msgstr "虚拟硬件上的 CPU 调度模式" -#: sys-utils/lscpu.c:314 +#: sys-utils/lscpu.c:321 msgid "physical address of a CPU" msgstr "CPU 的物理地址" -#: sys-utils/lscpu.c:315 +#: sys-utils/lscpu.c:322 msgid "shows if the hypervisor has allocated the CPU" msgstr "显示超级监督(hypervisor)是否分配了 CPU" -#: sys-utils/lscpu.c:316 +#: sys-utils/lscpu.c:323 msgid "shows if Linux currently makes use of the CPU" msgstr "显示 Linux 当前是否在使用该 CPU" -#: sys-utils/lscpu.c:317 +#: sys-utils/lscpu.c:324 msgid "shows the maximum MHz of the CPU" msgstr "显示 CPU 的最大 MHz" -#: sys-utils/lscpu.c:318 +#: sys-utils/lscpu.c:325 msgid "shows the minimum MHz of the CPU" msgstr "显示 CPU 的最小 MHz" -#: sys-utils/lscpu.c:413 +#: sys-utils/lscpu.c:459 msgid "error: uname failed" msgstr "错误：uname 失败" -#: sys-utils/lscpu.c:488 +#: sys-utils/lscpu.c:534 #, c-format msgid "failed to determine number of CPUs: %s" msgstr "确定 CPU 数 失败：%s" -#: sys-utils/lscpu.c:732 +#: sys-utils/lscpu.c:776 msgid "error: can not set signal handler" msgstr "错误：无法设置信号处理函数" -#: sys-utils/lscpu.c:737 +#: sys-utils/lscpu.c:781 msgid "error: can not restore signal handler" msgstr "错误：无法恢复信号处理函数" -#: sys-utils/lscpu.c:1172 +#: sys-utils/lscpu.c:1216 msgid "Failed to extract the node number" msgstr "提取节点号失败" -#: sys-utils/lscpu.c:1264 sys-utils/lscpu.c:1274 +#: sys-utils/lscpu.c:1310 sys-utils/lscpu.c:1320 msgid "Y" msgstr "Y" -#: sys-utils/lscpu.c:1264 sys-utils/lscpu.c:1274 +#: sys-utils/lscpu.c:1310 sys-utils/lscpu.c:1320 msgid "N" msgstr "N" -#: sys-utils/lscpu.c:1356 +#: sys-utils/lscpu.c:1404 #, c-format msgid "" "# The following is the parsable format, which can be fed to other\n" @@ -13341,517 +13308,488 @@ msgstr "" "# 以下是可解析格式，可以输给其他程序。每列中的各个不同项有一个惟一\n" "# 的从 0 开始的 ID。\n" -#: sys-utils/lscpu.c:1506 +#: sys-utils/lscpu.c:1554 msgid "Architecture:" msgstr "架构：" -#: sys-utils/lscpu.c:1520 +#: sys-utils/lscpu.c:1568 msgid "CPU op-mode(s):" msgstr "CPU 运行模式：" -#: sys-utils/lscpu.c:1523 sys-utils/lscpu.c:1525 +#: sys-utils/lscpu.c:1571 sys-utils/lscpu.c:1573 msgid "Byte Order:" msgstr "字节序：" -#: sys-utils/lscpu.c:1527 +#: sys-utils/lscpu.c:1575 msgid "CPU(s):" msgstr "CPU(s):" -#: sys-utils/lscpu.c:1530 +#: sys-utils/lscpu.c:1578 msgid "On-line CPU(s) mask:" msgstr "在线 CPU 掩码：" -#: sys-utils/lscpu.c:1531 +#: sys-utils/lscpu.c:1579 msgid "On-line CPU(s) list:" msgstr "在线 CPU 列表：" -#: sys-utils/lscpu.c:1550 +#: sys-utils/lscpu.c:1598 msgid "Off-line CPU(s) mask:" msgstr "离线 CPU 掩码：" -#: sys-utils/lscpu.c:1551 +#: sys-utils/lscpu.c:1599 msgid "Off-line CPU(s) list:" msgstr "离线 CPU 列表：" -#: sys-utils/lscpu.c:1582 +#: sys-utils/lscpu.c:1630 msgid "Thread(s) per core:" msgstr "每个核的线程数：" -#: sys-utils/lscpu.c:1583 +#: sys-utils/lscpu.c:1631 msgid "Core(s) per socket:" msgstr "每个座的核数：" -#: sys-utils/lscpu.c:1586 +#: sys-utils/lscpu.c:1634 msgid "Socket(s) per book:" msgstr "每个 book 的座数：" -#: sys-utils/lscpu.c:1588 +#: sys-utils/lscpu.c:1636 msgid "Book(s):" msgstr "Book：" -#: sys-utils/lscpu.c:1590 +#: sys-utils/lscpu.c:1638 msgid "Socket(s):" msgstr "座：" -#: sys-utils/lscpu.c:1594 +#: sys-utils/lscpu.c:1642 msgid "NUMA node(s):" msgstr "NUMA 节点：" -#: sys-utils/lscpu.c:1596 +#: sys-utils/lscpu.c:1644 msgid "Vendor ID:" msgstr "厂商 ID：" -#: sys-utils/lscpu.c:1598 +#: sys-utils/lscpu.c:1646 msgid "CPU family:" msgstr "CPU 系列：" -#: sys-utils/lscpu.c:1600 +#: sys-utils/lscpu.c:1648 msgid "Model:" msgstr "型号：" -#: sys-utils/lscpu.c:1602 +#: sys-utils/lscpu.c:1650 msgid "Model name:" msgstr "型号名称：" -#: sys-utils/lscpu.c:1604 +#: sys-utils/lscpu.c:1652 msgid "Stepping:" msgstr "步进：" -#: sys-utils/lscpu.c:1606 +#: sys-utils/lscpu.c:1654 msgid "CPU MHz:" msgstr "CPU MHz：" -#: sys-utils/lscpu.c:1608 +#: sys-utils/lscpu.c:1656 msgid "CPU max MHz:" msgstr "CPU 最大 MHz：" -#: sys-utils/lscpu.c:1610 +#: sys-utils/lscpu.c:1658 msgid "CPU min MHz:" msgstr "CPU 最小 MHz：" -#: sys-utils/lscpu.c:1612 +#: sys-utils/lscpu.c:1660 msgid "BogoMIPS:" msgstr "BogoMIPS：" -#: sys-utils/lscpu.c:1615 sys-utils/lscpu.c:1617 +#: sys-utils/lscpu.c:1663 sys-utils/lscpu.c:1665 msgid "Virtualization:" msgstr "虚拟化：" -#: sys-utils/lscpu.c:1620 +#: sys-utils/lscpu.c:1668 msgid "Hypervisor:" msgstr "超管理器：" -#: sys-utils/lscpu.c:1622 +#: sys-utils/lscpu.c:1670 msgid "Hypervisor vendor:" msgstr "超管理器厂商：" -#: sys-utils/lscpu.c:1623 +#: sys-utils/lscpu.c:1671 msgid "Virtualization type:" msgstr "虚拟化类型：" -#: sys-utils/lscpu.c:1626 +#: sys-utils/lscpu.c:1674 msgid "Dispatching mode:" msgstr "分派模式：" -#: sys-utils/lscpu.c:1632 +#: sys-utils/lscpu.c:1680 #, c-format msgid "%s cache:" msgstr "%s 缓存：" -#: sys-utils/lscpu.c:1638 +#: sys-utils/lscpu.c:1686 #, c-format msgid "NUMA node%d CPU(s):" msgstr "NUMA 节点%d CPU：" -#: sys-utils/lscpu.c:1643 +#: sys-utils/lscpu.c:1691 #, fuzzy -#| msgid "Flags" msgid "Flags:" msgstr "标志" -#: sys-utils/lscpu.c:1654 +#: sys-utils/lscpu.c:1694 +#, fuzzy +msgid "Physical sockets:" +msgstr "物理柱面数" + +#: sys-utils/lscpu.c:1695 +#, fuzzy +msgid "Physical chips:" +msgstr "物理柱面数" + +#: sys-utils/lscpu.c:1696 +#, fuzzy +msgid "Physical cores/chip:" +msgstr "物理扇区大小" + +#: sys-utils/lscpu.c:1708 msgid "Display information about the CPU architecture.\n" msgstr "" -#: sys-utils/lscpu.c:1657 +#: sys-utils/lscpu.c:1711 msgid " -a, --all print both online and offline CPUs (default for -e)\n" msgstr " -a, --all 同时打印在线和离线 CPU (-e 选项默认值)\n" -#: sys-utils/lscpu.c:1658 +#: sys-utils/lscpu.c:1712 msgid " -b, --online print online CPUs only (default for -p)\n" msgstr " -b, --online 只打印在线 CPU (-p 选项默认值)\n" -#: sys-utils/lscpu.c:1659 +#: sys-utils/lscpu.c:1713 msgid " -c, --offline print offline CPUs only\n" msgstr " -c, --offline 只打印离线 CPU\n" -#: sys-utils/lscpu.c:1660 +#: sys-utils/lscpu.c:1714 msgid " -e, --extended[=<list>] print out an extended readable format\n" msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n" -#: sys-utils/lscpu.c:1661 +#: sys-utils/lscpu.c:1715 msgid " -p, --parse[=<list>] print out a parsable format\n" msgstr " -p, --parse[=<列表>] 打印可解析格式\n" -#: sys-utils/lscpu.c:1662 +#: sys-utils/lscpu.c:1716 msgid " -s, --sysroot <dir> use specified directory as system root\n" msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n" -#: sys-utils/lscpu.c:1663 +#: sys-utils/lscpu.c:1717 msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n" msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n" -#: sys-utils/lscpu.c:1760 +#: sys-utils/lscpu.c:1814 #, 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 +#: sys-utils/lsipc.c:148 #, fuzzy -#| msgid "resource name" msgid "Resource key" msgstr "资源名称" -#: sys-utils/lsipc.c:149 +#: sys-utils/lsipc.c:148 #, fuzzy -#| msgid "key" msgid "Key" msgstr "键" -#: sys-utils/lsipc.c:150 +#: sys-utils/lsipc.c:149 #, fuzzy -#| msgid "resource name" msgid "Resource ID" msgstr "资源名称" -#: sys-utils/lsipc.c:150 +#: sys-utils/lsipc.c:149 #, fuzzy -#| msgid "UUID" msgid "ID" msgstr "UUID" -#: sys-utils/lsipc.c:151 +#: sys-utils/lsipc.c:150 msgid "Owner's username or UID" msgstr "" -#: sys-utils/lsipc.c:151 +#: sys-utils/lsipc.c:150 #, fuzzy -#| msgid "owner" msgid "Owner" msgstr "拥有者" -#: sys-utils/lsipc.c:152 +#: sys-utils/lsipc.c:151 #, fuzzy -#| msgid "version" msgid "Permissions" msgstr "版本：" -#: sys-utils/lsipc.c:153 +#: sys-utils/lsipc.c:152 msgid "Creator UID" msgstr "" -#: sys-utils/lsipc.c:154 +#: sys-utils/lsipc.c:153 msgid "Creator user" msgstr "" -#: sys-utils/lsipc.c:155 +#: sys-utils/lsipc.c:154 msgid "Creator GID" msgstr "" -#: sys-utils/lsipc.c:156 +#: sys-utils/lsipc.c:155 #, fuzzy -#| msgid "Primary group" msgid "Creator group" msgstr "主组" -#: sys-utils/lsipc.c:157 +#: sys-utils/lsipc.c:156 #, fuzzy -#| msgid "user ID" msgid "User ID" msgstr "用户 ID" -#: sys-utils/lsipc.c:157 +#: sys-utils/lsipc.c:156 #, fuzzy -#| msgid "UUID" msgid "UID" msgstr "UUID" -#: sys-utils/lsipc.c:158 +#: sys-utils/lsipc.c:157 #, fuzzy -#| msgid "Username" msgid "User name" msgstr "用户名" -#: sys-utils/lsipc.c:159 +#: sys-utils/lsipc.c:158 msgid "Group ID" msgstr "" -#: sys-utils/lsipc.c:159 +#: sys-utils/lsipc.c:158 #, fuzzy -#| msgid "SGI" msgid "GID" msgstr "SGI" -#: sys-utils/lsipc.c:160 +#: sys-utils/lsipc.c:159 #, fuzzy -#| msgid "group name" msgid "Group name" msgstr "组名" -#: sys-utils/lsipc.c:161 +#: sys-utils/lsipc.c:160 #, fuzzy -#| msgid "size of the swap area" msgid "Time of the last change" msgstr "交换区大小" -#: sys-utils/lsipc.c:161 +#: sys-utils/lsipc.c:160 #, fuzzy -#| msgid "last-changed" msgid "Last change" msgstr "上次更改" -#: sys-utils/lsipc.c:164 +#: sys-utils/lsipc.c:163 #, fuzzy -#| msgid "bytes in use" msgid "Bytes used" msgstr "已使用字节数" -#: sys-utils/lsipc.c:165 +#: sys-utils/lsipc.c:164 #, fuzzy -#| msgid "Number of heads" msgid "Number of messages" msgstr "磁头数" -#: sys-utils/lsipc.c:165 +#: sys-utils/lsipc.c:164 #, fuzzy -#| msgid "messages" msgid "Messages" msgstr "消息" -#: sys-utils/lsipc.c:166 +#: sys-utils/lsipc.c:165 #, fuzzy -#| msgid "date of last login" msgid "Time of last msg sent" msgstr "上次登录日期" -#: sys-utils/lsipc.c:166 +#: sys-utils/lsipc.c:165 msgid "Msg sent" msgstr "" -#: sys-utils/lsipc.c:167 +#: sys-utils/lsipc.c:166 msgid "Time of last msg received" msgstr "" -#: sys-utils/lsipc.c:167 +#: sys-utils/lsipc.c:166 msgid "Msg received" msgstr "" -#: sys-utils/lsipc.c:168 +#: sys-utils/lsipc.c:167 msgid "PID of the last msg sender" msgstr "" -#: sys-utils/lsipc.c:168 +#: sys-utils/lsipc.c:167 msgid "Msg sender" msgstr "" -#: sys-utils/lsipc.c:169 +#: sys-utils/lsipc.c:168 msgid "PID of the last msg receiver" msgstr "" -#: sys-utils/lsipc.c:169 +#: sys-utils/lsipc.c:168 msgid "Msg receiver" msgstr "" -#: sys-utils/lsipc.c:172 +#: sys-utils/lsipc.c:171 #, fuzzy -#| msgid "get blocksize" msgid "Segment size" msgstr "获得块大小" -#: sys-utils/lsipc.c:173 +#: sys-utils/lsipc.c:172 #, fuzzy -#| msgid "max number of processes" msgid "Number of attached processes" msgstr "最大进程数" -#: sys-utils/lsipc.c:173 +#: sys-utils/lsipc.c:172 msgid "Attached processes" msgstr "" -#: sys-utils/lsipc.c:174 +#: sys-utils/lsipc.c:173 #, fuzzy -#| msgid "status" msgid "Status" msgstr "状态" -#: sys-utils/lsipc.c:175 +#: sys-utils/lsipc.c:174 #, fuzzy -#| msgid "attached" msgid "Attach time" msgstr "已连上" -#: sys-utils/lsipc.c:176 +#: sys-utils/lsipc.c:175 #, fuzzy -#| msgid "detached" msgid "Detach time" msgstr "已断开" -#: sys-utils/lsipc.c:177 +#: sys-utils/lsipc.c:176 msgid "Creator command line" msgstr "" -#: sys-utils/lsipc.c:177 +#: sys-utils/lsipc.c:176 #, fuzzy -#| msgid "no command?" msgid "Creator command" msgstr "没有命令？" -#: sys-utils/lsipc.c:178 +#: sys-utils/lsipc.c:177 msgid "PID of the creator" msgstr "" -#: sys-utils/lsipc.c:178 +#: sys-utils/lsipc.c:177 msgid "Creator PID" msgstr "" -#: sys-utils/lsipc.c:179 +#: sys-utils/lsipc.c:178 msgid "PID of last user" msgstr "" -#: sys-utils/lsipc.c:179 +#: sys-utils/lsipc.c:178 #, fuzzy -#| msgid "user ID" msgid "Last user PID" msgstr "用户 ID" -#: sys-utils/lsipc.c:182 +#: sys-utils/lsipc.c:181 #, fuzzy -#| msgid "Number of sectors" msgid "Number of semaphores" msgstr "扇区数" -#: sys-utils/lsipc.c:182 +#: sys-utils/lsipc.c:181 #, fuzzy -#| msgid "Semaphore id: %d\n" msgid "Semaphores" msgstr "信号量 id：%d\n" -#: sys-utils/lsipc.c:183 +#: sys-utils/lsipc.c:182 msgid "Time of the last operation" msgstr "" -#: sys-utils/lsipc.c:183 +#: sys-utils/lsipc.c:182 #, fuzzy -#| msgid "operation %d\n" msgid "Last operation" msgstr "操作 %d\n" -#: sys-utils/lsipc.c:186 +#: sys-utils/lsipc.c:185 #, fuzzy -#| msgid "resource name" msgid "Resource name" msgstr "资源名称" -#: sys-utils/lsipc.c:186 +#: sys-utils/lsipc.c:185 #, fuzzy -#| msgid "resource name" msgid "Resource" msgstr "资源名称" -#: sys-utils/lsipc.c:187 +#: sys-utils/lsipc.c:186 #, fuzzy -#| msgid "resource description" msgid "Resource description" msgstr "资源描述" -#: sys-utils/lsipc.c:187 +#: sys-utils/lsipc.c:186 #, fuzzy -#| msgid "flag description" msgid "Description" msgstr "标志描述" -#: sys-utils/lsipc.c:188 +#: sys-utils/lsipc.c:187 msgid "Currently used" msgstr "" -#: sys-utils/lsipc.c:188 +#: sys-utils/lsipc.c:187 msgid "Used" msgstr "" -#: sys-utils/lsipc.c:189 +#: sys-utils/lsipc.c:188 #, fuzzy -#| msgid "filesystem use percentage" msgid "Currently use percentage" msgstr "文件系统使用百分比" -#: sys-utils/lsipc.c:189 +#: sys-utils/lsipc.c:188 #, fuzzy -#| msgid "Usage:" msgid "Use" msgstr "用法：" -#: sys-utils/lsipc.c:190 +#: sys-utils/lsipc.c:189 msgid "System-wide limit" msgstr "" -#: sys-utils/lsipc.c:190 +#: sys-utils/lsipc.c:189 msgid "Limit" msgstr "" -#: sys-utils/lsipc.c:225 +#: sys-utils/lsipc.c:224 #, c-format msgid "column %s does not apply to the specified IPC" msgstr "" -#: sys-utils/lsipc.c:287 +#: sys-utils/lsipc.c:286 msgid " -g, --global info about system-wide usage (may be used with -m, -q and -s)\n" msgstr "" -#: sys-utils/lsipc.c:288 +#: sys-utils/lsipc.c:287 #, fuzzy -#| msgid " -i, --id <id> print details on resource identified by <id>\n" msgid " -i, --id <id> print details on resource identified by <id>\n" msgstr " -i, --id <id> 打印由<id>标识的资源的详细信息\n" -#: sys-utils/lsipc.c:294 +#: sys-utils/lsipc.c:293 #, fuzzy -#| msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n" msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" -#: sys-utils/lsipc.c:295 +#: sys-utils/lsipc.c:294 #, fuzzy -#| msgid " -c, --creator show creator and owner\n" msgid " -c, --creator show creator and owner\n" msgstr " -c, --creator 显示创建者和拥有者\n" -#: sys-utils/lsipc.c:297 +#: sys-utils/lsipc.c:296 #, fuzzy -#| msgid " -r, --raw use raw output format\n" msgid " -J, --json use the JSON output format\n" msgstr " -r, --raw 使用原生输出格式\n" -#: sys-utils/lsipc.c:299 +#: sys-utils/lsipc.c:298 #, fuzzy -#| msgid " -l, --list use list format output\n" msgid " -l, --list force list output format (for example with --id)\n" msgstr " -l, --list 使用列表格式的输出\n" -#: sys-utils/lsipc.c:301 +#: sys-utils/lsipc.c:300 msgid " -P, --numeric-perms print numeric permissions (PERMS column)\n" msgstr "" -#: sys-utils/lsipc.c:303 +#: sys-utils/lsipc.c:302 #, fuzzy -#| msgid " -t, --time show attach, detach and change times\n" msgid " -t, --time show attach, detach and change times\n" msgstr " -t, --time 显示附加、脱离和更改时间\n" -#: sys-utils/lsipc.c:309 +#: sys-utils/lsipc.c:308 #, fuzzy, c-format -#| msgid "" -#| "\n" -#| "General Options:\n" msgid "" "\n" "Generic columns:\n" @@ -13859,11 +13797,8 @@ msgstr "" "\n" "常规选项：\n" -#: sys-utils/lsipc.c:313 +#: sys-utils/lsipc.c:312 #, fuzzy, c-format -#| msgid "" -#| "\n" -#| "Shared memory Segment shmid=%d\n" msgid "" "\n" "Shared-memory columns (--shmems):\n" @@ -13871,131 +13806,192 @@ msgstr "" "\n" "共享内存段 shmid=%d\n" -#: sys-utils/lsipc.c:317 +#: sys-utils/lsipc.c:316 #, c-format msgid "" "\n" "Message-queue columns (--queues):\n" msgstr "" -#: sys-utils/lsipc.c:321 +#: sys-utils/lsipc.c:320 #, fuzzy, c-format -#| msgid " -s, --semaphores semaphores\n" msgid "" "\n" "Semaphore columns (--semaphores):\n" msgstr " -s, --semaphores 信号量\n" -#: sys-utils/lsipc.c:325 +#: sys-utils/lsipc.c:324 #, c-format msgid "" "\n" "Summary columns (--global):\n" msgstr "" -#: sys-utils/lsipc.c:413 +#: sys-utils/lsipc.c:412 #, c-format msgid "" "Elements:\n" "\n" msgstr "" -#: sys-utils/lsipc.c:722 +#: sys-utils/lsipc.c:721 #, fuzzy -#| msgid "unique storage identifier" msgid "Number of semaphore identifiers" msgstr "惟一存储标识符" -#: sys-utils/lsipc.c:723 +#: sys-utils/lsipc.c:722 #, fuzzy -#| msgid "number of sectors" msgid "Total number of semaphores" msgstr "扇区数" -#: sys-utils/lsipc.c:724 +#: sys-utils/lsipc.c:723 #, fuzzy -#| msgid " -s, --semaphores semaphores\n" msgid "Max semaphores per semaphore set." msgstr " -s, --semaphores 信号量\n" -#: sys-utils/lsipc.c:725 +#: sys-utils/lsipc.c:724 #, fuzzy -#| msgid "max number of open files" msgid "Max number of operations per semop(2)" msgstr "打开文件的最大数量" -#: sys-utils/lsipc.c:726 +#: sys-utils/lsipc.c:725 #, fuzzy -#| msgid "semaphore max value = %d\n" msgid "Semaphore max value" msgstr "信号量最大值 = %d\n" -#: sys-utils/lsipc.c:880 +#: sys-utils/lsipc.c:879 #, fuzzy -#| msgid "Number of heads" msgid "Number of message queues" msgstr "磁头数" -#: sys-utils/lsipc.c:881 +#: sys-utils/lsipc.c:880 #, fuzzy -#| msgid "max size of message" msgid "Max size of message (bytes)" msgstr "最大消息尺寸" -#: sys-utils/lsipc.c:882 +#: sys-utils/lsipc.c:881 #, fuzzy -#| msgid "default max size of queue" msgid "Default max size of queue (bytes)" msgstr "默认的队列最大尺寸" -#: sys-utils/lsipc.c:995 sys-utils/lsipc.c:1014 +#: sys-utils/lsipc.c:994 sys-utils/lsipc.c:1013 msgid "hugetlb" msgstr "" -#: sys-utils/lsipc.c:996 sys-utils/lsipc.c:1021 +#: sys-utils/lsipc.c:995 sys-utils/lsipc.c:1020 #, fuzzy -#| msgid "Linux reserved" msgid "noreserve" msgstr "Linux 保留" -#: sys-utils/lsipc.c:1077 +#: sys-utils/lsipc.c:1076 #, fuzzy -#| msgid "" -#| "\n" -#| "Shared memory Segment shmid=%d\n" msgid "Shared memory segments" msgstr "" "\n" "共享内存段 shmid=%d\n" -#: sys-utils/lsipc.c:1078 +#: sys-utils/lsipc.c:1077 #, fuzzy -#| msgid "Shared memory id: %d\n" msgid "Shared memory pages" msgstr "共享内存 id：%d\n" -#: sys-utils/lsipc.c:1079 +#: sys-utils/lsipc.c:1078 #, fuzzy -#| msgid " -m, --shmems shared memory segments\n" msgid "Max size of shared memory segment (bytes)" msgstr " -m, --shmems 共享内存段\n" -#: sys-utils/lsipc.c:1080 +#: sys-utils/lsipc.c:1079 #, fuzzy -#| msgid " -m, --shmems shared memory segments\n" msgid "Min size of shared memory segment (bytes)" msgstr " -m, --shmems 共享内存段\n" -#: sys-utils/lsipc.c:1153 +#: sys-utils/lsipc.c:1152 #, fuzzy -#| msgid "failed to parse pid" msgid "failed to parse IPC identifier" msgstr "解析 pid 失败" -#: sys-utils/lsipc.c:1247 +#: sys-utils/lsipc.c:1246 msgid "--global is mutually exclusive with --creator, --id and --time" msgstr "" +#: sys-utils/lsns.c:83 +#, fuzzy +msgid "namespace identifier (inode number)" +msgstr "后备文件 inode 号" + +#: sys-utils/lsns.c:84 +msgid "kind of namespace" +msgstr "" + +#: sys-utils/lsns.c:85 +#, fuzzy +msgid "path to the namespace" +msgstr "设备的状态" + +#: sys-utils/lsns.c:86 +#, fuzzy +msgid "number of processes in the namespace" +msgstr "用户运行的进程数" + +#: sys-utils/lsns.c:87 +msgid "lowest PID in the namespace" +msgstr "" + +#: sys-utils/lsns.c:88 +msgid "PPID of the PID" +msgstr "" + +#: sys-utils/lsns.c:89 +msgid "command line of the PID" +msgstr "" + +#: sys-utils/lsns.c:90 +msgid "UID of the PID" +msgstr "" + +#: sys-utils/lsns.c:91 +msgid "username of the PID" +msgstr "" + +#: sys-utils/lsns.c:588 +#, fuzzy, c-format +msgid " %s [options] [<namespace>]\n" +msgstr " %s [选项] [<消息>]\n" + +#: sys-utils/lsns.c:591 +#, fuzzy +msgid "List system namespaces.\n" +msgstr "无法设置系统时钟。\n" + +#: sys-utils/lsns.c:598 +#, fuzzy +msgid " -p, --task <pid> print process namespaces\n" +msgstr " -t, --target <pid> 要获取名字空间的目标进程\n" + +#: sys-utils/lsns.c:601 +msgid " -t, --type <name> namespace type (mnt, net, ipc, user, pid, uts)\n" +msgstr "" + +#: sys-utils/lsns.c:691 +#, fuzzy, c-format +msgid "unknown namespace type: %s" +msgstr "未知的文件系统类型“%s”" + +#: sys-utils/lsns.c:710 +#, fuzzy +msgid "--task is mutually exclusive with <namespace>" +msgstr "--pid 和 命令 互相排斥" + +#: sys-utils/lsns.c:711 +#, fuzzy +msgid "invalid namespace argument" +msgstr "无效的 磁头数 参数" + +#: sys-utils/lsns.c:749 +#, c-format +msgid "not found namespace: %ju" +msgstr "" + #: sys-utils/mount.c:66 sys-utils/umount.c:118 #, c-format msgid "only root can use \"--%s\" option (effective UID is %u)" @@ -14020,11 +14016,6 @@ msgstr "只有 root 能执行该操作" msgid "%s from %s (libmount %s" msgstr "%s，来自 %s(libmount %s" -#: sys-utils/mount.c:102 sys-utils/umount.c:46 -#, c-format -msgid "%s: parse error: ignore entry at line %d." -msgstr "%s：解析出错：忽略第 %d 行的记录。" - #: sys-utils/mount.c:131 msgid "failed to read mtab" msgstr "读取 mtab 失败" @@ -14258,7 +14249,6 @@ msgstr "未知的文件系统类型“%s”" #: sys-utils/mount.c:578 #, fuzzy -#| msgid "unknown filesystem type '%s'" msgid "unknown filesystem type" msgstr "未知的文件系统类型“%s”" @@ -14306,7 +14296,7 @@ msgstr "%s 是写保护的，但指明了“-w”标志" msgid "cannot remount %s read-write, is write-protected" msgstr "无法以读写方式重新挂载 %s，它是写保护的" -#: sys-utils/mount.c:615 sys-utils/mount.c:635 sys-utils/unshare.c:184 +#: sys-utils/mount.c:615 sys-utils/mount.c:638 sys-utils/unshare.c:187 #, c-format msgid "mount %s on %s failed" msgstr "将 %s 挂载到 %s 失败" @@ -14316,27 +14306,27 @@ msgstr "将 %s 挂载到 %s 失败" msgid "%s is write-protected, mounting read-only" msgstr "%s 写保护，将以只读方式挂载" -#: sys-utils/mount.c:631 +#: sys-utils/mount.c:634 #, c-format msgid "no medium found on %s" msgstr "在 %s 上找不到媒体" -#: sys-utils/mount.c:659 +#: sys-utils/mount.c:662 #, c-format msgid "%s: failed to parse" msgstr "%s：解析失败" -#: sys-utils/mount.c:698 +#: sys-utils/mount.c:701 #, c-format msgid "unsupported option format: %s" msgstr "不支持的参数格式：%s" -#: sys-utils/mount.c:700 +#: sys-utils/mount.c:703 #, c-format msgid "failed to append option '%s'" msgstr "追加选项“%s”失败" -#: sys-utils/mount.c:717 +#: sys-utils/mount.c:720 #, c-format msgid "" " %1$s [-lhV]\n" @@ -14351,13 +14341,12 @@ msgstr "" " %1$s [选项] <源> <目录>\n" " %1$s <操作> <挂载点> [<目标>]\n" -#: sys-utils/mount.c:725 +#: sys-utils/mount.c:728 #, fuzzy -#| msgid "Checking all file systems.\n" msgid "Mount a filesystem.\n" msgstr "正在检查所有文件系统。\n" -#: sys-utils/mount.c:729 +#: sys-utils/mount.c:732 #, c-format msgid "" " -a, --all mount all filesystems mentioned in fstab\n" @@ -14372,24 +14361,22 @@ msgstr "" " -F, --fork 对每个设备禁用 fork(和 -a 选项一起使用)\n" " -T, --fstab <路径> /etc/fstab 的替代文件\n" -#: sys-utils/mount.c:735 +#: sys-utils/mount.c:738 #, fuzzy, c-format -#| msgid " -i, --internal-only don't call the umount.<type> helpers\n" msgid " -i, --internal-only don't call the mount.<type> helpers\n" msgstr " -i, --internal-only 不调用 umount.<类型> 辅助程序\n" -#: sys-utils/mount.c:737 +#: sys-utils/mount.c:740 #, fuzzy, c-format -#| msgid " -b, --bytes show sizes in bytes\n" msgid " -l, --show-labels show also filesystem labels\n" msgstr " -b, --bytes 以字节数显示大小\n" -#: sys-utils/mount.c:739 sys-utils/umount.c:93 +#: sys-utils/mount.c:742 sys-utils/umount.c:93 #, c-format msgid " -n, --no-mtab don't write to /etc/mtab\n" msgstr " -n, --no-mtab 不写 /etc/mtab\n" -#: sys-utils/mount.c:741 +#: sys-utils/mount.c:744 #, c-format msgid "" " -o, --options <list> comma-separated list of mount options\n" @@ -14402,7 +14389,7 @@ msgstr "" " -r, --read-only 以只读方式挂载文件系统(同 -o ro)\n" " -t, --types <列表> 限制文件系统类型集合\n" -#: sys-utils/mount.c:746 +#: sys-utils/mount.c:749 #, c-format msgid "" " --source <src> explicitly specifies source (path, label, uuid)\n" @@ -14411,17 +14398,17 @@ msgstr "" " --source <源> 指明源(路径、标签、uuid)\n" " --target <目标> 指明挂载点\n" -#: sys-utils/mount.c:749 sys-utils/umount.c:99 +#: sys-utils/mount.c:752 sys-utils/umount.c:99 #, c-format msgid " -v, --verbose say what is being done\n" msgstr " -v, --verbose 打印当前进行的操作\n" -#: sys-utils/mount.c:751 +#: sys-utils/mount.c:754 #, c-format msgid " -w, --rw, --read-write mount the filesystem read-write (default)\n" msgstr "" -#: sys-utils/mount.c:758 +#: sys-utils/mount.c:761 #, c-format msgid "" "\n" @@ -14442,7 +14429,7 @@ msgstr "" " PARTLABEL=<标签> 按分区标签指定设备\n" " PARTUUID=<uuid> 按分区 UUID 指定设备\n" -#: sys-utils/mount.c:767 +#: sys-utils/mount.c:770 #, c-format msgid "" " <device> specifies device by path\n" @@ -14453,7 +14440,7 @@ msgstr "" " <目录> 绑定式挂载的挂载点(参阅 --bind/rbind)\n" " <文件> 用于设置回环设备的常规文件\n" -#: sys-utils/mount.c:772 +#: sys-utils/mount.c:775 #, c-format msgid "" "\n" @@ -14468,7 +14455,7 @@ msgstr "" " -M, --move 将子树移动到其他位置\n" " -R, --rbind 挂载其他位置的子树及其包含的所有子挂载(submount)\n" -#: sys-utils/mount.c:777 +#: sys-utils/mount.c:780 #, c-format msgid "" " --make-shared mark a subtree as shared\n" @@ -14481,7 +14468,7 @@ msgstr "" " --make-private 将子树标记为 私有\n" " --make-unbindable 将子树标记为 不可绑定\n" -#: sys-utils/mount.c:782 +#: sys-utils/mount.c:785 #, c-format msgid "" " --make-rshared recursively mark a whole subtree as shared\n" @@ -14494,15 +14481,15 @@ msgstr "" " --make-rprivate 递归地将整个子树标记为 私有\n" " --make-runbindable 递归地将整个子树标记为 不可绑定\n" -#: sys-utils/mount.c:868 sys-utils/umount.c:549 +#: sys-utils/mount.c:871 sys-utils/umount.c:549 msgid "libmount context allocation failed" msgstr "libmount 环境(context)分配失败" -#: sys-utils/mount.c:925 sys-utils/umount.c:602 +#: sys-utils/mount.c:928 sys-utils/umount.c:602 msgid "failed to set options pattern" msgstr "设置选项模式失败" -#: sys-utils/mount.c:1078 +#: sys-utils/mount.c:1081 msgid "source specified more than once" msgstr "源指定了多次" @@ -14539,9 +14526,8 @@ msgstr "%s 不是一个挂载点\n" msgid "%s is a mountpoint\n" msgstr "%s 是一个挂载点\n" -#: sys-utils/nsenter.c:69 sys-utils/setpriv.c:93 sys-utils/unshare.c:232 +#: sys-utils/nsenter.c:69 sys-utils/setpriv.c:93 sys-utils/unshare.c:245 #, fuzzy, c-format -#| msgid " %s [options] <program> [arguments ...]\n" msgid " %s [options] <program> [<argument>...]\n" msgstr " %s [选项] <程序> [参数 ...]\n" @@ -14555,49 +14541,41 @@ msgstr " -t, --target <pid> 要获取名字空间的目标进程\n" #: sys-utils/nsenter.c:77 #, fuzzy -#| msgid " -m, --mount [=<file>] enter mount namespace\n" msgid " -m, --mount[=<file>] enter mount namespace\n" msgstr " -m, --mount [=<文件>] 进入挂臷名字空间\n" #: sys-utils/nsenter.c:78 #, fuzzy -#| msgid " -u, --uts [=<file>] enter UTS namespace (hostname etc)\n" msgid " -u, --uts[=<file>] enter UTS namespace (hostname etc)\n" msgstr " -u, --uts [=<文件>] 进入 UTS 名字空间(主机名等)\n" #: sys-utils/nsenter.c:79 #, fuzzy -#| msgid " -i, --ipc [=<file>] enter System V IPC namespace\n" msgid " -i, --ipc[=<file>] enter System V IPC namespace\n" msgstr " -i, --ipc [=<文件>] 进入系统 V IPC 名字空间\n" #: sys-utils/nsenter.c:80 #, fuzzy -#| msgid " -n, --net [=<file>] enter network namespace\n" msgid " -n, --net[=<file>] enter network namespace\n" msgstr " -n, --net [=<文件>] 进入网络名字空间\n" #: sys-utils/nsenter.c:81 #, fuzzy -#| msgid " -p, --pid [=<file>] enter pid namespace\n" msgid " -p, --pid[=<file>] enter pid namespace\n" msgstr " -p, --pid [=<文件>] 进入 pid 名字空间\n" #: sys-utils/nsenter.c:82 #, fuzzy -#| msgid " -U, --user [=<file>] enter user namespace\n" msgid " -U, --user[=<file>] enter user namespace\n" msgstr " -U, --user [=<文件>] 进入用户名字空间\n" #: sys-utils/nsenter.c:83 #, fuzzy -#| msgid " -S, --setuid <uid> set uid in user namespace\n" msgid " -S, --setuid <uid> set uid in entered namespace\n" msgstr " -S, --setuid <uid> 在用户名字空间中设置 uid\n" #: sys-utils/nsenter.c:84 #, fuzzy -#| msgid " -G, --setgid <gid> set gid in user namespace\n" msgid " -G, --setgid <gid> set gid in entered namespace\n" msgstr " -G, --setgid <gid> 在用户名字空间中设置 gid\n" @@ -14607,13 +14585,11 @@ msgstr "" #: sys-utils/nsenter.c:86 #, fuzzy -#| msgid " -r, --root [=<dir>] set the root directory\n" msgid " -r, --root[=<dir>] set the root directory\n" msgstr " -r, --root [=<目录>] 设置根目录\n" #: sys-utils/nsenter.c:87 #, fuzzy -#| msgid " -w, --wd [=<dir>] set the working directory\n" msgid " -w, --wd[=<dir>] set the working directory\n" msgstr " -w, --wd [=<目录>] 设置工作目录\n" @@ -14644,13 +14620,11 @@ msgstr "" #: sys-utils/nsenter.c:308 #, fuzzy, c-format -#| msgid "unable to create new selinux context" msgid "failed to get %d SELinux context" msgstr "无法创建新的 selinux 环境(context)" #: sys-utils/nsenter.c:311 #, fuzzy, c-format -#| msgid "Failed to set personality to %s" msgid "failed to set exec context to '%s'" msgstr "无法将人格(personality)设置为 %s" @@ -14686,7 +14660,6 @@ msgstr " %s [选项] 新根目录 旧根目录更名\n" #: sys-utils/pivot_root.c:37 #, fuzzy -#| msgid "Checking all file systems.\n" msgid "Change the root filesystem.\n" msgstr "正在检查所有文件系统。\n" @@ -14703,10 +14676,6 @@ msgstr "地址空间限制" msgid "max core file size" msgstr "最大核心文件尺寸" -#: sys-utils/prlimit.c:76 sys-utils/prlimit.c:79 -msgid "blocks" -msgstr "块" - #: sys-utils/prlimit.c:77 msgid "CPU time" msgstr "CPU 时间" @@ -14727,6 +14696,11 @@ msgstr "最大文件尺寸" msgid "max number of file locks held" msgstr "最大文件锁保持数量" +#: sys-utils/prlimit.c:80 +#, fuzzy +msgid "locks" +msgstr "块" + #: sys-utils/prlimit.c:81 msgid "max locked-in-memory address space" msgstr "最大内存锁定(locked-in-memory)地址空间" @@ -14743,18 +14717,24 @@ msgstr "允许提升的最大 nice 优先级" msgid "max number of open files" msgstr "打开文件的最大数量" +#: sys-utils/prlimit.c:84 +#, fuzzy +msgid "files" +msgstr "文件 %s" + #: sys-utils/prlimit.c:85 msgid "max number of processes" msgstr "最大进程数" +#: sys-utils/prlimit.c:85 +#, fuzzy +msgid "processes" +msgstr "进程 ID" + #: sys-utils/prlimit.c:86 msgid "max resident set size" msgstr "最大驻留集尺寸" -#: sys-utils/prlimit.c:86 -msgid "pages" -msgstr "页数" - #: sys-utils/prlimit.c:87 msgid "max real-time priority" msgstr "最大实时优先级" @@ -14771,6 +14751,10 @@ msgstr "毫秒数" msgid "max number of pending signals" msgstr "挂起(pending)信号的最大数量" +#: sys-utils/prlimit.c:89 +msgid "signals" +msgstr "" + #: sys-utils/prlimit.c:90 msgid "max stack size" msgstr "最大栈(stack)尺寸" @@ -14898,7 +14882,6 @@ msgstr "软限制 %s 不能超过硬限制" #: sys-utils/prlimit.c:363 #, fuzzy, c-format -#| msgid "New %s limit: " msgid "New %s limit for pid %d: " msgstr "新的 %s 限制：" @@ -14987,7 +14970,6 @@ msgstr "将假设为反向字节顺序。可使用 -n 强制为原生字节顺 #: sys-utils/readprofile.c:286 #, fuzzy, c-format -#| msgid "Sampling_step: %i\n" msgid "Sampling_step: %u\n" msgstr "采样步数(step)：%i\n" @@ -15034,19 +15016,16 @@ msgstr "" #: sys-utils/renice.c:70 #, fuzzy -#| msgid " -C, --cylinders <number> specify the number of cylinders\n" msgid " -n, --priority <num> specify the nice increment value\n" msgstr " -C, --cylinders <数字> 指定柱面数\n" #: sys-utils/renice.c:71 #, fuzzy -#| msgid " -i, --id log the process ID too\n" msgid " -p, --pid <id> interpret argument as process ID (default)\n" msgstr " -i, --id 也记录进程 ID\n" #: sys-utils/renice.c:72 #, fuzzy -#| msgid " -t, --target <pid> target process to get namespaces from\n" msgid " -g, --pgrp <id> interpret argument as process group ID\n" msgstr " -t, --target <pid> 要获取名字空间的目标进程\n" @@ -15078,19 +15057,18 @@ msgstr "未知用户 %s" #. * three ID names. Read: "bad value for %s: %s" #: sys-utils/renice.c:185 #, fuzzy, c-format -#| msgid "bad value %s" msgid "bad %s value: %s" msgstr "错误值 %s" -#: sys-utils/rtcwake.c:98 +#: sys-utils/rtcwake.c:97 msgid "Enter a system sleep state until a specified wakeup time.\n" msgstr "" -#: sys-utils/rtcwake.c:101 +#: sys-utils/rtcwake.c:100 msgid " -a, --auto reads the clock mode from adjust file (default)\n" msgstr " -a, --auto 从 adjust 文件读取时钟模式(默认)\n" -#: sys-utils/rtcwake.c:103 +#: sys-utils/rtcwake.c:102 #, c-format msgid "" " -A, --adjfile <file> specifies the path to the adjust file\n" @@ -15099,186 +15077,182 @@ msgstr "" " -A, --adjfile <文件> 指定 adjust 文件的路径\n" " 默认为 %s\n" -#: sys-utils/rtcwake.c:105 +#: sys-utils/rtcwake.c:104 #, fuzzy -#| msgid " -t, --time <time_t> time to wake\n" msgid " --date <timestamp> date time of timestamp to wake\n" msgstr " -t, --time <time_t> 指定唤醒时刻\n" -#: sys-utils/rtcwake.c:106 +#: sys-utils/rtcwake.c:105 msgid " -d, --device <device> select rtc device (rtc0|rtc1|...)\n" msgstr " -d, --device <设备> 选择 rtc 设备(rtc0|rtc1|...)\n" -#: sys-utils/rtcwake.c:107 +#: sys-utils/rtcwake.c:106 msgid " -n, --dry-run does everything, but suspend\n" msgstr " -n, --dry-run 演示操作但不执行(suspend)\n" -#: sys-utils/rtcwake.c:108 +#: sys-utils/rtcwake.c:107 msgid " -l, --local RTC uses local timezone\n" msgstr " -l, --local RTC 使用本地时区\n" -#: sys-utils/rtcwake.c:109 +#: sys-utils/rtcwake.c:108 msgid " --list-modes list available modes\n" msgstr "" -#: sys-utils/rtcwake.c:110 +#: sys-utils/rtcwake.c:109 msgid " -m, --mode <mode> standby|mem|... sleep mode\n" msgstr " -m, --mode <模式> 指定 standby|mem|... 等睡眠模式\n" -#: sys-utils/rtcwake.c:111 +#: sys-utils/rtcwake.c:110 msgid " -s, --seconds <seconds> seconds to sleep\n" msgstr " -s, --seconds <秒数> 指定睡眠的秒数\n" -#: sys-utils/rtcwake.c:112 +#: sys-utils/rtcwake.c:111 msgid " -t, --time <time_t> time to wake\n" msgstr " -t, --time <time_t> 指定唤醒时刻\n" -#: sys-utils/rtcwake.c:113 +#: sys-utils/rtcwake.c:112 msgid " -u, --utc RTC uses UTC\n" msgstr " -u, --utc RTC 使用 UTC\n" -#: sys-utils/rtcwake.c:114 +#: sys-utils/rtcwake.c:113 msgid " -v, --verbose verbose messages\n" msgstr " -v, --verbose 输出详尽消息\n" -#: sys-utils/rtcwake.c:167 +#: sys-utils/rtcwake.c:166 msgid "read rtc time failed" msgstr "读取 rtc 时间失败" -#: sys-utils/rtcwake.c:173 +#: sys-utils/rtcwake.c:172 msgid "read system time failed" msgstr "读取系统时间失败" -#: sys-utils/rtcwake.c:189 +#: sys-utils/rtcwake.c:188 msgid "convert rtc time failed" msgstr "转换 rtc 时间失败" -#: sys-utils/rtcwake.c:237 +#: sys-utils/rtcwake.c:236 msgid "set rtc wake alarm failed" msgstr "设置 rtc 唤醒闹钟失败" -#: sys-utils/rtcwake.c:307 +#: sys-utils/rtcwake.c:306 #, fuzzy, c-format -#| msgid "unexpected end of file on %s" msgid "unexpected third line in: %s: %s" msgstr "%s 上的文件结尾异常" -#: sys-utils/rtcwake.c:320 sys-utils/rtcwake.c:627 +#: sys-utils/rtcwake.c:319 sys-utils/rtcwake.c:626 msgid "read rtc alarm failed" msgstr "读取 rtc 闹钟失败" -#: sys-utils/rtcwake.c:325 +#: sys-utils/rtcwake.c:324 #, c-format msgid "alarm: off\n" msgstr "闹钟：关\n" -#: sys-utils/rtcwake.c:338 +#: sys-utils/rtcwake.c:337 msgid "convert time failed" msgstr "转换时间失败" -#: sys-utils/rtcwake.c:343 +#: sys-utils/rtcwake.c:342 #, c-format msgid "alarm: on %s" msgstr "闹钟：于 %s" -#: sys-utils/rtcwake.c:387 +#: sys-utils/rtcwake.c:386 #, fuzzy, c-format -#| msgid "Couldn't read %s" msgid "could not read: %s" msgstr "无法读 %s" -#: sys-utils/rtcwake.c:467 +#: sys-utils/rtcwake.c:466 #, c-format msgid "unrecognized suspend state '%s'" msgstr "不支持的挂起状态“%s”" -#: sys-utils/rtcwake.c:475 +#: sys-utils/rtcwake.c:474 msgid "invalid seconds argument" msgstr "无效的 秒数 参数" -#: sys-utils/rtcwake.c:479 +#: sys-utils/rtcwake.c:478 msgid "invalid time argument" msgstr "无效的 时间 参数" -#: sys-utils/rtcwake.c:507 +#: sys-utils/rtcwake.c:506 #, c-format msgid "%s: assuming RTC uses UTC ...\n" msgstr "%s：将假设 RTC 使用 UTC...\n" -#: sys-utils/rtcwake.c:514 +#: sys-utils/rtcwake.c:513 msgid "Using UTC time.\n" msgstr "使用 UTC 时间。\n" -#: sys-utils/rtcwake.c:515 +#: sys-utils/rtcwake.c:514 msgid "Using local time.\n" msgstr "使用当地时间。\n" -#: sys-utils/rtcwake.c:518 +#: sys-utils/rtcwake.c:517 #, fuzzy -#| msgid "must provide wake time (see -t and -s options)" msgid "must provide wake time (see --seconds, --time and --date options)" msgstr "必须指定唤醒时间(参阅 -t 和 -s 选项)" -#: sys-utils/rtcwake.c:524 +#: sys-utils/rtcwake.c:523 #, c-format msgid "%s not enabled for wakeup events" msgstr "%s 没有为唤醒事件启用" -#: sys-utils/rtcwake.c:531 +#: sys-utils/rtcwake.c:530 #, 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:538 +#: sys-utils/rtcwake.c:537 #, c-format msgid "time doesn't go backward to %s" msgstr "时间不能返回到 %s" -#: sys-utils/rtcwake.c:548 +#: sys-utils/rtcwake.c:547 #, c-format msgid "%s: wakeup using %s at %s" msgstr "%1$s：用 %3$s 的 %2$s 唤醒" -#: sys-utils/rtcwake.c:552 +#: sys-utils/rtcwake.c:551 #, c-format msgid "%s: wakeup from \"%s\" using %s at %s" msgstr "%s：从“%s”唤醒，使用 %s，时间 %s" -#: sys-utils/rtcwake.c:562 +#: sys-utils/rtcwake.c:561 #, c-format msgid "suspend mode: no; leaving\n" msgstr "挂起模式：无；将离开\n" -#: sys-utils/rtcwake.c:571 +#: sys-utils/rtcwake.c:570 #, c-format msgid "suspend mode: off; executing %s\n" msgstr "挂起模式：关；正在执行 %s\n" -#: sys-utils/rtcwake.c:590 +#: sys-utils/rtcwake.c:589 #, c-format msgid "suspend mode: on; reading rtc\n" msgstr "挂起模式：开；正在读 rtc\n" -#: sys-utils/rtcwake.c:595 +#: sys-utils/rtcwake.c:594 msgid "rtc read failed" msgstr "读 rtc 失败" -#: sys-utils/rtcwake.c:607 +#: sys-utils/rtcwake.c:606 #, c-format msgid "suspend mode: disable; disabling alarm\n" msgstr "挂起模式：禁用；正在禁用闹钟\n" -#: sys-utils/rtcwake.c:611 +#: sys-utils/rtcwake.c:610 #, c-format msgid "suspend mode: show; printing alarm info\n" msgstr "挂起模式：显示；正在打印闹钟信息\n" -#: sys-utils/rtcwake.c:618 +#: sys-utils/rtcwake.c:617 #, c-format msgid "suspend mode: %s; suspending system\n" msgstr "挂起模式：%s；正在挂起系统\n" -#: sys-utils/rtcwake.c:632 +#: sys-utils/rtcwake.c:631 msgid "disable rtc alarm interrupt failed" msgstr "禁用 rtc 闹钟中断失败" @@ -15289,13 +15263,11 @@ msgstr "正在打开 %s。\n" #: sys-utils/setarch.c:91 #, fuzzy, c-format -#| msgid " %s [options] <program> [arguments ...]\n" msgid " %s <arch> [options] [<program> [<argument>...]]\n" msgstr " %s [选项] <程序> [参数 ...]\n" #: sys-utils/setarch.c:93 #, fuzzy, c-format -#| msgid " %s [options] <program> [arguments ...]\n" msgid " %s [options] [<program> [<argument>...]]\n" msgstr " %s [选项] <程序> [参数 ...]\n" @@ -15353,7 +15325,6 @@ msgstr " --uname-2.6 开启 UNAME26\n" #: sys-utils/setarch.c:111 #, fuzzy -#| msgid " -v, --verbose says what options are being switched on\n" msgid " -v, --verbose say what options are being switched on\n" msgstr " -v, --verbose 打印开启了哪些选项\n" @@ -15380,36 +15351,32 @@ msgstr "请使用“%s --help”了解更多信息。" msgid "%s: Unrecognized architecture" msgstr "%s：未识别的架构" -#: sys-utils/setarch.c:248 +#: sys-utils/setarch.c:258 #, fuzzy, c-format -#| msgid "cannot set timeout for %s" msgid "Kernel cannot set architecture to %s" msgstr "无法设置 %s 的超时" -#: sys-utils/setarch.c:295 +#: sys-utils/setarch.c:305 msgid "Not enough arguments" msgstr "参数不够" -#: sys-utils/setarch.c:312 +#: sys-utils/setarch.c:322 #, c-format msgid "Failed to set personality to %s" msgstr "无法将人格(personality)设置为 %s" -#: sys-utils/setarch.c:369 +#: sys-utils/setarch.c:379 #, fuzzy -#| msgid "unrecognized option '%c'" msgid "unrecognized option '--list'" msgstr "不识别的选项“%c”" -#: sys-utils/setarch.c:376 +#: sys-utils/setarch.c:386 #, fuzzy -#| msgid "no length argument specified" msgid "no architecture argument specified" msgstr "没有指定长度参数" -#: sys-utils/setarch.c:382 +#: sys-utils/setarch.c:392 #, fuzzy, c-format -#| msgid "Failed to set personality to %s" msgid "failed to set personality to %s" msgstr "无法将人格(personality)设置为 %s" @@ -15815,7 +15782,7 @@ msgstr "非超级用户。" msgid "%s: swapoff failed" msgstr "%s：swapoff 失败" -#: sys-utils/swapoff.c:119 sys-utils/swapon.c:724 +#: sys-utils/swapoff.c:119 sys-utils/swapon.c:728 #, c-format msgid " %s [options] [<spec>]\n" msgstr " %s [选项] [<指定>]\n" @@ -15852,202 +15819,183 @@ msgstr "" " <设备> 要使用设备的名称\n" " <文件> 要使用文件的名称\n" -#: sys-utils/swapon.c:109 +#: sys-utils/swapon.c:93 msgid "device file or partition path" msgstr "设备文件或分区路径" -#: sys-utils/swapon.c:110 +#: sys-utils/swapon.c:94 msgid "type of the device" msgstr "设备的类型" -#: sys-utils/swapon.c:111 +#: sys-utils/swapon.c:95 msgid "size of the swap area" msgstr "交换区大小" -#: sys-utils/swapon.c:112 +#: sys-utils/swapon.c:96 msgid "bytes in use" msgstr "已使用字节数" -#: sys-utils/swapon.c:113 +#: sys-utils/swapon.c:97 msgid "swap priority" msgstr "交换优先级" -#: sys-utils/swapon.c:114 +#: sys-utils/swapon.c:98 msgid "swap uuid" msgstr "" -#: sys-utils/swapon.c:115 +#: sys-utils/swapon.c:99 #, fuzzy -#| msgid "Apple label" msgid "swap label" msgstr "Apple 标签" -#: sys-utils/swapon.c:232 +#: sys-utils/swapon.c:235 #, 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:232 +#: sys-utils/swapon.c:235 msgid "Filename" msgstr "文件名" -#: sys-utils/swapon.c:296 +#: sys-utils/swapon.c:298 #, c-format msgid "%s: reinitializing the swap." msgstr "%s：正在重新初始化交换区。" -#: sys-utils/swapon.c:347 +#: sys-utils/swapon.c:357 #, c-format msgid "%s: lseek failed" msgstr "%s：lseek 失败" -#: sys-utils/swapon.c:353 +#: sys-utils/swapon.c:363 #, c-format msgid "%s: write signature failed" msgstr "%s：写签名失败" -#: sys-utils/swapon.c:437 +#: sys-utils/swapon.c:446 #, c-format msgid "%s: found swap signature: version %ud, page-size %d, %s byte order" msgstr "%s：找到交换区签名：版本为 %ud，页面大小为 %d，%s 字节顺序" -#: sys-utils/swapon.c:442 +#: sys-utils/swapon.c:451 msgid "different" msgstr "不同" -#: sys-utils/swapon.c:442 +#: sys-utils/swapon.c:451 msgid "same" msgstr "相同" -#: sys-utils/swapon.c:485 -#, c-format -msgid "%s: insecure permissions %04o, %04o suggested." -msgstr "%s：不安全的权限 %04o，建议使用 %04o。" - -#: 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:496 +#: sys-utils/swapon.c:510 #, c-format msgid "%s: skipping - it appears to have holes." msgstr "%s：将跳过 - 它似乎有空洞。" -#: sys-utils/swapon.c:510 +#: sys-utils/swapon.c:518 #, c-format msgid "%s: get size failed" msgstr "%s：获取大小失败" -#: sys-utils/swapon.c:516 +#: sys-utils/swapon.c:524 #, c-format msgid "%s: read swap header failed" msgstr "%s：读交换区头失败" -#: sys-utils/swapon.c:526 +#: sys-utils/swapon.c:534 #, c-format msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu" msgstr "%s：页大小=%d，交换区大小=%llu，设备大小=%llu" -#: sys-utils/swapon.c:531 +#: sys-utils/swapon.c:539 #, c-format msgid "%s: last_page 0x%08llx is larger than actual size of swapspace" msgstr "%s：末页 0x%08llx 大于交换空间的实际大小" -#: sys-utils/swapon.c:541 +#: sys-utils/swapon.c:548 #, c-format msgid "%s: swap format pagesize does not match." msgstr "%s：交换格式页大小不匹配。" -#: sys-utils/swapon.c:549 +#: sys-utils/swapon.c:554 #, c-format msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)" msgstr "%s：交换格式页大小不匹配。(使用 --fixpgsz 来重新对它初始化。)" -#: sys-utils/swapon.c:558 +#: sys-utils/swapon.c:563 #, c-format msgid "%s: software suspend data detected. Rewriting the swap signature." msgstr "%s：检测到软件挂起数据。将重新写交换区签名。" -#: sys-utils/swapon.c:583 +#: sys-utils/swapon.c:589 #, c-format msgid "swapon %s\n" msgstr "swapon %s\n" -#: sys-utils/swapon.c:622 +#: sys-utils/swapon.c:629 #, c-format msgid "%s: swapon failed" msgstr "%s：swapon 失败" -#: sys-utils/swapon.c:727 +#: sys-utils/swapon.c:731 msgid "Enable devices and files for paging and swapping.\n" msgstr "" -#: sys-utils/swapon.c:730 +#: sys-utils/swapon.c:734 #, fuzzy -#| msgid " -a, --all list all used devices\n" msgid " -a, --all enable all swaps from /etc/fstab\n" msgstr " -a, --all 列出所有使用的设备\n" -#: sys-utils/swapon.c:731 +#: sys-utils/swapon.c:735 msgid " -d, --discard[=<policy>] enable swap discards, if supported by device\n" msgstr "" -#: sys-utils/swapon.c:732 +#: sys-utils/swapon.c:736 msgid " -e, --ifexists silently skip devices that do not exist\n" msgstr "" -#: sys-utils/swapon.c:733 +#: sys-utils/swapon.c:737 msgid " -f, --fixpgsz reinitialize the swap space if necessary\n" msgstr "" -#: sys-utils/swapon.c:734 +#: sys-utils/swapon.c:738 #, fuzzy -#| msgid " -O, --options <list> limit the set of filesystems by mount options\n" msgid " -o, --options <list> comma-separated list of swap options\n" msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n" -#: sys-utils/swapon.c:735 +#: sys-utils/swapon.c:739 #, fuzzy -#| msgid " -p, --priority <prio> mark given message with this priority\n" msgid " -p, --priority <prio> specify the priority of the swap device\n" msgstr " -p, --priority <级别> 将指定消息标记为此优先级\n" -#: sys-utils/swapon.c:736 +#: sys-utils/swapon.c:740 #, fuzzy -#| msgid " -s, --getsz display device size in 512-byte sectors [DEPRECATED]\n" msgid " -s, --summary display summary about used swap devices (DEPRECATED)\n" msgstr " -s, --getsz 以 512-字节扇区显示设备大小[已废弃]\n" -#: sys-utils/swapon.c:737 +#: sys-utils/swapon.c:741 msgid " --show[=<columns>] display summary in definable table\n" msgstr "" -#: sys-utils/swapon.c:738 +#: sys-utils/swapon.c:742 #, fuzzy -#| msgid " --noheadings don't print headings\n" msgid " --noheadings don't print table heading (with --show)\n" msgstr " --noheadings 不打印标题\n" -#: sys-utils/swapon.c:739 +#: sys-utils/swapon.c:743 #, fuzzy -#| msgid " -r, --raw use raw output format\n" msgid " --raw use the raw output format (with --show)\n" msgstr " -r, --raw 使用原生输出格式\n" -#: sys-utils/swapon.c:740 +#: sys-utils/swapon.c:744 #, fuzzy -#| msgid " --help display this help and exit\n" msgid " --bytes display swap size in bytes in --show output\n" msgstr " --help 显示此帮助并退出\n" -#: sys-utils/swapon.c:741 +#: sys-utils/swapon.c:745 #, fuzzy -#| msgid " -v, --verbose verbose mode\n" msgid " -v, --verbose verbose mode\n" msgstr " -v, --verbose 详尽模式\n" -#: sys-utils/swapon.c:747 +#: sys-utils/swapon.c:751 msgid "" "\n" "The <spec> parameter:\n" @@ -16071,14 +16019,8 @@ msgstr "" " <设备> 要使用设备的名称\n" " <文件> 要使用文件的名称\n" -#: sys-utils/swapon.c:757 +#: sys-utils/swapon.c:761 #, fuzzy -#| msgid "" -#| "\n" -#| "Available discard policy types (for --discard):\n" -#| " once\t : only single-time area discards are issued. (swapon)\n" -#| " pages\t : discard freed pages before they are reused.\n" -#| " * if no policy is selected both discard types are enabled. (default)\n" msgid "" "\n" "Available discard policy types (for --discard):\n" @@ -16092,7 +16034,7 @@ msgstr "" " pages\t ：对释放的页在重新使用前丢弃\n" " * 如果未选择策略，则两者都将启用。(默认)\n" -#: sys-utils/swapon.c:762 +#: sys-utils/swapon.c:766 msgid "" "\n" "Available columns (for --show):\n" @@ -16100,16 +16042,16 @@ msgstr "" "\n" "可用列(用于 --show)：\n" -#: sys-utils/swapon.c:837 +#: sys-utils/swapon.c:840 msgid "failed to parse priority" msgstr "解析优先级失败" -#: sys-utils/swapon.c:856 +#: sys-utils/swapon.c:859 #, c-format msgid "unsupported discard policy: %s" msgstr "不支持的丢弃策略：%s" -#: sys-utils/swapon-common.c:63 +#: sys-utils/swapon-common.c:74 #, c-format msgid "cannot find the device for %s" msgstr "找不到对应 %s 的设备" @@ -16298,7 +16240,6 @@ msgstr "" #: sys-utils/umount.c:82 #, fuzzy -#| msgid "Linux filesystem" msgid "Unmount filesystems.\n" msgstr "Linux 文件系统" @@ -16441,112 +16382,111 @@ 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:85 +#: sys-utils/unshare.c:88 #, fuzzy, c-format -#| msgid "unsupported argument: %s" msgid "unsupported --setgroups argument '%s'" msgstr "不支持的参数：%s" -#: sys-utils/unshare.c:106 sys-utils/unshare.c:121 +#: sys-utils/unshare.c:109 sys-utils/unshare.c:124 #, c-format msgid "write failed %s" msgstr "写失败：%s" -#: sys-utils/unshare.c:144 +#: sys-utils/unshare.c:147 #, fuzzy, c-format -#| msgid "unsupported option format: %s" msgid "unsupported propagation mode: %s" msgstr "不支持的参数格式：%s" -#: sys-utils/unshare.c:153 +#: sys-utils/unshare.c:156 msgid "cannot change root filesystem propagation" msgstr "" -#: sys-utils/unshare.c:198 +#: sys-utils/unshare.c:201 #, fuzzy, c-format -#| msgid "cannot read %s" msgid "cannot stat %s" msgstr "不能读 %s" -#: sys-utils/unshare.c:236 +#: sys-utils/unshare.c:212 +#, fuzzy +msgid "pipe failed" +msgstr "打开失败" + +#: sys-utils/unshare.c:226 +#, fuzzy +msgid "failed to read pipe" +msgstr "读 速度 失败" + +#: sys-utils/unshare.c:249 msgid "Run a program with some namespaces unshared from the parent.\n" msgstr "" -#: sys-utils/unshare.c:239 +#: sys-utils/unshare.c:252 #, fuzzy -#| msgid " -m, --mount [=<file>] enter mount namespace\n" msgid " -m, --mount[=<file>] unshare mounts namespace\n" msgstr " -m, --mount [=<文件>] 进入挂臷名字空间\n" -#: sys-utils/unshare.c:240 +#: sys-utils/unshare.c:253 #, fuzzy -#| msgid " -u, --uts [=<file>] enter UTS namespace (hostname etc)\n" msgid " -u, --uts[=<file>] unshare UTS namespace (hostname etc)\n" msgstr " -u, --uts [=<文件>] 进入 UTS 名字空间(主机名等)\n" -#: sys-utils/unshare.c:241 +#: sys-utils/unshare.c:254 #, fuzzy -#| msgid " -i, --ipc [=<file>] enter System V IPC namespace\n" msgid " -i, --ipc[=<file>] unshare System V IPC namespace\n" msgstr " -i, --ipc [=<文件>] 进入系统 V IPC 名字空间\n" -#: sys-utils/unshare.c:242 +#: sys-utils/unshare.c:255 #, fuzzy -#| msgid " -n, --net [=<file>] enter network namespace\n" msgid " -n, --net[=<file>] unshare network namespace\n" msgstr " -n, --net [=<文件>] 进入网络名字空间\n" -#: sys-utils/unshare.c:243 +#: sys-utils/unshare.c:256 #, fuzzy -#| msgid " -p, --pid [=<file>] enter pid namespace\n" msgid " -p, --pid[=<file>] unshare pid namespace\n" msgstr " -p, --pid [=<文件>] 进入 pid 名字空间\n" -#: sys-utils/unshare.c:244 +#: sys-utils/unshare.c:257 #, fuzzy -#| msgid " -U, --user [=<file>] enter user namespace\n" msgid " -U, --user[=<file>] unshare user namespace\n" msgstr " -U, --user [=<文件>] 进入用户名字空间\n" -#: sys-utils/unshare.c:245 +#: sys-utils/unshare.c:258 msgid " -f, --fork fork before launching <program>\n" msgstr " -f, --fork 在启动<程序>前 fork\n" -#: sys-utils/unshare.c:246 +#: sys-utils/unshare.c:259 msgid " --mount-proc[=<dir>] mount proc filesystem first (implies --mount)\n" msgstr " --mount-proc[=<目录>] 先挂载 proc 文件系统(连带打开 --mount)\n" -#: sys-utils/unshare.c:247 +#: sys-utils/unshare.c:260 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:248 +#: sys-utils/unshare.c:261 msgid "" " --propagation slave|shared|private|unchanged\n" " modify mount propagation in mount namespace\n" msgstr "" -#: sys-utils/unshare.c:250 +#: sys-utils/unshare.c:263 #, fuzzy -#| msgid " -G, --setgid <gid> set gid in user namespace\n" msgid " -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n" msgstr " -G, --setgid <gid> 在用户名字空间中设置 gid\n" -#: sys-utils/unshare.c:364 +#: sys-utils/unshare.c:378 msgid "unshare failed" msgstr "unshare 失败" -#: sys-utils/unshare.c:402 +#: sys-utils/unshare.c:422 msgid "child exit failed" msgstr "子进程退出失败" -#: sys-utils/unshare.c:409 +#: sys-utils/unshare.c:429 #, fuzzy -#| msgid "options --{shell,fast,command,session-command,login} and --user are mutually exclusive" msgid "options --setgroups=allow and --map-root-user are mutually exclusive" msgstr "选项 --{shell,fast,command,session-command,login} 和 --user 互斥" -#: sys-utils/unshare.c:429 +#: sys-utils/unshare.c:449 #, c-format msgid "mount %s failed" msgstr "挂载 %s 失败" @@ -16722,65 +16662,59 @@ msgstr "标识：" msgid "version" msgstr "版本：" -#: sys-utils/zramctl.c:71 +#: sys-utils/zramctl.c:72 #, fuzzy -#| msgid "device name" msgid "zram device name" msgstr "设备名" -#: sys-utils/zramctl.c:72 +#: sys-utils/zramctl.c:73 msgid "limit on the uncompressed amount of data" msgstr "" -#: sys-utils/zramctl.c:73 +#: sys-utils/zramctl.c:74 msgid "uncompressed size of stored data" msgstr "" -#: sys-utils/zramctl.c:74 +#: sys-utils/zramctl.c:75 msgid "compressed size of stored data" msgstr "" -#: sys-utils/zramctl.c:75 +#: sys-utils/zramctl.c:76 msgid "the selected compression algorithm" msgstr "" -#: sys-utils/zramctl.c:76 +#: sys-utils/zramctl.c:77 msgid "number of concurrent compress operations" msgstr "" -#: sys-utils/zramctl.c:77 +#: sys-utils/zramctl.c:78 #, fuzzy -#| msgid "failed to allocate memory: %m" msgid "empty pages with no allocated memory" msgstr "分配内存失败：%m" -#: sys-utils/zramctl.c:78 +#: sys-utils/zramctl.c:79 msgid "all memory including allocator fragmentation and metadata overhead" msgstr "" -#: sys-utils/zramctl.c:79 +#: sys-utils/zramctl.c:80 msgid "memory limit used to store compressed data" msgstr "" -#: sys-utils/zramctl.c:80 -msgid "memory zram have consumed to store compressed data" +#: sys-utils/zramctl.c:81 +msgid "memory zram have been consumed to store compressed data" msgstr "" -#: sys-utils/zramctl.c:81 -msgid "number of objects migrated migrated by compaction" +#: sys-utils/zramctl.c:82 +msgid "number of objects migrated by compaction" msgstr "" -#: sys-utils/zramctl.c:297 sys-utils/zramctl.c:308 +#: sys-utils/zramctl.c:306 sys-utils/zramctl.c:317 #, fuzzy -#| msgid "failed to parse start" msgid "Failed to parse mm_stat" msgstr "解析 起点 失败" -#: sys-utils/zramctl.c:455 +#: sys-utils/zramctl.c:464 #, fuzzy, c-format -#| msgid "" -#| " %1$s [options] [<loopdev>]\n" -#| " %1$s [options] -f | <loopdev> <file>\n" msgid "" " %1$s [options] <device>\n" " %1$s -r <device> [...]\n" @@ -16789,252 +16723,234 @@ msgstr "" " %1$s [选项] [<回环设备>]\n" " %1$s [选项] -f | <回环设备> <文件>\n" -#: sys-utils/zramctl.c:461 +#: sys-utils/zramctl.c:470 msgid "Set up and control zram devices.\n" msgstr "" -#: sys-utils/zramctl.c:464 +#: sys-utils/zramctl.c:473 msgid " -a, --algorithm lzo|lz4 compression algorithm to use\n" msgstr "" -#: sys-utils/zramctl.c:465 +#: sys-utils/zramctl.c:474 #, fuzzy -#| msgid " -b, --bytes print sizes in bytes rather than in human readable format\n" msgid " -b, --bytes print sizes in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n" -#: sys-utils/zramctl.c:466 +#: sys-utils/zramctl.c:475 #, fuzzy -#| msgid " -f, --find find first unused device\n" msgid " -f, --find find a free device\n" msgstr " -f, --find 查找第一个未使用的设备\n" -#: sys-utils/zramctl.c:467 +#: sys-utils/zramctl.c:476 #, fuzzy -#| msgid " -n, --noheadings don't print headings\n" msgid " -n, --noheadings don't print headings\n" msgstr " -n, --noheadings 不打印标题\n" -#: sys-utils/zramctl.c:468 +#: sys-utils/zramctl.c:477 #, fuzzy -#| msgid " -o, --output[=<list>] define the columns to output\n" msgid " -o, --output <list> columns to use for status output\n" msgstr " -o, --output[=<列表>] 定义要输出的列\n" -#: sys-utils/zramctl.c:469 +#: sys-utils/zramctl.c:478 #, fuzzy -#| msgid " --raw use raw --list output format\n" msgid " --raw use raw status output format\n" msgstr " --raw 使用原生 --list 输出格式\n" -#: sys-utils/zramctl.c:470 +#: sys-utils/zramctl.c:479 #, fuzzy -#| msgid " -D, --detach-all detach all used devices\n" msgid " -r, --reset reset all specified devices\n" msgstr " -D, --detach-all 断开所有使用的设备\n" -#: sys-utils/zramctl.c:471 +#: sys-utils/zramctl.c:480 #, fuzzy -#| msgid " -b, --sector-size <size> physical and logical sector size\n" msgid " -s, --size <size> device size\n" msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n" -#: sys-utils/zramctl.c:472 +#: sys-utils/zramctl.c:481 #, fuzzy -#| msgid " -s, --sectors <number> set the number of sectors to use\n" msgid " -t, --streams <number> number of compression streams\n" msgstr " -s, --sectors <数字> 设置要使用的扇区数\n" -#: sys-utils/zramctl.c:538 +#: sys-utils/zramctl.c:547 #, fuzzy, c-format -#| msgid "unsupported argument: %s" msgid "unsupported algorithm: %s" msgstr "不支持的参数：%s" -#: sys-utils/zramctl.c:560 +#: sys-utils/zramctl.c:569 #, fuzzy -#| msgid "failed to parse start" msgid "failed to parse streams" msgstr "解析 起点 失败" -#: sys-utils/zramctl.c:582 +#: sys-utils/zramctl.c:591 #, fuzzy -#| msgid "options --pid and COMMAND are mutually exclusive" msgid "option --find is mutually exclusive with <device>" msgstr "--pid 和 命令 互相排斥" -#: sys-utils/zramctl.c:588 +#: sys-utils/zramctl.c:597 #, fuzzy -#| msgid "only one device argument is currently supported" msgid "only one <device> at a time is allowed" msgstr "当前只支持一个设备参数" -#: sys-utils/zramctl.c:591 +#: sys-utils/zramctl.c:600 msgid "options --algorithm and --streams must be combined with --size" msgstr "" -#: sys-utils/zramctl.c:621 sys-utils/zramctl.c:649 +#: sys-utils/zramctl.c:630 sys-utils/zramctl.c:658 #, fuzzy, c-format -#| msgid "%s: failed to parse" msgid "%s: failed to reset" msgstr "%s：解析失败" -#: sys-utils/zramctl.c:631 sys-utils/zramctl.c:639 +#: sys-utils/zramctl.c:640 sys-utils/zramctl.c:648 msgid "no free zram device found" msgstr "" -#: sys-utils/zramctl.c:653 +#: sys-utils/zramctl.c:662 #, fuzzy, c-format -#| msgid "failed to parse number of lines" msgid "%s: failed to set number of streams" msgstr "解析行数失败" -#: sys-utils/zramctl.c:657 +#: sys-utils/zramctl.c:666 #, fuzzy, c-format -#| msgid "%s: failed to set backing file" msgid "%s: failed to set algorithm" msgstr "%s：设置后备文件失败" -#: sys-utils/zramctl.c:660 +#: sys-utils/zramctl.c:669 #, fuzzy, c-format -#| msgid "%s: failed to get whole-disk device number" msgid "%s: failed to set disksize (%ju bytes)" msgstr "%s：获取 整盘 设备号失败" -#: term-utils/agetty.c:452 +#: term-utils/agetty.c:453 #, c-format msgid "%s%s (automatic login)\n" msgstr "%s%s (自动登录)\n" -#: term-utils/agetty.c:506 +#: term-utils/agetty.c:507 #, c-format msgid "%s: can't change root directory %s: %m" msgstr "%s：无法更改根目录 %s：%m" -#: term-utils/agetty.c:511 +#: term-utils/agetty.c:512 #, c-format msgid "%s: can't change working directory %s: %m" msgstr "%s：无法更改工作目录 %s：%m" -#: term-utils/agetty.c:516 +#: term-utils/agetty.c:517 #, c-format msgid "%s: can't change process priority: %m" msgstr "%s：无法更改进程优先级：%m" -#: term-utils/agetty.c:527 +#: term-utils/agetty.c:528 #, c-format msgid "%s: can't exec %s: %m" msgstr "%s：无法执行 %s：%m" -#: term-utils/agetty.c:558 term-utils/agetty.c:845 term-utils/agetty.c:857 -#: term-utils/agetty.c:1414 term-utils/agetty.c:1432 term-utils/agetty.c:1467 -#: term-utils/agetty.c:1477 term-utils/agetty.c:1514 term-utils/agetty.c:1968 -#: term-utils/agetty.c:2490 +#: term-utils/agetty.c:559 term-utils/agetty.c:846 term-utils/agetty.c:858 +#: term-utils/agetty.c:1415 term-utils/agetty.c:1433 term-utils/agetty.c:1468 +#: term-utils/agetty.c:1478 term-utils/agetty.c:1515 term-utils/agetty.c:1975 +#: term-utils/agetty.c:2509 #, c-format msgid "failed to allocate memory: %m" msgstr "分配内存失败：%m" -#: term-utils/agetty.c:722 +#: term-utils/agetty.c:723 msgid "invalid argument of --local-line" msgstr "--local-line 选项参数无效" -#: term-utils/agetty.c:754 +#: term-utils/agetty.c:755 #, c-format msgid "bad timeout value: %s" msgstr "超时值有误：%s" -#: term-utils/agetty.c:875 +#: term-utils/agetty.c:876 #, c-format msgid "bad speed: %s" msgstr "速度有误：%s" -#: term-utils/agetty.c:877 +#: term-utils/agetty.c:878 msgid "too many alternate speeds" msgstr "备选速度过多" -#: term-utils/agetty.c:1005 term-utils/agetty.c:1022 term-utils/agetty.c:1062 +#: term-utils/agetty.c:1006 term-utils/agetty.c:1010 term-utils/agetty.c:1063 #, c-format msgid "/dev/%s: cannot open as standard input: %m" msgstr "/dev/%s：无法以标准输入打开：%m" -#: term-utils/agetty.c:1028 +#: term-utils/agetty.c:1029 #, c-format msgid "/dev/%s: not a character device" msgstr "/dev/%s：不是字符设备" -#: term-utils/agetty.c:1030 +#: term-utils/agetty.c:1031 #, c-format msgid "/dev/%s: not a tty" msgstr "/dev/%s：不是终端" -#: term-utils/agetty.c:1034 term-utils/agetty.c:1066 +#: term-utils/agetty.c:1035 term-utils/agetty.c:1067 #, c-format msgid "/dev/%s: cannot get controlling tty: %m" msgstr "/dev/%s：无法获取控制 tty：%m" -#: term-utils/agetty.c:1056 +#: term-utils/agetty.c:1057 #, c-format msgid "/dev/%s: vhangup() failed: %m" msgstr "/dev/%s：vhangup() 失败：%m" -#: term-utils/agetty.c:1077 +#: term-utils/agetty.c:1078 #, c-format msgid "%s: not open for read/write" msgstr "%s：未打开(就)读/写" -#: term-utils/agetty.c:1082 +#: term-utils/agetty.c:1083 #, c-format msgid "/dev/%s: cannot set process group: %m" msgstr "/dev/%s：无法设置进程组：%m" -#: term-utils/agetty.c:1096 +#: term-utils/agetty.c:1097 #, c-format msgid "%s: dup problem: %m" msgstr "%s：dup 问题：%m" -#: term-utils/agetty.c:1113 +#: term-utils/agetty.c:1114 #, c-format msgid "%s: failed to get terminal attributes: %m" msgstr "%s：获取终端属性失败：%m" -#: term-utils/agetty.c:1320 term-utils/agetty.c:1340 +#: term-utils/agetty.c:1321 term-utils/agetty.c:1341 #, c-format msgid "setting terminal attributes failed: %m" msgstr "设置终端属性失败：%m" -#: term-utils/agetty.c:1457 +#: term-utils/agetty.c:1458 #, fuzzy -#| msgid "cannot open lock file %s" msgid "cannot open os-release file" msgstr "不能打开锁文件 %s" -#: term-utils/agetty.c:1635 +#: term-utils/agetty.c:1636 #, fuzzy, c-format -#| msgid "failed to read typescript file %s" msgid "failed to create reload file: %s: %m" msgstr "读 typescript 文件 %s 失败" -#: term-utils/agetty.c:1726 +#: term-utils/agetty.c:1733 msgid "[press ENTER to login]" msgstr "[按 ENTER 键登录]" -#: term-utils/agetty.c:1750 +#: term-utils/agetty.c:1757 msgid "Num Lock off" msgstr "Num Lock 关" -#: term-utils/agetty.c:1753 +#: term-utils/agetty.c:1760 msgid "Num Lock on" msgstr "Num Lock 开" -#: term-utils/agetty.c:1756 +#: term-utils/agetty.c:1763 msgid "Caps Lock on" msgstr "Caps Lock 开" -#: term-utils/agetty.c:1759 +#: term-utils/agetty.c:1766 msgid "Scroll Lock on" msgstr "Scroll Lock 开" -#: term-utils/agetty.c:1762 +#: term-utils/agetty.c:1769 #, c-format msgid "" "Hint: %s\n" @@ -17043,32 +16959,32 @@ msgstr "" "提示：%s\n" "\n" -#: term-utils/agetty.c:1889 +#: term-utils/agetty.c:1896 #, c-format msgid "%s: read: %m" msgstr "%s：read：%m" -#: term-utils/agetty.c:1948 +#: term-utils/agetty.c:1955 #, c-format msgid "%s: input overrun" msgstr "%s：输入过载" -#: term-utils/agetty.c:1964 term-utils/agetty.c:1972 +#: term-utils/agetty.c:1971 term-utils/agetty.c:1979 #, c-format msgid "%s: invalid character conversion for login name" msgstr "%s：登录名字符转换无效" -#: term-utils/agetty.c:1978 +#: term-utils/agetty.c:1985 #, c-format msgid "%s: invalid character 0x%x in login name" msgstr "%s：登录名中的字符 0x%x 无效" -#: term-utils/agetty.c:2063 +#: term-utils/agetty.c:2070 #, c-format msgid "%s: failed to set terminal attributes: %m" msgstr "%s：设置终端属性失败：%m" -#: term-utils/agetty.c:2099 +#: term-utils/agetty.c:2106 #, c-format msgid "" " %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n" @@ -17077,166 +16993,164 @@ msgstr "" " %1$s [选项] <线路> [<波特率>,...] [<终端类型>]\n" " %1$s [选项] <波特率>,... <线路> [<终端类型>]\n" -#: term-utils/agetty.c:2103 +#: term-utils/agetty.c:2110 msgid "Open a terminal and set its mode.\n" msgstr "" -#: term-utils/agetty.c:2106 +#: term-utils/agetty.c:2113 msgid " -8, --8bits assume 8-bit tty\n" msgstr " -8, --8bits 采用 8 位 tty\n" -#: term-utils/agetty.c:2107 +#: term-utils/agetty.c:2114 msgid " -a, --autologin <user> login the specified user automatically\n" msgstr " -a, --autologin <用户> 以指定用户自动登录\n" -#: term-utils/agetty.c:2108 +#: term-utils/agetty.c:2115 msgid " -c, --noreset do not reset control mode\n" msgstr " -c, --noreset 不重置控制模式\n" -#: term-utils/agetty.c:2109 +#: term-utils/agetty.c:2116 msgid " -E, --remote use -r <hostname> for login(1)\n" msgstr " -E, --remote 使用 -r <主机名> 选项调用 login(1)\n" -#: term-utils/agetty.c:2110 +#: term-utils/agetty.c:2117 msgid " -f, --issue-file <file> display issue file\n" msgstr " -f, --issue-file <文件> 指定要显示的预登录消息(issue)文件\n" -#: term-utils/agetty.c:2111 +#: term-utils/agetty.c:2118 msgid " -h, --flow-control enable hardware flow control\n" msgstr " -h, --flow-control 启用硬件流控制\n" -#: term-utils/agetty.c:2112 +#: term-utils/agetty.c:2119 msgid " -H, --host <hostname> specify login host\n" msgstr " -H, --host <主机名> 指定登录主机\n" -#: term-utils/agetty.c:2113 +#: term-utils/agetty.c:2120 msgid " -i, --noissue do not display issue file\n" msgstr " -i, --noissue 不显示预登录消息(issue)文件\n" -#: term-utils/agetty.c:2114 +#: term-utils/agetty.c:2121 msgid " -I, --init-string <string> set init string\n" msgstr " -I, --init-string <字符串> 设置初始字符串\n" -#: term-utils/agetty.c:2115 +#: term-utils/agetty.c:2122 msgid " -J --noclear do not clear the screen before prompt\n" msgstr " -J --noclear 提示之前不清屏\n" -#: term-utils/agetty.c:2116 +#: term-utils/agetty.c:2123 msgid " -l, --login-program <file> specify login program\n" msgstr " -l, --login-program <文件> 指定登录程序\n" -#: term-utils/agetty.c:2117 +#: term-utils/agetty.c:2124 msgid " -L, --local-line[=<mode>] control the local line flag\n" msgstr " -L, --local-line[=<模式>] 控制本地线路标志\n" -#: term-utils/agetty.c:2118 +#: term-utils/agetty.c:2125 msgid " -m, --extract-baud extract baud rate during connect\n" msgstr " -m, --extract-baud 连接过程中提取波特率\n" -#: term-utils/agetty.c:2119 +#: term-utils/agetty.c:2126 msgid " -n, --skip-login do not prompt for login\n" msgstr " -n, --skip-login 不提示登录\n" -#: term-utils/agetty.c:2120 +#: term-utils/agetty.c:2127 msgid " -N --nonewline do not print a newline before issue\n" msgstr " -N --nonewline 预登录消息(issue)前不打印换行(newline)\n" -#: term-utils/agetty.c:2121 +#: term-utils/agetty.c:2128 msgid " -o, --login-options <opts> options that are passed to login\n" msgstr " -o, --login-options <选项> 传递给登录程序的选项\n" -#: term-utils/agetty.c:2122 +#: term-utils/agetty.c:2129 msgid " -p, --login-pause wait for any key before the login\n" msgstr " -p, --login-pause 登录前等待按下任意键来继续\n" -#: term-utils/agetty.c:2123 +#: term-utils/agetty.c:2130 msgid " -r, --chroot <dir> change root to the directory\n" msgstr " -r, --chroot <目录> 将根目录更改为指定目录\n" -#: term-utils/agetty.c:2124 +#: term-utils/agetty.c:2131 msgid " -R, --hangup do virtually hangup on the tty\n" msgstr " -R, --hangup 对 tty 执行虚拟挂起(virtual hangup)\n" -#: term-utils/agetty.c:2125 +#: term-utils/agetty.c:2132 msgid " -s, --keep-baud try to keep baud rate after break\n" msgstr " -s, --keep-baud 中断(break)后尝试保持波特率\n" -#: term-utils/agetty.c:2126 +#: term-utils/agetty.c:2133 msgid " -t, --timeout <number> login process timeout\n" msgstr " -t, --timeout <数字> 登录进程超时(秒)\n" -#: term-utils/agetty.c:2127 +#: term-utils/agetty.c:2134 msgid " -U, --detect-case detect uppercase terminal\n" msgstr " -U, --detect-case 检测纯大写终端\n" -#: term-utils/agetty.c:2128 +#: term-utils/agetty.c:2135 msgid " -w, --wait-cr wait carriage-return\n" msgstr " -w, --wait-cr 等待回车\n" -#: term-utils/agetty.c:2129 +#: term-utils/agetty.c:2136 msgid " --nohints do not print hints\n" msgstr " --nohints 不打印提示信息\n" -#: term-utils/agetty.c:2130 +#: term-utils/agetty.c:2137 msgid " --nohostname no hostname at all will be shown\n" msgstr " --nohostname 将完全不显示主机名\n" -#: term-utils/agetty.c:2131 +#: term-utils/agetty.c:2138 msgid " --long-hostname show full qualified hostname\n" msgstr " --long-hostname 显示完全限定主机名\n" -#: term-utils/agetty.c:2132 +#: term-utils/agetty.c:2139 msgid " --erase-chars <string> additional backspace chars\n" msgstr " --erase-chars <字符串> 附加的退格字符\n" -#: term-utils/agetty.c:2133 +#: term-utils/agetty.c:2140 msgid " --kill-chars <string> additional kill chars\n" msgstr " --kill-chars <字符串> 附加的杀死(kill)字符\n" -#: term-utils/agetty.c:2134 +#: term-utils/agetty.c:2141 msgid " --chdir <directory> chdir before the login\n" msgstr " --chdir <目录> 登录前切换目录(chdir)\n" -#: term-utils/agetty.c:2135 +#: term-utils/agetty.c:2142 msgid " --delay <number> sleep seconds before prompt\n" msgstr " --delay <数字> 提示前睡眠的秒数\n" -#: term-utils/agetty.c:2136 +#: term-utils/agetty.c:2143 msgid " --nice <number> run login with this priority\n" msgstr " --nice <数字> 以指定优先级运行 login\n" -#: term-utils/agetty.c:2137 +#: term-utils/agetty.c:2144 #, fuzzy -#| msgid " --nohints do not print hints\n" msgid " --reload reload prompts on running agetty instances\n" msgstr " --nohints 不打印提示信息\n" -#: term-utils/agetty.c:2138 +#: term-utils/agetty.c:2145 msgid " --help display this help and exit\n" msgstr " --help 显示此帮助并退出\n" -#: term-utils/agetty.c:2139 +#: term-utils/agetty.c:2146 msgid " --version output version information and exit\n" msgstr " --version 输出版本信息并退出\n" -#: term-utils/agetty.c:2450 +#: term-utils/agetty.c:2469 #, c-format msgid "%d user" msgid_plural "%d users" msgstr[0] "%d 位用户" -#: term-utils/agetty.c:2578 +#: term-utils/agetty.c:2597 #, c-format msgid "checkname failed: %m" msgstr "checkname 失败：%m" -#: term-utils/agetty.c:2624 +#: term-utils/agetty.c:2643 #, fuzzy, c-format -#| msgid "cannot close file %s" msgid "cannot touch file %s" msgstr "无法关闭文件 %s" -#: term-utils/agetty.c:2628 +#: term-utils/agetty.c:2647 msgid "--reload is unsupported on your system" msgstr "" @@ -17247,7 +17161,6 @@ msgstr " %s [选项] [y | n]\n" #: term-utils/mesg.c:78 #, fuzzy -#| msgid "write access to your terminal is denied" msgid "Control write access of other users to your terminal.\n" msgstr "拒绝了写您的终端" @@ -17259,42 +17172,42 @@ msgstr " -v, --verbose 解释正在进行的操作\n" msgid "ttyname failed" msgstr "ttyname 失败" -#: term-utils/mesg.c:132 +#: term-utils/mesg.c:134 msgid "is y" msgstr "是 y" -#: term-utils/mesg.c:135 +#: term-utils/mesg.c:137 msgid "is n" msgstr "是 n" -#: term-utils/mesg.c:146 term-utils/mesg.c:152 +#: term-utils/mesg.c:148 term-utils/mesg.c:155 #, c-format msgid "change %s mode failed" msgstr "更改 %s 模式失败" -#: term-utils/mesg.c:148 +#: term-utils/mesg.c:150 msgid "write access to your terminal is allowed" msgstr "允许了写您的终端" -#: term-utils/mesg.c:154 +#: term-utils/mesg.c:157 msgid "write access to your terminal is denied" msgstr "拒绝了写您的终端" -#: term-utils/mesg.c:157 +#: term-utils/mesg.c:161 #, c-format msgid "invalid argument: %s" msgstr "无效参数：%s" -#: term-utils/script.c:157 +#: term-utils/script.c:160 #, c-format msgid " %s [options] [file]\n" msgstr " %s [选项] [文件]\n" -#: term-utils/script.c:160 +#: term-utils/script.c:163 msgid "Make a typescript of a terminal session.\n" msgstr "" -#: term-utils/script.c:163 +#: term-utils/script.c:166 msgid "" " -a, --append append the output\n" " -c, --command <command> run command rather than interactive shell\n" @@ -17318,7 +17231,7 @@ msgstr "" " -h, --help 显示此帮助并退出\n" "\n" -#: term-utils/script.c:185 +#: term-utils/script.c:188 #, c-format msgid "" "output file `%s' is a link\n" @@ -17329,20 +17242,17 @@ msgstr "" "如果真想用它，使用 --force 选项。\n" "程序没有启动。" -#: term-utils/script.c:197 +#: term-utils/script.c:200 #, c-format msgid "Script done, file is %s\n" msgstr "脚本完成，文件为 %s\n" -#: term-utils/script.c:258 +#: term-utils/script.c:262 msgid "cannot write script file" msgstr "无法写脚本文件" -#: term-utils/script.c:388 +#: term-utils/script.c:392 #, fuzzy, c-format -#| msgid "" -#| "\n" -#| "Session terminated, killing shell..." msgid "" "\n" "Session terminated.\n" @@ -17350,18 +17260,12 @@ msgstr "" "\n" "会话已终止，正在杀死 shell..." -#: term-utils/script.c:429 +#: term-utils/script.c:433 #, c-format msgid "Script started on %s" msgstr "脚本启动于 %s" -#: term-utils/script.c:446 -#, fuzzy -#| msgid "poll() failed" -msgid "poll failed" -msgstr "poll() 失败" - -#: term-utils/script.c:501 +#: term-utils/script.c:505 #, c-format msgid "" "\n" @@ -17370,19 +17274,19 @@ msgstr "" "\n" "脚本完成，于 %s" -#: term-utils/script.c:597 +#: term-utils/script.c:601 msgid "failed to get terminal attributes" msgstr "取终端属性失败" -#: term-utils/script.c:604 +#: term-utils/script.c:608 msgid "openpty failed" msgstr "openpty 失败" -#: term-utils/script.c:643 +#: term-utils/script.c:646 msgid "out of pty's" msgstr "pty 的输出" -#: term-utils/script.c:743 +#: term-utils/script.c:746 #, c-format msgid "Script started, file is %s\n" msgstr "脚本已启动，文件为 %s\n" @@ -17863,24 +17767,22 @@ msgstr "越过第一行" msgid "-- line already flushed" msgstr "-- 行已经被冲洗(flushed)" -#: text-utils/colcrt.c:318 text-utils/column.c:92 +#: text-utils/colcrt.c:81 text-utils/column.c:117 #, c-format msgid " %s [options] [<file>...]\n" msgstr " %s [选项] [<文件>...]\n" -#: text-utils/colcrt.c:321 +#: text-utils/colcrt.c:84 msgid "Filter nroff output for CRT previewing.\n" msgstr "" -#: text-utils/colcrt.c:324 +#: text-utils/colcrt.c:87 #, fuzzy -#| msgid " -u suppress underlining\n" msgid " -, --no-underlining suppress all underlining\n" msgstr " -u 屏蔽下划线\n" -#: text-utils/colcrt.c:325 +#: text-utils/colcrt.c:88 #, fuzzy -#| msgid " -a, --all print all devices\n" msgid " -2, --half-lines print all half-lines\n" msgstr " -a, --all 打印所有设备\n" @@ -17907,23 +17809,23 @@ msgstr "第一个参数" msgid "second argument" msgstr "第二个参数" -#: text-utils/column.c:95 +#: text-utils/column.c:120 msgid "Columnate lists.\n" msgstr "" -#: text-utils/column.c:98 +#: text-utils/column.c:123 msgid " -c, --columns <width> width of output in number of characters\n" msgstr " -c, --columns <宽度> 输出宽度(字符数)\n" -#: text-utils/column.c:99 +#: text-utils/column.c:124 msgid " -t, --table create a table\n" msgstr " -t, --table 创建表格\n" -#: text-utils/column.c:100 +#: text-utils/column.c:125 msgid " -s, --separator <string> possible table delimiters\n" msgstr " -s, --separator <字符串> 可用的表格分隔符\n" -#: text-utils/column.c:101 +#: text-utils/column.c:126 msgid "" " -o, --output-separator <string>\n" " columns separator for table output; default is two spaces\n" @@ -17931,20 +17833,20 @@ msgstr "" " -o, --output-separator <字符串>\n" " 表格输出列分隔符，默认为两个空格\n" -#: text-utils/column.c:103 +#: text-utils/column.c:128 msgid " -x, --fillrows fill rows before columns\n" msgstr " -x, --fillrows 先填充行，再填充列\n" -#: text-utils/column.c:159 +#: text-utils/column.c:182 msgid "invalid columns argument" msgstr "无效的 列数 参数" -#: text-utils/column.c:395 +#: text-utils/column.c:422 #, c-format msgid "line %d is too long, output will be truncated" msgstr "第 %d 行过长，输出将截短" -#: text-utils/hexdump.c:155 text-utils/more.c:319 +#: text-utils/hexdump.c:155 text-utils/more.c:230 #, c-format msgid " %s [options] <file>...\n" msgstr " %s [选项] <文件>...\n" @@ -18033,60 +17935,60 @@ msgstr "对字符计数使用了多个转换字符" msgid "Read one line.\n" msgstr "" -#: text-utils/more.c:322 +#: text-utils/more.c:233 msgid "A file perusal filter for CRT viewing.\n" msgstr "" -#: text-utils/more.c:325 +#: text-utils/more.c:236 msgid " -d display help instead of ringing bell\n" msgstr " -d 显示帮助而非响铃\n" -#: text-utils/more.c:326 +#: text-utils/more.c:237 msgid " -f count logical rather than screen lines\n" msgstr " -f 计算逻辑行数，而非屏幕行数\n" -#: text-utils/more.c:327 +#: text-utils/more.c:238 msgid " -l suppress pause after form feed\n" msgstr " -l 屏蔽换页(form feed)后的暂停\n" -#: text-utils/more.c:328 +#: text-utils/more.c:239 msgid " -c do not scroll, display text and clean line ends\n" msgstr " -c 不滚动，显示文本并清理行末\n" -#: text-utils/more.c:329 +#: text-utils/more.c:240 msgid " -p do not scroll, clean screen and display text\n" msgstr " -p 不滚动，清除屏幕并显示文本\n" -#: text-utils/more.c:330 +#: text-utils/more.c:241 msgid " -s squeeze multiple blank lines into one\n" msgstr " -s 将多行空行压缩为一行\n" -#: text-utils/more.c:331 +#: text-utils/more.c:242 msgid " -u suppress underlining\n" msgstr " -u 屏蔽下划线\n" -#: text-utils/more.c:332 +#: text-utils/more.c:243 msgid " -<number> the number of lines per screenful\n" msgstr " -<数字> 每屏的行数\n" -#: text-utils/more.c:333 +#: text-utils/more.c:244 msgid " +<number> display file beginning from line number\n" msgstr " +<数字> 从指定行开始显示文件\n" -#: text-utils/more.c:334 +#: text-utils/more.c:245 msgid " +/<string> display file beginning from search string match\n" msgstr " +/<字符串> 从匹配搜索字符串的位置开始显示文件\n" -#: text-utils/more.c:335 +#: text-utils/more.c:246 msgid " -V display version information and exit\n" msgstr " -V 显示版本信息并退出\n" -#: text-utils/more.c:578 +#: text-utils/more.c:489 #, c-format msgid "unknown option -%s" msgstr "未知选项 -%s" -#: text-utils/more.c:602 +#: text-utils/more.c:513 #, c-format msgid "" "\n" @@ -18097,7 +17999,7 @@ msgstr "" "*** %s：目录 ***\n" "\n" -#: text-utils/more.c:644 +#: text-utils/more.c:555 #, c-format msgid "" "\n" @@ -18108,39 +18010,39 @@ msgstr "" "******** %s：不是文件文件 ********\n" "\n" -#: text-utils/more.c:739 +#: text-utils/more.c:650 #, c-format msgid "[Use q or Q to quit]" msgstr "[使用 q 或 Q 退出]" -#: text-utils/more.c:810 +#: text-utils/more.c:721 #, c-format msgid "--More--" msgstr "--更多--" -#: text-utils/more.c:812 +#: text-utils/more.c:723 #, c-format msgid "(Next file: %s)" msgstr "(下个文件：%s)" -#: text-utils/more.c:820 +#: text-utils/more.c:731 #, c-format msgid "[Press space to continue, 'q' to quit.]" msgstr "[按空格键继续，“q”键退出。]" -#: text-utils/more.c:1246 +#: text-utils/more.c:1157 #, c-format msgid "...back %d page" msgid_plural "...back %d pages" msgstr[0] "...后退 %d 页" -#: text-utils/more.c:1294 +#: text-utils/more.c:1205 #, c-format msgid "...skipping %d line" msgid_plural "...skipping %d lines" msgstr[0] "...跳过 %d 行" -#: text-utils/more.c:1332 +#: text-utils/more.c:1243 msgid "" "\n" "***Back***\n" @@ -18150,11 +18052,11 @@ msgstr "" "***后退***\n" "\n" -#: text-utils/more.c:1347 +#: text-utils/more.c:1258 msgid "No previous regular expression" msgstr "无上一个正则表达式" -#: text-utils/more.c:1377 +#: text-utils/more.c:1288 msgid "" "\n" "Most commands optionally preceded by integer argument k. Defaults in brackets.\n" @@ -18164,7 +18066,7 @@ msgstr "" "多数命令可在前面加整数参数 k。方括号中为参数的默认值\n" "星号(*)表示参数将成为新的默认值。\n" -#: text-utils/more.c:1384 +#: text-utils/more.c:1295 msgid "" "<space> Display next k lines of text [current screen size]\n" "z Display next k lines of text [current screen size]*\n" @@ -18206,30 +18108,30 @@ msgstr "" ":f 显示当前文件名和行号\n" ". 重复前一命令\n" -#: text-utils/more.c:1457 text-utils/more.c:1463 +#: text-utils/more.c:1368 text-utils/more.c:1374 #, c-format msgid "[Press 'h' for instructions.]" msgstr "[按“h”键获取说明。]" -#: text-utils/more.c:1494 +#: text-utils/more.c:1405 #, c-format msgid "\"%s\" line %d" msgstr "“%s”第 %d 行" -#: text-utils/more.c:1496 +#: text-utils/more.c:1407 #, c-format msgid "[Not a file] line %d" msgstr "[不是文件] 第 %d 行" -#: text-utils/more.c:1578 +#: text-utils/more.c:1489 msgid " Overflow\n" msgstr " 上溢\n" -#: text-utils/more.c:1627 +#: text-utils/more.c:1538 msgid "...skipping\n" msgstr "...跳过\n" -#: text-utils/more.c:1661 +#: text-utils/more.c:1572 msgid "" "\n" "Pattern not found\n" @@ -18237,19 +18139,19 @@ msgstr "" "\n" "未找到模式\n" -#: text-utils/more.c:1667 text-utils/pg.c:1028 text-utils/pg.c:1174 +#: text-utils/more.c:1578 text-utils/pg.c:1027 text-utils/pg.c:1173 msgid "Pattern not found" msgstr "找不到模式" -#: text-utils/more.c:1713 +#: text-utils/more.c:1624 msgid "exec failed\n" msgstr "exec 失败\n" -#: text-utils/more.c:1727 +#: text-utils/more.c:1638 msgid "can't fork\n" msgstr "无法 fork\n" -#: text-utils/more.c:1761 +#: text-utils/more.c:1672 msgid "" "\n" "...Skipping " @@ -18257,23 +18159,23 @@ msgstr "" "\n" "...跳过 " -#: text-utils/more.c:1765 +#: text-utils/more.c:1676 msgid "...Skipping to file " msgstr "...跳到文件 " -#: text-utils/more.c:1767 +#: text-utils/more.c:1678 msgid "...Skipping back to file " msgstr "...将跳回文件 " -#: text-utils/more.c:2057 +#: text-utils/more.c:1968 msgid "Line too long" msgstr "行过长" -#: text-utils/more.c:2094 +#: text-utils/more.c:2005 msgid "No previous command to substitute for" msgstr "没有要替换的前一命令" -#: text-utils/pg.c:145 +#: text-utils/pg.c:144 msgid "" "-------------------------------------------------------\n" " h this screen\n" @@ -18321,138 +18223,138 @@ msgstr "" "更多信息请参阅 pg(1)。\n" "-------------------------------------------------------\n" -#: text-utils/pg.c:223 +#: text-utils/pg.c:222 #, c-format msgid " %s [options] [+line] [+/pattern/] [files]\n" msgstr " %s [选项] [+行] [+/模式/] [文件]\n" -#: text-utils/pg.c:227 +#: text-utils/pg.c:226 msgid "Browse pagewise through text files.\n" msgstr "" -#: text-utils/pg.c:230 +#: text-utils/pg.c:229 msgid " -number lines per page\n" msgstr " -number 每页的行数\n" -#: text-utils/pg.c:231 +#: text-utils/pg.c:230 msgid " -c clear screen before displaying\n" msgstr " -c 显示前清屏\n" -#: text-utils/pg.c:232 +#: text-utils/pg.c:231 msgid " -e do not pause at end of a file\n" msgstr " -e 不在文件末尾暂停\n" -#: text-utils/pg.c:233 +#: text-utils/pg.c:232 msgid " -f do not split long lines\n" msgstr " -f 不分割长行\n" -#: text-utils/pg.c:234 +#: text-utils/pg.c:233 msgid " -n terminate command with new line\n" msgstr " -n 用换行符(new line)终止命令\n" -#: text-utils/pg.c:235 +#: text-utils/pg.c:234 msgid " -p <prompt> specify prompt\n" msgstr " -p <提示> 指定提示语\n" -#: text-utils/pg.c:236 +#: text-utils/pg.c:235 msgid " -r disallow shell escape\n" msgstr " -r 禁止 shell 转义\n" -#: text-utils/pg.c:237 +#: text-utils/pg.c:236 msgid " -s print messages to stdout\n" msgstr " -s 向标准输出打印消息\n" -#: text-utils/pg.c:238 +#: text-utils/pg.c:237 msgid " +number start at the given line\n" msgstr " +数字 从指定行开始\n" -#: text-utils/pg.c:239 +#: text-utils/pg.c:238 msgid " +/pattern/ start at the line containing pattern\n" msgstr " +/模式/ 从包含 模式 的行开始\n" -#: text-utils/pg.c:251 +#: text-utils/pg.c:250 #, c-format msgid "option requires an argument -- %s" msgstr "选项需要一个参数 -- %s" -#: text-utils/pg.c:257 +#: text-utils/pg.c:256 #, c-format msgid "illegal option -- %s" msgstr "非法的参数 -- %s" -#: text-utils/pg.c:360 +#: text-utils/pg.c:359 msgid "...skipping forward\n" msgstr "...前进\n" -#: text-utils/pg.c:362 +#: text-utils/pg.c:361 msgid "...skipping backward\n" msgstr "...后退\n" -#: text-utils/pg.c:378 +#: text-utils/pg.c:377 msgid "No next file" msgstr "无下一个文件" -#: text-utils/pg.c:382 +#: text-utils/pg.c:381 msgid "No previous file" msgstr "无上一个文件" -#: text-utils/pg.c:884 +#: text-utils/pg.c:883 #, c-format msgid "Read error from %s file" msgstr "从 %s 文件读出错" -#: text-utils/pg.c:887 +#: text-utils/pg.c:886 #, c-format msgid "Unexpected EOF in %s file" msgstr "在 %s 文件中遇到异常 EOF" -#: text-utils/pg.c:889 +#: text-utils/pg.c:888 #, c-format msgid "Unknown error in %s file" msgstr "在 %s 文件中遇到未知错误" -#: text-utils/pg.c:942 +#: text-utils/pg.c:941 msgid "Cannot create tempfile" msgstr "无法创建临时文件" -#: text-utils/pg.c:951 text-utils/pg.c:1115 text-utils/pg.c:1141 +#: text-utils/pg.c:950 text-utils/pg.c:1114 text-utils/pg.c:1140 msgid "RE error: " msgstr "表达式错误：" -#: text-utils/pg.c:1098 +#: text-utils/pg.c:1097 msgid "(EOF)" msgstr "(文件末尾)" -#: text-utils/pg.c:1123 text-utils/pg.c:1149 +#: text-utils/pg.c:1122 text-utils/pg.c:1148 msgid "No remembered search string" msgstr "没有记忆的搜索字符串" -#: text-utils/pg.c:1204 +#: text-utils/pg.c:1203 msgid "cannot open " msgstr "打不开 " -#: text-utils/pg.c:1256 +#: text-utils/pg.c:1255 msgid "saved" msgstr "已保存" -#: text-utils/pg.c:1346 +#: text-utils/pg.c:1345 msgid ": !command not allowed in rflag mode.\n" msgstr ": !命令 在 rflag 模式下不许使用。\n" -#: text-utils/pg.c:1381 +#: text-utils/pg.c:1380 msgid "fork() failed, try again later\n" msgstr "fork() 失败，请稍后重试\n" -#: text-utils/pg.c:1469 +#: text-utils/pg.c:1468 msgid "(Next file: " msgstr "(下个文件：" -#: text-utils/pg.c:1535 +#: text-utils/pg.c:1534 #, c-format msgid "%s %s Copyright (c) 2000-2001 Gunnar Ritter. All rights reserved.\n" msgstr "%s %s Copyright (c) 2000-2001 Gunnar Ritter. All rights reserved.\n" -#: text-utils/pg.c:1588 text-utils/pg.c:1661 +#: text-utils/pg.c:1587 text-utils/pg.c:1660 msgid "failed to parse number of lines per page" msgstr "解析每页的行数失败" @@ -18477,7 +18379,6 @@ msgstr "%s：无法添加 inotify 观察(达到了 inotify 观察数限制)。" #: text-utils/tailf.c:198 #, fuzzy, c-format -#| msgid " %s [options] <file>\n" msgid " %s [option] <file>\n" msgstr " %s [选项] <文件>\n" @@ -18487,13 +18388,11 @@ msgstr "" #: text-utils/tailf.c:204 #, fuzzy -#| msgid " -C, --cylinders <number> specify the number of cylinders\n" msgid " -n, --lines <number> output the last <number> lines\n" msgstr " -C, --cylinders <数字> 指定柱面数\n" #: text-utils/tailf.c:205 #, fuzzy -#| msgid " -<number> how many lines to show\n" msgid " -<number> same as '-n <number>'\n" msgstr " -<数字> 显示行数\n" @@ -18511,7 +18410,6 @@ msgstr "未指定输入文件" #: text-utils/tailf.c:283 #, fuzzy, c-format -#| msgid "%s: is not a directory" msgid "%s: is not a file" msgstr "%s：不是目录" @@ -18550,6 +18448,95 @@ msgstr "输入中有未知转义序列：%o，%o" msgid "Input line too long." msgstr "输入行过长。" +#~ msgid "cannot access file %s" +#~ msgstr "无法访问文件 %s" + +#~ msgid "%s is not a block special device" +#~ msgstr "%s 不是一个块特殊设备" + +#~ msgid "%s: device is misaligned" +#~ msgstr "%s：设备未正确对齐" + +#~ msgid "OS/2 hidden C: drive" +#~ msgstr "OS/2 隐藏的 C: 盘" + +#~ msgid "Done." +#~ msgstr "完成。" + +#~ msgid "%s: failed to get device path" +#~ msgstr "%s：获取设备路径失败" + +#~ msgid "%s: unknown device name" +#~ msgstr "%s：未知设备名称" + +#~ msgid "%s: failed to get dm name" +#~ msgstr "%s：获取 dm 名称失败" + +#~ msgid "the sort column has to be among the output columns" +#~ msgstr "排序列必须是输出的列" + +#~ msgid "" +#~ " -p, --pid <path> path to pid file\n" +#~ " -s, --socket <path> path to socket\n" +#~ " -T, --timeout <sec> specify inactivity timeout\n" +#~ " -k, --kill kill running daemon\n" +#~ " -r, --random test random-based generation\n" +#~ " -t, --time test time-based generation\n" +#~ " -n, --uuids <num> request number of uuids\n" +#~ " -P, --no-pid do not create pid file\n" +#~ " -F, --no-fork do not daemonize using double-fork\n" +#~ " -S, --socket-activation do not create listening socket\n" +#~ " -d, --debug run in debugging mode\n" +#~ " -q, --quiet turn on quiet mode\n" +#~ " -V, --version output version information and exit\n" +#~ " -h, --help display this help and exit\n" +#~ "\n" +#~ msgstr "" +#~ " -p, --pid <路径> pid 文件路径\n" +#~ " -s, --socket <路径> 套接字路径\n" +#~ " -T, --timeout <秒数> 指定不活动超时\n" +#~ " -k, --kill 杀死运行进程\n" +#~ " -r, --random 测试基于随机数的生成方法\n" +#~ " -t, --time 测试基于时间的生成方法\n" +#~ " -n, --uuids <数字> 指定 uuid 号\n" +#~ " -P, --no-pid 不创建 pid 文件\n" +#~ " -F, --no-fork 不使用双 fork 变成守护进程\n" +#~ " -S, --socket-activation 不创建侦听套接字\n" +#~ " -d, --debug 以调试模式运行\n" +#~ " -q, --quiet 打开安静模式\n" +#~ " -V, --version 输出版本信息并退出\n" +#~ " -h, --help 显示此帮助并退出\n" +#~ "\n" + +#~ msgid "unknown scheduling policy" +#~ msgstr "未知的调度策略" + +#, fuzzy +#~| msgid "" +#~| " -o, --offset <num> offset in bytes to discard from\n" +#~| " -l, --length <num> length of bytes to discard from the offset\n" +#~| " -s, --secure perform secure discard\n" +#~| " -v, --verbose print aligned length and offset\n" +#~ msgid "" +#~ " -o, --offset <num> offset in bytes to discard from\n" +#~ " -l, --length <num> length of bytes to discard from the offset\n" +#~ " -p, --step <num> size of the discard iterations within the offset\n" +#~ " -s, --secure perform secure discard\n" +#~ " -v, --verbose print aligned length and offset\n" +#~ msgstr "" +#~ " -o, --offset <数字> 要忽略部分的字节偏移量\n" +#~ " -l, --length <数字> 从偏移位置开始要忽略的字节长度\n" +#~ " -s, --secure 执行安全忽略\n" +#~ " -v, --verbose 打印对齐的长度和偏移\n" + +#, fuzzy +#~| msgid "%s %.6f seconds\n" +#~ msgid "%s .%06d seconds\n" +#~ msgstr "%s %.6f 秒\n" + +#~ msgid "pages" +#~ msgstr "页数" + #~ msgid "Minimal size is %ju" #~ msgstr "最小为 %ju" @@ -20390,9 +20377,6 @@ msgstr "输入行过长。" #~ msgid "can't lock lock file %s: %s" #~ msgstr "无法锁定锁文件 %s：%s" -#~ msgid "timed out" -#~ msgstr "已超时" - #~ msgid "" #~ "Cannot create link %s\n" #~ "Perhaps there is a stale lock file?\n" |