diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 3405 |
1 files changed, 1772 insertions, 1633 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 7b0786c4f..d94a0cf07 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: util-linux-2.29-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2017-10-19 12:53+0200\n" +"POT-Creation-Date: 2018-02-13 10:57+0100\n" "PO-Revision-Date: 2016-11-07 05:25-0500\n" "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -32,12 +32,12 @@ msgid "Tell the kernel about the existence of a specified partition.\n" msgstr "通知内核，存在某个指定分区。\n" #: disk-utils/addpart.c:53 disk-utils/blockdev.c:244 disk-utils/delpart.c:53 -#: disk-utils/mkfs.bfs.c:133 disk-utils/resizepart.c:95 misc-utils/kill.c:396 -#: misc-utils/kill.c:438 misc-utils/rename.c:200 misc-utils/whereis.c:515 +#: disk-utils/mkfs.bfs.c:133 disk-utils/resizepart.c:95 misc-utils/kill.c:269 +#: misc-utils/kill.c:311 misc-utils/rename.c:199 misc-utils/whereis.c:518 #: sys-utils/flock.c:175 sys-utils/ipcrm.c:160 sys-utils/ldattach.c:368 #: sys-utils/renice.c:146 sys-utils/switch_root.c:241 sys-utils/tunelp.c:152 -#: term-utils/agetty.c:850 term-utils/agetty.c:851 term-utils/agetty.c:859 -#: term-utils/agetty.c:860 +#: term-utils/agetty.c:859 term-utils/agetty.c:860 term-utils/agetty.c:868 +#: term-utils/agetty.c:869 msgid "not enough arguments" msgstr "参数不够" @@ -46,32 +46,32 @@ msgstr "参数不够" #: disk-utils/fdformat.c:229 disk-utils/fdisk.c:764 disk-utils/fdisk.c:1066 #: disk-utils/fdisk-list.c:321 disk-utils/fdisk-list.c:361 #: disk-utils/fdisk-list.c:380 disk-utils/fsck.c:1457 -#: disk-utils/fsck.cramfs.c:152 disk-utils/fsck.cramfs.c:507 +#: disk-utils/fsck.cramfs.c:152 disk-utils/fsck.cramfs.c:512 #: disk-utils/isosize.c:102 disk-utils/mkfs.bfs.c:192 -#: disk-utils/mkfs.cramfs.c:171 disk-utils/mkfs.cramfs.c:659 -#: disk-utils/mkfs.cramfs.c:799 disk-utils/mkfs.minix.c:824 +#: disk-utils/mkfs.cramfs.c:171 disk-utils/mkfs.cramfs.c:660 +#: disk-utils/mkfs.cramfs.c:800 disk-utils/mkfs.minix.c:824 #: disk-utils/mkswap.c:217 disk-utils/mkswap.c:246 disk-utils/partx.c:1013 -#: disk-utils/resizepart.c:103 disk-utils/sfdisk.c:648 disk-utils/sfdisk.c:704 -#: disk-utils/sfdisk.c:758 disk-utils/sfdisk.c:817 disk-utils/sfdisk.c:881 -#: disk-utils/sfdisk.c:922 disk-utils/sfdisk.c:952 disk-utils/sfdisk.c:989 -#: disk-utils/sfdisk.c:1548 disk-utils/swaplabel.c:65 libfdisk/src/bsd.c:640 -#: lib/path.c:81 lib/path.c:99 login-utils/islocal.c:87 login-utils/last.c:674 +#: disk-utils/resizepart.c:103 disk-utils/sfdisk.c:655 disk-utils/sfdisk.c:711 +#: disk-utils/sfdisk.c:765 disk-utils/sfdisk.c:824 disk-utils/sfdisk.c:898 +#: disk-utils/sfdisk.c:939 disk-utils/sfdisk.c:969 disk-utils/sfdisk.c:1006 +#: disk-utils/sfdisk.c:1565 disk-utils/swaplabel.c:65 libfdisk/src/bsd.c:640 +#: lib/path.c:95 lib/path.c:113 login-utils/islocal.c:87 login-utils/last.c:674 #: login-utils/sulogin.c:443 login-utils/sulogin.c:480 -#: login-utils/utmpdump.c:136 login-utils/utmpdump.c:354 -#: login-utils/utmpdump.c:376 login-utils/vipw.c:262 login-utils/vipw.c:280 +#: login-utils/utmpdump.c:134 login-utils/utmpdump.c:352 +#: login-utils/utmpdump.c:374 login-utils/vipw.c:261 login-utils/vipw.c:279 #: misc-utils/findmnt.c:1099 misc-utils/logger.c:1223 misc-utils/mcookie.c:115 #: misc-utils/uuidd.c:198 sys-utils/blkdiscard.c:182 sys-utils/blkzone.c:96 -#: sys-utils/dmesg.c:532 sys-utils/eject.c:499 sys-utils/eject.c:699 -#: sys-utils/fallocate.c:405 sys-utils/fsfreeze.c:117 sys-utils/fstrim.c:72 -#: sys-utils/hwclock.c:207 sys-utils/hwclock.c:806 sys-utils/hwclock-rtc.c:400 +#: sys-utils/dmesg.c:524 sys-utils/eject.c:499 sys-utils/eject.c:695 +#: sys-utils/fallocate.c:396 sys-utils/fsfreeze.c:117 sys-utils/fstrim.c:71 +#: sys-utils/hwclock.c:227 sys-utils/hwclock.c:814 sys-utils/hwclock-rtc.c:400 #: sys-utils/hwclock-rtc.c:435 sys-utils/ldattach.c:392 sys-utils/nsenter.c:129 -#: sys-utils/rfkill.c:188 sys-utils/rfkill.c:543 sys-utils/rtcwake.c:134 -#: sys-utils/rtcwake.c:268 sys-utils/setpriv.c:276 sys-utils/setpriv.c:614 -#: sys-utils/setpriv.c:637 sys-utils/swapon.c:376 sys-utils/swapon.c:519 -#: sys-utils/switch_root.c:167 sys-utils/unshare.c:106 sys-utils/unshare.c:121 -#: sys-utils/wdctl.c:322 sys-utils/wdctl.c:378 sys-utils/zramctl.c:509 -#: term-utils/agetty.c:2614 term-utils/mesg.c:127 term-utils/script.c:460 -#: term-utils/script.c:468 term-utils/script.c:563 +#: sys-utils/rfkill.c:193 sys-utils/rfkill.c:544 sys-utils/rtcwake.c:136 +#: sys-utils/rtcwake.c:286 sys-utils/setpriv.c:276 sys-utils/setpriv.c:614 +#: sys-utils/setpriv.c:637 sys-utils/swapon.c:375 sys-utils/swapon.c:518 +#: sys-utils/switch_root.c:167 sys-utils/unshare.c:108 sys-utils/unshare.c:123 +#: sys-utils/wdctl.c:322 sys-utils/wdctl.c:378 sys-utils/zramctl.c:508 +#: term-utils/agetty.c:2752 term-utils/mesg.c:127 term-utils/script.c:460 +#: term-utils/script.c:468 term-utils/script.c:559 #: term-utils/scriptreplay.c:198 term-utils/scriptreplay.c:201 #: term-utils/wall.c:419 text-utils/colcrt.c:282 text-utils/more.c:534 #: text-utils/rev.c:141 text-utils/ul.c:230 @@ -216,7 +216,7 @@ msgstr " %-25s 获得 512-字节扇区的大小\n" #: disk-utils/mkfs.bfs.c:181 disk-utils/mkfs.c:116 disk-utils/mkfs.minix.c:813 #: disk-utils/swaplabel.c:181 misc-utils/wipefs.c:718 #: sys-utils/blkdiscard.c:171 sys-utils/blkzone.c:394 sys-utils/tunelp.c:242 -#: sys-utils/zramctl.c:693 sys-utils/zramctl.c:719 +#: sys-utils/zramctl.c:689 sys-utils/zramctl.c:715 msgid "no device specified" msgstr "未指定设备" @@ -307,8 +307,8 @@ msgid "Quit program without writing changes" msgstr "退出程序而不写入更改" #: disk-utils/cfdisk.c:191 libfdisk/src/bsd.c:438 libfdisk/src/bsd.c:1022 -#: libfdisk/src/dos.c:2431 libfdisk/src/gpt.c:3043 libfdisk/src/sgi.c:1159 -#: libfdisk/src/sun.c:1100 +#: libfdisk/src/dos.c:2431 libfdisk/src/gpt.c:3132 libfdisk/src/sgi.c:1159 +#: libfdisk/src/sun.c:1126 msgid "Type" msgstr "类型" @@ -445,17 +445,17 @@ msgid "The script file will be applied to in-memory partition table." msgstr "该脚本文件将应用于内存中的分区表。" #: disk-utils/cfdisk.c:2028 disk-utils/cfdisk.c:2070 -#: disk-utils/fdisk-menu.c:479 disk-utils/fdisk-menu.c:523 +#: disk-utils/fdisk-menu.c:480 disk-utils/fdisk-menu.c:524 #, c-format msgid "Cannot open %s" msgstr "打不开 %s" -#: disk-utils/cfdisk.c:2030 disk-utils/fdisk-menu.c:481 +#: disk-utils/cfdisk.c:2030 disk-utils/fdisk-menu.c:482 #, c-format msgid "Failed to parse script file %s" msgstr "解析脚本文件 %s 失败" -#: disk-utils/cfdisk.c:2032 disk-utils/fdisk-menu.c:483 +#: disk-utils/cfdisk.c:2032 disk-utils/fdisk-menu.c:484 #, c-format msgid "Failed to apply script %s" msgstr "应用脚本文件 %s 失败" @@ -464,7 +464,7 @@ msgstr "应用脚本文件 %s 失败" msgid "The current in-memory partition table will be dumped to the file." msgstr "当前的内存中分区表将转储到该文件中。" -#: disk-utils/cfdisk.c:2057 disk-utils/fdisk-menu.c:511 +#: disk-utils/cfdisk.c:2057 disk-utils/fdisk-menu.c:512 msgid "Failed to allocate script handler" msgstr "分配脚本处理程序失败" @@ -476,7 +476,7 @@ msgstr "将磁盘布局读入脚本出错。" msgid "Disk layout successfully dumped." msgstr "成功转储了磁盘布局。" -#: disk-utils/cfdisk.c:2080 disk-utils/fdisk-menu.c:529 +#: disk-utils/cfdisk.c:2080 disk-utils/fdisk-menu.c:530 #, c-format msgid "Failed to write script %s" msgstr "写脚本文件 %s 失败" @@ -485,7 +485,7 @@ msgstr "写脚本文件 %s 失败" msgid "Select label type" msgstr "选择标签类型" -#: disk-utils/cfdisk.c:2119 disk-utils/fdisk.c:1074 disk-utils/fdisk-menu.c:487 +#: disk-utils/cfdisk.c:2119 disk-utils/fdisk.c:1074 disk-utils/fdisk-menu.c:488 msgid "Device does not contain a recognized partition table." msgstr "设备不包含可识别的分区表。" @@ -600,7 +600,7 @@ msgstr "无法切换标志。" msgid "Could not delete partition %zu." msgstr "无法删除分区 %zu。" -#: disk-utils/cfdisk.c:2309 disk-utils/fdisk-menu.c:657 +#: disk-utils/cfdisk.c:2309 disk-utils/fdisk-menu.c:658 #, c-format msgid "Partition %zu has been deleted." msgstr "分区 %zu 已删除。" @@ -630,7 +630,7 @@ msgid "Partition %zu resized." msgstr "%s：已调整分区 #%d 的大小\n" #: disk-utils/cfdisk.c:2427 disk-utils/cfdisk.c:2543 disk-utils/fdisk.c:1063 -#: disk-utils/fdisk-menu.c:590 +#: disk-utils/fdisk-menu.c:591 msgid "Device is open in read-only mode." msgstr "设备以只读方式打开。" @@ -642,8 +642,8 @@ msgstr "您确定想将分区表写入磁盘吗？" msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog." msgstr "输入“yes”或“no”或按 ESC 取消对话框。" -#: disk-utils/cfdisk.c:2439 login-utils/lslogins.c:209 sys-utils/lscpu.c:1588 -#: sys-utils/lscpu.c:1598 sys-utils/lsmem.c:200 +#: disk-utils/cfdisk.c:2439 login-utils/lslogins.c:209 sys-utils/lscpu.c:1436 +#: sys-utils/lscpu.c:1446 sys-utils/lsmem.c:268 msgid "yes" msgstr "是" @@ -655,7 +655,7 @@ msgstr "未将分区表写入磁盘。" msgid "Failed to write disklabel." msgstr "写磁盘标签失败。" -#: disk-utils/cfdisk.c:2451 disk-utils/fdisk-menu.c:598 +#: disk-utils/cfdisk.c:2451 disk-utils/fdisk-menu.c:599 msgid "The partition table has been altered." msgstr "分区表已调整。" @@ -681,7 +681,7 @@ msgstr "读分区失败" msgid " %1$s [options] <disk>\n" msgstr " %1$s [选项] <磁盘>\n" -#: disk-utils/cfdisk.c:2632 disk-utils/fdisk.c:808 disk-utils/sfdisk.c:1826 +#: disk-utils/cfdisk.c:2632 disk-utils/fdisk.c:808 disk-utils/sfdisk.c:1843 msgid "Display or manipulate a disk partition table.\n" msgstr "显示或操作磁盘分区表。\n" @@ -693,8 +693,8 @@ msgstr " -L, --color[=<何时>] 彩色输出(auto自动，always总是或nev msgid " -z, --zero start with zeroed partition table\n" msgstr " -z, --zero 以空分区表开始\n" -#: disk-utils/cfdisk.c:2676 disk-utils/fdisk.c:950 disk-utils/sfdisk.c:2103 -#: misc-utils/cal.c:391 sys-utils/dmesg.c:1435 text-utils/hexdump.c:114 +#: disk-utils/cfdisk.c:2676 disk-utils/fdisk.c:950 disk-utils/sfdisk.c:2120 +#: misc-utils/cal.c:429 sys-utils/dmesg.c:1410 text-utils/hexdump.c:114 msgid "unsupported color mode" msgstr "不支持的颜色模式" @@ -792,20 +792,20 @@ msgid "invalid argument - repair" msgstr "无效参数 - repair" #: disk-utils/fdformat.c:223 disk-utils/fsck.cramfs.c:148 -#: disk-utils/mkfs.bfs.c:188 disk-utils/mkfs.cramfs.c:336 -#: disk-utils/mkfs.cramfs.c:757 disk-utils/mkfs.cramfs.c:796 +#: disk-utils/mkfs.bfs.c:188 disk-utils/mkfs.cramfs.c:337 +#: disk-utils/mkfs.cramfs.c:758 disk-utils/mkfs.cramfs.c:797 #: disk-utils/mkfs.minix.c:821 disk-utils/mkswap.c:243 disk-utils/partx.c:951 -#: login-utils/last.c:688 login-utils/utmpdump.c:139 misc-utils/namei.c:135 +#: login-utils/last.c:688 login-utils/utmpdump.c:137 misc-utils/namei.c:135 #: misc-utils/rename.c:63 sys-utils/blkdiscard.c:185 sys-utils/blkzone.c:99 -#: sys-utils/dmesg.c:534 sys-utils/fallocate.c:216 sys-utils/fsfreeze.c:120 -#: sys-utils/fstrim.c:77 sys-utils/nsenter.c:164 sys-utils/nsenter.c:168 -#: sys-utils/swapon.c:524 sys-utils/switch_root.c:94 +#: sys-utils/dmesg.c:526 sys-utils/fallocate.c:197 sys-utils/fsfreeze.c:120 +#: sys-utils/fstrim.c:76 sys-utils/nsenter.c:164 sys-utils/nsenter.c:168 +#: sys-utils/swapon.c:523 sys-utils/switch_root.c:94 #: sys-utils/switch_root.c:137 term-utils/mesg.c:129 text-utils/more.c:525 #, c-format msgid "stat of %s failed" msgstr "对 %s stat 失败" -#: disk-utils/fdformat.c:226 disk-utils/partx.c:1010 misc-utils/lsblk.c:1499 +#: disk-utils/fdformat.c:226 disk-utils/partx.c:1010 misc-utils/lsblk.c:1501 #: sys-utils/blkdiscard.c:187 sys-utils/blkzone.c:101 #: sys-utils/mountpoint.c:107 #, c-format @@ -856,7 +856,7 @@ msgid "Using default response %c." msgstr "将使用默认回应 %c。" #: disk-utils/fdisk.c:222 disk-utils/fdisk.c:296 disk-utils/fdisk.c:371 -#: libfdisk/src/dos.c:1241 libfdisk/src/gpt.c:2380 +#: libfdisk/src/dos.c:1241 libfdisk/src/gpt.c:2469 msgid "Value out of range." msgstr "值超出范围。" @@ -952,7 +952,7 @@ msgid "cannot read" msgstr "不能读" #: disk-utils/fdisk.c:741 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:982 -#: libfdisk/src/gpt.c:2309 +#: libfdisk/src/gpt.c:2398 msgid "First sector" msgstr "第一个扇区" @@ -961,7 +961,7 @@ msgstr "第一个扇区" msgid "BLKGETSIZE ioctl failed on %s" msgstr "对 %s 进行 BLKGETSIZE ioctl 失败" -#: disk-utils/fdisk.c:786 disk-utils/sfdisk.c:1457 +#: disk-utils/fdisk.c:786 disk-utils/sfdisk.c:1474 #, fuzzy, c-format msgid "The old %s signature will be removed by a write command." msgstr "写入命令将移除该签名。" @@ -1024,7 +1024,7 @@ msgstr " -b, --bytes 以字节为单位而非易读的格 msgid " -w, --wipe <mode> wipe signatures (auto, always or never)\n" msgstr " -w, --wipe <模式> 擦除签名(auto, always 或 never)\n" -#: disk-utils/fdisk.c:824 disk-utils/sfdisk.c:1869 +#: disk-utils/fdisk.c:824 disk-utils/sfdisk.c:1886 msgid " -W, --wipe-partitions <mode> wipe signatures from new partitions (auto, always or never)\n" msgstr " -W, --wipe-partitions <模式> 擦除新分区的签名(auto, always 或 never)\n" @@ -1075,8 +1075,8 @@ msgstr "不支持的磁盘标签：%s" msgid "unsupported unit" msgstr "不支持的单位“%c”" -#: disk-utils/fdisk.c:984 disk-utils/fdisk.c:989 disk-utils/sfdisk.c:2067 -#: disk-utils/sfdisk.c:2072 +#: disk-utils/fdisk.c:984 disk-utils/fdisk.c:989 disk-utils/sfdisk.c:2084 +#: disk-utils/sfdisk.c:2089 msgid "unsupported wipe mode" msgstr "不支持的擦除模式" @@ -1084,18 +1084,18 @@ msgstr "不支持的擦除模式" msgid "The device properties (sector size and geometry) should be used with one specified device only." msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。" -#: disk-utils/fdisk.c:1033 disk-utils/fdisk.c:1048 disk-utils/fsck.cramfs.c:690 -#: disk-utils/mkfs.bfs.c:198 disk-utils/mkfs.cramfs.c:786 +#: disk-utils/fdisk.c:1033 disk-utils/fdisk.c:1048 disk-utils/fsck.cramfs.c:695 +#: disk-utils/mkfs.bfs.c:198 disk-utils/mkfs.cramfs.c:787 #: disk-utils/partx.c:967 disk-utils/raw.c:137 disk-utils/raw.c:150 -#: disk-utils/raw.c:162 disk-utils/raw.c:203 misc-utils/cal.c:473 -#: misc-utils/findfs.c:59 misc-utils/look.c:150 misc-utils/whereis.c:570 -#: misc-utils/whereis.c:581 misc-utils/whereis.c:592 misc-utils/whereis.c:634 +#: disk-utils/raw.c:162 disk-utils/raw.c:203 misc-utils/cal.c:520 +#: misc-utils/findfs.c:58 misc-utils/look.c:150 misc-utils/whereis.c:573 +#: misc-utils/whereis.c:584 misc-utils/whereis.c:595 misc-utils/whereis.c:637 #: schedutils/chrt.c:504 schedutils/ionice.c:262 schedutils/taskset.c:189 -#: sys-utils/chcpu.c:344 sys-utils/chmem.c:317 sys-utils/dmesg.c:1491 +#: sys-utils/chcpu.c:344 sys-utils/chmem.c:419 sys-utils/dmesg.c:1469 #: sys-utils/ipcmk.c:135 sys-utils/ldattach.c:321 sys-utils/losetup.c:888 -#: sys-utils/lscpu.c:2177 sys-utils/lsmem.c:499 sys-utils/mount.c:698 +#: sys-utils/lscpu.c:2025 sys-utils/lsmem.c:623 sys-utils/mount.c:698 #: sys-utils/mount.c:711 sys-utils/mount.c:780 sys-utils/mountpoint.c:181 -#: sys-utils/pivot_root.c:72 sys-utils/swapoff.c:231 sys-utils/swapon.c:989 +#: sys-utils/pivot_root.c:72 sys-utils/swapoff.c:230 sys-utils/swapon.c:988 #: sys-utils/switch_root.c:250 sys-utils/umount.c:528 term-utils/setterm.c:1176 #: text-utils/col.c:233 text-utils/more.c:337 #, fuzzy @@ -1107,7 +1107,7 @@ msgstr "错误值" msgid "Welcome to fdisk (%s)." msgstr "欢迎使用 fdisk (%s)。" -#: disk-utils/fdisk.c:1056 disk-utils/sfdisk.c:1599 +#: disk-utils/fdisk.c:1056 disk-utils/sfdisk.c:1616 msgid "" "Changes will remain in memory only, until you decide to write them.\n" "Be careful before using the write command.\n" @@ -1165,35 +1165,35 @@ msgid "failed to allocate iterator" msgstr "分配迭代器失败" #: disk-utils/fdisk-list.c:122 disk-utils/fdisk-list.c:242 -#: disk-utils/partx.c:667 login-utils/lslogins.c:917 misc-utils/fincore.c:362 -#: misc-utils/findmnt.c:1596 misc-utils/lsblk.c:1906 misc-utils/lslocks.c:449 -#: misc-utils/uuidparse.c:258 misc-utils/wipefs.c:151 sys-utils/losetup.c:321 -#: sys-utils/lscpu.c:1761 sys-utils/lscpu.c:1864 sys-utils/lsipc.c:338 -#: sys-utils/prlimit.c:297 sys-utils/rfkill.c:456 sys-utils/swapon.c:285 -#: sys-utils/wdctl.c:260 sys-utils/zramctl.c:488 text-utils/column.c:205 +#: disk-utils/partx.c:667 login-utils/lslogins.c:916 misc-utils/fincore.c:362 +#: misc-utils/findmnt.c:1596 misc-utils/lsblk.c:1908 misc-utils/lslocks.c:449 +#: misc-utils/uuidparse.c:252 misc-utils/wipefs.c:151 sys-utils/losetup.c:321 +#: sys-utils/lscpu.c:1609 sys-utils/lscpu.c:1712 sys-utils/lsipc.c:338 +#: sys-utils/prlimit.c:297 sys-utils/rfkill.c:457 sys-utils/swapon.c:284 +#: sys-utils/wdctl.c:260 sys-utils/zramctl.c:487 text-utils/column.c:209 msgid "failed to allocate output table" msgstr "分配输出表失败" #: disk-utils/fdisk-list.c:163 disk-utils/fdisk-list.c:266 -#: disk-utils/partx.c:581 login-utils/lslogins.c:975 misc-utils/fincore.c:123 -#: misc-utils/findmnt.c:688 misc-utils/findmnt.c:706 misc-utils/lsblk.c:1174 +#: disk-utils/partx.c:581 login-utils/lslogins.c:974 misc-utils/fincore.c:123 +#: misc-utils/findmnt.c:688 misc-utils/findmnt.c:706 misc-utils/lsblk.c:1176 #: misc-utils/lslocks.c:391 misc-utils/uuidparse.c:154 misc-utils/wipefs.c:210 -#: sys-utils/losetup.c:340 sys-utils/losetup.c:369 sys-utils/lscpu.c:1787 -#: sys-utils/lscpu.c:1815 sys-utils/lsipc.c:470 sys-utils/lsipc.c:545 +#: sys-utils/losetup.c:340 sys-utils/losetup.c:369 sys-utils/lscpu.c:1635 +#: sys-utils/lscpu.c:1663 sys-utils/lsipc.c:470 sys-utils/lsipc.c:545 #: sys-utils/lsipc.c:647 sys-utils/lsipc.c:739 sys-utils/lsipc.c:900 -#: sys-utils/prlimit.c:229 sys-utils/rfkill.c:373 sys-utils/swapon.c:180 -#: sys-utils/wdctl.c:214 sys-utils/zramctl.c:407 text-utils/column.c:420 +#: sys-utils/prlimit.c:229 sys-utils/rfkill.c:374 sys-utils/swapon.c:179 +#: sys-utils/wdctl.c:214 sys-utils/zramctl.c:407 text-utils/column.c:450 msgid "failed to allocate output line" msgstr "分配输出行失败" #: disk-utils/fdisk-list.c:173 disk-utils/fdisk-list.c:273 -#: disk-utils/partx.c:644 login-utils/lslogins.c:1073 misc-utils/fincore.c:159 -#: misc-utils/findmnt.c:692 misc-utils/findmnt.c:711 misc-utils/lsblk.c:1165 -#: misc-utils/lslocks.c:436 misc-utils/uuidparse.c:245 misc-utils/wipefs.c:250 -#: sys-utils/losetup.c:301 sys-utils/lscpu.c:1795 sys-utils/lscpu.c:1826 +#: disk-utils/partx.c:644 login-utils/lslogins.c:1072 misc-utils/fincore.c:159 +#: misc-utils/findmnt.c:692 misc-utils/findmnt.c:711 misc-utils/lsblk.c:1167 +#: misc-utils/lslocks.c:436 misc-utils/uuidparse.c:239 misc-utils/wipefs.c:250 +#: sys-utils/losetup.c:301 sys-utils/lscpu.c:1643 sys-utils/lscpu.c:1674 #: sys-utils/lsipc.c:504 sys-utils/lsipc.c:629 sys-utils/prlimit.c:261 -#: sys-utils/rfkill.c:401 sys-utils/swapon.c:228 sys-utils/wdctl.c:242 -#: sys-utils/zramctl.c:473 text-utils/column.c:426 +#: sys-utils/rfkill.c:402 sys-utils/swapon.c:227 sys-utils/wdctl.c:242 +#: sys-utils/zramctl.c:472 text-utils/column.c:457 #, fuzzy msgid "failed to add output data" msgstr "向输出表添加数据出错" @@ -1213,22 +1213,22 @@ msgid "Partition table entries are not in disk order." msgstr "分区表记录没有按磁盘顺序。" #: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1017 libfdisk/src/dos.c:2425 -#: libfdisk/src/gpt.c:3039 libfdisk/src/sgi.c:1153 libfdisk/src/sun.c:1094 +#: libfdisk/src/gpt.c:3128 libfdisk/src/sgi.c:1153 libfdisk/src/sun.c:1120 msgid "Start" msgstr "起点" #: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1018 libfdisk/src/dos.c:2426 -#: libfdisk/src/gpt.c:3040 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1095 +#: libfdisk/src/gpt.c:3129 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1121 msgid "End" msgstr "末尾" #: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2427 -#: libfdisk/src/gpt.c:3041 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1096 +#: libfdisk/src/gpt.c:3130 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1122 msgid "Sectors" msgstr "扇区" #: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1021 libfdisk/src/dos.c:2429 -#: libfdisk/src/gpt.c:3042 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1098 +#: libfdisk/src/gpt.c:3131 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1124 msgid "Size" msgstr "大小" @@ -1242,287 +1242,287 @@ msgstr "未分区的空间 %s：%s，%ju 个字节，%ju 个扇区" msgid "%s unknown column: %s" msgstr "%s 未知列: %s" -#: disk-utils/fdisk-menu.c:96 +#: disk-utils/fdisk-menu.c:97 msgid "Generic" msgstr "常规" -#: disk-utils/fdisk-menu.c:97 +#: disk-utils/fdisk-menu.c:98 msgid "delete a partition" msgstr "删除分区" -#: disk-utils/fdisk-menu.c:98 +#: disk-utils/fdisk-menu.c:99 msgid "list free unpartitioned space" msgstr "列出未分区的空闲区" -#: disk-utils/fdisk-menu.c:99 +#: disk-utils/fdisk-menu.c:100 msgid "list known partition types" msgstr "列出已知分区类型" -#: disk-utils/fdisk-menu.c:100 +#: disk-utils/fdisk-menu.c:101 msgid "add a new partition" msgstr "添加新分区" -#: disk-utils/fdisk-menu.c:101 +#: disk-utils/fdisk-menu.c:102 msgid "print the partition table" msgstr "打印分区表" -#: disk-utils/fdisk-menu.c:102 +#: disk-utils/fdisk-menu.c:103 msgid "change a partition type" msgstr "更改分区类型" -#: disk-utils/fdisk-menu.c:103 +#: disk-utils/fdisk-menu.c:104 msgid "verify the partition table" msgstr "检查分区表" -#: disk-utils/fdisk-menu.c:104 +#: disk-utils/fdisk-menu.c:105 msgid "print information about a partition" msgstr "打印某个分区的相关信息" -#: disk-utils/fdisk-menu.c:106 +#: disk-utils/fdisk-menu.c:107 msgid "print the raw data of the first sector from the device" msgstr "打印设备第1个扇区的原始数据" -#: disk-utils/fdisk-menu.c:107 +#: disk-utils/fdisk-menu.c:108 msgid "print the raw data of the disklabel from the device" msgstr "打印设备磁盘标签的原始数据" -#: disk-utils/fdisk-menu.c:108 +#: disk-utils/fdisk-menu.c:109 msgid "fix partitions order" msgstr "修复分区顺序" -#: disk-utils/fdisk-menu.c:110 +#: disk-utils/fdisk-menu.c:111 msgid "Misc" msgstr "杂项" -#: disk-utils/fdisk-menu.c:111 +#: disk-utils/fdisk-menu.c:112 msgid "print this menu" msgstr "打印此菜单" -#: disk-utils/fdisk-menu.c:112 +#: disk-utils/fdisk-menu.c:113 msgid "change display/entry units" msgstr "更改 显示/记录 单位" -#: disk-utils/fdisk-menu.c:113 +#: disk-utils/fdisk-menu.c:114 msgid "extra functionality (experts only)" msgstr "更多功能(仅限专业人员)" -#: disk-utils/fdisk-menu.c:115 +#: disk-utils/fdisk-menu.c:116 msgid "Script" msgstr "脚本" -#: disk-utils/fdisk-menu.c:116 +#: disk-utils/fdisk-menu.c:117 msgid "load disk layout from sfdisk script file" msgstr "从 sfdisk 脚本文件加载磁盘布局" -#: disk-utils/fdisk-menu.c:117 +#: disk-utils/fdisk-menu.c:118 msgid "dump disk layout to sfdisk script file" msgstr "将磁盘布局转储为 sfdisk 脚本文件" -#: disk-utils/fdisk-menu.c:119 +#: disk-utils/fdisk-menu.c:120 msgid "Save & Exit" msgstr "保存并退出" -#: disk-utils/fdisk-menu.c:120 +#: disk-utils/fdisk-menu.c:121 msgid "write table to disk and exit" msgstr "将分区表写入磁盘并退出" -#: disk-utils/fdisk-menu.c:121 +#: disk-utils/fdisk-menu.c:122 msgid "write table to disk" msgstr "将分区表写入磁盘" -#: disk-utils/fdisk-menu.c:122 +#: disk-utils/fdisk-menu.c:123 msgid "quit without saving changes" msgstr "退出而不保存更改" -#: disk-utils/fdisk-menu.c:123 +#: disk-utils/fdisk-menu.c:124 msgid "return to main menu" msgstr "返回主菜单" -#: disk-utils/fdisk-menu.c:125 +#: disk-utils/fdisk-menu.c:126 msgid "return from BSD to DOS" msgstr "从 BSD 回到 DOS" -#: disk-utils/fdisk-menu.c:136 +#: disk-utils/fdisk-menu.c:137 msgid "Create a new label" msgstr "新建空磁盘标签" -#: disk-utils/fdisk-menu.c:137 +#: disk-utils/fdisk-menu.c:138 msgid "create a new empty GPT partition table" msgstr "新建一份 GPT 分区表" -#: disk-utils/fdisk-menu.c:138 +#: disk-utils/fdisk-menu.c:139 msgid "create a new empty SGI (IRIX) partition table" msgstr "新建一份空 GPT (IRIX) 分区表" -#: disk-utils/fdisk-menu.c:139 +#: disk-utils/fdisk-menu.c:140 msgid "create a new empty DOS partition table" msgstr "新建一份的空 DOS 分区表" -#: disk-utils/fdisk-menu.c:140 +#: disk-utils/fdisk-menu.c:141 msgid "create a new empty Sun partition table" msgstr "新建一份空 Sun 分区表" -#: disk-utils/fdisk-menu.c:144 +#: disk-utils/fdisk-menu.c:145 msgid "create an IRIX (SGI) partition table" msgstr "创建一份 IRIX(SGI) 分区表" -#: disk-utils/fdisk-menu.c:153 -msgid "Geometry" -msgstr "几何属性" - #: disk-utils/fdisk-menu.c:154 +msgid "Geometry (for the current label)" +msgstr "" + +#: disk-utils/fdisk-menu.c:155 msgid "change number of cylinders" msgstr "更改柱面数" -#: disk-utils/fdisk-menu.c:155 +#: disk-utils/fdisk-menu.c:156 msgid "change number of heads" msgstr "更改磁头数" -#: disk-utils/fdisk-menu.c:156 +#: disk-utils/fdisk-menu.c:157 msgid "change number of sectors/track" msgstr "更改扇区/磁道数" -#: disk-utils/fdisk-menu.c:165 include/pt-mbr-partnames.h:95 +#: disk-utils/fdisk-menu.c:166 include/pt-mbr-partnames.h:95 msgid "GPT" msgstr "GPT" -#: disk-utils/fdisk-menu.c:166 +#: disk-utils/fdisk-menu.c:167 msgid "change disk GUID" msgstr "更改磁盘 GUID" -#: disk-utils/fdisk-menu.c:167 +#: disk-utils/fdisk-menu.c:168 msgid "change partition name" msgstr "更改分区名" -#: disk-utils/fdisk-menu.c:168 +#: disk-utils/fdisk-menu.c:169 msgid "change partition UUID" msgstr "更改分区 UUID" -#: disk-utils/fdisk-menu.c:169 +#: disk-utils/fdisk-menu.c:170 msgid "change table length" msgstr "更改表长度" -#: disk-utils/fdisk-menu.c:170 +#: disk-utils/fdisk-menu.c:171 msgid "enter protective/hybrid MBR" msgstr "进入 保护/混合 MBR" -#: disk-utils/fdisk-menu.c:173 +#: disk-utils/fdisk-menu.c:174 msgid "toggle the legacy BIOS bootable flag" msgstr "开关旧 BIOS 的 可启动 标志" -#: disk-utils/fdisk-menu.c:174 +#: disk-utils/fdisk-menu.c:175 msgid "toggle the no block IO protocol flag" msgstr "开关 不阻塞 IO 协议 标志" -#: disk-utils/fdisk-menu.c:175 +#: disk-utils/fdisk-menu.c:176 msgid "toggle the required partition flag" msgstr "开关 必需分区 标志" -#: disk-utils/fdisk-menu.c:176 +#: disk-utils/fdisk-menu.c:177 msgid "toggle the GUID specific bits" msgstr "开/关 GUID 特定位" -#: disk-utils/fdisk-menu.c:186 +#: disk-utils/fdisk-menu.c:187 msgid "Sun" msgstr "Sun" -#: disk-utils/fdisk-menu.c:187 +#: disk-utils/fdisk-menu.c:188 msgid "toggle the read-only flag" msgstr "开关 只读 标志" -#: disk-utils/fdisk-menu.c:188 +#: disk-utils/fdisk-menu.c:189 msgid "toggle the mountable flag" msgstr "开关 可挂臷 标志" -#: disk-utils/fdisk-menu.c:190 +#: disk-utils/fdisk-menu.c:191 msgid "change number of alternate cylinders" msgstr "更改备选柱面数" -#: disk-utils/fdisk-menu.c:191 +#: disk-utils/fdisk-menu.c:192 msgid "change number of extra sectors per cylinder" msgstr "更改每柱面的额外扇区数" -#: disk-utils/fdisk-menu.c:192 +#: disk-utils/fdisk-menu.c:193 msgid "change interleave factor" msgstr "更改交错系数" -#: disk-utils/fdisk-menu.c:193 +#: disk-utils/fdisk-menu.c:194 msgid "change rotation speed (rpm)" msgstr "更改转速(转/分)" -#: disk-utils/fdisk-menu.c:194 +#: disk-utils/fdisk-menu.c:195 msgid "change number of physical cylinders" msgstr "更改物理柱面数" -#: disk-utils/fdisk-menu.c:203 +#: disk-utils/fdisk-menu.c:204 msgid "SGI" msgstr "SGI" -#: disk-utils/fdisk-menu.c:204 +#: disk-utils/fdisk-menu.c:205 msgid "select bootable partition" msgstr "选择可启动分区" -#: disk-utils/fdisk-menu.c:205 +#: disk-utils/fdisk-menu.c:206 msgid "edit bootfile entry" msgstr "编辑启动文件记录" -#: disk-utils/fdisk-menu.c:206 +#: disk-utils/fdisk-menu.c:207 msgid "select sgi swap partition" msgstr "选择 sgi 交换分区" -#: disk-utils/fdisk-menu.c:207 +#: disk-utils/fdisk-menu.c:208 msgid "create SGI info" msgstr "创建 SGI 信息" -#: disk-utils/fdisk-menu.c:216 +#: disk-utils/fdisk-menu.c:217 msgid "DOS (MBR)" msgstr "DOS (MBR)" -#: disk-utils/fdisk-menu.c:217 +#: disk-utils/fdisk-menu.c:218 msgid "toggle a bootable flag" msgstr "开关 可启动 标志" -#: disk-utils/fdisk-menu.c:218 +#: disk-utils/fdisk-menu.c:219 msgid "edit nested BSD disklabel" msgstr "编辑嵌套的 BSD 磁盘标签" -#: disk-utils/fdisk-menu.c:219 +#: disk-utils/fdisk-menu.c:220 msgid "toggle the dos compatibility flag" msgstr "开关 dos 兼容性标志" -#: disk-utils/fdisk-menu.c:221 +#: disk-utils/fdisk-menu.c:222 msgid "move beginning of data in a partition" msgstr "移动分区数据的起始点" -#: disk-utils/fdisk-menu.c:222 +#: disk-utils/fdisk-menu.c:223 msgid "change the disk identifier" msgstr "更改磁盘标识符" -#: disk-utils/fdisk-menu.c:224 +#: disk-utils/fdisk-menu.c:225 msgid "return from protective/hybrid MBR to GPT" msgstr "从 保护/混合 MBR 回到 GPT" -#: disk-utils/fdisk-menu.c:234 +#: disk-utils/fdisk-menu.c:235 msgid "BSD" msgstr "BSD" -#: disk-utils/fdisk-menu.c:235 +#: disk-utils/fdisk-menu.c:236 msgid "edit drive data" msgstr "编辑驱动数据" -#: disk-utils/fdisk-menu.c:236 +#: disk-utils/fdisk-menu.c:237 msgid "install bootstrap" msgstr "安装引导程序" -#: disk-utils/fdisk-menu.c:237 +#: disk-utils/fdisk-menu.c:238 msgid "show complete disklabel" msgstr "显示完整磁盘标签" -#: disk-utils/fdisk-menu.c:238 +#: disk-utils/fdisk-menu.c:239 msgid "link BSD partition to non-BSD partition" msgstr "将 BSD 分区链接到非 BSD 分区" -#: disk-utils/fdisk-menu.c:370 +#: disk-utils/fdisk-menu.c:371 #, c-format msgid "" "\n" @@ -1531,7 +1531,7 @@ msgstr "" "\n" "帮助 (专业命令)：\n" -#: disk-utils/fdisk-menu.c:372 disk-utils/sfdisk.c:1266 +#: disk-utils/fdisk-menu.c:373 disk-utils/sfdisk.c:1283 #, c-format msgid "" "\n" @@ -1540,20 +1540,20 @@ msgstr "" "\n" "帮助：\n" -#: disk-utils/fdisk-menu.c:392 +#: disk-utils/fdisk-menu.c:393 #, c-format msgid "You're editing nested '%s' partition table, primary partition table is '%s'." msgstr "您正在编辑嵌套的“%s”分区表，主分区表为“%s”。" -#: disk-utils/fdisk-menu.c:422 +#: disk-utils/fdisk-menu.c:423 msgid "Expert command (m for help): " msgstr "专家命令(输入 m 显示帮助)：" -#: disk-utils/fdisk-menu.c:424 +#: disk-utils/fdisk-menu.c:425 msgid "Command (m for help): " msgstr "命令(输入 m 获取帮助)：" -#: disk-utils/fdisk-menu.c:434 +#: disk-utils/fdisk-menu.c:435 msgid "" "\n" "Do you really want to quit? " @@ -1561,102 +1561,102 @@ msgstr "" "\n" "您确实要退出吗？" -#: disk-utils/fdisk-menu.c:447 +#: disk-utils/fdisk-menu.c:448 #, c-format msgid "%c: unknown command" msgstr "%c：未知命令" -#: disk-utils/fdisk-menu.c:472 disk-utils/fdisk-menu.c:505 +#: disk-utils/fdisk-menu.c:473 disk-utils/fdisk-menu.c:506 msgid "Enter script file name" msgstr "输入脚本文件名" -#: disk-utils/fdisk-menu.c:484 +#: disk-utils/fdisk-menu.c:485 msgid "Resetting fdisk!" msgstr "" -#: disk-utils/fdisk-menu.c:491 +#: disk-utils/fdisk-menu.c:492 msgid "Script successfully applied." msgstr "成功应用了脚本。" -#: disk-utils/fdisk-menu.c:517 +#: disk-utils/fdisk-menu.c:518 msgid "Failed to transform disk layout into script" msgstr "将磁盘布局转换成脚本失败" -#: disk-utils/fdisk-menu.c:531 +#: disk-utils/fdisk-menu.c:532 msgid "Script successfully saved." msgstr "成本保存了脚本。" -#: disk-utils/fdisk-menu.c:554 disk-utils/sfdisk.c:1487 +#: disk-utils/fdisk-menu.c:555 disk-utils/sfdisk.c:1504 #, c-format msgid "Partition #%zu contains a %s signature." msgstr "分区 #%zu 包含一个 %s 签名。" -#: disk-utils/fdisk-menu.c:557 disk-utils/sfdisk.c:1490 +#: disk-utils/fdisk-menu.c:558 disk-utils/sfdisk.c:1507 msgid "Do you want to remove the signature?" msgstr "您想移除该签名吗？" -#: disk-utils/fdisk-menu.c:562 disk-utils/sfdisk.c:1495 +#: disk-utils/fdisk-menu.c:563 disk-utils/sfdisk.c:1512 msgid "The signature will be removed by a write command." msgstr "写入命令将移除该签名。" -#: disk-utils/fdisk-menu.c:595 +#: disk-utils/fdisk-menu.c:596 msgid "failed to write disklabel" msgstr "写磁盘标签失败" -#: disk-utils/fdisk-menu.c:637 +#: disk-utils/fdisk-menu.c:638 msgid "Failed to fix partitions order." msgstr "修复分区顺序失败。" -#: disk-utils/fdisk-menu.c:639 +#: disk-utils/fdisk-menu.c:640 msgid "Partitions order fixed." msgstr "已修复分区顺序。" -#: disk-utils/fdisk-menu.c:655 +#: disk-utils/fdisk-menu.c:656 #, c-format msgid "Could not delete partition %zu" msgstr "无法删除分区 %zu" -#: disk-utils/fdisk-menu.c:684 +#: disk-utils/fdisk-menu.c:685 msgid "Changing display/entry units to cylinders (DEPRECATED!)." msgstr "将显示/记录单位更改为柱面(已废弃！)。" -#: disk-utils/fdisk-menu.c:686 +#: disk-utils/fdisk-menu.c:687 msgid "Changing display/entry units to sectors." msgstr "将显示/记录单位更改为盲区。" -#: disk-utils/fdisk-menu.c:696 disk-utils/fdisk-menu.c:866 +#: disk-utils/fdisk-menu.c:697 disk-utils/fdisk-menu.c:868 msgid "Leaving nested disklabel." msgstr "离开嵌套的磁盘标签。" -#: disk-utils/fdisk-menu.c:733 +#: disk-utils/fdisk-menu.c:734 msgid "New maximum entries" msgstr "新的最大记录数" -#: disk-utils/fdisk-menu.c:743 +#: disk-utils/fdisk-menu.c:745 msgid "Entering protective/hybrid MBR disklabel." msgstr "进入 保护/混合 MBR 磁盘标签。" -#: disk-utils/fdisk-menu.c:759 +#: disk-utils/fdisk-menu.c:761 msgid "New UUID (in 8-4-4-4-12 format)" msgstr "新 UUID (以 8-4-4-4-12 格式)" -#: disk-utils/fdisk-menu.c:774 +#: disk-utils/fdisk-menu.c:776 msgid "New name" msgstr "新名称" -#: disk-utils/fdisk-menu.c:837 +#: disk-utils/fdisk-menu.c:839 msgid "Entering nested BSD disklabel." msgstr "进入嵌套的 BSD 磁盘标签。" -#: disk-utils/fdisk-menu.c:1022 +#: disk-utils/fdisk-menu.c:1037 msgid "Number of cylinders" msgstr "柱面数" -#: disk-utils/fdisk-menu.c:1026 +#: disk-utils/fdisk-menu.c:1044 msgid "Number of heads" msgstr "磁头数" -#: disk-utils/fdisk-menu.c:1030 +#: disk-utils/fdisk-menu.c:1050 msgid "Number of sectors" msgstr "扇区数" @@ -1671,17 +1671,17 @@ msgid "%s is not mounted\n" msgstr "%s 未挂载\n" #: disk-utils/fsck.c:329 disk-utils/fsck.cramfs.c:171 -#: disk-utils/fsck.cramfs.c:178 disk-utils/fsck.cramfs.c:232 -#: disk-utils/fsck.cramfs.c:250 disk-utils/sfdisk.c:298 libfdisk/src/bsd.c:645 -#: lib/path.c:126 lib/path.c:147 lib/path.c:168 lib/path.c:216 +#: disk-utils/fsck.cramfs.c:178 disk-utils/fsck.cramfs.c:234 +#: disk-utils/fsck.cramfs.c:255 disk-utils/sfdisk.c:298 libfdisk/src/bsd.c:645 +#: lib/path.c:140 lib/path.c:161 lib/path.c:182 lib/path.c:230 #: login-utils/last.c:208 login-utils/last.c:245 login-utils/sulogin.c:655 -#: sys-utils/rfkill.c:209 sys-utils/setpriv.c:285 term-utils/setterm.c:723 +#: sys-utils/rfkill.c:214 sys-utils/setpriv.c:285 term-utils/setterm.c:723 #: term-utils/setterm.c:780 term-utils/setterm.c:784 term-utils/setterm.c:791 #, c-format msgid "cannot read %s" msgstr "不能读 %s" -#: disk-utils/fsck.c:331 lib/path.c:149 lib/path.c:170 +#: disk-utils/fsck.c:331 lib/path.c:163 lib/path.c:184 #, c-format msgid "parse error: %s" msgstr "解析错误：%s" @@ -1720,7 +1720,7 @@ msgstr "正在解锁 %s。\n" msgid "failed to setup description for %s" msgstr "设置 %s 描述 失败" -#: disk-utils/fsck.c:472 misc-utils/findmnt.c:784 misc-utils/lsblk.c:444 +#: disk-utils/fsck.c:472 misc-utils/findmnt.c:784 misc-utils/lsblk.c:446 #: sys-utils/mount.c:101 sys-utils/swapon-common.c:19 sys-utils/umount.c:49 #, c-format msgid "%s: parse error at line %d -- ignored" @@ -1731,10 +1731,10 @@ msgstr "%s：第 %d 行解析出错 -- 已忽略" msgid "%s: failed to parse fstab" msgstr "%s：解析 fstab 失败" -#: disk-utils/fsck.c:677 login-utils/login.c:934 login-utils/sulogin.c:1024 +#: disk-utils/fsck.c:677 login-utils/login.c:940 login-utils/sulogin.c:1024 #: login-utils/vipw.c:208 sys-utils/flock.c:346 sys-utils/nsenter.c:180 -#: sys-utils/swapon.c:321 sys-utils/unshare.c:219 sys-utils/unshare.c:419 -#: term-utils/script.c:809 +#: sys-utils/swapon.c:320 sys-utils/unshare.c:221 sys-utils/unshare.c:435 +#: term-utils/script.c:805 msgid "fork failed" msgstr "fork 失败" @@ -1747,8 +1747,8 @@ msgstr "%s：执行失败" msgid "wait: no more child process?!?" msgstr "等待：没有剩余子进程了？！？" -#: disk-utils/fsck.c:775 sys-utils/flock.c:364 sys-utils/swapon.c:353 -#: sys-utils/unshare.c:403 sys-utils/unshare.c:424 +#: disk-utils/fsck.c:775 sys-utils/flock.c:364 sys-utils/swapon.c:352 +#: sys-utils/unshare.c:419 sys-utils/unshare.c:440 msgid "waitpid failed" msgstr "waitpid 失败" @@ -1900,7 +1900,7 @@ msgstr "必须以 root 用户进行匹配文件系统扫描：%s" msgid "couldn't find matching filesystem: %s" msgstr "找不到匹配的文件系统：%s" -#: disk-utils/fsck.c:1479 disk-utils/fsck.c:1576 misc-utils/kill.c:363 +#: disk-utils/fsck.c:1479 disk-utils/fsck.c:1576 misc-utils/kill.c:236 #: sys-utils/eject.c:278 msgid "too many arguments" msgstr "参数过多" @@ -1914,7 +1914,7 @@ msgstr "-r 的参数无效" msgid "option '%s' may be specified only once" msgstr "--pid 选项只能指定一次" -#: disk-utils/fsck.c:1556 misc-utils/kill.c:409 +#: disk-utils/fsck.c:1556 misc-utils/kill.c:282 #, c-format msgid "option '%s' requires an argument" msgstr "“%s”选项需要一个参数" @@ -1971,9 +1971,9 @@ msgstr "不是一个块设备或文件：%s" msgid "file length too short" msgstr "文件长度过短" -#: disk-utils/fsck.cramfs.c:176 disk-utils/fsck.cramfs.c:230 -#: disk-utils/fsck.cramfs.c:246 libfdisk/src/bsd.c:717 libfdisk/src/bsd.c:892 -#: login-utils/last.c:203 login-utils/last.c:237 sys-utils/fallocate.c:221 +#: disk-utils/fsck.cramfs.c:176 disk-utils/fsck.cramfs.c:231 +#: disk-utils/fsck.cramfs.c:251 libfdisk/src/bsd.c:717 libfdisk/src/bsd.c:892 +#: login-utils/last.c:203 login-utils/last.c:237 sys-utils/fallocate.c:202 #, c-format msgid "seek on %s failed" msgstr "在 %s 上定位失败" @@ -2020,171 +2020,176 @@ msgstr "旧的 cramfs 格式" msgid "unable to test CRC: old cramfs format" msgstr "无法检测 CRC：旧的 cramfs 格式" -#: disk-utils/fsck.cramfs.c:269 +#: disk-utils/fsck.cramfs.c:236 +#, fuzzy, c-format +msgid "failed to read %<PRIu32> bytes from file %s" +msgstr "读 typescript 文件 %s 失败" + +#: disk-utils/fsck.cramfs.c:274 msgid "crc error" msgstr "crc 错误" -#: disk-utils/fsck.cramfs.c:299 disk-utils/fsck.minix.c:560 +#: disk-utils/fsck.cramfs.c:304 disk-utils/fsck.minix.c:560 msgid "seek failed" msgstr "定位失败" -#: disk-utils/fsck.cramfs.c:303 +#: disk-utils/fsck.cramfs.c:308 msgid "read romfs failed" msgstr "读取 romfs 失败" -#: disk-utils/fsck.cramfs.c:335 +#: disk-utils/fsck.cramfs.c:340 msgid "root inode is not directory" msgstr "根 inode 不是一个目录" -#: disk-utils/fsck.cramfs.c:339 +#: disk-utils/fsck.cramfs.c:344 #, c-format msgid "bad root offset (%lu)" msgstr "错误的根偏移(%lu)" -#: disk-utils/fsck.cramfs.c:357 +#: disk-utils/fsck.cramfs.c:362 msgid "data block too large" msgstr "数据块过大" -#: disk-utils/fsck.cramfs.c:361 +#: disk-utils/fsck.cramfs.c:366 #, c-format msgid "decompression error: %s" msgstr "解压出错：%s" -#: disk-utils/fsck.cramfs.c:387 +#: disk-utils/fsck.cramfs.c:392 #, c-format msgid " hole at %lu (%zu)\n" msgstr " 位于 %lu 的空洞(%zu)\n" -#: disk-utils/fsck.cramfs.c:394 disk-utils/fsck.cramfs.c:547 +#: disk-utils/fsck.cramfs.c:399 disk-utils/fsck.cramfs.c:552 #, c-format msgid " uncompressing block at %lu to %lu (%lu)\n" msgstr " 正在将 %lu 处的块解压到 %lu (%lu)\n" -#: disk-utils/fsck.cramfs.c:401 +#: disk-utils/fsck.cramfs.c:406 #, c-format msgid "non-block (%ld) bytes" msgstr "非块(%ld)字节 " -#: disk-utils/fsck.cramfs.c:405 +#: disk-utils/fsck.cramfs.c:410 #, c-format msgid "non-size (%ld vs %ld) bytes" msgstr "无大小(%ld ： %ld)字节" -#: disk-utils/fsck.cramfs.c:410 disk-utils/fsck.cramfs.c:513 -#: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:366 sys-utils/fallocate.c:417 -#: sys-utils/rfkill.c:550 sys-utils/setpriv.c:620 sys-utils/setpriv.c:643 -#: sys-utils/swapon.c:394 term-utils/ttymsg.c:175 +#: disk-utils/fsck.cramfs.c:415 disk-utils/fsck.cramfs.c:518 +#: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:366 sys-utils/fallocate.c:408 +#: sys-utils/rfkill.c:551 sys-utils/setpriv.c:620 sys-utils/setpriv.c:643 +#: sys-utils/swapon.c:393 term-utils/ttymsg.c:175 #, c-format msgid "write failed: %s" msgstr "写失败：%s" -#: disk-utils/fsck.cramfs.c:421 +#: disk-utils/fsck.cramfs.c:426 #, c-format msgid "lchown failed: %s" msgstr "lchown 失败：%s" -#: disk-utils/fsck.cramfs.c:425 +#: disk-utils/fsck.cramfs.c:430 #, c-format msgid "chown failed: %s" msgstr "chown 失败：%s" -#: disk-utils/fsck.cramfs.c:430 +#: disk-utils/fsck.cramfs.c:435 #, c-format msgid "utime failed: %s" msgstr "utime 失败：%s" -#: disk-utils/fsck.cramfs.c:442 +#: disk-utils/fsck.cramfs.c:447 #, 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:462 #, c-format msgid "mkdir failed: %s" msgstr "mkdir 失败：%s" -#: disk-utils/fsck.cramfs.c:473 +#: disk-utils/fsck.cramfs.c:478 msgid "filename length is zero" msgstr "文件名长度为 0" -#: disk-utils/fsck.cramfs.c:475 +#: disk-utils/fsck.cramfs.c:480 msgid "bad filename length" msgstr "文件名长度有误" -#: disk-utils/fsck.cramfs.c:481 +#: disk-utils/fsck.cramfs.c:486 msgid "bad inode offset" msgstr "inode 偏移有误" -#: disk-utils/fsck.cramfs.c:496 +#: disk-utils/fsck.cramfs.c:501 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:504 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:533 msgid "symbolic link has zero offset" msgstr "符号链接偏移为 0" -#: disk-utils/fsck.cramfs.c:530 +#: disk-utils/fsck.cramfs.c:535 msgid "symbolic link has zero size" msgstr "符号链接大小为 0" -#: disk-utils/fsck.cramfs.c:539 +#: disk-utils/fsck.cramfs.c:544 #, c-format msgid "size error in symlink: %s" msgstr "符号链接大小出错：%s" -#: disk-utils/fsck.cramfs.c:553 +#: disk-utils/fsck.cramfs.c:558 #, c-format msgid "symlink failed: %s" msgstr "symlink 失败：%s" -#: disk-utils/fsck.cramfs.c:566 +#: disk-utils/fsck.cramfs.c:571 #, c-format msgid "special file has non-zero offset: %s" msgstr "特殊文件的偏移不为 0：%s" -#: disk-utils/fsck.cramfs.c:576 +#: disk-utils/fsck.cramfs.c:581 #, c-format msgid "fifo has non-zero size: %s" msgstr "FIFO 的大小不为 0：%s" -#: disk-utils/fsck.cramfs.c:582 +#: disk-utils/fsck.cramfs.c:587 #, c-format msgid "socket has non-zero size: %s" msgstr "套接字的大小不为 0：%s" -#: disk-utils/fsck.cramfs.c:585 +#: disk-utils/fsck.cramfs.c:590 #, c-format msgid "bogus mode: %s (%o)" msgstr "伪(bogus)模式：%s (%o)" -#: disk-utils/fsck.cramfs.c:594 +#: disk-utils/fsck.cramfs.c:599 #, c-format msgid "mknod failed: %s" msgstr "mknod 失败：%s" -#: disk-utils/fsck.cramfs.c:626 +#: disk-utils/fsck.cramfs.c:631 #, 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:635 #, c-format msgid "directory data end (%lu) != file data start (%lu)" msgstr "目录数据终点 (%lu) != 文件数据起点 (%lu)" -#: disk-utils/fsck.cramfs.c:634 +#: disk-utils/fsck.cramfs.c:639 msgid "invalid file data offset" msgstr "无效的文件数据偏移" -#: disk-utils/fsck.cramfs.c:683 disk-utils/mkfs.cramfs.c:735 +#: disk-utils/fsck.cramfs.c:688 disk-utils/mkfs.cramfs.c:736 msgid "invalid blocksize argument" msgstr "无效的 块大小 参数" -#: disk-utils/fsck.cramfs.c:706 +#: disk-utils/fsck.cramfs.c:711 #, c-format msgid "%s: OK\n" msgstr "%s：OK\n" @@ -2641,8 +2646,8 @@ msgstr "" #: disk-utils/fsck.minix.c:1432 disk-utils/mkfs.minix.c:838 #: disk-utils/mkswap.c:541 disk-utils/partx.c:1058 disk-utils/resizepart.c:114 -#: login-utils/su-common.c:328 login-utils/su-common.c:405 -#: login-utils/utmpdump.c:393 sys-utils/dmesg.c:669 sys-utils/wdctl.c:347 +#: login-utils/su-common.c:323 login-utils/su-common.c:400 +#: login-utils/utmpdump.c:391 sys-utils/dmesg.c:661 sys-utils/wdctl.c:347 #: sys-utils/wdctl.c:412 term-utils/script.c:298 term-utils/script.c:375 #: term-utils/setterm.c:887 text-utils/pg.c:1256 msgid "write failed" @@ -2860,14 +2865,9 @@ msgstr "" " -V, --verbose 解释正在进行的操作；\n" " 多次指定 -V 将导致空运行(dry-run)\n" -#: disk-utils/mkfs.c:139 lib/exec_shell.c:49 login-utils/newgrp.c:239 -#: login-utils/su-common.c:1073 login-utils/su-common.c:1441 -#: login-utils/sulogin.c:791 login-utils/sulogin.c:795 schedutils/chrt.c:556 -#: schedutils/ionice.c:260 schedutils/taskset.c:248 sys-utils/flock.c:121 -#: sys-utils/nsenter.c:481 sys-utils/prlimit.c:642 sys-utils/rtcwake.c:575 -#: sys-utils/setarch.c:313 sys-utils/setarch.c:392 sys-utils/setsid.c:117 -#: sys-utils/swapon.c:345 sys-utils/switch_root.c:261 sys-utils/unshare.c:460 -#: term-utils/script.c:622 text-utils/pg.c:1383 +#: disk-utils/mkfs.c:139 include/c.h:223 login-utils/su-common.c:1435 +#: login-utils/sulogin.c:791 login-utils/sulogin.c:795 sys-utils/flock.c:121 +#: sys-utils/rtcwake.c:595 term-utils/script.c:618 #, c-format msgid "failed to execute %s" msgstr "执行 %s 失败" @@ -2909,111 +2909,111 @@ msgstr "" msgid "readlink failed: %s" msgstr "readlink 失败：%s" -#: disk-utils/mkfs.cramfs.c:306 +#: disk-utils/mkfs.cramfs.c:307 #, c-format msgid "could not read directory %s" msgstr "无法读目录 %s" -#: disk-utils/mkfs.cramfs.c:441 +#: disk-utils/mkfs.cramfs.c:442 msgid "filesystem too big. Exiting." msgstr "文件系统过大。将退出。" -#: disk-utils/mkfs.cramfs.c:600 +#: disk-utils/mkfs.cramfs.c:601 #, c-format msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n" msgstr "AIEEE：块已“压缩”到 > 2*块长度(%ld)\n" -#: disk-utils/mkfs.cramfs.c:619 +#: disk-utils/mkfs.cramfs.c:620 #, c-format msgid "%6.2f%% (%+ld bytes)\t%s\n" msgstr "%6.2f%% (%+ld 字节)\t%s\n" -#: disk-utils/mkfs.cramfs.c:664 +#: disk-utils/mkfs.cramfs.c:665 #, c-format msgid "cannot close file %s" msgstr "无法关闭文件 %s" -#: disk-utils/mkfs.cramfs.c:741 +#: disk-utils/mkfs.cramfs.c:742 msgid "invalid edition number argument" msgstr "无效的修订版本号参数" -#: disk-utils/mkfs.cramfs.c:751 +#: disk-utils/mkfs.cramfs.c:752 msgid "invalid endianness given; must be 'big', 'little', or 'host'" msgstr "给定的大小端无效。必须为“big”、“little”或“host”" -#: disk-utils/mkfs.cramfs.c:817 +#: disk-utils/mkfs.cramfs.c:818 #, c-format msgid "warning: guestimate of required size (upper bound) is %lldMB, but maximum image size is %uMB. We might die prematurely." msgstr "警告：估计需要的大小(上限)为 %lldMB，但最大镜像大小为 %uMB。程序可能提前终止(die)。" -#: disk-utils/mkfs.cramfs.c:841 +#: disk-utils/mkfs.cramfs.c:842 msgid "ROM image map" msgstr "ROM 镜像映射" -#: disk-utils/mkfs.cramfs.c:853 +#: disk-utils/mkfs.cramfs.c:854 #, c-format msgid "Including: %s\n" msgstr "包含：%s\n" -#: disk-utils/mkfs.cramfs.c:859 +#: disk-utils/mkfs.cramfs.c:860 #, c-format msgid "Directory data: %zd bytes\n" msgstr "目录数据：%zd 字节\n" -#: disk-utils/mkfs.cramfs.c:867 +#: disk-utils/mkfs.cramfs.c:868 #, c-format msgid "Everything: %zd kilobytes\n" msgstr "全部：%zd KB\n" -#: disk-utils/mkfs.cramfs.c:872 +#: disk-utils/mkfs.cramfs.c:873 #, c-format msgid "Super block: %zd bytes\n" msgstr "超级块：%zd 字节\n" -#: disk-utils/mkfs.cramfs.c:879 +#: disk-utils/mkfs.cramfs.c:880 #, c-format msgid "CRC: %x\n" msgstr "CRC：%x\n" -#: disk-utils/mkfs.cramfs.c:884 +#: disk-utils/mkfs.cramfs.c:885 #, c-format msgid "not enough space allocated for ROM image (%lld allocated, %zu used)" msgstr "为 ROM 镜像分配的空间不足(已分配 %lld，已使用 %zu)" -#: disk-utils/mkfs.cramfs.c:890 +#: disk-utils/mkfs.cramfs.c:891 #, c-format msgid "ROM image write failed (%zd %zd)" msgstr "写 ROM 镜像失败(%zd %zd)" -#: disk-utils/mkfs.cramfs.c:893 +#: disk-utils/mkfs.cramfs.c:894 msgid "ROM image" msgstr "ROM 镜像" -#: disk-utils/mkfs.cramfs.c:902 +#: disk-utils/mkfs.cramfs.c:903 #, c-format msgid "warning: filenames truncated to %u bytes." msgstr "警告：文件名被截短为 %u 个字节。" -#: disk-utils/mkfs.cramfs.c:904 +#: disk-utils/mkfs.cramfs.c:905 msgid "warning: files were skipped due to errors." msgstr "警告：由于错误，文件被跳过。" -#: disk-utils/mkfs.cramfs.c:906 +#: disk-utils/mkfs.cramfs.c:907 #, c-format msgid "warning: file sizes truncated to %luMB (minus 1 byte)." msgstr "警告：文件大小被截短为 %luMB(减 1 字节)。" -#: disk-utils/mkfs.cramfs.c:910 +#: disk-utils/mkfs.cramfs.c:911 #, c-format msgid "warning: uids truncated to %u bits. (This may be a security concern.)" msgstr "警告：uid 被截短为 %u 位。(可能有安全隐患。)" -#: disk-utils/mkfs.cramfs.c:913 +#: disk-utils/mkfs.cramfs.c:914 #, c-format msgid "warning: gids truncated to %u bits. (This may be a security concern.)" msgstr "警告：gid 被截短为 %u 位。(可能有安全隐患。)" -#: disk-utils/mkfs.cramfs.c:916 +#: disk-utils/mkfs.cramfs.c:917 #, c-format msgid "" "WARNING: device numbers truncated to %u bits. This almost certainly means\n" @@ -3419,12 +3419,12 @@ msgstr "警告：将把交换区截短为 %llu KiB" msgid "error: %s is mounted; will not make swapspace" msgstr "错误：%s 已挂载；将不会创建交换空间" -#: disk-utils/mkswap.c:470 sys-utils/swapon.c:530 +#: disk-utils/mkswap.c:470 sys-utils/swapon.c:529 #, c-format msgid "%s: insecure permissions %04o, %04o suggested." msgstr "%s：不安全的权限 %04o，建议使用 %04o。" -#: disk-utils/mkswap.c:474 sys-utils/swapon.c:535 +#: disk-utils/mkswap.c:474 sys-utils/swapon.c:534 #, c-format msgid "%s: insecure file owner %d, 0 (root) suggested." msgstr "%s：不安全的文件拥有者 %d，建议使用 0(root)。" @@ -3484,7 +3484,7 @@ msgstr "易读形式的大小" msgid "partition name" msgstr "分区名" -#: disk-utils/partx.c:92 misc-utils/findmnt.c:108 misc-utils/lsblk.c:171 +#: disk-utils/partx.c:92 misc-utils/findmnt.c:108 misc-utils/lsblk.c:173 msgid "partition UUID" msgstr "分区 UUID" @@ -3492,7 +3492,7 @@ msgstr "分区 UUID" msgid "partition table type (dos, gpt, ...)" msgstr "分区表类型(dos、gpt、...)" -#: disk-utils/partx.c:94 misc-utils/lsblk.c:172 +#: disk-utils/partx.c:94 misc-utils/lsblk.c:174 msgid "partition flags" msgstr "分区标志" @@ -3525,11 +3525,11 @@ msgid "%s: failed to set up loop device" msgstr "%s：设置回环设备失败" #: disk-utils/partx.c:161 login-utils/lslogins.c:307 misc-utils/fincore.c:92 -#: misc-utils/findmnt.c:376 misc-utils/lsblk.c:365 misc-utils/lslocks.c:342 +#: misc-utils/findmnt.c:376 misc-utils/lsblk.c:367 misc-utils/lslocks.c:342 #: misc-utils/uuidparse.c:125 misc-utils/wipefs.c:126 sys-utils/losetup.c:110 -#: sys-utils/lscpu.c:373 sys-utils/lsipc.c:232 sys-utils/lsmem.c:136 -#: sys-utils/lsns.c:189 sys-utils/prlimit.c:277 sys-utils/rfkill.c:155 -#: sys-utils/swapon.c:151 sys-utils/wdctl.c:151 sys-utils/zramctl.c:146 +#: sys-utils/lscpu.c:220 sys-utils/lsipc.c:232 sys-utils/lsmem.c:180 +#: sys-utils/lsns.c:223 sys-utils/prlimit.c:277 sys-utils/rfkill.c:160 +#: sys-utils/swapon.c:150 sys-utils/wdctl.c:151 sys-utils/zramctl.c:146 #, c-format msgid "unknown column: %s" msgstr "未知列: %s" @@ -3626,9 +3626,9 @@ msgid_plural "#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n" msgstr[0] "#%2d：%9ju-%9ju (%9ju 扇区%6ju MB)\n" #: disk-utils/partx.c:678 misc-utils/fincore.c:374 misc-utils/findmnt.c:1622 -#: misc-utils/lsblk.c:1928 misc-utils/lslocks.c:462 sys-utils/losetup.c:333 -#: sys-utils/lscpu.c:1770 sys-utils/prlimit.c:306 sys-utils/rfkill.c:466 -#: sys-utils/swapon.c:294 sys-utils/wdctl.c:271 +#: misc-utils/lsblk.c:1930 misc-utils/lslocks.c:462 sys-utils/losetup.c:333 +#: sys-utils/lscpu.c:1618 sys-utils/prlimit.c:306 sys-utils/rfkill.c:467 +#: sys-utils/swapon.c:293 sys-utils/wdctl.c:271 #, fuzzy msgid "failed to allocate output column" msgstr "分配输出行失败" @@ -3682,7 +3682,7 @@ msgstr "" " -s, --show 列出分区\n" "\n" -#: disk-utils/partx.c:764 misc-utils/lsblk.c:1638 sys-utils/lsmem.c:382 +#: disk-utils/partx.c:764 misc-utils/lsblk.c:1640 sys-utils/lsmem.c:500 msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" @@ -3698,11 +3698,11 @@ msgstr " -n, --nr <n:m> 指定分区范围(例如：--nr 2:4)\n" msgid " -o, --output <list> define which output columns to use\n" msgstr " -o, --output <列表> 定义使用哪个输出列\n" -#: disk-utils/partx.c:768 misc-utils/lsblk.c:1654 sys-utils/lsmem.c:380 +#: disk-utils/partx.c:768 misc-utils/lsblk.c:1656 sys-utils/lsmem.c:498 msgid " -P, --pairs use key=\"value\" output format\n" msgstr " -P, --pairs 使用 key=“value” 输出格式\n" -#: disk-utils/partx.c:769 misc-utils/lsblk.c:1655 sys-utils/lsmem.c:385 +#: disk-utils/partx.c:769 misc-utils/lsblk.c:1657 sys-utils/lsmem.c:503 msgid " -r, --raw use raw output format\n" msgstr " -r, --raw 使用原生输出格式\n" @@ -3931,7 +3931,7 @@ msgstr " 原起点：%ju，新起点：%ju (移动 %ju 个扇区)\n" msgid "Do you want to move partition data?" msgstr "您想移动分区数据吗？" -#: disk-utils/sfdisk.c:454 disk-utils/sfdisk.c:1797 +#: disk-utils/sfdisk.c:454 disk-utils/sfdisk.c:1814 msgid "Leaving." msgstr "离开中。" @@ -3952,12 +3952,12 @@ msgstr "" "\n" "分区表已调整。" -#: disk-utils/sfdisk.c:624 +#: disk-utils/sfdisk.c:631 #, c-format msgid "unsupported label '%s'" msgstr "不支持的标签：“%s”" -#: disk-utils/sfdisk.c:627 +#: disk-utils/sfdisk.c:634 msgid "" "Id Name\n" "\n" @@ -3965,166 +3965,172 @@ msgstr "" "Id 名称\n" "\n" -#: disk-utils/sfdisk.c:657 +#: disk-utils/sfdisk.c:664 msgid "unrecognized partition table type" msgstr "未识别的分区表类型" -#: disk-utils/sfdisk.c:710 +#: disk-utils/sfdisk.c:717 #, c-format msgid "Cannot get size of %s" msgstr "无法获得 %s 的大小" -#: disk-utils/sfdisk.c:747 +#: disk-utils/sfdisk.c:754 #, c-format msgid "total: %ju blocks\n" msgstr "共计：%ju 个块\n" -#: disk-utils/sfdisk.c:809 disk-utils/sfdisk.c:877 disk-utils/sfdisk.c:918 -#: disk-utils/sfdisk.c:948 disk-utils/sfdisk.c:1015 disk-utils/sfdisk.c:1079 -#: disk-utils/sfdisk.c:1134 disk-utils/sfdisk.c:1190 disk-utils/sfdisk.c:1544 +#: disk-utils/sfdisk.c:816 disk-utils/sfdisk.c:894 disk-utils/sfdisk.c:935 +#: disk-utils/sfdisk.c:965 disk-utils/sfdisk.c:1032 disk-utils/sfdisk.c:1096 +#: disk-utils/sfdisk.c:1151 disk-utils/sfdisk.c:1207 disk-utils/sfdisk.c:1561 msgid "no disk device specified" msgstr "未指定磁盘设备" -#: disk-utils/sfdisk.c:820 -msgid "toggle boot flags is supported for MBR only" +#: disk-utils/sfdisk.c:830 +#, fuzzy +msgid "cannot switch to PMBR" +msgstr "无法 stat %s" + +#: disk-utils/sfdisk.c:832 +#, fuzzy +msgid "toggle boot flags is supported for MBR or PMBR only" msgstr "开/关启动标志 只支持 MBR" -#: disk-utils/sfdisk.c:851 disk-utils/sfdisk.c:897 disk-utils/sfdisk.c:1020 -#: disk-utils/sfdisk.c:1084 disk-utils/sfdisk.c:1139 disk-utils/sfdisk.c:1195 -#: disk-utils/sfdisk.c:1542 disk-utils/sfdisk.c:2039 +#: disk-utils/sfdisk.c:867 disk-utils/sfdisk.c:914 disk-utils/sfdisk.c:1037 +#: disk-utils/sfdisk.c:1101 disk-utils/sfdisk.c:1156 disk-utils/sfdisk.c:1212 +#: disk-utils/sfdisk.c:1559 disk-utils/sfdisk.c:2056 msgid "failed to parse partition number" msgstr "解析分区号失败" -#: disk-utils/sfdisk.c:856 +#: disk-utils/sfdisk.c:872 #, c-format msgid "%s: partition %d: failed to toggle bootable flag" msgstr "%s：分区 %d：开/关启动标志失败" -#: disk-utils/sfdisk.c:892 disk-utils/sfdisk.c:900 +#: disk-utils/sfdisk.c:909 disk-utils/sfdisk.c:917 #, c-format msgid "%s: partition %zu: failed to delete" msgstr "%s：分区 %zu：删除失败" -#: disk-utils/sfdisk.c:955 +#: disk-utils/sfdisk.c:972 #, fuzzy, c-format msgid "%s: does not contain a recognized partition table" msgstr "设备不包含可识别的分区表。" -#: disk-utils/sfdisk.c:959 +#: disk-utils/sfdisk.c:976 msgid "failed to allocate dump struct" msgstr "分配转储结构失败" -#: disk-utils/sfdisk.c:963 +#: disk-utils/sfdisk.c:980 #, fuzzy, c-format msgid "%s: failed to dump partition table" msgstr "转储分区表失败" -#: disk-utils/sfdisk.c:993 +#: disk-utils/sfdisk.c:1010 #, c-format msgid "%s: no partition table found" msgstr "%s：找不到分区表" -#: disk-utils/sfdisk.c:997 +#: disk-utils/sfdisk.c:1014 #, c-format msgid "%s: partition %zu: partition table contains only %zu partitions" msgstr "%s：分区 %zu：分区表中只包含 %zu 个分区" -#: disk-utils/sfdisk.c:1000 +#: disk-utils/sfdisk.c:1017 #, c-format msgid "%s: partition %zu: partition is unused" msgstr "%s: 分区 %zu: 分区未使用" -#: disk-utils/sfdisk.c:1019 disk-utils/sfdisk.c:1083 disk-utils/sfdisk.c:1138 -#: disk-utils/sfdisk.c:1194 +#: disk-utils/sfdisk.c:1036 disk-utils/sfdisk.c:1100 disk-utils/sfdisk.c:1155 +#: disk-utils/sfdisk.c:1211 msgid "no partition number specified" msgstr "未指定分区号" -#: disk-utils/sfdisk.c:1025 disk-utils/sfdisk.c:1089 disk-utils/sfdisk.c:1144 -#: disk-utils/sfdisk.c:1200 +#: disk-utils/sfdisk.c:1042 disk-utils/sfdisk.c:1106 disk-utils/sfdisk.c:1161 +#: disk-utils/sfdisk.c:1217 msgid "unexpected arguments" msgstr "参数异常" -#: disk-utils/sfdisk.c:1040 +#: disk-utils/sfdisk.c:1057 #, c-format msgid "%s: partition %zu: failed to get partition type" msgstr "%s: 分区 %zu:获取分区类型失败" -#: disk-utils/sfdisk.c:1059 +#: disk-utils/sfdisk.c:1076 #, c-format msgid "failed to parse %s partition type '%s'" msgstr "解析 %s 的分区类型“%s”失败" -#: disk-utils/sfdisk.c:1063 +#: disk-utils/sfdisk.c:1080 #, c-format msgid "%s: partition %zu: failed to set partition type" msgstr "%s: 分区 %zu: 设置分区类型失败" -#: disk-utils/sfdisk.c:1101 +#: disk-utils/sfdisk.c:1118 #, c-format msgid "%s: partition %zu: failed to get partition UUID" msgstr "%s: 分区 %zu: 获取分区 UUID 失败" -#: disk-utils/sfdisk.c:1114 disk-utils/sfdisk.c:1169 disk-utils/sfdisk.c:1223 +#: disk-utils/sfdisk.c:1131 disk-utils/sfdisk.c:1186 disk-utils/sfdisk.c:1240 msgid "failed to allocate partition object" msgstr "分配分区对象失败" -#: disk-utils/sfdisk.c:1118 +#: disk-utils/sfdisk.c:1135 #, c-format msgid "%s: partition %zu: failed to set partition UUID" msgstr "%s: 分区 %zu: 设置分区 UUID 失败" -#: disk-utils/sfdisk.c:1156 +#: disk-utils/sfdisk.c:1173 #, c-format msgid "%s: partition %zu: failed to get partition name" msgstr "%s: 分区 %zu: 获取分区名失败" -#: disk-utils/sfdisk.c:1173 +#: disk-utils/sfdisk.c:1190 #, c-format msgid "%s: partition %zu: failed to set partition name" msgstr "%s: 分区 %zu: 设置分区名失败" -#: disk-utils/sfdisk.c:1227 +#: disk-utils/sfdisk.c:1244 #, c-format msgid "%s: partition %zu: failed to set partition attributes" msgstr "%s: 分区 %zu: 设置分区属性失败" -#: disk-utils/sfdisk.c:1270 +#: disk-utils/sfdisk.c:1287 msgid " Commands:\n" msgstr " 命令：\n" -#: disk-utils/sfdisk.c:1272 +#: disk-utils/sfdisk.c:1289 msgid " write write table to disk and exit\n" msgstr " write 将分区表写入磁盘并退出\n" -#: disk-utils/sfdisk.c:1273 +#: disk-utils/sfdisk.c:1290 msgid " quit show new situation and wait for user's feedback before write\n" msgstr " quit 显示新状况并等待用户反馈后再写入\n" -#: disk-utils/sfdisk.c:1274 +#: disk-utils/sfdisk.c:1291 msgid " abort exit sfdisk shell\n" msgstr " abort 退出 sfdisk shell\n" -#: disk-utils/sfdisk.c:1275 +#: disk-utils/sfdisk.c:1292 msgid " print display the partition table\n" msgstr " print 显示分区表\n" -#: disk-utils/sfdisk.c:1276 +#: disk-utils/sfdisk.c:1293 msgid " help show this help text\n" msgstr " help 显示帮助并退出\n" -#: disk-utils/sfdisk.c:1278 +#: disk-utils/sfdisk.c:1295 msgid " Ctrl-D the same as 'quit'\n" msgstr " Ctrl-D 同“quit”\n" -#: disk-utils/sfdisk.c:1282 +#: disk-utils/sfdisk.c:1299 msgid " Input format:\n" msgstr " 输入格式：\n" -#: disk-utils/sfdisk.c:1284 +#: disk-utils/sfdisk.c:1301 msgid " <start>, <size>, <type>, <bootable>\n" msgstr " <起点>, <大小>, <类型>, <可启动>\n" -#: disk-utils/sfdisk.c:1287 +#: disk-utils/sfdisk.c:1304 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" @@ -4134,7 +4140,7 @@ msgstr "" " <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n" " 默认为第一处可用空间。\n" -#: disk-utils/sfdisk.c:1292 +#: disk-utils/sfdisk.c:1309 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" @@ -4144,68 +4150,70 @@ msgstr "" " <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n" " 默认为所有可用空间。\n" -#: disk-utils/sfdisk.c:1297 +#: disk-utils/sfdisk.c:1314 msgid " <type> The partition type. Default is a Linux data partition.\n" msgstr " <类型> 分区类型。默认为 Linux 数据分区。\n" -#: disk-utils/sfdisk.c:1298 -msgid " MBR: hex or L,S,E,X shortcuts.\n" +#: disk-utils/sfdisk.c:1315 +#, fuzzy +msgid " MBR: hex or L,S,E,X,U,R,V shortcuts.\n" msgstr " MBR：hex 或 L,S,E,X 快捷方式。\n" -#: disk-utils/sfdisk.c:1299 -msgid " GPT: UUID or L,S,H shortcuts.\n" +#: disk-utils/sfdisk.c:1316 +#, fuzzy +msgid " GPT: UUID or L,S,H,U,R,V shortcuts.\n" msgstr " GPT：UUID 或 L,S,H 快捷方式。\n" -#: disk-utils/sfdisk.c:1302 +#: disk-utils/sfdisk.c:1319 msgid " <bootable> Use '*' to mark an MBR partition as bootable.\n" msgstr " <可启动> 使用“*”将 MBR 分区标记为 可启动。\n" -#: disk-utils/sfdisk.c:1306 +#: disk-utils/sfdisk.c:1323 msgid " Example:\n" msgstr "示例：\n" -#: disk-utils/sfdisk.c:1308 +#: disk-utils/sfdisk.c:1325 msgid " , 4G Creates a 4GiB partition at default start offset.\n" msgstr " , 4G 在默认起始偏移位置创建一个 4GiB 分区。\n" -#: disk-utils/sfdisk.c:1340 sys-utils/dmesg.c:1556 +#: disk-utils/sfdisk.c:1357 sys-utils/dmesg.c:1539 msgid "unsupported command" msgstr "不支持的命令" -#: disk-utils/sfdisk.c:1342 +#: disk-utils/sfdisk.c:1359 #, c-format msgid "line %d: unsupported command" msgstr "第 %d 行：不支持的命令" -#: disk-utils/sfdisk.c:1463 +#: disk-utils/sfdisk.c:1480 #, fuzzy, c-format msgid "The old %s signature may remain on the device. It is recommended to wipe the device with wipefs(8) or sfdisk --wipe, in order to avoid possible collisions." msgstr "强烈建议您使用 wipefs(8)来擦除该设备，以避免潜在的冲突。" -#: disk-utils/sfdisk.c:1511 +#: disk-utils/sfdisk.c:1528 msgid "failed to allocate partition name" msgstr "分配分区名失败" -#: disk-utils/sfdisk.c:1552 +#: disk-utils/sfdisk.c:1569 msgid "failed to allocate script handler" msgstr "分配脚本处理程序失败" -#: disk-utils/sfdisk.c:1568 +#: disk-utils/sfdisk.c:1585 #, c-format msgid "%s: cannot modify partition %d: no partition table was found" msgstr "%s：无法修改分区 %d：未找到分区表" -#: disk-utils/sfdisk.c:1573 +#: disk-utils/sfdisk.c:1590 #, c-format msgid "%s: cannot modify partition %d: partition table contains only %zu partitions" msgstr "%s: 无法修改分区 %d: 分区表只包含 %zu 个分区" -#: disk-utils/sfdisk.c:1579 +#: disk-utils/sfdisk.c:1596 #, c-format msgid "warning: %s: partition %d is not defined yet" msgstr "警告：%s: 分区 %d 尚未定义" -#: disk-utils/sfdisk.c:1597 +#: disk-utils/sfdisk.c:1614 #, c-format msgid "" "\n" @@ -4214,11 +4222,11 @@ msgstr "" "\n" "欢迎使用 sfdisk (%s)。" -#: disk-utils/sfdisk.c:1605 +#: disk-utils/sfdisk.c:1622 msgid "Checking that no-one is using this disk right now ..." msgstr "请检查现在是不是有人在使用此磁盘..." -#: disk-utils/sfdisk.c:1608 +#: disk-utils/sfdisk.c:1625 msgid "" " FAILED\n" "\n" @@ -4226,7 +4234,7 @@ msgstr "" " 失败\n" "\n" -#: disk-utils/sfdisk.c:1611 +#: disk-utils/sfdisk.c:1628 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" @@ -4236,11 +4244,11 @@ msgstr "" "请卸载此磁盘上所有的文件系统，并关闭(swapoff)上面的交换分区。\n" "可使用 --no-reread 标志阻止此检查。\n" -#: disk-utils/sfdisk.c:1616 +#: disk-utils/sfdisk.c:1633 msgid "Use the --force flag to overrule all checks." msgstr "使用 --force 标志否决所有检查。" -#: disk-utils/sfdisk.c:1618 +#: disk-utils/sfdisk.c:1635 msgid "" " OK\n" "\n" @@ -4248,7 +4256,7 @@ msgstr "" " 好的\n" "\n" -#: disk-utils/sfdisk.c:1630 +#: disk-utils/sfdisk.c:1647 msgid "" "\n" "Old situation:" @@ -4256,7 +4264,7 @@ msgstr "" "\n" "旧状况：" -#: disk-utils/sfdisk.c:1648 +#: disk-utils/sfdisk.c:1665 #, c-format msgid "" "\n" @@ -4268,7 +4276,7 @@ msgstr "" "sfdisk 即将创建一个新的磁盘标签“%s”。\n" "在定义第一个分区之前使用“label: <名字>”可覆盖默认值。" -#: disk-utils/sfdisk.c:1651 +#: disk-utils/sfdisk.c:1668 msgid "" "\n" "Type 'help' to get more information.\n" @@ -4276,32 +4284,32 @@ msgstr "" "\n" "请执行“%s --help”了解更多信息。\n" -#: disk-utils/sfdisk.c:1669 +#: disk-utils/sfdisk.c:1686 msgid "All partitions used." msgstr "所有分区均已使用。" -#: disk-utils/sfdisk.c:1697 +#: disk-utils/sfdisk.c:1714 msgid "Done.\n" msgstr "完成。\n" -#: disk-utils/sfdisk.c:1709 +#: disk-utils/sfdisk.c:1726 msgid "Ignoring partition." msgstr "忽略分区。" -#: disk-utils/sfdisk.c:1718 disk-utils/sfdisk.c:1778 +#: disk-utils/sfdisk.c:1735 disk-utils/sfdisk.c:1795 msgid "Failed to apply script headers, disk label not created." msgstr "无法应用脚本标头(header)，未创建磁盘标签。" -#: disk-utils/sfdisk.c:1737 +#: disk-utils/sfdisk.c:1754 #, fuzzy, c-format msgid "Failed to add #%d partition" msgstr "添加分区失败" -#: disk-utils/sfdisk.c:1760 +#: disk-utils/sfdisk.c:1777 msgid "Script header accepted." msgstr "已接受脚本标头(header)。" -#: disk-utils/sfdisk.c:1785 +#: disk-utils/sfdisk.c:1802 msgid "" "\n" "New situation:" @@ -4309,15 +4317,15 @@ msgstr "" "\n" "新状况：" -#: disk-utils/sfdisk.c:1795 +#: disk-utils/sfdisk.c:1812 msgid "Do you want to write this to disk?" msgstr "您想写入该磁盘吗？" -#: disk-utils/sfdisk.c:1808 +#: disk-utils/sfdisk.c:1825 msgid "Leaving.\n" msgstr "离开中。\n" -#: disk-utils/sfdisk.c:1822 +#: disk-utils/sfdisk.c:1839 #, c-format msgid "" " %1$s [options] <dev> [[-N] <part>]\n" @@ -4326,182 +4334,183 @@ msgstr "" " %1$s [选项] <设备> [[-N] <分区>]\n" " %1$s [选项] <命令>\n" -#: disk-utils/sfdisk.c:1829 -msgid " -A, --activate <dev> [<part> ...] list or set bootable MBR partitions\n" +#: disk-utils/sfdisk.c:1846 +#, fuzzy +msgid " -A, --activate <dev> [<part> ...] list or set bootable (P)MBR partitions\n" msgstr " -A, --activate <设备> [<分区> ...] 列出或设置可启动的 MBR 分区\n" -#: disk-utils/sfdisk.c:1830 +#: disk-utils/sfdisk.c:1847 msgid " -d, --dump <dev> dump partition table (usable for later input)\n" msgstr " -d, --dump <设备> 转储分区表(用于后续输入)\n" -#: disk-utils/sfdisk.c:1831 +#: disk-utils/sfdisk.c:1848 msgid " -J, --json <dev> dump partition table in JSON format\n" msgstr " -J, --json <设备> 以 JSON 格式转储分区表\n" -#: disk-utils/sfdisk.c:1832 +#: disk-utils/sfdisk.c:1849 msgid " -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n" msgstr " -g, --show-geometry [<设备> ...] 列出所有或指定设备的几何属性\n" -#: disk-utils/sfdisk.c:1833 +#: disk-utils/sfdisk.c:1850 msgid " -l, --list [<dev> ...] list partitions of each device\n" msgstr " -l, --list [<设备> ...] 列出每台设备上的分区\n" -#: disk-utils/sfdisk.c:1834 +#: disk-utils/sfdisk.c:1851 msgid " -F, --list-free [<dev> ...] list unpartitioned free areas of each device\n" msgstr " -F, --list-free [<设备> ...] 列出每台设备上的未分区空间\n" -#: disk-utils/sfdisk.c:1835 +#: disk-utils/sfdisk.c:1852 msgid " -r, --reorder <dev> fix partitions order (by start offset)\n" msgstr " -r, --reorder <设备> (通过起始偏移量)修复分区顺序\n" -#: disk-utils/sfdisk.c:1836 +#: disk-utils/sfdisk.c:1853 msgid " -s, --show-size [<dev> ...] list sizes of all or specified devices\n" msgstr " -s, --show-size [<设备> ...] 列出所有或指定设备的大小\n" -#: disk-utils/sfdisk.c:1837 +#: disk-utils/sfdisk.c:1854 msgid " -T, --list-types print the recognized types (see -X)\n" msgstr " -T, --list-types 打印识别的类型(见 -X)\n" -#: disk-utils/sfdisk.c:1838 +#: disk-utils/sfdisk.c:1855 msgid " -V, --verify [<dev> ...] test whether partitions seem correct\n" msgstr " -V, --verify [<设备> ...] 测试分区是否正确\n" -#: disk-utils/sfdisk.c:1839 +#: disk-utils/sfdisk.c:1856 msgid " --delete <dev> [<part> ...] delete all or specified partitions\n" msgstr " --delete <设备> [<分区> ...] 删除所有或指定分区\n" -#: disk-utils/sfdisk.c:1842 +#: disk-utils/sfdisk.c:1859 msgid " --part-label <dev> <part> [<str>] print or change partition label\n" msgstr " --part-label <设备> <分区> [<字符串>] 打印或更改分区标签\n" -#: disk-utils/sfdisk.c:1843 +#: disk-utils/sfdisk.c:1860 msgid " --part-type <dev> <part> [<type>] print or change partition type\n" msgstr " --part-type <设备> <分区> [<类型>] 打印或更改分区类型\n" -#: disk-utils/sfdisk.c:1844 +#: disk-utils/sfdisk.c:1861 msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n" msgstr " --part-uuid <设备> <分区> [<uuid>] 打印或更改分区 uuid\n" -#: disk-utils/sfdisk.c:1845 +#: disk-utils/sfdisk.c:1862 msgid " --part-attrs <dev> <part> [<str>] print or change partition attributes\n" msgstr " --part-attrs <设备> <分区> [<字符串>] 打印或更改分区属性\n" -#: disk-utils/sfdisk.c:1848 +#: disk-utils/sfdisk.c:1865 msgid " <dev> device (usually disk) path\n" msgstr " <设备> 设备(通常是磁盘)的路径\n" -#: disk-utils/sfdisk.c:1849 +#: disk-utils/sfdisk.c:1866 msgid " <part> partition number\n" msgstr " <分区> 分区号\n" -#: disk-utils/sfdisk.c:1850 +#: disk-utils/sfdisk.c:1867 msgid " <type> partition type, GUID for GPT, hex for MBR\n" msgstr " <类型> 分区类型，GUID 对应 GPT，hex 对应 MBR\n" -#: disk-utils/sfdisk.c:1853 +#: disk-utils/sfdisk.c:1870 msgid " -a, --append append partitions to existing partition table\n" msgstr " -a, --append 将分区附加到已有分区表\n" -#: disk-utils/sfdisk.c:1854 +#: disk-utils/sfdisk.c:1871 msgid " -b, --backup backup partition table sectors (see -O)\n" msgstr " -b, --backup 备份分区表扇区(见 -O)\n" -#: disk-utils/sfdisk.c:1855 +#: disk-utils/sfdisk.c:1872 msgid " --bytes print SIZE in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" -#: disk-utils/sfdisk.c:1856 +#: disk-utils/sfdisk.c:1873 msgid " --move-data[=<typescript>] move partition data after relocation (requires -N)\n" msgstr " --move-data[=<typescript>] 重新定位后移动分区数据(需要 -N)\n" -#: disk-utils/sfdisk.c:1857 +#: disk-utils/sfdisk.c:1874 msgid " -f, --force disable all consistency checking\n" msgstr " -f, --force 禁用所有的一致性检查\n" -#: disk-utils/sfdisk.c:1858 +#: disk-utils/sfdisk.c:1875 msgid " --color[=<when>] colorize output (auto, always or never)\n" msgstr " --color[=<何时>] 彩色输出(auto，always 或 never)\n" -#: disk-utils/sfdisk.c:1861 +#: disk-utils/sfdisk.c:1878 msgid " -N, --partno <num> specify partition number\n" msgstr " -N, --partno <数字> 指定分区号\n" -#: disk-utils/sfdisk.c:1862 +#: disk-utils/sfdisk.c:1879 msgid " -n, --no-act do everything except write to device\n" msgstr " -n, --no-act 不真正执行写入设备\n" -#: disk-utils/sfdisk.c:1863 +#: disk-utils/sfdisk.c:1880 msgid " --no-reread do not check whether the device is in use\n" msgstr " --no-reread 不检查设备是否正在使用\n" -#: disk-utils/sfdisk.c:1864 +#: disk-utils/sfdisk.c:1881 msgid " --no-tell-kernel do not tell kernel about changes\n" msgstr " --no-tell-kernel 更改而不告诉内核\n" -#: disk-utils/sfdisk.c:1865 +#: disk-utils/sfdisk.c:1882 msgid " -O, --backup-file <path> override default backup file name\n" msgstr " -O, --backup-file <路径> 覆盖默认的备份文件名\n" -#: disk-utils/sfdisk.c:1866 +#: disk-utils/sfdisk.c:1883 msgid " -o, --output <list> output columns\n" msgstr " -o, --output <列表> 输出列\n" -#: disk-utils/sfdisk.c:1867 +#: disk-utils/sfdisk.c:1884 msgid " -q, --quiet suppress extra info messages\n" msgstr " -q, --quiet 禁止输出额外信息\n" -#: disk-utils/sfdisk.c:1868 +#: disk-utils/sfdisk.c:1885 msgid " -w, --wipe <mode> wipe signatures (auto, always or never)\n" msgstr " -w, --wipe <模式> 擦除签名(auto, always 或 never)\n" -#: disk-utils/sfdisk.c:1870 +#: disk-utils/sfdisk.c:1887 msgid " -X, --label <name> specify label type (dos, gpt, ...)\n" msgstr " -X, --label <名称> 指定标签类型(dos, gpt, ...)\n" -#: disk-utils/sfdisk.c:1871 +#: disk-utils/sfdisk.c:1888 msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n" msgstr " -Y, --label-nested <名称> 指定嵌套标签类型(dos, bsd)\n" -#: disk-utils/sfdisk.c:1873 +#: disk-utils/sfdisk.c:1890 msgid " -G, --show-pt-geometry deprecated, alias to --show-geometry\n" msgstr " -G, --show-pt-geometry 已废弃，同 --show-geometry\n" -#: disk-utils/sfdisk.c:1874 +#: disk-utils/sfdisk.c:1891 msgid " -L, --Linux deprecated, only for backward compatibility\n" msgstr " -L, --Linux 已废弃，仅为向后兼容\n" -#: disk-utils/sfdisk.c:1875 +#: disk-utils/sfdisk.c:1892 msgid " -u, --unit S deprecated, only sector unit is supported\n" msgstr " -u, --unit S 已废弃，只支持扇区单位\n" -#: disk-utils/sfdisk.c:1993 +#: disk-utils/sfdisk.c:2010 #, c-format msgid "%s is deprecated in favour of --part-type" msgstr "%s 已废弃，请改用 --part-type" -#: disk-utils/sfdisk.c:1998 +#: disk-utils/sfdisk.c:2015 msgid "--id is deprecated in favour of --part-type" msgstr "--id 已废弃，请改用 --part-type" -#: disk-utils/sfdisk.c:2014 +#: disk-utils/sfdisk.c:2031 msgid "--show-pt-geometry is no more implemented. Using --show-geometry." msgstr "--show-pt-geometry 不再实现。请使用 --show-geometry。" -#: disk-utils/sfdisk.c:2026 +#: disk-utils/sfdisk.c:2043 msgid "--Linux option is unnecessary and deprecated" msgstr "--Linux 选项没必要，并且已废弃" -#: disk-utils/sfdisk.c:2055 +#: disk-utils/sfdisk.c:2072 #, c-format msgid "unsupported unit '%c'" msgstr "不支持的单位“%c”" -#: disk-utils/sfdisk.c:2058 include/c.h:330 +#: disk-utils/sfdisk.c:2075 include/c.h:336 #, c-format msgid "%s from %s\n" msgstr "%s，来自 %s\n" -#: disk-utils/sfdisk.c:2135 +#: disk-utils/sfdisk.c:2152 msgid "--movedata requires -N" msgstr "--movedata 需要 -N" @@ -4556,7 +4565,7 @@ msgstr "忽略 -U (不支持 UUID)" msgid "Try '%s --help' for more information.\n" msgstr "请尝试执行“%s --help”了解更多信息。\n" -#: include/c.h:312 +#: include/c.h:318 msgid "" "\n" "Usage:\n" @@ -4564,7 +4573,7 @@ msgstr "" "\n" "用法：\n" -#: include/c.h:313 +#: include/c.h:319 msgid "" "\n" "Options:\n" @@ -4572,7 +4581,7 @@ msgstr "" "\n" "选项：\n" -#: include/c.h:314 +#: include/c.h:320 msgid "" "\n" "Functions:\n" @@ -4580,7 +4589,7 @@ msgstr "" "\n" "功能：\n" -#: include/c.h:315 +#: include/c.h:321 msgid "" "\n" "Commands:\n" @@ -4588,7 +4597,7 @@ msgstr "" "\n" "命令：\n" -#: include/c.h:316 +#: include/c.h:322 #, fuzzy msgid "" "\n" @@ -4597,17 +4606,17 @@ msgstr "" "\n" "可用的 --list 列：\n" -#: include/c.h:319 +#: include/c.h:325 #, fuzzy msgid "display this help" msgstr " -? 显示此帮助并退出\n" -#: include/c.h:320 +#: include/c.h:326 #, fuzzy msgid "display version" msgstr " -version\n" -#: include/c.h:328 +#: include/c.h:334 #, c-format msgid "" "\n" @@ -4616,8 +4625,8 @@ msgstr "" "\n" "更多信息请参阅 %s。\n" -#: include/closestream.h:46 include/closestream.h:48 login-utils/vipw.c:277 -#: login-utils/vipw.c:296 sys-utils/rtcwake.c:278 term-utils/setterm.c:811 +#: include/closestream.h:46 include/closestream.h:48 login-utils/vipw.c:276 +#: login-utils/vipw.c:295 sys-utils/rtcwake.c:298 term-utils/setterm.c:811 #: text-utils/col.c:160 msgid "write error" msgstr "写出错" @@ -4630,8 +4639,8 @@ msgstr "默认启用颜色" msgid "colors are disabled by default" msgstr "默认禁用颜色" -#: include/env.h:18 lib/pager.c:151 login-utils/login.c:1018 -#: login-utils/login.c:1022 term-utils/agetty.c:1160 +#: include/env.h:18 lib/pager.c:151 login-utils/login.c:1026 +#: login-utils/login.c:1030 term-utils/agetty.c:1169 #, c-format msgid "failed to set the %s environment variable" msgstr "设置环境变量 %s 失败" @@ -5003,7 +5012,7 @@ msgstr "Linux/PA-RISC 启动" msgid "DOS secondary" msgstr "DOS 次要" -#: include/pt-mbr-partnames.h:101 +#: include/pt-mbr-partnames.h:101 libfdisk/src/gpt.c:274 msgid "VMware VMFS" msgstr "VMware VMFS" @@ -5068,7 +5077,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:296 libfdisk/src/dos.c:1218 libfdisk/src/gpt.c:2358 +#: libfdisk/src/bsd.c:296 libfdisk/src/dos.c:1218 libfdisk/src/gpt.c:2447 msgid "Last sector, +sectors or +size{K,M,G,T,P}" msgstr "上个扇区，+sectors 或 +size{K,M,G,T,P}" @@ -5089,7 +5098,7 @@ msgstr "磁盘" msgid "Packname" msgstr "包名" -#: libfdisk/src/bsd.c:462 libfdisk/src/sun.c:1101 +#: libfdisk/src/bsd.c:462 libfdisk/src/sun.c:1127 msgid "Flags" msgstr "标志" @@ -5118,15 +5127,15 @@ msgid "Sectors/Cylinder" msgstr "扇区/柱面" #: libfdisk/src/bsd.c:490 libfdisk/src/bsd.c:1020 libfdisk/src/dos.c:2428 -#: libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:189 libfdisk/src/sun.c:1097 +#: libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:197 libfdisk/src/sun.c:1123 msgid "Cylinders" msgstr "柱面" -#: libfdisk/src/bsd.c:495 libfdisk/src/sun.c:748 +#: libfdisk/src/bsd.c:495 libfdisk/src/sun.c:773 msgid "Rpm" msgstr "转每分" -#: libfdisk/src/bsd.c:500 libfdisk/src/sgi.c:291 libfdisk/src/sun.c:768 +#: libfdisk/src/bsd.c:500 libfdisk/src/sgi.c:291 libfdisk/src/sun.c:793 msgid "Interleave" msgstr "交错" @@ -5219,7 +5228,7 @@ msgstr "磁盘标签已写入 %s。(不要忘了也写入 %s 磁盘标签。)" msgid "Disklabel written to %s." msgstr "磁盘标签已写入 %s。" -#: libfdisk/src/bsd.c:911 libfdisk/src/context.c:686 +#: libfdisk/src/bsd.c:911 libfdisk/src/context.c:688 msgid "Syncing disks." msgstr "正在同步磁盘。" @@ -5248,54 +5257,54 @@ msgstr "Bsize" msgid "Cpg" msgstr "Cpg" -#: libfdisk/src/context.c:680 +#: libfdisk/src/context.c:682 #, c-format msgid "%s: close device failed" msgstr "%s：关闭设备失败" -#: libfdisk/src/context.c:754 +#: libfdisk/src/context.c:756 msgid "Calling ioctl() to re-read partition table." msgstr "将调用 ioctl() 来重新读分区表。" -#: libfdisk/src/context.c:763 +#: libfdisk/src/context.c:765 msgid "Re-reading the partition table failed." msgstr "重新读取分区表失败。" -#: libfdisk/src/context.c:765 +#: libfdisk/src/context.c:767 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/context.c:850 +#: libfdisk/src/context.c:852 #, fuzzy, c-format msgid "Failed to remove partition %zu from system" msgstr "移除分区失败" -#: libfdisk/src/context.c:858 +#: libfdisk/src/context.c:860 #, fuzzy, c-format msgid "Failed to update system information about partition %zu" msgstr "打印某个分区的相关信息" -#: libfdisk/src/context.c:866 +#: libfdisk/src/context.c:868 #, fuzzy, c-format msgid "Failed to add partition %zu to system" msgstr "添加分区失败" -#: libfdisk/src/context.c:872 +#: libfdisk/src/context.c:874 #, fuzzy msgid "The kernel still uses the old partitions. The new table will be used at the next reboot. " msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 kpartx(8) 后生效。" -#: libfdisk/src/context.c:1082 +#: libfdisk/src/context.c:1084 msgid "cylinder" msgid_plural "cylinders" msgstr[0] "柱面" -#: libfdisk/src/context.c:1083 +#: libfdisk/src/context.c:1085 msgid "sector" msgid_plural "sectors" msgstr[0] "扇区" -#: libfdisk/src/context.c:1386 +#: libfdisk/src/context.c:1388 msgid "Incomplete geometry setting." msgstr "不完整的几何属性设置。" @@ -5391,8 +5400,8 @@ msgstr "分区表 %3$zu 的无效标志 0x%1$02x%2$02x 将通过写入来更正" msgid "Start sector %ju out of range." msgstr "起始扇区 %ju 超出范围。" -#: libfdisk/src/dos.c:1076 libfdisk/src/gpt.c:2232 libfdisk/src/sgi.c:838 -#: libfdisk/src/sun.c:505 +#: libfdisk/src/dos.c:1076 libfdisk/src/gpt.c:2321 libfdisk/src/sgi.c:838 +#: libfdisk/src/sun.c:520 #, c-format msgid "Partition %zu is already defined. Delete it before re-adding it." msgstr "分区 %zu 已经定义过。请删除后再重新添加它。" @@ -5402,7 +5411,7 @@ msgstr "分区 %zu 已经定义过。请删除后再重新添加它。" msgid "Sector %llu is already allocated." msgstr "扇区 %llu 已经分配." -#: libfdisk/src/dos.c:1185 libfdisk/src/gpt.c:2241 +#: libfdisk/src/dos.c:1185 libfdisk/src/gpt.c:2330 msgid "No free sectors available." msgstr "无空闲扇区可用。" @@ -5549,7 +5558,7 @@ msgstr "无效的分区类型“%c”。" msgid "Cannot write sector %jd: seek failed" msgstr "写扇区 %jd 失败：定位失败" -#: libfdisk/src/dos.c:1954 libfdisk/src/gpt.c:1148 +#: libfdisk/src/dos.c:1954 libfdisk/src/gpt.c:1221 msgid "Disk identifier" msgstr "磁盘标识符" @@ -5561,7 +5570,7 @@ msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 msgid "Cannot change type of the extended partition which is already used by logical partitions. Delete logical partitions first." msgstr "无法更改已被逻辑分区使用的扩展分区的类型。请先删除逻辑分区。" -#: libfdisk/src/dos.c:2259 libfdisk/src/gpt.c:2948 +#: libfdisk/src/dos.c:2259 libfdisk/src/gpt.c:3037 msgid "Nothing to do. Ordering is correct already." msgstr "无须操作。顺序已经是正确的了。" @@ -5589,8 +5598,8 @@ msgstr "分区 %zu 的 可启动 标志已启用。" msgid "The bootable flag on partition %zu is disabled now." msgstr "分区 %zu 的 可启动 标志已禁用。" -#: libfdisk/src/dos.c:2423 libfdisk/src/gpt.c:3038 libfdisk/src/sgi.c:1152 -#: libfdisk/src/sun.c:1093 +#: libfdisk/src/dos.c:2423 libfdisk/src/gpt.c:3127 libfdisk/src/sgi.c:1152 +#: libfdisk/src/sun.c:1119 msgid "Device" msgstr "设备" @@ -5598,7 +5607,7 @@ msgstr "设备" msgid "Boot" msgstr "启动" -#: libfdisk/src/dos.c:2430 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1099 +#: libfdisk/src/dos.c:2430 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1125 msgid "Id" msgstr "Id" @@ -5610,7 +5619,7 @@ msgstr "起始-C/H/S" msgid "End-C/H/S" msgstr "终-C/H/S" -#: libfdisk/src/dos.c:2436 libfdisk/src/gpt.c:3048 libfdisk/src/sgi.c:1160 +#: libfdisk/src/dos.c:2436 libfdisk/src/gpt.c:3137 libfdisk/src/sgi.c:1160 msgid "Attrs" msgstr "属性" @@ -5922,308 +5931,337 @@ msgstr "创建中的 Ceph 磁盘" msgid "Ceph crypt disk in creation" msgstr "创建中的加密 Ceph 磁盘" -#: libfdisk/src/gpt.c:274 +#: libfdisk/src/gpt.c:275 +#, fuzzy +msgid "VMware Diagnostic" +msgstr "Compaq 诊断" + +#: libfdisk/src/gpt.c:276 +#, fuzzy +msgid "VMware Virtual SAN" +msgstr "VMware VMFS" + +#: libfdisk/src/gpt.c:277 +#, fuzzy +msgid "VMware Virsto" +msgstr "VMware VMFS" + +#: libfdisk/src/gpt.c:278 +#, fuzzy +msgid "VMware Reserved" +msgstr "ChromeOS 保留" + +#: libfdisk/src/gpt.c:281 msgid "OpenBSD data" msgstr "OpenBSD 数据" -#: libfdisk/src/gpt.c:277 +#: libfdisk/src/gpt.c:284 msgid "QNX6 file system" msgstr "QNX6 文件系统" -#: libfdisk/src/gpt.c:280 +#: libfdisk/src/gpt.c:287 msgid "Plan 9 partition" msgstr "Plan 9 分区" -#: libfdisk/src/gpt.c:594 +#: libfdisk/src/gpt.c:661 msgid "failed to allocate GPT header" msgstr "分配 GPT 头失败" -#: libfdisk/src/gpt.c:677 +#: libfdisk/src/gpt.c:744 msgid "First LBA specified by script is out of range." msgstr "脚本指定的第一个 LBA 超出范围。" -#: libfdisk/src/gpt.c:689 +#: libfdisk/src/gpt.c:756 msgid "Last LBA specified by script is out of range." msgstr "脚本指定的最后一个 LBA 超出范围。" -#: libfdisk/src/gpt.c:827 -#, c-format -msgid "GPT PMBR size mismatch (%<PRIu64> != %<PRIu64>) will be corrected by w(rite)." +#: libfdisk/src/gpt.c:895 +#, fuzzy, c-format +msgid "GPT PMBR size mismatch (%<PRIu64> != %<PRIu64>) will be corrected by write." msgstr "GPT PMBR 大小不符(%<PRIu64> != %<PRIu64>)，将用 w(写) 予以更正。" -#: libfdisk/src/gpt.c:844 +#: libfdisk/src/gpt.c:917 msgid "gpt: stat() failed" msgstr "gpt：stat() 失败" -#: libfdisk/src/gpt.c:854 +#: libfdisk/src/gpt.c:927 #, c-format msgid "gpt: cannot handle files with mode %o" msgstr "gpt：无法操作模式为 %o 的文件" -#: libfdisk/src/gpt.c:1118 +#: libfdisk/src/gpt.c:1191 msgid "GPT Header" msgstr "GPT 头" -#: libfdisk/src/gpt.c:1123 +#: libfdisk/src/gpt.c:1196 msgid "GPT Entries" msgstr "GPT 记录项" -#: libfdisk/src/gpt.c:1155 +#: libfdisk/src/gpt.c:1228 msgid "First LBA" msgstr "第一个 LBA" -#: libfdisk/src/gpt.c:1160 +#: libfdisk/src/gpt.c:1233 msgid "Last LBA" msgstr "最后一个 LBA" #. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header. -#: libfdisk/src/gpt.c:1166 +#: libfdisk/src/gpt.c:1239 msgid "Alternative LBA" msgstr "替代 LBA" #. TRANSLATORS: The start of the array of partition entries. -#: libfdisk/src/gpt.c:1172 +#: libfdisk/src/gpt.c:1245 msgid "Partition entries LBA" msgstr "分区记录项 LBA" -#: libfdisk/src/gpt.c:1177 +#: libfdisk/src/gpt.c:1250 msgid "Allocated partition entries" msgstr "已分配的分区项" -#: libfdisk/src/gpt.c:1522 +#: libfdisk/src/gpt.c:1595 msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used." msgstr "备份 GPT 表损坏，但主表似乎正常，将使用它。" -#: libfdisk/src/gpt.c:1531 +#: libfdisk/src/gpt.c:1605 msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used." msgstr "主 GPT 表损坏，但备份似乎正常，将使用它。" -#: libfdisk/src/gpt.c:1713 +#: libfdisk/src/gpt.c:1618 +msgid "The backup GPT table is not on the end of the device. This problem will be corrected by write." +msgstr "" + +#: libfdisk/src/gpt.c:1800 #, c-format msgid "unsupported GPT attribute bit '%s'" msgstr "不支持的 GPT 属性位“%s”" -#: libfdisk/src/gpt.c:1718 +#: libfdisk/src/gpt.c:1805 #, fuzzy, c-format msgid "failed to parse GPT attribute string '%s'" msgstr "解析列表“%s”失败" -#: libfdisk/src/gpt.c:1818 +#: libfdisk/src/gpt.c:1905 #, c-format msgid "Partition UUID changed from %s to %s." msgstr "分区 UUID 已从 %s 更改为 %s。" -#: libfdisk/src/gpt.c:1826 +#: libfdisk/src/gpt.c:1914 +#, fuzzy +msgid "Failed to translate partition name, name not changed." +msgstr "分配分区名失败" + +#: libfdisk/src/gpt.c:1916 #, c-format msgid "Partition name changed from '%s' to '%.*s'." msgstr "分区名已由“%s”改为“%.*s”。" -#: libfdisk/src/gpt.c:1855 +#: libfdisk/src/gpt.c:1945 msgid "The start of the partition understeps FirstUsableLBA." msgstr "分区起点未到首个可用 LBA。" -#: libfdisk/src/gpt.c:1862 +#: libfdisk/src/gpt.c:1952 msgid "The end of the partition oversteps LastUsableLBA." msgstr "分区终点超过了最后可用 LBA。" -#: libfdisk/src/gpt.c:2025 +#: libfdisk/src/gpt.c:2114 msgid "The device contains hybrid MBR -- writing GPT only. You have to sync the MBR manually." msgstr "该设备包含混合 MBR -- 将只写入 GPT。您需要手动同步 MBR。" -#: libfdisk/src/gpt.c:2062 +#: libfdisk/src/gpt.c:2151 msgid "Disk does not contain a valid backup header." msgstr "磁盘不含有效的备用磁头。" -#: libfdisk/src/gpt.c:2067 +#: libfdisk/src/gpt.c:2156 msgid "Invalid primary header CRC checksum." msgstr "无效的主磁头 CRC 校验和。" -#: libfdisk/src/gpt.c:2071 +#: libfdisk/src/gpt.c:2160 msgid "Invalid backup header CRC checksum." msgstr "无效的备份磁头 CRC 校验和。" -#: libfdisk/src/gpt.c:2076 +#: libfdisk/src/gpt.c:2165 msgid "Invalid partition entry checksum." msgstr "无效的分区记录校验和。" -#: libfdisk/src/gpt.c:2081 +#: libfdisk/src/gpt.c:2170 msgid "Invalid primary header LBA sanity checks." msgstr "无效的主磁头 LBA 完整性检查。" -#: libfdisk/src/gpt.c:2085 +#: libfdisk/src/gpt.c:2174 msgid "Invalid backup header LBA sanity checks." msgstr "无效的备用磁头 LBA 完整性检查。" -#: libfdisk/src/gpt.c:2090 +#: libfdisk/src/gpt.c:2179 msgid "MyLBA mismatch with real position at primary header." msgstr "MyLBA 不匹配，真正位置在主磁头。" -#: libfdisk/src/gpt.c:2094 +#: libfdisk/src/gpt.c:2183 msgid "MyLBA mismatch with real position at backup header." msgstr "MyLBA 不匹配，真正位置在备份磁头。" -#: libfdisk/src/gpt.c:2099 +#: libfdisk/src/gpt.c:2188 msgid "Disk is too small to hold all data." msgstr "磁盘太小，放不下所有数据。" -#: libfdisk/src/gpt.c:2109 +#: libfdisk/src/gpt.c:2198 msgid "Primary and backup header mismatch." msgstr "主磁头和备份磁头不匹配。" -#: libfdisk/src/gpt.c:2115 +#: libfdisk/src/gpt.c:2204 #, c-format msgid "Partition %u overlaps with partition %u." msgstr "分区 %u 与 %u 重叠。" -#: libfdisk/src/gpt.c:2122 +#: libfdisk/src/gpt.c:2211 #, c-format msgid "Partition %u is too big for the disk." msgstr "分区 %u 对于该磁盘而言过大。" -#: libfdisk/src/gpt.c:2129 +#: libfdisk/src/gpt.c:2218 #, c-format msgid "Partition %u ends before it starts." msgstr "分区 %u 结束于起点之前。" -#: libfdisk/src/gpt.c:2138 +#: libfdisk/src/gpt.c:2227 msgid "No errors detected." msgstr "未检测到错误。" -#: libfdisk/src/gpt.c:2139 +#: libfdisk/src/gpt.c:2228 #, c-format msgid "Header version: %s" msgstr "磁头版本：%s" -#: libfdisk/src/gpt.c:2140 +#: libfdisk/src/gpt.c:2229 #, fuzzy, c-format msgid "Using %zu out of %zu partitions." msgstr "使用着 %2$d 个分区中的 %1$u 个。" -#: libfdisk/src/gpt.c:2150 +#: libfdisk/src/gpt.c:2239 #, 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:2158 +#: libfdisk/src/gpt.c:2247 #, c-format msgid "%d error detected." msgid_plural "%d errors detected." msgstr[0] "检测到 %d 个错误。" -#: libfdisk/src/gpt.c:2237 +#: libfdisk/src/gpt.c:2326 msgid "All partitions are already in use." msgstr "所有分区均已占用。" -#: libfdisk/src/gpt.c:2294 libfdisk/src/gpt.c:2321 +#: libfdisk/src/gpt.c:2383 libfdisk/src/gpt.c:2410 #, c-format msgid "Sector %ju already used." msgstr "扇区 %ju 已使用。" -#: libfdisk/src/gpt.c:2386 +#: libfdisk/src/gpt.c:2475 #, c-format msgid "Could not create partition %zu" msgstr "无法创建分区 %zu" -#: libfdisk/src/gpt.c:2393 +#: libfdisk/src/gpt.c:2482 #, c-format msgid "The last usable GPT sector is %ju, but %ju is requested." msgstr "最后一个可用的 GPT 扇区是 %ju，但请求了 %ju。" -#: libfdisk/src/gpt.c:2400 +#: libfdisk/src/gpt.c:2489 #, c-format msgid "The first usable GPT sector is %ju, but %ju is requested." msgstr "第一个可用的 GPT 扇区是 %ju，但请求了 %ju。" -#: libfdisk/src/gpt.c:2539 +#: libfdisk/src/gpt.c:2628 #, c-format msgid "Created a new GPT disklabel (GUID: %s)." msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。" -#: libfdisk/src/gpt.c:2557 +#: libfdisk/src/gpt.c:2646 msgid "Enter new disk UUID (in 8-4-4-4-12 format)" msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)" -#: libfdisk/src/gpt.c:2564 +#: libfdisk/src/gpt.c:2653 msgid "Failed to parse your UUID." msgstr "解析您的 UUID 失败。" -#: libfdisk/src/gpt.c:2578 +#: libfdisk/src/gpt.c:2667 #, c-format msgid "Disk identifier changed from %s to %s." msgstr "将磁盘标识从 %s 更改为 %s 失败。" -#: libfdisk/src/gpt.c:2598 +#: libfdisk/src/gpt.c:2687 msgid "Not enough space for new partition table!" msgstr "创建新分区表的空闲空间不够！" -#: libfdisk/src/gpt.c:2609 +#: libfdisk/src/gpt.c:2698 #, fuzzy, c-format msgid "Partition #%zu out of range (minimal start is %<PRIu64> sectors)" msgstr "分区 #%u 超出范围(最小起点是 %<PRIu64> 扇区)" -#: libfdisk/src/gpt.c:2614 +#: libfdisk/src/gpt.c:2703 #, fuzzy, c-format msgid "Partition #%zu out of range (maximal end is %<PRIu64> sectors)" msgstr "分区 #%u 超出范围(最小终点是 %<PRIu64> 扇区)" -#: libfdisk/src/gpt.c:2657 +#: libfdisk/src/gpt.c:2746 #, fuzzy, c-format msgid "The number of the partition has to be smaller than %zu." msgstr "已创建分区达到最大数量。" -#: libfdisk/src/gpt.c:2680 +#: libfdisk/src/gpt.c:2769 msgid "Cannot allocate memory!" msgstr "无法分配内存！" -#: libfdisk/src/gpt.c:2710 +#: libfdisk/src/gpt.c:2799 #, c-format msgid "Partition table length changed from %<PRIu32> to %<PRIu64>." msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。" -#: libfdisk/src/gpt.c:2819 +#: libfdisk/src/gpt.c:2908 #, c-format msgid "The attributes on partition %zu changed to 0x%016<PRIx64>." msgstr "分区 %zu 的属性已改为 0x%016<PRIx64>。" -#: libfdisk/src/gpt.c:2869 +#: libfdisk/src/gpt.c:2958 msgid "Enter GUID specific bit" msgstr "输入 GUID 特定位" -#: libfdisk/src/gpt.c:2884 +#: libfdisk/src/gpt.c:2973 #, c-format msgid "failed to toggle unsupported bit %lu" msgstr "开/关不支持的位 %lu 失败" -#: libfdisk/src/gpt.c:2897 +#: libfdisk/src/gpt.c:2986 #, c-format msgid "The GUID specific bit %d on partition %zu is enabled now." msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。" -#: libfdisk/src/gpt.c:2898 +#: libfdisk/src/gpt.c:2987 #, c-format msgid "The GUID specific bit %d on partition %zu is disabled now." msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。" -#: libfdisk/src/gpt.c:2902 +#: libfdisk/src/gpt.c:2991 #, c-format msgid "The %s flag on partition %zu is enabled now." msgstr "分区 %2$zu 上的标志 %1$s 现已启用。" -#: libfdisk/src/gpt.c:2903 +#: libfdisk/src/gpt.c:2992 #, c-format msgid "The %s flag on partition %zu is disabled now." msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。" -#: libfdisk/src/gpt.c:3045 +#: libfdisk/src/gpt.c:3134 msgid "Type-UUID" msgstr "类型-UUID" -#: libfdisk/src/gpt.c:3046 +#: libfdisk/src/gpt.c:3135 msgid "UUID" msgstr "UUID" -#: libfdisk/src/gpt.c:3047 login-utils/chfn.c:156 login-utils/chfn.c:158 +#: libfdisk/src/gpt.c:3136 login-utils/chfn.c:156 login-utils/chfn.c:158 #: login-utils/chfn.c:324 msgid "Name" msgstr "名称" @@ -6239,7 +6277,7 @@ msgstr "调整分区 #%zu 的大小失败。" #: libfdisk/src/parttype.c:258 misc-utils/findmnt.c:655 #: misc-utils/uuidparse.c:199 misc-utils/uuidparse.c:217 schedutils/chrt.c:205 -#: schedutils/ionice.c:79 sys-utils/hwclock.c:248 +#: schedutils/ionice.c:79 sys-utils/hwclock.c:268 msgid "unknown" msgstr "未知" @@ -6311,11 +6349,11 @@ msgstr "在第二扇区创建了 SGI 信息。" msgid "Detected an SGI disklabel with wrong checksum." msgstr "检测到校验和错误的 sgi 磁盘标签。" -#: libfdisk/src/sgi.c:281 libfdisk/src/sun.c:758 +#: libfdisk/src/sgi.c:281 libfdisk/src/sun.c:783 msgid "Physical cylinders" msgstr "物理柱面数" -#: libfdisk/src/sgi.c:286 libfdisk/src/sun.c:763 +#: libfdisk/src/sgi.c:286 libfdisk/src/sun.c:788 msgid "Extra sects/cyl" msgstr "额外扇区/柱面" @@ -6363,7 +6401,7 @@ msgstr "启动文件已更改为“%s”。" msgid "More than one entire disk entry present." msgstr "存在超过一个整磁盘记录。" -#: libfdisk/src/sgi.c:602 libfdisk/src/sun.c:446 +#: libfdisk/src/sgi.c:602 libfdisk/src/sun.c:459 msgid "No partitions defined." msgstr "未定义分区。" @@ -6424,7 +6462,7 @@ msgstr "整个磁盘已经被分区覆盖。" msgid "You got a partition overlap on the disk. Fix it first!" msgstr "磁盘上有重叠分区。请先修复它！" -#: libfdisk/src/sgi.c:874 libfdisk/src/sun.c:532 +#: libfdisk/src/sgi.c:874 libfdisk/src/sun.c:555 #, c-format msgid "First %s" msgstr "起始 %s" @@ -6433,12 +6471,12 @@ 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:913 libfdisk/src/sun.c:627 +#: libfdisk/src/sgi.c:913 libfdisk/src/sun.c:650 #, 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:984 libfdisk/src/sun.c:234 +#: libfdisk/src/sgi.c:984 libfdisk/src/sun.c:242 #, c-format msgid "BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %llu. This value may be truncated for devices > 33.8 GB." msgstr "对 %s 执行 BLKGETSIZE ioctl 失败。将使用几何 柱面 属性值 %llu。对于大于 33.8 GB 的设备，这个值可能被截短。" @@ -6526,57 +6564,57 @@ msgstr "检测到带错误 vtoc.nparts [%u] 的 sun 磁盘标签。" msgid "Warning: Wrong values need to be fixed up and will be corrected by w(rite)" msgstr "警告：错误值需要修复，并且将通过 w(写) 操作修正。" -#: libfdisk/src/sun.c:185 +#: libfdisk/src/sun.c:187 msgid "Heads" msgstr "磁头" -#: libfdisk/src/sun.c:187 +#: libfdisk/src/sun.c:192 msgid "Sectors/track" msgstr "扇区/磁道" -#: libfdisk/src/sun.c:285 +#: libfdisk/src/sun.c:293 msgid "Created a new Sun disklabel." msgstr "创建新的 Sun 磁盘标签。" -#: libfdisk/src/sun.c:404 +#: libfdisk/src/sun.c:417 #, c-format msgid "Partition %u doesn't end on cylinder boundary." msgstr "分区 %u 未结束在柱面边界上。" -#: libfdisk/src/sun.c:423 +#: libfdisk/src/sun.c:436 #, c-format msgid "Partition %u overlaps with others in sectors %u-%u." msgstr "分区 %u 在扇区 %u-%u 与其他分区重叠。" -#: libfdisk/src/sun.c:451 +#: libfdisk/src/sun.c:464 #, c-format msgid "Unused gap - sectors 0-%u." msgstr "未使用的间隙 - 扇区 0-%u。" -#: libfdisk/src/sun.c:453 libfdisk/src/sun.c:459 +#: libfdisk/src/sun.c:466 libfdisk/src/sun.c:472 #, c-format msgid "Unused gap - sectors %u-%u." msgstr "未使用的间隙 - 扇区 %u-%u。" -#: libfdisk/src/sun.c:516 +#: libfdisk/src/sun.c:534 msgid "Other partitions already cover the whole disk. Delete some/shrink them before retry." msgstr "其他分区已覆盖了整个磁盘。删除几个分区或压缩它们，然后重试。" -#: libfdisk/src/sun.c:581 -#, c-format -msgid "Sector %d is already allocated" -msgstr "扇区 %d 已分配" - -#: libfdisk/src/sun.c:588 +#: libfdisk/src/sun.c:551 msgid "It is highly recommended that the third partition covers the whole disk and is of type `Whole disk'" msgstr "强烈建议让第三个分区覆盖整个磁盘，并设为“整盘”类型" -#: libfdisk/src/sun.c:598 +#: libfdisk/src/sun.c:593 #, c-format msgid "Aligning the first sector from %u to %u to be on cylinder boundary." msgstr "将把从 %u 到 %u 的首个扇区对齐到柱面边界。" -#: libfdisk/src/sun.c:673 +#: libfdisk/src/sun.c:621 +#, c-format +msgid "Sector %d is already allocated" +msgstr "扇区 %d 已分配" + +#: libfdisk/src/sun.c:696 #, c-format msgid "" "You haven't covered the whole disk with the 3rd partition, but your value\n" @@ -6586,44 +6624,44 @@ msgstr "" "您没有使第三个分区覆盖整个磁盘，但是值 %lu %s 覆盖了其他分区。\n" "您的记录已经更改为 %lu %s" -#: libfdisk/src/sun.c:714 +#: libfdisk/src/sun.c:739 #, 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:738 +#: libfdisk/src/sun.c:763 msgid "Label ID" msgstr "标签 ID" -#: libfdisk/src/sun.c:743 +#: libfdisk/src/sun.c:768 msgid "Volume ID" msgstr "卷 ID" -#: libfdisk/src/sun.c:753 +#: libfdisk/src/sun.c:778 msgid "Alternate cylinders" msgstr "备用柱面数" -#: libfdisk/src/sun.c:859 +#: libfdisk/src/sun.c:884 msgid "Number of alternate cylinders" msgstr "备用柱面的数量" -#: libfdisk/src/sun.c:884 +#: libfdisk/src/sun.c:909 msgid "Extra sectors per cylinder" msgstr "每个柱面的额外扇区数" -#: libfdisk/src/sun.c:908 +#: libfdisk/src/sun.c:933 msgid "Interleave factor" msgstr "交错系数" -#: libfdisk/src/sun.c:932 +#: libfdisk/src/sun.c:957 msgid "Rotation speed (rpm)" msgstr "转速(转/分)" -#: libfdisk/src/sun.c:956 +#: libfdisk/src/sun.c:981 msgid "Number of physical cylinders" msgstr "物理柱面数" -#: libfdisk/src/sun.c:1021 +#: libfdisk/src/sun.c:1046 msgid "" "Consider leaving partition 3 as Whole disk (5),\n" "as SunOS/Solaris expects it and even Linux likes it.\n" @@ -6631,7 +6669,7 @@ msgstr "" "考虑保持分区 3 为 整盘 (5)，\n" "这是 SunOS/Solaris 的规定，Linux 也建议这么做。\n" -#: libfdisk/src/sun.c:1032 +#: libfdisk/src/sun.c:1057 msgid "" "It is highly recommended that the partition at offset 0\n" "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n" @@ -6648,319 +6686,319 @@ msgstr "" msgid "operation failed: %m" msgstr "readlink 失败：%s" -#: libmount/src/context_mount.c:1305 +#: libmount/src/context_mount.c:1323 #, c-format msgid "WARNING: failed to apply propagation flags" msgstr "警告：应用传播标志失败" -#: libmount/src/context_mount.c:1315 +#: libmount/src/context_mount.c:1333 #, fuzzy, c-format msgid "WARNING: device write-protected, mounted read-only" msgstr "%s 写保护，将以只读方式挂载" -#: libmount/src/context_mount.c:1329 +#: libmount/src/context_mount.c:1347 #, c-format msgid "operation permitted for root only" msgstr "" -#: libmount/src/context_mount.c:1333 +#: libmount/src/context_mount.c:1351 #, c-format msgid "%s is already mounted" msgstr "%s 已经挂载" -#: libmount/src/context_mount.c:1339 +#: libmount/src/context_mount.c:1357 #, fuzzy, c-format msgid "can't find in %s" msgstr "在 %2$s 中找不到 %1$s" -#: libmount/src/context_mount.c:1342 +#: libmount/src/context_mount.c:1360 #, fuzzy, c-format msgid "can't find mount point in %s" msgstr "在 %2$s 中找不到挂载点 %1$s" -#: libmount/src/context_mount.c:1345 +#: libmount/src/context_mount.c:1363 #, c-format msgid "can't find mount source %s in %s" msgstr "在 %2$s 中找不到挂载源 %1$s" -#: libmount/src/context_mount.c:1350 +#: libmount/src/context_mount.c:1368 #, c-format msgid "more filesystems detected on %s; use -t <type> or wipefs(8)" msgstr "" -#: libmount/src/context_mount.c:1355 +#: libmount/src/context_mount.c:1373 #, fuzzy, c-format msgid "failed to determine filesystem type" msgstr "%s：确定源失败" -#: libmount/src/context_mount.c:1356 +#: libmount/src/context_mount.c:1374 #, fuzzy, c-format msgid "no filesystem type specified" msgstr "未指定文件名" -#: libmount/src/context_mount.c:1363 +#: libmount/src/context_mount.c:1381 #, c-format msgid "can't find %s" msgstr "找不到 %s" -#: libmount/src/context_mount.c:1365 +#: libmount/src/context_mount.c:1383 #, fuzzy, c-format msgid "no mount source specified" msgstr "未指定挂载点" -#: libmount/src/context_mount.c:1371 +#: libmount/src/context_mount.c:1389 #, fuzzy, c-format msgid "failed to parse mount options: %m" msgstr "解析挂臷选项失败" -#: libmount/src/context_mount.c:1372 +#: libmount/src/context_mount.c:1390 #, c-format msgid "failed to parse mount options" msgstr "解析挂臷选项失败" -#: libmount/src/context_mount.c:1376 +#: libmount/src/context_mount.c:1394 #, fuzzy, c-format msgid "failed to setup loop device for %s" msgstr "%s：设置回环设备失败" -#: libmount/src/context_mount.c:1380 +#: libmount/src/context_mount.c:1398 #, fuzzy, c-format msgid "overlapping loop device exists for %s" msgstr "%s: 重叠的回环设备已存在" -#: libmount/src/context_mount.c:1384 libmount/src/context_umount.c:1068 +#: libmount/src/context_mount.c:1402 libmount/src/context_umount.c:1076 #, fuzzy, c-format msgid "locking failed" msgstr "关闭 %s 失败" -#: libmount/src/context_mount.c:1387 +#: libmount/src/context_mount.c:1405 #, fuzzy, c-format msgid "mount failed: %m" msgstr "挂载失败" -#: libmount/src/context_mount.c:1397 +#: libmount/src/context_mount.c:1415 #, fuzzy, c-format msgid "filesystem was mounted, but failed to update userspace mount table" msgstr "%s：文件系统已卸载，但 mount(8) 失败" -#: libmount/src/context_mount.c:1402 +#: libmount/src/context_mount.c:1420 #, fuzzy, c-format msgid "filesystem was mounted, but any subsequent operation failed: %m" msgstr "%s：文件系统已卸载，但 mount(8) 失败" -#: libmount/src/context_mount.c:1420 libmount/src/context_mount.c:1477 +#: libmount/src/context_mount.c:1438 libmount/src/context_mount.c:1495 #, fuzzy, c-format msgid "mount point is not a directory" msgstr "挂载点 %s 不是目录" -#: libmount/src/context_mount.c:1422 login-utils/newgrp.c:227 +#: libmount/src/context_mount.c:1440 login-utils/newgrp.c:227 #, c-format msgid "permission denied" msgstr "权限不足" -#: libmount/src/context_mount.c:1424 +#: libmount/src/context_mount.c:1442 #, c-format msgid "must be superuser to use mount" msgstr "必须以超级用户身份使用 mount" -#: libmount/src/context_mount.c:1434 +#: libmount/src/context_mount.c:1452 #, fuzzy, c-format msgid "mount point is busy" msgstr "mount：%s 忙" -#: libmount/src/context_mount.c:1447 +#: libmount/src/context_mount.c:1465 #, fuzzy, c-format msgid "%s already mounted on %s" msgstr "mount：%s 已挂载于 %s\n" -#: libmount/src/context_mount.c:1453 +#: libmount/src/context_mount.c:1471 #, fuzzy, c-format msgid "%s already mounted or mount point busy" msgstr "%s 已经挂载或 %s 忙" -#: libmount/src/context_mount.c:1459 +#: libmount/src/context_mount.c:1477 #, fuzzy, c-format msgid "mount point does not exist" msgstr "挂载点 %s 不存在" -#: libmount/src/context_mount.c:1462 +#: libmount/src/context_mount.c:1480 #, fuzzy, c-format msgid "mount point is a symbolic link to nowhere" msgstr "挂载点 %s 是一个没有目标的符号链接" -#: libmount/src/context_mount.c:1467 +#: libmount/src/context_mount.c:1485 #, c-format msgid "special device %s does not exist" msgstr "特殊设备 %s 不存在" -#: libmount/src/context_mount.c:1470 libmount/src/context_mount.c:1486 -#: libmount/src/context_mount.c:1570 libmount/src/context_mount.c:1593 +#: libmount/src/context_mount.c:1488 libmount/src/context_mount.c:1504 +#: libmount/src/context_mount.c:1588 libmount/src/context_mount.c:1611 #, fuzzy, c-format msgid "mount(2) system call failed: %m" msgstr "mount(2) 失败" -#: libmount/src/context_mount.c:1482 +#: libmount/src/context_mount.c:1500 #, c-format msgid "special device %s does not exist (a path prefix is not a directory)" msgstr "特殊设备 %s 不存在(路径前缀不是目录)" -#: libmount/src/context_mount.c:1494 +#: libmount/src/context_mount.c:1512 #, fuzzy, c-format msgid "mount point not mounted or bad option" msgstr "mount：%s 未挂载或选项错误" -#: libmount/src/context_mount.c:1496 +#: libmount/src/context_mount.c:1514 #, fuzzy, c-format msgid "not mount point or bad option" msgstr "%s 不是一个挂载点或选项有误" -#: libmount/src/context_mount.c:1499 +#: libmount/src/context_mount.c:1517 #, fuzzy, c-format msgid "bad option; moving a mount residing under a shared mount is unsupported" msgstr "选项错误。注意，不支持移动位于共享挂载内的挂载。" -#: libmount/src/context_mount.c:1503 +#: libmount/src/context_mount.c:1521 #, fuzzy, c-format msgid "bad option; for several filesystems (e.g. nfs, cifs) you might need a /sbin/mount.<type> helper program" msgstr "" " (对某些文件系统(如 nfs、cifs) 您可能需要\n" " 一款 /sbin/mount.<类型> 助手程序)" -#: libmount/src/context_mount.c:1507 +#: libmount/src/context_mount.c:1525 #, fuzzy, c-format msgid "wrong fs type, bad option, bad superblock on %s, missing codepage or helper program, or other error" msgstr "" "文件系统类型错误、选项错误、%s 上有坏超级块、\n" " 缺少代码页或助手程序，或其他错误" -#: libmount/src/context_mount.c:1514 +#: libmount/src/context_mount.c:1532 #, c-format msgid "mount table full" msgstr "挂载表满" -#: libmount/src/context_mount.c:1519 +#: libmount/src/context_mount.c:1537 #, fuzzy, c-format msgid "can't read superblock on %s" msgstr "%s：不能读超级块" -#: libmount/src/context_mount.c:1526 +#: libmount/src/context_mount.c:1544 #, c-format msgid "unknown filesystem type '%s'" msgstr "未知的文件系统类型“%s”" -#: libmount/src/context_mount.c:1529 +#: libmount/src/context_mount.c:1547 #, c-format msgid "unknown filesystem type" msgstr "未知的文件系统类型" -#: libmount/src/context_mount.c:1538 +#: libmount/src/context_mount.c:1556 #, c-format msgid "%s is not a block device, and stat(2) fails?" msgstr "%s 不是块设备，而且 stat(2) 失败？" -#: libmount/src/context_mount.c:1541 +#: libmount/src/context_mount.c:1559 #, fuzzy, c-format msgid "the kernel does not recognize %s as a block device; maybe \"modprobe driver\" is necessary" msgstr "" "内核无法将 %s 识别为块设备\n" " (试试“modprobe driver”？)" -#: libmount/src/context_mount.c:1544 +#: libmount/src/context_mount.c:1562 #, fuzzy, c-format msgid "%s is not a block device; try \"-o loop\"" msgstr "%s 不是块设备(用 `-o loop' 试试？)" -#: libmount/src/context_mount.c:1546 +#: libmount/src/context_mount.c:1564 #, fuzzy, c-format msgid "%s is not a block device" msgstr "%s 不是一个块设备" -#: libmount/src/context_mount.c:1553 +#: libmount/src/context_mount.c:1571 #, c-format msgid "%s is not a valid block device" msgstr "%s 不是一个有效的块设备" -#: libmount/src/context_mount.c:1561 +#: libmount/src/context_mount.c:1579 #, c-format msgid "cannot mount %s read-only" msgstr "无法以只读方式挂载 %s" -#: libmount/src/context_mount.c:1563 +#: libmount/src/context_mount.c:1581 #, fuzzy, c-format msgid "%s is write-protected but explicit read-write mode requested" msgstr "%s 是写保护的，但指明了“-w”标志" -#: libmount/src/context_mount.c:1565 +#: libmount/src/context_mount.c:1583 #, c-format msgid "cannot remount %s read-write, is write-protected" msgstr "无法以读写方式重新挂载 %s，它是写保护的" -#: libmount/src/context_mount.c:1567 +#: libmount/src/context_mount.c:1585 #, fuzzy, c-format msgid "bind %s failed" msgstr "%s 失败" -#: libmount/src/context_mount.c:1578 +#: libmount/src/context_mount.c:1596 #, c-format msgid "no medium found on %s" msgstr "在 %s 上找不到媒体" -#: libmount/src/context_mount.c:1585 +#: libmount/src/context_mount.c:1603 #, fuzzy, c-format msgid "cannot mount; probably corrupted filesystem on %s" msgstr "将不会尝试在“%s”上创建文件系统" -#: libmount/src/context_umount.c:1064 libmount/src/context_umount.c:1102 +#: libmount/src/context_umount.c:1072 libmount/src/context_umount.c:1110 #, fuzzy, c-format msgid "not mounted" msgstr "%s：未挂载" -#: libmount/src/context_umount.c:1072 +#: libmount/src/context_umount.c:1080 #, fuzzy, c-format msgid "umount failed: %m" msgstr "挂载失败" -#: libmount/src/context_umount.c:1081 +#: libmount/src/context_umount.c:1089 #, fuzzy, c-format msgid "filesystem was unmounted, but failed to update userspace mount table" msgstr "%s：文件系统已卸载，但 mount(8) 失败" -#: libmount/src/context_umount.c:1086 +#: libmount/src/context_umount.c:1094 #, fuzzy, c-format msgid "filesystem was unmounted, but any subsequent operation failed: %m" msgstr "%s：文件系统已卸载，但 mount(8) 失败" -#: libmount/src/context_umount.c:1099 +#: libmount/src/context_umount.c:1107 #, fuzzy, c-format msgid "invalid block device" msgstr "%s：无效的块设备" -#: libmount/src/context_umount.c:1105 +#: libmount/src/context_umount.c:1113 #, fuzzy, c-format msgid "can't write superblock" msgstr "%s：无法写超级块" -#: libmount/src/context_umount.c:1108 +#: libmount/src/context_umount.c:1116 #, fuzzy, c-format msgid "target is busy" msgstr "目标存在" -#: libmount/src/context_umount.c:1111 +#: libmount/src/context_umount.c:1119 #, fuzzy, c-format msgid "no mount point specified" msgstr "未指定挂载点" -#: libmount/src/context_umount.c:1114 +#: libmount/src/context_umount.c:1122 #, fuzzy, c-format msgid "must be superuser to unmount" msgstr "%s：必须以超级用户身份卸载" -#: libmount/src/context_umount.c:1117 +#: libmount/src/context_umount.c:1125 #, fuzzy, c-format msgid "block devices are not permitted on filesystem" msgstr "%s：文件系统不允许块设备" -#: libmount/src/context_umount.c:1120 +#: libmount/src/context_umount.c:1128 #, fuzzy, c-format msgid "umount(2) system call failed: %m" msgstr "mount(2) 失败" @@ -6970,16 +7008,16 @@ msgstr "mount(2) 失败" msgid "waitpid failed (%s)" msgstr "waitpid 失败(%s)" -#: lib/path.c:225 sys-utils/lscpu.c:1912 +#: lib/path.c:239 sys-utils/lscpu.c:1760 msgid "failed to callocate cpu set" msgstr "分配(callocate) CPU 组 失败" -#: lib/path.c:229 +#: lib/path.c:243 #, c-format msgid "failed to parse CPU list %s" msgstr "解析 CPU 列表 %s 失败" -#: lib/path.c:232 +#: lib/path.c:246 #, c-format msgid "failed to parse CPU mask %s" msgstr "解析 CPU 掩码 %s 失败" @@ -7033,6 +7071,15 @@ msgstr "%s：不是有效的交换分区" msgid "%s: unsupported swap version '%s'" msgstr "%s：不支持的 swap 版本“%s”" +#: lib/timeutils.c:459 +msgid "format_iso_time: buffer overflow." +msgstr "" + +#: lib/timeutils.c:477 lib/timeutils.c:501 +#, fuzzy, c-format +msgid "time %ld is out of range." +msgstr "值超出范围。" + #: login-utils/chfn.c:96 login-utils/chsh.c:74 #, c-format msgid " %s [options] [<username>]\n" @@ -7245,7 +7292,7 @@ msgstr "shell 已更改。\n" msgid "Usage: %s <passwordfile> <username>...\n" msgstr "用法：%s <密码文件> <用户名>...\n" -#: login-utils/last.c:169 login-utils/lslogins.c:1218 sys-utils/dmesg.c:1295 +#: login-utils/last.c:169 login-utils/lslogins.c:1217 sys-utils/dmesg.c:1269 #: sys-utils/lsipc.c:269 #, c-format msgid "unknown time format: %s" @@ -7345,7 +7392,7 @@ msgid "failed to parse number" msgstr "解析数字失败" #: login-utils/last.c:993 login-utils/last.c:998 login-utils/last.c:1003 -#: sys-utils/rtcwake.c:483 +#: sys-utils/rtcwake.c:503 #, c-format msgid "invalid time value \"%s\"" msgstr "无效的时间值\"%s\"" @@ -7441,26 +7488,26 @@ msgstr "LOGIN ON %s BY %s FROM %s" msgid "LOGIN ON %s BY %s" msgstr "LOGIN ON %s BY %s" -#: login-utils/login.c:685 +#: login-utils/login.c:686 msgid "login: " msgstr "登录：" -#: login-utils/login.c:711 +#: login-utils/login.c:717 #, c-format msgid "PAM failure, aborting: %s" msgstr "PAM 失败，将中止：%s" -#: login-utils/login.c:712 +#: login-utils/login.c:718 #, c-format msgid "Couldn't initialize PAM: %s" msgstr "无法初始化 PAM：%s" -#: login-utils/login.c:783 +#: login-utils/login.c:789 #, c-format msgid "FAILED LOGIN %u FROM %s FOR %s, %s" msgstr "FAILED LOGIN %u FROM %s FOR %s, %s" -#: login-utils/login.c:791 login-utils/sulogin.c:1013 +#: login-utils/login.c:797 login-utils/sulogin.c:1013 #, c-format msgid "" "Login incorrect\n" @@ -7469,17 +7516,17 @@ msgstr "" "登录不正确\n" "\n" -#: login-utils/login.c:806 +#: login-utils/login.c:812 #, 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:812 +#: login-utils/login.c:818 #, c-format msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s" msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s" -#: login-utils/login.c:820 +#: login-utils/login.c:826 #, c-format msgid "" "\n" @@ -7488,7 +7535,7 @@ msgstr "" "\n" "登录不正确\n" -#: login-utils/login.c:848 login-utils/login.c:1233 login-utils/login.c:1256 +#: login-utils/login.c:854 login-utils/login.c:1241 login-utils/login.c:1264 msgid "" "\n" "Session setup problem, abort." @@ -7496,96 +7543,96 @@ msgstr "" "\n" "会话设置问题，中止。" -#: login-utils/login.c:849 +#: login-utils/login.c:855 #, c-format msgid "NULL user name in %s:%d. Abort." msgstr "%s:%d 中是空(NULL)用户名。中止。" -#: login-utils/login.c:986 +#: login-utils/login.c:994 #, c-format msgid "TIOCSCTTY failed: %m" msgstr "TIOCSCTTY 失败：%m" -#: login-utils/login.c:1090 +#: login-utils/login.c:1098 #, fuzzy, c-format msgid " %s [-p] [-h <host>] [-H] [[-f] <username>]\n" msgstr "用法：login [-p] [-h <主机>] [-H] [[-f] <用户名>]\n" -#: login-utils/login.c:1092 +#: login-utils/login.c:1100 msgid "Begin a session on the system.\n" msgstr "在此系统上开始一次会话。\n" -#: login-utils/login.c:1095 +#: login-utils/login.c:1103 #, fuzzy msgid " -p do not destroy the environment" msgstr " -f 不分割长行\n" -#: login-utils/login.c:1096 +#: login-utils/login.c:1104 msgid " -f skip a second login authentication" msgstr "" -#: login-utils/login.c:1097 +#: login-utils/login.c:1105 msgid " -h <host> hostname to be used for utmp logging" msgstr "" -#: login-utils/login.c:1098 +#: login-utils/login.c:1106 #, fuzzy msgid " -H suppress hostname in the login prompt" msgstr " -u 屏蔽下划线\n" -#: login-utils/login.c:1143 +#: login-utils/login.c:1151 #, fuzzy, c-format msgid "%s: timed out after %u seconds" msgstr "%u 秒后超时" -#: login-utils/login.c:1176 +#: login-utils/login.c:1184 #, c-format msgid "login: -h is for superuser only\n" msgstr "login：-h 是超级用户专用选项\n" -#: login-utils/login.c:1234 +#: login-utils/login.c:1242 #, c-format msgid "Invalid user name \"%s\" in %s:%d. Abort." msgstr "%2$s:%3$d 中是无效用户名“%1$s”。中止。" -#: login-utils/login.c:1255 +#: login-utils/login.c:1263 #, c-format msgid "groups initialization failed: %m" msgstr "组初始化失败：%m" -#: login-utils/login.c:1280 +#: login-utils/login.c:1288 msgid "setgid() failed" msgstr "setgid() 失败" -#: login-utils/login.c:1310 +#: login-utils/login.c:1318 #, c-format msgid "You have new mail.\n" msgstr "有您的新邮件。\n" -#: login-utils/login.c:1312 +#: login-utils/login.c:1320 #, c-format msgid "You have mail.\n" msgstr "有您的邮件。\n" -#: login-utils/login.c:1326 +#: login-utils/login.c:1334 msgid "setuid() failed" msgstr "setuid() 失败" -#: login-utils/login.c:1332 login-utils/sulogin.c:729 +#: login-utils/login.c:1340 login-utils/sulogin.c:729 #, c-format msgid "%s: change directory failed" msgstr "%s：更改目录失败" -#: login-utils/login.c:1339 login-utils/sulogin.c:730 +#: login-utils/login.c:1347 login-utils/sulogin.c:730 #, c-format msgid "Logging in with home = \"/\".\n" msgstr "以 home = “/” 登录。\n" -#: login-utils/login.c:1368 +#: login-utils/login.c:1376 msgid "couldn't exec shell script" msgstr "无法执行(exec) shell 脚本" -#: login-utils/login.c:1370 +#: login-utils/login.c:1378 msgid "no shell" msgstr "无 shell" @@ -7598,12 +7645,12 @@ msgstr "%s：%s 包含无效的数字值：%s" msgid "hush login status: restore original IDs failed" msgstr "静默(hush)登录状态：恢复原 ID 失败" -#: login-utils/lslogins.c:208 sys-utils/lscpu.c:1588 sys-utils/lscpu.c:1598 -#: sys-utils/lsmem.c:200 +#: login-utils/lslogins.c:208 sys-utils/lscpu.c:1436 sys-utils/lscpu.c:1446 +#: sys-utils/lsmem.c:268 msgid "no" msgstr "否" -#: login-utils/lslogins.c:217 misc-utils/lsblk.c:184 +#: login-utils/lslogins.c:217 misc-utils/lsblk.c:186 msgid "user name" msgstr "用户名" @@ -7803,29 +7850,29 @@ msgstr "用户运行的进程数" msgid "Running processes" msgstr "运行中的进程" -#: login-utils/lslogins.c:288 misc-utils/findmnt.c:136 misc-utils/lsblk.c:239 -#: sys-utils/lsipc.c:204 sys-utils/lsmem.c:117 +#: login-utils/lslogins.c:288 misc-utils/findmnt.c:136 misc-utils/lsblk.c:241 +#: sys-utils/lsipc.c:204 sys-utils/lsmem.c:147 #, c-format msgid "too many columns specified, the limit is %zu columns" msgstr "指定了过多的列，限制是 %zu 列" -#: login-utils/lslogins.c:343 sys-utils/lsipc.c:457 +#: login-utils/lslogins.c:342 sys-utils/lsipc.c:457 msgid "unsupported time type" msgstr "不支持的时间类型" -#: login-utils/lslogins.c:347 +#: login-utils/lslogins.c:346 msgid "failed to compose time string" msgstr "生成时间字符串失败" -#: login-utils/lslogins.c:644 +#: login-utils/lslogins.c:643 msgid "failed to get supplementary groups" msgstr "获得附属组失败" -#: login-utils/lslogins.c:1069 +#: login-utils/lslogins.c:1068 msgid "internal error: unknown column" msgstr "内部错误：未知的列" -#: login-utils/lslogins.c:1167 +#: login-utils/lslogins.c:1166 #, c-format msgid "" "\n" @@ -7834,109 +7881,109 @@ msgstr "" "\n" "上次的日志：\n" -#: login-utils/lslogins.c:1227 login-utils/nologin.c:27 +#: login-utils/lslogins.c:1226 login-utils/nologin.c:27 #: misc-utils/lslocks.c:495 misc-utils/mcookie.c:83 misc-utils/uuidd.c:62 -#: misc-utils/uuidgen.c:26 sys-utils/dmesg.c:275 sys-utils/ipcmk.c:67 -#: sys-utils/lscpu.c:2052 sys-utils/lsipc.c:278 sys-utils/lsmem.c:373 -#: sys-utils/readprofile.c:104 sys-utils/rtcwake.c:96 term-utils/setterm.c:379 +#: misc-utils/uuidgen.c:26 sys-utils/dmesg.c:266 sys-utils/ipcmk.c:67 +#: sys-utils/lscpu.c:1900 sys-utils/lsipc.c:278 sys-utils/lsmem.c:491 +#: sys-utils/readprofile.c:104 sys-utils/rtcwake.c:98 term-utils/setterm.c:379 #: text-utils/line.c:31 #, c-format msgid " %s [options]\n" msgstr " %s [选项]\n" -#: login-utils/lslogins.c:1230 +#: login-utils/lslogins.c:1229 msgid "Display information about known users in the system.\n" msgstr "显示系统中已知用户的信息。\n" -#: login-utils/lslogins.c:1233 +#: login-utils/lslogins.c:1232 msgid " -a, --acc-expiration display info about passwords expiration\n" msgstr " -a, --acc-expiration 显示关于密码过期的信息\n" -#: login-utils/lslogins.c:1234 +#: login-utils/lslogins.c:1233 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:1235 sys-utils/lsipc.c:297 +#: login-utils/lslogins.c:1234 sys-utils/lsipc.c:297 msgid " -e, --export display in an export-able output format\n" msgstr " -e, --export 以可导出的格式显示\n" -#: login-utils/lslogins.c:1236 +#: login-utils/lslogins.c:1235 msgid " -f, --failed display data about the users' last failed logins\n" msgstr " -f, --failed 显示有关该用户上次登录失败的数据\n" -#: login-utils/lslogins.c:1237 +#: login-utils/lslogins.c:1236 msgid " -G, --supp-groups display information about groups\n" msgstr " -G, --supp-groups 显示与组相关的信息\n" -#: login-utils/lslogins.c:1238 +#: login-utils/lslogins.c:1237 msgid " -g, --groups=<groups> display users belonging to a group in <groups>\n" msgstr " -g, --groups=<groups> 显示属于<groups>中的组的用户\n" -#: login-utils/lslogins.c:1239 +#: login-utils/lslogins.c:1238 msgid " -L, --last show info about the users' last login sessions\n" msgstr " -L, --last 显示关于该用户上次登录会话的信息\n" -#: login-utils/lslogins.c:1240 +#: login-utils/lslogins.c:1239 msgid " -l, --logins=<logins> display only users from <logins>\n" msgstr " -l, --logins=<登录方式> 只显示以指定<登录方式>登录的用户\n" -#: login-utils/lslogins.c:1241 sys-utils/lsipc.c:299 +#: login-utils/lslogins.c:1240 sys-utils/lsipc.c:299 msgid " -n, --newline display each piece of information on a new line\n" msgstr " -n, --newline 逐行显示每一部分信息\n" -#: login-utils/lslogins.c:1242 sys-utils/lsipc.c:292 +#: login-utils/lslogins.c:1241 sys-utils/lsipc.c:292 msgid " --noheadings don't print headings\n" msgstr " --noheadings 不打印标题\n" -#: login-utils/lslogins.c:1243 sys-utils/lsipc.c:293 +#: login-utils/lslogins.c:1242 sys-utils/lsipc.c:293 msgid " --notruncate don't truncate output\n" msgstr " --notruncate 不截断输出\n" -#: login-utils/lslogins.c:1244 sys-utils/lsipc.c:301 +#: login-utils/lslogins.c:1243 sys-utils/lsipc.c:301 msgid " -o, --output[=<list>] define the columns to output\n" msgstr " -o, --output[=<列表>] 定义要输出的列\n" -#: login-utils/lslogins.c:1245 +#: login-utils/lslogins.c:1244 msgid " -p, --pwd display information related to login by password.\n" msgstr " -p, --pwd 显示与 用密码登录 相关的信息。\n" -#: login-utils/lslogins.c:1246 sys-utils/lsipc.c:303 +#: login-utils/lslogins.c:1245 sys-utils/lsipc.c:303 msgid " -r, --raw display in raw mode\n" msgstr " -r, --raw 以原始方式显示\n" -#: login-utils/lslogins.c:1247 +#: login-utils/lslogins.c:1246 msgid " -s, --system-accs display system accounts\n" msgstr " -s, --system-accs 显示系统帐户\n" -#: login-utils/lslogins.c:1248 sys-utils/lsipc.c:294 +#: login-utils/lslogins.c:1247 sys-utils/lsipc.c:294 msgid " --time-format=<type> display dates in short, full or iso format\n" msgstr " --time-format=<格式> 以短、长或 iso 格式显示日期\n" -#: login-utils/lslogins.c:1249 +#: login-utils/lslogins.c:1248 msgid " -u, --user-accs display user accounts\n" msgstr " -u, --user-accs 显示用户帐户\n" -#: login-utils/lslogins.c:1250 +#: login-utils/lslogins.c:1249 msgid " -Z, --context display SELinux contexts\n" msgstr " -Z, --context 显示 SELinux 环境\n" -#: login-utils/lslogins.c:1251 +#: login-utils/lslogins.c:1250 msgid " -z, --print0 delimit user entries with a nul character\n" msgstr " -z, --print0 用空字符(nul)分隔用户记录项\n" -#: login-utils/lslogins.c:1252 +#: login-utils/lslogins.c:1251 msgid " --wtmp-file <path> set an alternate path for wtmp\n" msgstr " --wtmp-file <路径> 设置 wtmp 的可选路径\n" -#: login-utils/lslogins.c:1253 +#: login-utils/lslogins.c:1252 msgid " --btmp-file <path> set an alternate path for btmp\n" msgstr " --btmp-file <路径> 设置 btmp 的可选路径\n" -#: login-utils/lslogins.c:1435 +#: login-utils/lslogins.c:1434 msgid "failed to request selinux state" msgstr "请求 selinux 状态失败" -#: login-utils/lslogins.c:1449 login-utils/lslogins.c:1453 +#: login-utils/lslogins.c:1448 login-utils/lslogins.c:1452 msgid "Only one user may be specified. Use -l for multiple users." msgstr "只能指定一个用户。多用户请使用 -l。" @@ -7990,79 +8037,79 @@ msgstr "客气的拒绝登录。\n" msgid "This account is currently not available.\n" msgstr "此帐户目前不可用。\n" -#: login-utils/su-common.c:229 +#: login-utils/su-common.c:224 msgid " (core dumped)" msgstr " (核心已转储)" -#: login-utils/su-common.c:283 term-utils/script.c:636 +#: login-utils/su-common.c:278 term-utils/script.c:632 msgid "failed to get terminal attributes" msgstr "取终端属性失败" -#: login-utils/su-common.c:307 +#: login-utils/su-common.c:302 #, fuzzy msgid "failed to create pseudo-terminal" msgstr "分配输出表失败" -#: login-utils/su-common.c:493 login-utils/su-common.c:767 +#: login-utils/su-common.c:488 login-utils/su-common.c:762 msgid "cannot block signals" msgstr "无法阻塞信号" -#: login-utils/su-common.c:529 misc-utils/uuidd.c:411 term-utils/script.c:496 +#: login-utils/su-common.c:524 misc-utils/uuidd.c:411 term-utils/script.c:494 msgid "poll failed" msgstr "轮询失败" -#: login-utils/su-common.c:675 +#: login-utils/su-common.c:670 #, fuzzy msgid "failed to modify environment" msgstr "打开目录失败" -#: login-utils/su-common.c:711 +#: login-utils/su-common.c:706 msgid "may not be used by non-root users" msgstr "非 root 用户不能使用" -#: login-utils/su-common.c:735 +#: login-utils/su-common.c:730 msgid "incorrect password" msgstr "密码错误" -#: login-utils/su-common.c:748 +#: login-utils/su-common.c:743 #, c-format msgid "cannot open session: %s" msgstr "无法打开会话：%s" -#: login-utils/su-common.c:784 +#: login-utils/su-common.c:779 msgid "cannot initialize signal mask for session" msgstr "" -#: login-utils/su-common.c:792 +#: login-utils/su-common.c:787 #, fuzzy msgid "cannot initialize signal mask" msgstr "无法阻塞信号" -#: login-utils/su-common.c:802 +#: login-utils/su-common.c:797 #, fuzzy msgid "cannot set signal handler for session" msgstr "无法设置信号处理函数" -#: login-utils/su-common.c:810 misc-utils/uuidd.c:398 sys-utils/lscpu.c:892 -#: term-utils/script.c:800 +#: login-utils/su-common.c:805 misc-utils/uuidd.c:398 sys-utils/lscpu.c:743 +#: term-utils/script.c:796 msgid "cannot set signal handler" msgstr "无法设置信号处理函数" -#: login-utils/su-common.c:818 +#: login-utils/su-common.c:813 #, fuzzy msgid "cannot set signal mask" msgstr "无法设置信号处理函数" -#: login-utils/su-common.c:846 +#: login-utils/su-common.c:841 msgid "cannot create child process" msgstr "无法创建子进程" -#: login-utils/su-common.c:863 +#: login-utils/su-common.c:860 #, c-format msgid "cannot change directory to %s" msgstr "无法更改到 %s 目录" -#: login-utils/su-common.c:882 +#: login-utils/su-common.c:879 #, c-format msgid "" "\n" @@ -8071,57 +8118,57 @@ msgstr "" "\n" "会话已终止，正在杀死 shell..." -#: login-utils/su-common.c:893 +#: login-utils/su-common.c:890 #, c-format msgid " ...killed.\n" msgstr " ...已杀死。\n" -#: login-utils/su-common.c:944 +#: login-utils/su-common.c:941 #, fuzzy msgid "failed to set the PATH environment variable" msgstr "设置环境变量 %s 失败" -#: login-utils/su-common.c:1009 +#: login-utils/su-common.c:1006 msgid "cannot set groups" msgstr "无法设置 组" -#: login-utils/su-common.c:1015 +#: login-utils/su-common.c:1012 #, fuzzy, c-format msgid "failed to user credentials: %s" msgstr "解析级别“%s”失败" -#: login-utils/su-common.c:1025 sys-utils/eject.c:664 +#: login-utils/su-common.c:1022 sys-utils/eject.c:660 msgid "cannot set group id" msgstr "无法设置 组 id" -#: login-utils/su-common.c:1027 sys-utils/eject.c:667 +#: login-utils/su-common.c:1024 sys-utils/eject.c:663 msgid "cannot set user id" msgstr "无法设置 用户 id" -#: login-utils/su-common.c:1098 +#: login-utils/su-common.c:1092 msgid " -m, -p, --preserve-environment do not reset environment variables\n" msgstr " -m, -p, --preserve-environment 不重置环境变量\n" -#: login-utils/su-common.c:1099 +#: login-utils/su-common.c:1093 msgid " -g, --group <group> specify the primary group\n" msgstr " -g, --group <组> 指定主组\n" -#: login-utils/su-common.c:1100 +#: login-utils/su-common.c:1094 #, fuzzy msgid " -G, --supp-group <group> specify a supplemental group\n" msgstr "" " -G, --supp-group <组> 指定一个辅助组\n" "\n" -#: login-utils/su-common.c:1103 +#: login-utils/su-common.c:1097 msgid " -, -l, --login make the shell a login shell\n" msgstr " -, -l, --login 使 shell 成为登录 shell\n" -#: login-utils/su-common.c:1104 +#: login-utils/su-common.c:1098 msgid " -c, --command <command> pass a single command to the shell with -c\n" msgstr " -c, --command <命令> 使用 -c 向 shell 传递一条命令\n" -#: login-utils/su-common.c:1105 +#: login-utils/su-common.c:1099 msgid "" " --session-command <command> pass a single command to the shell with -c\n" " and do not create a new session\n" @@ -8129,20 +8176,20 @@ msgstr "" " --session-command <命令> 使用 -c 向 shell 传递一条命令\n" " 而不创建新会话\n" -#: login-utils/su-common.c:1107 +#: login-utils/su-common.c:1101 msgid " -f, --fast pass -f to the shell (for csh or tcsh)\n" msgstr " -f, --fast 向shell 传递 -f 选项(csh 或 tcsh)\n" -#: login-utils/su-common.c:1108 +#: login-utils/su-common.c:1102 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:1109 +#: login-utils/su-common.c:1103 #, fuzzy msgid " -P, --pty create a new pseudo-terminal\n" msgstr " -t, --table 创建表格\n" -#: login-utils/su-common.c:1119 +#: login-utils/su-common.c:1113 #, fuzzy, c-format msgid "" " %1$s [options] -u <user> [[--] <command>]\n" @@ -8151,7 +8198,7 @@ msgstr "" " %1$s [选项] <设备> [[-N] <分区>]\n" " %1$s [选项] <命令>\n" -#: login-utils/su-common.c:1124 +#: login-utils/su-common.c:1118 #, fuzzy msgid "" "Run <command> with the effective user ID and group ID of <user>. If -u is\n" @@ -8163,17 +8210,17 @@ msgstr "" "将退而使用与 su(1) 兼容的语法并执行标准 shell。\n" "选项 -c、-f、-l 及 -s 与 -u 相互排斥。\n" -#: login-utils/su-common.c:1129 +#: login-utils/su-common.c:1123 #, fuzzy msgid " -u, --user <user> username\n" msgstr " -u, --user <用户> 用户名\n" -#: login-utils/su-common.c:1140 +#: login-utils/su-common.c:1134 #, c-format msgid " %s [options] [-] [<user> [<argument>...]]\n" msgstr " %s [选项] [-] [<用户> [<参数>...]]\n" -#: login-utils/su-common.c:1144 +#: login-utils/su-common.c:1138 #, fuzzy msgid "" "Change the effective user ID and group ID to that of <user>.\n" @@ -8183,49 +8230,49 @@ msgstr "" "将有效用户 id 和组 id 更改为<用户>的 id。\n" "单个 - 视为 -l。如果未指定<用户>，将假定为 root。\n" -#: login-utils/su-common.c:1190 +#: login-utils/su-common.c:1184 #, 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:1196 +#: login-utils/su-common.c:1190 #, c-format msgid "group %s does not exist" msgstr "组 %s 不存在" -#: login-utils/su-common.c:1296 +#: login-utils/su-common.c:1290 #, fuzzy msgid "--pty is not supported for your system" msgstr "您的系统不支持 --reload" -#: login-utils/su-common.c:1332 +#: login-utils/su-common.c:1326 msgid "ignoring --preserve-environment, it's mutually exclusive with --login" msgstr "将忽略 --preserve-environment，它与 --login 互斥。" -#: login-utils/su-common.c:1346 +#: login-utils/su-common.c:1340 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:1349 +#: login-utils/su-common.c:1343 msgid "no command was specified" msgstr "没有指定命令" -#: login-utils/su-common.c:1361 +#: login-utils/su-common.c:1355 msgid "only root can specify alternative groups" msgstr "只有 root 用户能指定替代组" -#: login-utils/su-common.c:1371 +#: login-utils/su-common.c:1365 #, c-format msgid "user %s does not exist" msgstr "用户 %s 不存在" -#: login-utils/su-common.c:1404 +#: login-utils/su-common.c:1398 #, c-format msgid "using restricted shell %s" msgstr "将使用受限 shell %s" -#: login-utils/su-common.c:1435 +#: login-utils/su-common.c:1429 #, c-format msgid "warning: cannot change directory to %s" msgstr "警告：无法更改到 %s 目录" @@ -8321,7 +8368,7 @@ msgstr "" " -e, --force 如果 getpwnam(3) 失败，直接检查密码文件\n" #: login-utils/sulogin.c:863 misc-utils/findmnt.c:1468 sys-utils/wdctl.c:524 -#: term-utils/agetty.c:808 term-utils/wall.c:216 +#: term-utils/agetty.c:817 term-utils/wall.c:216 msgid "invalid timeout argument" msgstr "无效的 timeout 超时参数" @@ -8363,51 +8410,51 @@ msgstr "" "无法等待 su shell\n" "\n" -#: login-utils/utmpdump.c:176 +#: login-utils/utmpdump.c:174 #, c-format msgid "%s: cannot add inotify watch." msgstr "%s：无法添加 inotify 观察。" -#: login-utils/utmpdump.c:185 +#: login-utils/utmpdump.c:183 #, c-format msgid "%s: cannot read inotify events" msgstr "%s：无法读 inotify 事件" -#: login-utils/utmpdump.c:246 login-utils/utmpdump.c:251 +#: login-utils/utmpdump.c:244 login-utils/utmpdump.c:249 msgid "Extraneous newline in file. Exiting." msgstr "文件中有无关的换行符。将退出。" -#: login-utils/utmpdump.c:305 +#: login-utils/utmpdump.c:303 #, c-format msgid " %s [options] [filename]\n" msgstr " %s [选项] [文件名]\n" -#: login-utils/utmpdump.c:308 +#: login-utils/utmpdump.c:306 msgid "Dump UTMP and WTMP files in raw format.\n" msgstr "以原始格式转储 UTMP 和 WTMP 文件。\n" -#: login-utils/utmpdump.c:311 +#: login-utils/utmpdump.c:309 msgid " -f, --follow output appended data as the file grows\n" msgstr " -f, --follow 随文件增长输出追加的数据\n" -#: login-utils/utmpdump.c:312 +#: login-utils/utmpdump.c:310 msgid " -r, --reverse write back dumped data into utmp file\n" msgstr " -r, --reverse 将转储的数据写回 utmp 文件\n" -#: login-utils/utmpdump.c:313 +#: login-utils/utmpdump.c:311 msgid " -o, --output <file> write to file instead of standard output\n" msgstr " -o, --output <文件> 写入文件而非标准输出\n" -#: login-utils/utmpdump.c:379 +#: login-utils/utmpdump.c:377 msgid "following standard input is unsupported" msgstr "不支持跟随(follow)标准输入" -#: login-utils/utmpdump.c:385 +#: login-utils/utmpdump.c:383 #, c-format msgid "Utmp undump of %s\n" msgstr "%s 的 Utmp undump\n" -#: login-utils/utmpdump.c:388 +#: login-utils/utmpdump.c:386 #, c-format msgid "Utmp dump of %s\n" msgstr "%s 的 Utmp dump\n" @@ -8431,38 +8478,38 @@ msgstr "无法获取 %s 的环境" msgid "Can't set context for %s" msgstr "无法设置 %s 的环境" -#: login-utils/vipw.c:240 +#: login-utils/vipw.c:239 #, c-format msgid "%s unchanged" msgstr "%s 未改变" -#: login-utils/vipw.c:258 +#: login-utils/vipw.c:257 msgid "cannot get lock" msgstr "无法获得锁" -#: login-utils/vipw.c:285 +#: login-utils/vipw.c:284 msgid "no changes made" msgstr "无改变" -#: login-utils/vipw.c:294 +#: login-utils/vipw.c:293 msgid "cannot chmod file" msgstr "无法对文件 chmod" -#: login-utils/vipw.c:309 +#: login-utils/vipw.c:308 msgid "Edit the password or group file.\n" msgstr "编辑密码或组文件。\n" -#: login-utils/vipw.c:362 +#: login-utils/vipw.c:361 msgid "You are using shadow groups on this system.\n" msgstr "您正在使用此系统上的遮蔽(shadow)组。\n" -#: login-utils/vipw.c:363 +#: login-utils/vipw.c:362 msgid "You are using shadow passwords on this system.\n" msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n" #. TRANSLATORS: this program uses for y and n rpmatch(3), #. * which means they can be translated. -#: login-utils/vipw.c:367 +#: login-utils/vipw.c:366 #, c-format msgid "Would you like to edit %s now [y/n]? " msgstr "您想现在编辑 %s 吗[y/n]？" @@ -8664,128 +8711,138 @@ msgstr "" msgid "The lookup option requires a search type specified using -t" msgstr "" -#: misc-utils/cal.c:373 +#: misc-utils/cal.c:411 msgid "invalid month argument" msgstr "无效的月份参数" -#: misc-utils/cal.c:381 +#: misc-utils/cal.c:419 msgid "invalid week argument" msgstr "无效的 周 参数" -#: misc-utils/cal.c:383 +#: misc-utils/cal.c:421 msgid "illegal week value: use 1-54" msgstr "非法的 周 值：请使用 1-54" -#: misc-utils/cal.c:422 +#: misc-utils/cal.c:466 #, c-format msgid "failed to parse timestamp or unknown month name: %s" msgstr " 解析时间戳失败或月份名未知：%s" -#: misc-utils/cal.c:431 +#: misc-utils/cal.c:475 msgid "illegal day value" msgstr "日 值不合法" -#: misc-utils/cal.c:433 misc-utils/cal.c:456 +#: misc-utils/cal.c:477 misc-utils/cal.c:501 #, c-format msgid "illegal day value: use 1-%d" msgstr "日 值不合法：请使用 1-%d" -#: misc-utils/cal.c:437 misc-utils/cal.c:445 +#: misc-utils/cal.c:481 misc-utils/cal.c:489 msgid "illegal month value: use 1-12" msgstr "月份值不合法：请使用 1-12" -#: misc-utils/cal.c:441 +#: misc-utils/cal.c:485 #, c-format msgid "unknown month name: %s" msgstr "月份名未知：%s" -#: misc-utils/cal.c:448 misc-utils/cal.c:452 +#: misc-utils/cal.c:492 misc-utils/cal.c:496 msgid "illegal year value" msgstr "年份值不合法" -#: misc-utils/cal.c:450 +#: misc-utils/cal.c:494 msgid "illegal year value: use positive integer" msgstr "年份值不合法：请使用正整数" -#: misc-utils/cal.c:483 misc-utils/cal.c:496 +#: misc-utils/cal.c:530 misc-utils/cal.c:543 #, c-format msgid "illegal week value: year %d doesn't have week %d" msgstr "非法的 周 值：%d 年没有第 %d 周" -#: misc-utils/cal.c:680 +#: misc-utils/cal.c:742 #, c-format msgid "%s" msgstr "%s" -#: misc-utils/cal.c:686 +#: misc-utils/cal.c:748 #, c-format msgid "%04d" msgstr "%04d" -#: misc-utils/cal.c:692 +#: misc-utils/cal.c:754 #, c-format msgid "%s %04d" msgstr "%s %04d" -#: misc-utils/cal.c:995 +#: misc-utils/cal.c:1094 #, c-format msgid " %s [options] [[[day] month] year]\n" msgstr " %s [选项] [[[日] 月] 年]\n" -#: misc-utils/cal.c:996 +#: misc-utils/cal.c:1095 #, c-format msgid " %s [options] <timestamp|monthname>\n" msgstr " %s [选项] <时间戳|月份名>\n" -#: misc-utils/cal.c:999 +#: misc-utils/cal.c:1098 msgid "Display a calendar, or some part of it.\n" msgstr "显示日历或部分日历。\n" -#: misc-utils/cal.c:1000 +#: misc-utils/cal.c:1099 msgid "Without any arguments, display the current month.\n" msgstr "不带参数时，显示当月日历。\n" -#: misc-utils/cal.c:1003 +#: misc-utils/cal.c:1102 msgid " -1, --one show only a single month (default)\n" msgstr " -1, --one 只显示一个月(默认)\n" -#: misc-utils/cal.c:1004 +#: misc-utils/cal.c:1103 msgid " -3, --three show three months spanning the date\n" msgstr " -3, --three 显示该日期前后三个月\n" -#: misc-utils/cal.c:1005 +#: misc-utils/cal.c:1104 msgid " -n, --months <num> show num months starting with date's month\n" msgstr " -n, --months < 数字> 显示以日期所在月份开始的若干个月\n" -#: misc-utils/cal.c:1006 +#: misc-utils/cal.c:1105 msgid " -S, --span span the date when displaying multiple months\n" msgstr " -S, --span 显示多个月份时的日期范围\n" -#: misc-utils/cal.c:1007 +#: misc-utils/cal.c:1106 msgid " -s, --sunday Sunday as first day of week\n" msgstr " -s, --sunday 周日作为一周的第一天\n" -#: misc-utils/cal.c:1008 +#: misc-utils/cal.c:1107 msgid " -m, --monday Monday as first day of week\n" msgstr " -m, --monday 周一作为一周的第一天\n" -#: misc-utils/cal.c:1009 -msgid " -j, --julian output Julian dates\n" +#: misc-utils/cal.c:1108 +#, fuzzy +msgid " -j, --julian use day-of-year for all calendars\n" msgstr " -j, --julian 输出儒略日期\n" -#: misc-utils/cal.c:1010 +#: misc-utils/cal.c:1109 +msgid " --reform <val> Gregorian reform date (1752|gregorian|iso|julian)\n" +msgstr "" + +#: misc-utils/cal.c:1110 +#, fuzzy +msgid " --iso alias for --reform=iso\n" +msgstr " t - 原生格式的表" + +#: misc-utils/cal.c:1111 msgid " -y, --year show the whole year\n" msgstr " -y, --year 显示全年\n" -#: misc-utils/cal.c:1011 +#: misc-utils/cal.c:1112 msgid " -Y, --twelve show the next twelve months\n" msgstr " -Y, --twelve 显示之后的 12 个月\n" -#: misc-utils/cal.c:1012 +#: misc-utils/cal.c:1113 msgid " -w, --week[=<num>] show US or ISO-8601 week numbers\n" msgstr " -w, --week[=<数字>] 显示美国或 ISO-8601 周数\n" -#: misc-utils/cal.c:1013 +#: misc-utils/cal.c:1114 msgid " --color[=<when>] colorize messages (auto, always or never)\n" msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n" @@ -8863,16 +8920,16 @@ msgstr " -r, --raw 使用原生输出格式\n" msgid "no file specified" msgstr "未指定文件" -#: misc-utils/findfs.c:29 +#: misc-utils/findfs.c:28 #, c-format msgid " %s [options] {LABEL,UUID,PARTUUID,PARTLABEL}=<value>\n" msgstr " %s [选项] {LABEL,UUID,PARTUUID,PARTLABEL}=<值>\n" -#: misc-utils/findfs.c:33 +#: misc-utils/findfs.c:32 msgid "Find a filesystem by label or UUID.\n" msgstr "按标签或 UUID 查找文件系统。\n" -#: misc-utils/findfs.c:76 +#: misc-utils/findfs.c:75 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析“%s”" @@ -8885,7 +8942,7 @@ msgstr "源设备" msgid "mountpoint" msgstr "挂载点" -#: misc-utils/findmnt.c:101 misc-utils/lsblk.c:164 +#: misc-utils/findmnt.c:101 misc-utils/lsblk.c:166 msgid "filesystem type" msgstr "文件系统类型" @@ -8905,7 +8962,7 @@ msgstr "FS 的特定挂载选项" msgid "filesystem label" msgstr "文件系统标签" -#: misc-utils/findmnt.c:106 misc-utils/lsblk.c:167 +#: misc-utils/findmnt.c:106 misc-utils/lsblk.c:169 msgid "filesystem UUID" msgstr "文件系统 UUID" @@ -8913,7 +8970,7 @@ msgstr "文件系统 UUID" msgid "partition label" msgstr "分区标签" -#: misc-utils/findmnt.c:109 misc-utils/lsblk.c:163 +#: misc-utils/findmnt.c:109 misc-utils/lsblk.c:165 msgid "major:minor device number" msgstr "主:次 设备号" @@ -8994,7 +9051,7 @@ msgstr "重新挂载" msgid "move" msgstr "移动" -#: misc-utils/findmnt.c:814 misc-utils/findmnt.c:1077 sys-utils/eject.c:718 +#: misc-utils/findmnt.c:814 misc-utils/findmnt.c:1077 sys-utils/eject.c:714 #: sys-utils/mount.c:324 msgid "failed to initialize libmount table" msgstr "初始化 libmount table 失败" @@ -9006,9 +9063,9 @@ msgstr "不能读 %s" #: misc-utils/findmnt.c:1017 misc-utils/findmnt.c:1083 #: misc-utils/findmnt-verify.c:94 misc-utils/findmnt-verify.c:481 -#: sys-utils/fstrim.c:187 sys-utils/mount.c:133 sys-utils/mount.c:181 -#: sys-utils/swapoff.c:56 sys-utils/swapoff.c:155 sys-utils/swapon.c:249 -#: sys-utils/swapon.c:279 sys-utils/swapon.c:738 sys-utils/umount.c:174 +#: sys-utils/fstrim.c:186 sys-utils/mount.c:133 sys-utils/mount.c:181 +#: sys-utils/swapoff.c:55 sys-utils/swapoff.c:154 sys-utils/swapon.c:248 +#: sys-utils/swapon.c:278 sys-utils/swapon.c:737 sys-utils/umount.c:174 msgid "failed to initialize libmount iterator" msgstr "无法初始化 libmount 迭代器" @@ -9114,12 +9171,12 @@ msgstr " -f, --first-only 只打印找到的第一个文件系统\n" msgid " -i, --invert invert the sense of matching\n" msgstr " -i, --invert 反转搜索的匹配\n" -#: misc-utils/findmnt.c:1224 misc-utils/lslocks.c:501 sys-utils/lsns.c:620 -#: sys-utils/rfkill.c:571 +#: misc-utils/findmnt.c:1224 misc-utils/lslocks.c:501 sys-utils/lsns.c:904 +#: sys-utils/rfkill.c:572 msgid " -J, --json use JSON output format\n" msgstr " -J, --json 使用 JSON 输出格式\n" -#: misc-utils/findmnt.c:1225 sys-utils/lsns.c:621 +#: misc-utils/findmnt.c:1225 sys-utils/lsns.c:905 msgid " -l, --list use list format output\n" msgstr " -l, --list 使用列表格式的输出\n" @@ -9180,7 +9237,7 @@ msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集 msgid " -U, --uniq ignore filesystems with duplicate target\n" msgstr " -U, --uniq 忽略目标重复的文件系统\n" -#: misc-utils/findmnt.c:1240 misc-utils/lslocks.c:507 sys-utils/lsns.c:626 +#: misc-utils/findmnt.c:1240 misc-utils/lslocks.c:507 sys-utils/lsns.c:910 msgid " -u, --notruncate don't truncate text in columns\n" msgstr " -u, --notruncate 不截断列中的文本\n" @@ -9459,21 +9516,21 @@ msgstr "缺少 optstring 参数" msgid "internal error, contact the author." msgstr "内部错误，请联系作者。" -#: misc-utils/kill.c:234 +#: misc-utils/kill.c:151 #, c-format msgid "unknown signal %s; valid signals:" msgstr "未知信号 %s；有效信号为：" -#: misc-utils/kill.c:303 +#: misc-utils/kill.c:176 #, c-format msgid " %s [options] <pid>|<name>...\n" msgstr " %s [选项] <pid>|<名称> ...\n" -#: misc-utils/kill.c:306 +#: misc-utils/kill.c:179 msgid "Forcibly terminate a process.\n" msgstr "强制结束某个进程。\n" -#: misc-utils/kill.c:309 +#: misc-utils/kill.c:182 msgid "" " -a, --all do not restrict the name-to-pid conversion to processes\n" " with the same uid as the present process\n" @@ -9481,42 +9538,42 @@ msgstr "" " -a, --all 不限于只对和当前进程的 uid 相同的进程进行\n" " 名称-pid 转换\n" -#: misc-utils/kill.c:311 +#: misc-utils/kill.c:184 msgid " -s, --signal <signal> send this <signal> instead of SIGTERM\n" msgstr " -s, --signal <信号> 发送指定的<信号>而非 SIGTERM\n" -#: misc-utils/kill.c:313 +#: misc-utils/kill.c:186 msgid " -q, --queue <value> use sigqueue(2), not kill(2), and pass <value> as data\n" msgstr " -q, --queue <值> 使用 sigqueue(2) 代替 kill(2)，并传递<值>数据\n" -#: misc-utils/kill.c:315 +#: misc-utils/kill.c:188 msgid " -p, --pid print pids without signaling them\n" msgstr " -p, --pid 打印 pid 而不向它们发送信号\n" -#: misc-utils/kill.c:316 +#: misc-utils/kill.c:189 msgid " -l, --list[=<signal>] list signal names, or convert a signal number to a name\n" msgstr " -l, --list [=<信号>] 列出信号名，或将一个信号数值转换为名称\n" -#: misc-utils/kill.c:317 +#: misc-utils/kill.c:190 msgid " -L, --table list signal names and numbers\n" msgstr " -L, --table 列出信号名和数值\n" -#: misc-utils/kill.c:318 +#: misc-utils/kill.c:191 msgid " --verbose print pids that will be signaled\n" msgstr " --verbose 打印将收到信号的 pid\n" -#: misc-utils/kill.c:367 misc-utils/kill.c:376 +#: misc-utils/kill.c:240 misc-utils/kill.c:249 sys-utils/unshare.c:386 #, c-format msgid "unknown signal: %s" msgstr "未知信号：%s" -#: 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 +#: misc-utils/kill.c:260 misc-utils/kill.c:263 misc-utils/kill.c:272 +#: misc-utils/kill.c:284 misc-utils/kill.c:307 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s 和 %s 相互排斥" -#: misc-utils/kill.c:414 sys-utils/eject.c:205 sys-utils/eject.c:230 +#: misc-utils/kill.c:287 sys-utils/eject.c:205 sys-utils/eject.c:230 #: sys-utils/losetup.c:707 sys-utils/tunelp.c:167 sys-utils/tunelp.c:174 #: sys-utils/tunelp.c:181 sys-utils/tunelp.c:188 sys-utils/tunelp.c:195 #: sys-utils/tunelp.c:201 sys-utils/tunelp.c:205 sys-utils/tunelp.c:212 @@ -9533,22 +9590,22 @@ msgstr "%s 和 %s 相互排斥" msgid "argument error" msgstr "参数出错" -#: misc-utils/kill.c:431 +#: misc-utils/kill.c:304 #, c-format msgid "invalid signal name or number: %s" msgstr "无效的信号名或数字：%s" -#: misc-utils/kill.c:448 +#: misc-utils/kill.c:321 #, c-format msgid "sending signal %d to pid %d\n" msgstr "将信号 %d 发送给 pid %d\n" -#: misc-utils/kill.c:461 +#: misc-utils/kill.c:334 #, c-format msgid "sending signal to %s failed" msgstr "向 %s 发送信号失败" -#: misc-utils/kill.c:507 +#: misc-utils/kill.c:380 #, c-format msgid "cannot find process \"%s\"" msgstr "找不到进程“%s”" @@ -9795,296 +9852,296 @@ msgstr " -f, --ignore-case 比较时忽略大小写\n" msgid " -t, --terminate <char> define the string-termination character\n" msgstr " -t, --terminate <字符> 定义字符串终止字符\n" -#: misc-utils/lsblk.c:160 +#: misc-utils/lsblk.c:162 msgid "device name" msgstr "设备名" -#: misc-utils/lsblk.c:161 +#: misc-utils/lsblk.c:163 msgid "internal kernel device name" msgstr "内部内核设备名称" -#: misc-utils/lsblk.c:162 +#: misc-utils/lsblk.c:164 msgid "internal parent kernel device name" msgstr "内部上级内核设备名称" -#: misc-utils/lsblk.c:165 sys-utils/zramctl.c:86 +#: misc-utils/lsblk.c:167 sys-utils/zramctl.c:86 msgid "where the device is mounted" msgstr "设备挂载位置" -#: misc-utils/lsblk.c:166 misc-utils/wipefs.c:104 +#: misc-utils/lsblk.c:168 misc-utils/wipefs.c:104 msgid "filesystem LABEL" msgstr "文件系统标签" -#: misc-utils/lsblk.c:169 +#: misc-utils/lsblk.c:171 msgid "partition type UUID" msgstr "分区类型 UUID" -#: misc-utils/lsblk.c:170 +#: misc-utils/lsblk.c:172 msgid "partition LABEL" msgstr "分区 LABEL" -#: misc-utils/lsblk.c:174 +#: misc-utils/lsblk.c:176 msgid "read-ahead of the device" msgstr "该设备的预读(read-ahead)" -#: misc-utils/lsblk.c:175 sys-utils/losetup.c:77 +#: misc-utils/lsblk.c:177 sys-utils/losetup.c:77 msgid "read-only device" msgstr "只读设备" -#: misc-utils/lsblk.c:176 +#: misc-utils/lsblk.c:178 msgid "removable device" msgstr "可移动设备" -#: misc-utils/lsblk.c:177 +#: misc-utils/lsblk.c:179 msgid "removable or hotplug device (usb, pcmcia, ...)" msgstr "可移动或热插拔设备(usb, pcmcia, ...)" -#: misc-utils/lsblk.c:178 +#: misc-utils/lsblk.c:180 msgid "rotational device" msgstr "转动设备" -#: misc-utils/lsblk.c:179 +#: misc-utils/lsblk.c:181 msgid "adds randomness" msgstr "添加随机性" -#: misc-utils/lsblk.c:180 +#: misc-utils/lsblk.c:182 msgid "device identifier" msgstr "设备标识符" -#: misc-utils/lsblk.c:181 +#: misc-utils/lsblk.c:183 msgid "disk serial number" msgstr "磁盘序列号" -#: misc-utils/lsblk.c:182 +#: misc-utils/lsblk.c:184 msgid "size of the device" msgstr "磁盘容量" -#: misc-utils/lsblk.c:183 +#: misc-utils/lsblk.c:185 msgid "state of the device" msgstr "设备的状态" -#: misc-utils/lsblk.c:185 +#: misc-utils/lsblk.c:187 msgid "group name" msgstr "组名" -#: misc-utils/lsblk.c:186 +#: misc-utils/lsblk.c:188 msgid "device node permissions" msgstr "设备节点权限" -#: misc-utils/lsblk.c:187 +#: misc-utils/lsblk.c:189 msgid "alignment offset" msgstr "对齐偏移量" -#: misc-utils/lsblk.c:188 +#: misc-utils/lsblk.c:190 msgid "minimum I/O size" msgstr "最小 I/O 大小" -#: misc-utils/lsblk.c:189 +#: misc-utils/lsblk.c:191 msgid "optimal I/O size" msgstr "最优 I/O 大小" -#: misc-utils/lsblk.c:190 +#: misc-utils/lsblk.c:192 msgid "physical sector size" msgstr "物理扇区大小" -#: misc-utils/lsblk.c:191 +#: misc-utils/lsblk.c:193 msgid "logical sector size" msgstr "逻辑扇区大小" -#: misc-utils/lsblk.c:192 +#: misc-utils/lsblk.c:194 msgid "I/O scheduler name" msgstr "I/O 调度器名称" -#: misc-utils/lsblk.c:193 +#: misc-utils/lsblk.c:195 msgid "request queue size" msgstr "请求队列大小" -#: misc-utils/lsblk.c:194 +#: misc-utils/lsblk.c:196 msgid "device type" msgstr "设备类型" -#: misc-utils/lsblk.c:195 +#: misc-utils/lsblk.c:197 msgid "discard alignment offset" msgstr "忽略对齐偏移量" -#: misc-utils/lsblk.c:196 +#: misc-utils/lsblk.c:198 msgid "discard granularity" msgstr "忽略粒度" -#: misc-utils/lsblk.c:197 +#: misc-utils/lsblk.c:199 msgid "discard max bytes" msgstr "忽略最大字节数" -#: misc-utils/lsblk.c:198 +#: misc-utils/lsblk.c:200 msgid "discard zeroes data" msgstr "忽略零数据" -#: misc-utils/lsblk.c:199 +#: misc-utils/lsblk.c:201 msgid "write same max bytes" msgstr "写相同的最大字节数" -#: misc-utils/lsblk.c:200 +#: misc-utils/lsblk.c:202 msgid "unique storage identifier" msgstr "惟一存储标识符" -#: misc-utils/lsblk.c:201 +#: misc-utils/lsblk.c:203 msgid "Host:Channel:Target:Lun for SCSI" msgstr "SCSI 的 Host:Channel:Target:Lun" -#: misc-utils/lsblk.c:202 +#: misc-utils/lsblk.c:204 msgid "device transport type" msgstr "设备传输类型" -#: misc-utils/lsblk.c:203 +#: misc-utils/lsblk.c:205 msgid "de-duplicated chain of subsystems" msgstr "对成链的子系统去重" -#: misc-utils/lsblk.c:204 +#: misc-utils/lsblk.c:206 msgid "device revision" msgstr "设备修订版本" -#: misc-utils/lsblk.c:205 +#: misc-utils/lsblk.c:207 msgid "device vendor" msgstr "设备制造商" -#: misc-utils/lsblk.c:206 +#: misc-utils/lsblk.c:208 msgid "zone model" msgstr "" -#: misc-utils/lsblk.c:1290 +#: misc-utils/lsblk.c:1292 msgid "failed to open device directory in sysfs" msgstr "打开 sysfs 中的设备目录失败" -#: misc-utils/lsblk.c:1476 +#: misc-utils/lsblk.c:1478 #, c-format msgid "%s: failed to compose sysfs path" msgstr "%s：组成 sysfs 路径失败" -#: misc-utils/lsblk.c:1482 +#: misc-utils/lsblk.c:1484 #, c-format msgid "%s: failed to read link" msgstr "%s：读链接失败" -#: misc-utils/lsblk.c:1504 +#: misc-utils/lsblk.c:1506 #, c-format msgid "%s: failed to get sysfs name" msgstr "%s：获取 sysfs 名称失败" -#: misc-utils/lsblk.c:1513 +#: misc-utils/lsblk.c:1515 #, c-format msgid "%s: failed to get whole-disk device number" msgstr "%s：获取 整盘 设备号失败" -#: misc-utils/lsblk.c:1565 misc-utils/lsblk.c:1567 misc-utils/lsblk.c:1592 -#: misc-utils/lsblk.c:1594 +#: misc-utils/lsblk.c:1567 misc-utils/lsblk.c:1569 misc-utils/lsblk.c:1594 +#: misc-utils/lsblk.c:1596 #, c-format msgid "failed to parse list '%s'" msgstr "解析列表“%s”失败" #. TRANSLATORS: The standard value for %d is 256. -#: misc-utils/lsblk.c:1572 +#: misc-utils/lsblk.c:1574 #, 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:1599 +#: misc-utils/lsblk.c:1601 #, c-format msgid "the list of included devices is too large (limit is %d devices)" msgstr "包含设备列表过大(限制为 %d 台设备)" -#: misc-utils/lsblk.c:1631 sys-utils/wdctl.c:175 +#: misc-utils/lsblk.c:1633 sys-utils/wdctl.c:175 #, c-format msgid " %s [options] [<device> ...]\n" msgstr " %s [选项] [<设备> ...]\n" -#: misc-utils/lsblk.c:1634 +#: misc-utils/lsblk.c:1636 msgid "List information about block devices.\n" msgstr "列出块设备的信息。\n" -#: misc-utils/lsblk.c:1637 +#: misc-utils/lsblk.c:1639 msgid " -a, --all print all devices\n" msgstr " -a, --all 打印所有设备\n" -#: misc-utils/lsblk.c:1639 +#: misc-utils/lsblk.c:1641 msgid " -d, --nodeps don't print slaves or holders\n" msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n" -#: misc-utils/lsblk.c:1640 +#: misc-utils/lsblk.c:1642 msgid " -D, --discard print discard capabilities\n" msgstr " -D, --discard 打印时丢弃能力\n" -#: misc-utils/lsblk.c:1641 +#: misc-utils/lsblk.c:1643 #, fuzzy msgid " -z, --zoned print zone model\n" msgstr " -c, --offline 只打印离线 CPU\n" -#: misc-utils/lsblk.c:1642 +#: misc-utils/lsblk.c:1644 msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n" msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认：内存盘)\n" -#: misc-utils/lsblk.c:1643 +#: misc-utils/lsblk.c:1645 msgid " -f, --fs output info about filesystems\n" msgstr " -f, --fs 输出文件系统信息\n" -#: misc-utils/lsblk.c:1644 +#: misc-utils/lsblk.c:1646 msgid " -i, --ascii use ascii characters only\n" msgstr " -i, --ascii 只使用 ascii 字符\n" -#: misc-utils/lsblk.c:1645 +#: misc-utils/lsblk.c:1647 msgid " -I, --include <list> show only devices with specified major numbers\n" msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n" -#: misc-utils/lsblk.c:1646 sys-utils/lsmem.c:379 +#: misc-utils/lsblk.c:1648 sys-utils/lsmem.c:497 msgid " -J, --json use JSON output format\n" msgstr " -J, --json 使用 JSON 输出格式\n" -#: misc-utils/lsblk.c:1647 +#: misc-utils/lsblk.c:1649 msgid " -l, --list use list format output\n" msgstr " -l, --list 使用列表格式的输出\n" -#: misc-utils/lsblk.c:1648 +#: misc-utils/lsblk.c:1650 #, fuzzy msgid " -T, --tree use tree format output\n" msgstr " -l, --list 使用列表格式的输出\n" -#: misc-utils/lsblk.c:1649 +#: misc-utils/lsblk.c:1651 msgid " -m, --perms output info about permissions\n" msgstr " -m, --perms 输出权限信息\n" -#: misc-utils/lsblk.c:1650 sys-utils/lsmem.c:383 +#: misc-utils/lsblk.c:1652 sys-utils/lsmem.c:501 msgid " -n, --noheadings don't print headings\n" msgstr " -n, --noheadings 不打印标题\n" -#: misc-utils/lsblk.c:1651 sys-utils/lsmem.c:384 +#: misc-utils/lsblk.c:1653 sys-utils/lsmem.c:502 msgid " -o, --output <list> output columns\n" msgstr " -o, --output <列表> 输出列\n" -#: misc-utils/lsblk.c:1652 +#: misc-utils/lsblk.c:1654 msgid " -O, --output-all output all columns\n" msgstr " -O, --output-all 输出所有列\n" -#: misc-utils/lsblk.c:1653 +#: misc-utils/lsblk.c:1655 msgid " -p, --paths print complete device path\n" msgstr " -p, --paths 打印完整设备路径\n" -#: misc-utils/lsblk.c:1656 +#: misc-utils/lsblk.c:1658 msgid " -s, --inverse inverse dependencies\n" msgstr " -s, --inverse 反向依赖\n" -#: misc-utils/lsblk.c:1657 +#: misc-utils/lsblk.c:1659 msgid " -S, --scsi output info about SCSI devices\n" msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n" -#: misc-utils/lsblk.c:1658 +#: misc-utils/lsblk.c:1660 msgid " -t, --topology output info about topology\n" msgstr " -t, --topology 输出拓扑信息\n" -#: misc-utils/lsblk.c:1659 +#: misc-utils/lsblk.c:1661 msgid " -x, --sort <column> sort output by <column>\n" msgstr " -x, --sort <列> 按<列>对输出排序\n" -#: misc-utils/lsblk.c:1676 +#: misc-utils/lsblk.c:1678 #, c-format msgid "failed to access sysfs directory: %s" msgstr "无法访问 sysfs 目录：%s" @@ -10098,8 +10155,9 @@ msgid "PID of the process holding the lock" msgstr "持有锁的进程 PID" #: misc-utils/lslocks.c:75 -msgid "kind of lock: FL_FLOCK or FL_POSIX." -msgstr "锁类型：FL_FLOCK 或 FL_POSIX。" +#, fuzzy +msgid "kind of lock" +msgstr "锁的大小" #: misc-utils/lslocks.c:76 msgid "size of the lock" @@ -10157,11 +10215,11 @@ msgstr "列出本地系统锁。\n" msgid " -i, --noinaccessible ignore locks without read permissions\n" msgstr " -i, --noinaccessible 忽略没有读权限的锁\n" -#: misc-utils/lslocks.c:503 sys-utils/lsns.c:622 sys-utils/rfkill.c:572 +#: misc-utils/lslocks.c:503 sys-utils/lsns.c:906 sys-utils/rfkill.c:573 msgid " -n, --noheadings don't print headings\n" msgstr " -n, --noheadings 不打印标题\n" -#: misc-utils/lslocks.c:504 sys-utils/lsns.c:623 sys-utils/rfkill.c:573 +#: misc-utils/lslocks.c:504 sys-utils/lsns.c:907 sys-utils/rfkill.c:574 msgid " -o, --output <list> define which output columns to use\n" msgstr " -o, --output <list> 定义使用哪个输出列\n" @@ -10169,12 +10227,12 @@ msgstr " -o, --output <list> 定义使用哪个输出列\n" msgid " -p, --pid <pid> display only locks held by this process\n" msgstr " -p, --pid <pid> 只显示由指定进程持有的锁\n" -#: misc-utils/lslocks.c:506 sys-utils/lsns.c:625 sys-utils/rfkill.c:574 +#: misc-utils/lslocks.c:506 sys-utils/lsns.c:909 sys-utils/rfkill.c:575 msgid " -r, --raw use the raw output format\n" msgstr " -r, --raw 使用原生输出格式\n" #: misc-utils/lslocks.c:563 schedutils/chrt.c:475 schedutils/ionice.c:177 -#: schedutils/taskset.c:171 sys-utils/lsns.c:698 sys-utils/prlimit.c:585 +#: schedutils/taskset.c:171 sys-utils/lsns.c:986 sys-utils/prlimit.c:585 msgid "invalid PID argument" msgstr "无效的 PID 参数" @@ -10205,7 +10263,7 @@ msgstr[0] "从 %2$s 获得 %1$zu 字节\n" msgid "closing %s failed" msgstr "关闭 %s 失败" -#: misc-utils/mcookie.c:164 sys-utils/blkdiscard.c:146 sys-utils/fstrim.c:308 +#: misc-utils/mcookie.c:164 sys-utils/blkdiscard.c:146 sys-utils/fstrim.c:307 #: text-utils/hexdump.c:117 msgid "failed to parse length" msgstr "解析长度失败" @@ -10214,7 +10272,7 @@ msgstr "解析长度失败" msgid "--max-size ignored when used without --file" msgstr "不带 --file 时忽略 --max-size" -#: misc-utils/mcookie.c:185 +#: misc-utils/mcookie.c:186 #, c-format msgid "Got %d byte from %s\n" msgid_plural "Got %d bytes from %s\n" @@ -10262,7 +10320,7 @@ msgstr "" msgid "pathname argument is missing" msgstr "缺少 路径名 参数" -#: misc-utils/namei.c:414 sys-utils/lsns.c:762 +#: misc-utils/namei.c:414 sys-utils/lsns.c:1060 msgid "failed to allocate UID cache" msgstr "分配 UID 缓存失败" @@ -10300,41 +10358,41 @@ msgstr "%s：unlink 失败" msgid "%s: symlinking to %s failed" msgstr "%s：符号链接到 %s 失败" -#: misc-utils/rename.c:117 +#: misc-utils/rename.c:116 #, fuzzy, c-format msgid "Skipping existing file: `%s'\n" msgstr "...跳到文件 " -#: misc-utils/rename.c:121 +#: misc-utils/rename.c:120 #, c-format msgid "%s: rename to %s failed" msgstr "%s：重命名为 %s 失败" -#: misc-utils/rename.c:135 +#: misc-utils/rename.c:134 #, c-format msgid " %s [options] <expression> <replacement> <file>...\n" msgstr " %s [选项] <表达式> <替换> <文件>...\n" -#: misc-utils/rename.c:139 +#: misc-utils/rename.c:138 msgid "Rename files.\n" msgstr "重命名文件。\n" -#: misc-utils/rename.c:142 +#: misc-utils/rename.c:141 #, fuzzy msgid " -v, --verbose explain what is being done\n" msgstr " -v, --verbose 解释正在进行的操作\n" -#: misc-utils/rename.c:143 +#: misc-utils/rename.c:142 #, fuzzy msgid " -s, --symlink act on the target of symlinks\n" msgstr " -s, --symlink 在符号链接的目标上执行\n" -#: misc-utils/rename.c:144 +#: misc-utils/rename.c:143 #, fuzzy msgid " -n, --no-act do not make any changes\n" msgstr " -n, --noheadings 不打印标题\n" -#: misc-utils/rename.c:145 +#: misc-utils/rename.c:144 msgid " -o, --no-overwrite don't overwrite existing files\n" msgstr "" @@ -10472,8 +10530,8 @@ msgstr "收到太多文件描述符，请检查 uuidd.socket" msgid "timeout [%d sec]\n" msgstr "超时 [%d 秒]\n" -#: misc-utils/uuidd.c:434 term-utils/setterm.c:899 text-utils/column.c:449 -#: text-utils/column.c:462 +#: misc-utils/uuidd.c:434 term-utils/setterm.c:899 text-utils/column.c:493 +#: text-utils/column.c:526 msgid "read failed" msgstr "read 失败" @@ -10681,57 +10739,57 @@ msgstr "" msgid "sha1-based" msgstr "" -#: misc-utils/uuidparse.c:273 misc-utils/wipefs.c:170 sys-utils/lscpu.c:1874 -#: sys-utils/lsns.c:532 sys-utils/zramctl.c:497 +#: misc-utils/uuidparse.c:267 misc-utils/wipefs.c:170 sys-utils/lscpu.c:1722 +#: sys-utils/lsns.c:809 sys-utils/zramctl.c:496 msgid "failed to initialize output column" msgstr "初始化输出列失败" -#: misc-utils/whereis.c:196 +#: misc-utils/whereis.c:199 #, c-format msgid " %s [options] [-BMS <dir>... -f] <name>\n" msgstr " %s [选项] [-BMS <dir>... -f] <名称>\n" -#: misc-utils/whereis.c:199 +#: misc-utils/whereis.c:202 msgid "Locate the binary, source, and manual-page files for a command.\n" msgstr "定位某个命令的二进制文件、源码和帮助页文件。\n" -#: misc-utils/whereis.c:202 +#: misc-utils/whereis.c:205 msgid " -b search only for binaries\n" msgstr " -b 只搜索二进制文件\n" -#: misc-utils/whereis.c:203 +#: misc-utils/whereis.c:206 msgid " -B <dirs> define binaries lookup path\n" msgstr " -B <目录> 定义二进制文件查找路径\n" -#: misc-utils/whereis.c:204 +#: misc-utils/whereis.c:207 msgid " -m search only for manuals and infos\n" msgstr " -m 只搜索手册和信息\n" -#: misc-utils/whereis.c:205 +#: misc-utils/whereis.c:208 msgid " -M <dirs> define man and info lookup path\n" msgstr " -M <目录> 定义 man 和 info 查找路径\n" -#: misc-utils/whereis.c:206 +#: misc-utils/whereis.c:209 msgid " -s search only for sources\n" msgstr " -s 只搜索源代码\n" -#: misc-utils/whereis.c:207 +#: misc-utils/whereis.c:210 msgid " -S <dirs> define sources lookup path\n" msgstr " -S <目录> 定义源代码查找路径\n" -#: misc-utils/whereis.c:208 +#: misc-utils/whereis.c:211 msgid " -f terminate <dirs> argument list\n" msgstr " -f 终止 <目录> 参数列表\n" -#: misc-utils/whereis.c:209 +#: misc-utils/whereis.c:212 msgid " -u search for unusual entries\n" msgstr " -u 搜索不常见记录\n" -#: misc-utils/whereis.c:210 +#: misc-utils/whereis.c:213 msgid " -l output effective lookup paths\n" msgstr " -l 输出有效查找路径\n" -#: misc-utils/whereis.c:645 +#: misc-utils/whereis.c:648 msgid "option -f is missing" msgstr "缺少 -f 选项" @@ -11306,7 +11364,7 @@ msgstr " -z, --zeroout 用 零填充而非丢弃\n" msgid " -v, --verbose print aligned length and offset\n" msgstr " -v, --verbose 打印对齐的长度和偏移\n" -#: sys-utils/blkdiscard.c:150 sys-utils/fstrim.c:312 sys-utils/losetup.c:691 +#: sys-utils/blkdiscard.c:150 sys-utils/fstrim.c:311 sys-utils/losetup.c:691 #: text-utils/hexdump.c:124 msgid "failed to parse offset" msgstr "解析偏移失败" @@ -11315,8 +11373,8 @@ msgstr "解析偏移失败" msgid "failed to parse step" msgstr "解析步长失败" -#: sys-utils/blkdiscard.c:176 sys-utils/blkzone.c:398 sys-utils/fallocate.c:382 -#: sys-utils/fsfreeze.c:111 sys-utils/fstrim.c:334 +#: sys-utils/blkdiscard.c:176 sys-utils/blkzone.c:398 sys-utils/fallocate.c:373 +#: sys-utils/fsfreeze.c:111 sys-utils/fstrim.c:333 msgid "unexpected number of arguments" msgstr "参数数量异常" @@ -11462,7 +11520,7 @@ msgstr "解析行数失败" msgid "failed to parse zone offset" msgstr "解析偏移失败" -#: sys-utils/blkzone.c:391 sys-utils/setsid.c:87 +#: sys-utils/blkzone.c:391 sys-utils/setsid.c:92 #, fuzzy msgid "no command specified" msgstr "没有指定命令" @@ -11638,159 +11696,192 @@ msgstr "" msgid "unsupported argument: %s" msgstr "不支持的参数：%s" -#: sys-utils/chmem.c:67 +#: sys-utils/chmem.c:100 #, c-format msgid "Memory Block %<PRIu64> (0x%016<PRIx64>-0x%016<PRIx64>)" msgstr "" -#: sys-utils/chmem.c:83 sys-utils/chmem.c:129 +#: sys-utils/chmem.c:124 sys-utils/chmem.c:197 #, fuzzy msgid "Failed to parse index" msgstr "解析 id 失败" -#: sys-utils/chmem.c:91 +#: sys-utils/chmem.c:151 #, fuzzy, c-format msgid "%s enable failed\n" msgstr "CPU %u 启用失败" -#: sys-utils/chmem.c:93 +#: sys-utils/chmem.c:153 #, fuzzy, c-format msgid "%s disable failed\n" msgstr "CPU %u 禁用失败" -#: sys-utils/chmem.c:96 sys-utils/chmem.c:152 +#: sys-utils/chmem.c:156 sys-utils/chmem.c:243 #, fuzzy, c-format msgid "%s enabled\n" msgstr "CPU %u 已启用\n" -#: sys-utils/chmem.c:98 sys-utils/chmem.c:154 +#: sys-utils/chmem.c:158 sys-utils/chmem.c:245 #, fuzzy, c-format msgid "%s disabled\n" msgstr "CPU %u 已禁用\n" -#: sys-utils/chmem.c:110 +#: sys-utils/chmem.c:170 #, c-format msgid "Could only enable %s of memory" msgstr "" -#: sys-utils/chmem.c:112 +#: sys-utils/chmem.c:172 #, c-format msgid "Could only disable %s of memory" msgstr "" -#: sys-utils/chmem.c:138 +#: sys-utils/chmem.c:206 #, fuzzy, c-format msgid "%s already enabled\n" msgstr "CPU %u 已经启用\n" -#: sys-utils/chmem.c:140 +#: sys-utils/chmem.c:208 #, fuzzy, c-format msgid "%s already disabled\n" msgstr "CPU %u 已经禁用\n" -#: sys-utils/chmem.c:147 +#: sys-utils/chmem.c:219 +#, fuzzy, c-format +msgid "%s enable failed: Zone mismatch" +msgstr "CPU %u 启用失败" + +#: sys-utils/chmem.c:223 +#, fuzzy, c-format +msgid "%s disable failed: Zone mismatch" +msgstr "CPU %u 禁用失败" + +#: sys-utils/chmem.c:238 #, fuzzy, c-format msgid "%s enable failed" msgstr "CPU %u 启用失败" -#: sys-utils/chmem.c:149 +#: sys-utils/chmem.c:240 #, fuzzy, c-format msgid "%s disable failed" msgstr "CPU %u 禁用失败" -#: sys-utils/chmem.c:175 sys-utils/lsmem.c:357 sys-utils/lsmem.c:361 +#: sys-utils/chmem.c:266 sys-utils/lsmem.c:471 sys-utils/lsmem.c:475 #, fuzzy, c-format msgid "Failed to read %s" msgstr "读 速度 失败" -#: sys-utils/chmem.c:183 +#: sys-utils/chmem.c:274 #, fuzzy msgid "Failed to parse block number" msgstr "解析数字失败" -#: sys-utils/chmem.c:188 +#: sys-utils/chmem.c:279 #, fuzzy msgid "Failed to parse size" msgstr "解析大小失败。" -#: sys-utils/chmem.c:192 +#: sys-utils/chmem.c:283 #, c-format msgid "Size must be aligned to memory block size (%s)" msgstr "" -#: sys-utils/chmem.c:201 +#: sys-utils/chmem.c:292 #, fuzzy msgid "Failed to parse start" msgstr "解析 起点 失败" -#: sys-utils/chmem.c:202 +#: sys-utils/chmem.c:293 #, fuzzy msgid "Failed to parse end" msgstr "解析 终点 失败" -#: sys-utils/chmem.c:206 +#: sys-utils/chmem.c:297 #, fuzzy, c-format msgid "Invalid start address format: %s" msgstr "无效的 起点 参数" -#: sys-utils/chmem.c:208 +#: sys-utils/chmem.c:299 #, fuzzy, c-format msgid "Invalid end address format: %s" msgstr "无效的信号名或数字：%s" -#: sys-utils/chmem.c:209 +#: sys-utils/chmem.c:300 #, fuzzy msgid "Failed to parse start address" msgstr "解析 起点 失败" -#: sys-utils/chmem.c:210 +#: sys-utils/chmem.c:301 #, fuzzy msgid "Failed to parse end address" msgstr "解析 终点 失败" -#: sys-utils/chmem.c:213 +#: sys-utils/chmem.c:304 #, c-format msgid "Start address and (end address + 1) must be aligned to memory block size (%s)" msgstr "" -#: sys-utils/chmem.c:227 +#: sys-utils/chmem.c:318 #, fuzzy, c-format msgid "Invalid parameter: %s" msgstr "无效参数：%s" -#: sys-utils/chmem.c:234 +#: sys-utils/chmem.c:325 #, fuzzy, c-format msgid "Invalid range: %s" msgstr "无效参数：%s" -#: sys-utils/chmem.c:241 +#: sys-utils/chmem.c:334 #, fuzzy, c-format msgid " %s [options] [SIZE|RANGE|BLOCKRANGE]\n" msgstr " %s [选项] [y | n]\n" -#: sys-utils/chmem.c:244 +#: sys-utils/chmem.c:337 msgid "Set a particular size or range of memory online or offline.\n" msgstr "" -#: sys-utils/chmem.c:247 +#: sys-utils/chmem.c:340 #, fuzzy -msgid " -e, --enable enable memory\n" +msgid " -e, --enable enable memory\n" msgstr " -v, --verbose 详尽方式\n" -#: sys-utils/chmem.c:248 -msgid " -d, --disable disable memory\n" -msgstr "" +#: sys-utils/chmem.c:341 +#, fuzzy +msgid " -d, --disable disable memory\n" +msgstr " -v, --verbose 详尽方式\n" -#: sys-utils/chmem.c:249 +#: sys-utils/chmem.c:342 #, fuzzy -msgid " -b, --blocks use memory blocks\n" +msgid " -b, --blocks use memory blocks\n" msgstr " -v, --verbose 详尽方式\n" -#: sys-utils/chmem.c:250 +#: sys-utils/chmem.c:343 +msgid " -z, --zone <name> select memory zone (see below)\n" +msgstr "" + +#: sys-utils/chmem.c:344 #, fuzzy -msgid " -v, --verbose verbose output\n" +msgid " -v, --verbose verbose output\n" msgstr " -v, --verbose 详尽方式\n" +#: sys-utils/chmem.c:347 +#, fuzzy +msgid "" +"\n" +"Supported zones:\n" +msgstr "" +"\n" +"支持的日志设施：\n" + +#: sys-utils/chmem.c:429 +msgid "zone ignored, no valid_zones sysfs attribute present" +msgstr "" + +#: sys-utils/chmem.c:434 +#, fuzzy, c-format +msgid "unknown memory zone: %s" +msgstr "月份名未知：%s" + #: sys-utils/ctrlaltdel.c:28 #, c-format msgid " %s hard|soft\n" @@ -11819,179 +11910,183 @@ msgstr "只有 root 用户才能设置 Ctrl-Alt-Del 行为" msgid "unknown argument: %s" msgstr "未知参数：%s" -#: sys-utils/dmesg.c:110 +#: sys-utils/dmesg.c:109 msgid "system is unusable" msgstr "系统无法使用" -#: sys-utils/dmesg.c:111 +#: sys-utils/dmesg.c:110 msgid "action must be taken immediately" msgstr "操作必须立即执行" -#: sys-utils/dmesg.c:112 +#: sys-utils/dmesg.c:111 msgid "critical conditions" msgstr "紧急条件" -#: sys-utils/dmesg.c:113 +#: sys-utils/dmesg.c:112 msgid "error conditions" msgstr "错误条件" -#: sys-utils/dmesg.c:114 +#: sys-utils/dmesg.c:113 msgid "warning conditions" msgstr "警告条件" -#: sys-utils/dmesg.c:115 +#: sys-utils/dmesg.c:114 msgid "normal but significant condition" msgstr "正常但重要的条件" -#: sys-utils/dmesg.c:116 +#: sys-utils/dmesg.c:115 msgid "informational" msgstr "信息" -#: sys-utils/dmesg.c:117 +#: sys-utils/dmesg.c:116 msgid "debug-level messages" msgstr "调试级别的消息" -#: sys-utils/dmesg.c:131 +#: sys-utils/dmesg.c:130 msgid "kernel messages" msgstr "内核消息" -#: sys-utils/dmesg.c:132 +#: sys-utils/dmesg.c:131 msgid "random user-level messages" msgstr "随机的用户级消息" -#: sys-utils/dmesg.c:133 +#: sys-utils/dmesg.c:132 msgid "mail system" msgstr "邮件系统" -#: sys-utils/dmesg.c:134 +#: sys-utils/dmesg.c:133 msgid "system daemons" msgstr "系统守护进程" -#: sys-utils/dmesg.c:135 +#: sys-utils/dmesg.c:134 msgid "security/authorization messages" msgstr "安全/认证消息" -#: sys-utils/dmesg.c:136 +#: sys-utils/dmesg.c:135 msgid "messages generated internally by syslogd" msgstr "syslogd 内部生成的消息" -#: sys-utils/dmesg.c:137 +#: sys-utils/dmesg.c:136 msgid "line printer subsystem" msgstr "行打印机子系统" -#: sys-utils/dmesg.c:138 +#: sys-utils/dmesg.c:137 msgid "network news subsystem" msgstr "网络新闻子系统" -#: sys-utils/dmesg.c:139 +#: sys-utils/dmesg.c:138 msgid "UUCP subsystem" msgstr "UUCP 子系统" -#: sys-utils/dmesg.c:140 +#: sys-utils/dmesg.c:139 msgid "clock daemon" msgstr "时钟守护进程" -#: sys-utils/dmesg.c:141 +#: sys-utils/dmesg.c:140 msgid "security/authorization messages (private)" msgstr "安全/认证消息(私有)" -#: sys-utils/dmesg.c:142 +#: sys-utils/dmesg.c:141 msgid "FTP daemon" msgstr "ftp 守护进程" -#: sys-utils/dmesg.c:278 +#: sys-utils/dmesg.c:269 msgid "Display or control the kernel ring buffer.\n" msgstr "显示或控制内核环形缓冲区。\n" -#: sys-utils/dmesg.c:281 +#: sys-utils/dmesg.c:272 msgid " -C, --clear clear the kernel ring buffer\n" msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n" -#: sys-utils/dmesg.c:282 +#: sys-utils/dmesg.c:273 msgid " -c, --read-clear read and clear all messages\n" msgstr " -c, --read-clear 读取并清除所有消息\n" -#: sys-utils/dmesg.c:283 +#: sys-utils/dmesg.c:274 msgid " -D, --console-off disable printing messages to console\n" msgstr " -D, --console-off 禁止向终端打印消息\n" -#: sys-utils/dmesg.c:284 +#: sys-utils/dmesg.c:275 msgid " -E, --console-on enable printing messages to console\n" msgstr " -E, --console-on 启用向终端打印消息\n" -#: sys-utils/dmesg.c:285 +#: sys-utils/dmesg.c:276 msgid " -F, --file <file> use the file instead of the kernel log buffer\n" msgstr " -F, --file <文件> 用 文件 代替内核日志缓冲区\n" -#: sys-utils/dmesg.c:286 +#: sys-utils/dmesg.c:277 msgid " -f, --facility <list> restrict output to defined facilities\n" msgstr " -f, --facility <列表> 将输出限制为定义的设施\n" -#: sys-utils/dmesg.c:287 +#: sys-utils/dmesg.c:278 msgid " -H, --human human readable output\n" msgstr " -H, --human 易读格式输出\n" -#: sys-utils/dmesg.c:288 +#: sys-utils/dmesg.c:279 msgid " -k, --kernel display kernel messages\n" msgstr " -k, --kernel 显示内核消息\n" -#: sys-utils/dmesg.c:289 +#: sys-utils/dmesg.c:280 msgid " -L, --color[=<when>] colorize messages (auto, always or never)\n" msgstr " -L, --color[=<时机>] 彩色显示消息(auto, always 或 never)\n" -#: sys-utils/dmesg.c:292 +#: sys-utils/dmesg.c:283 msgid " -l, --level <list> restrict output to defined levels\n" msgstr " -l, --level <列表> 限制输出级别\n" -#: sys-utils/dmesg.c:293 +#: sys-utils/dmesg.c:284 msgid " -n, --console-level <level> set level of messages printed to console\n" msgstr " -n, --console-level <级别> 设置打印到终端的消息级别\n" -#: sys-utils/dmesg.c:294 +#: sys-utils/dmesg.c:285 msgid " -P, --nopager do not pipe output into a pager\n" msgstr " -P, --nopager 不将输出通过管道传递给分页程序\n" -#: sys-utils/dmesg.c:295 +#: sys-utils/dmesg.c:286 +msgid " -p, --force-prefix force timestamp output on each line of multi-line messages\n" +msgstr "" + +#: sys-utils/dmesg.c:287 msgid " -r, --raw print the raw message buffer\n" msgstr " -r, --raw 打印原生消息缓冲区\n" -#: sys-utils/dmesg.c:296 +#: sys-utils/dmesg.c:288 msgid " -S, --syslog force to use syslog(2) rather than /dev/kmsg\n" msgstr " -S, --syslog 强制使用 syslog(2) 而非 /dev/kmsg\n" -#: sys-utils/dmesg.c:297 +#: sys-utils/dmesg.c:289 msgid " -s, --buffer-size <size> buffer size to query the kernel ring buffer\n" msgstr " -s, --buffer-size <大小> 查询内核环形缓冲区所用的缓冲区大小\n" -#: sys-utils/dmesg.c:298 +#: sys-utils/dmesg.c:290 msgid " -u, --userspace display userspace messages\n" msgstr " -u, --userspace 显示用户空间消息\n" -#: sys-utils/dmesg.c:299 +#: sys-utils/dmesg.c:291 msgid " -w, --follow wait for new messages\n" msgstr " -w, --follow 等待新消息\n" -#: sys-utils/dmesg.c:300 +#: sys-utils/dmesg.c:292 msgid " -x, --decode decode facility and level to readable string\n" msgstr " -x, --decode 将设施和级别解码为可读的字符串\n" -#: sys-utils/dmesg.c:301 +#: sys-utils/dmesg.c:293 msgid " -d, --show-delta show time delta between printed messages\n" msgstr " -d, --show-delta 显示打印消息之间的时间差\n" -#: sys-utils/dmesg.c:302 +#: sys-utils/dmesg.c:294 msgid " -e, --reltime show local time and time delta in readable format\n" msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n" -#: sys-utils/dmesg.c:303 +#: sys-utils/dmesg.c:295 msgid " -T, --ctime show human-readable timestamp (may be inaccurate!)\n" msgstr " -T, --ctime 显示易读的时间戳(可能不准确！)\n" -#: sys-utils/dmesg.c:304 +#: sys-utils/dmesg.c:296 msgid " -t, --notime don't show any timestamp with messages\n" msgstr " -t, --notime 不显示任何消息的时间戳\n" -#: sys-utils/dmesg.c:305 +#: sys-utils/dmesg.c:297 msgid "" " --time-format <format> show timestamp using the given format:\n" " [delta|reltime|ctime|notime|iso]\n" @@ -12001,7 +12096,7 @@ msgstr "" " [delta|reltime|ctime|notime|iso]\n" "挂起/恢复会使 ctime 和 iso 时间戳不精确。\n" -#: sys-utils/dmesg.c:310 +#: sys-utils/dmesg.c:302 msgid "" "\n" "Supported log facilities:\n" @@ -12009,7 +12104,7 @@ msgstr "" "\n" "支持的日志设施：\n" -#: sys-utils/dmesg.c:316 +#: sys-utils/dmesg.c:308 msgid "" "\n" "Supported log levels (priorities):\n" @@ -12017,48 +12112,48 @@ msgstr "" "\n" "支持的日志级别(优先级)：\n" -#: sys-utils/dmesg.c:370 +#: sys-utils/dmesg.c:362 #, c-format msgid "failed to parse level '%s'" msgstr "解析级别“%s”失败" -#: sys-utils/dmesg.c:372 +#: sys-utils/dmesg.c:364 #, c-format msgid "unknown level '%s'" msgstr "未知级别“%s”" -#: sys-utils/dmesg.c:408 +#: sys-utils/dmesg.c:400 #, c-format msgid "failed to parse facility '%s'" msgstr "解析设施“%s”失败" -#: sys-utils/dmesg.c:410 +#: sys-utils/dmesg.c:402 #, c-format msgid "unknown facility '%s'" msgstr "未知设施“%s”" -#: sys-utils/dmesg.c:538 +#: sys-utils/dmesg.c:530 #, c-format msgid "cannot mmap: %s" msgstr "无法 mmap：%s" -#: sys-utils/dmesg.c:1458 +#: sys-utils/dmesg.c:1436 msgid "invalid buffer size argument" msgstr "无效的 缓冲区大小 参数" -#: sys-utils/dmesg.c:1510 +#: sys-utils/dmesg.c:1488 msgid "--show-delta is ignored when used together with iso8601 time format" msgstr "--show-delta 与 iso8601 时间格式共用时将忽略" -#: sys-utils/dmesg.c:1533 +#: sys-utils/dmesg.c:1511 msgid "--raw can be used together with --level or --facility only when reading messages from /dev/kmsg" msgstr "只有从 /dev/kmsg 读消息时，--raw 才可与 --level 或 --facility 共用" -#: sys-utils/dmesg.c:1543 +#: sys-utils/dmesg.c:1526 msgid "read kernel buffer failed" msgstr "读取内核缓冲区失败" -#: sys-utils/dmesg.c:1562 +#: sys-utils/dmesg.c:1545 msgid "klogctl failed" msgstr "klogctl 失败" @@ -12175,7 +12270,7 @@ msgstr "此内核不支持 CD-ROM 关闭仓门命令\n" msgid "CD-ROM eject unsupported" msgstr "不支持 CD-ROM 弹出" -#: sys-utils/eject.c:432 sys-utils/eject.c:455 sys-utils/eject.c:1010 +#: sys-utils/eject.c:432 sys-utils/eject.c:455 sys-utils/eject.c:1006 msgid "CD-ROM eject command failed" msgstr "CD-ROM 弹出命令失败" @@ -12191,7 +12286,7 @@ msgstr "CD-ROM 驱动器未就绪" msgid "CD-ROM select speed command failed" msgstr "CD-ROM 选择速度命令失败" -#: sys-utils/eject.c:483 sys-utils/eject.c:569 +#: sys-utils/eject.c:483 msgid "CD-ROM select speed command not supported by this kernel" msgstr "此内核不支持 CD-ROM 选择速度命令" @@ -12209,190 +12304,185 @@ msgstr "%s：读 速度 失败" msgid "failed to read speed" msgstr "读 速度 失败" -#: sys-utils/eject.c:587 +#: sys-utils/eject.c:583 msgid "not an sg device, or old sg driver" msgstr "不是 sg 设备，或为旧 sg 驱动" -#: sys-utils/eject.c:659 +#: sys-utils/eject.c:655 #, c-format msgid "%s: unmounting" msgstr "%s：正在卸载" -#: sys-utils/eject.c:674 -#, c-format -msgid "unable to exec /bin/umount of `%s'" -msgstr "无法对“%s”执行 /bin/umount" - -#: sys-utils/eject.c:677 +#: sys-utils/eject.c:673 msgid "unable to fork" msgstr "无法 fork" -#: sys-utils/eject.c:684 +#: sys-utils/eject.c:680 #, c-format msgid "unmount of `%s' did not exit normally" msgstr "卸载“%s”未正常退出" -#: sys-utils/eject.c:687 +#: sys-utils/eject.c:683 #, c-format msgid "unmount of `%s' failed\n" msgstr "挂臷“%s”失败\n" -#: sys-utils/eject.c:729 +#: sys-utils/eject.c:725 msgid "failed to parse mount table" msgstr "解析挂臷表失败" -#: sys-utils/eject.c:790 sys-utils/eject.c:891 +#: sys-utils/eject.c:786 sys-utils/eject.c:887 #, c-format msgid "%s: mounted on %s" msgstr "%s：已挂臷于 %s" -#: sys-utils/eject.c:832 +#: sys-utils/eject.c:828 msgid "setting CD-ROM speed to auto" msgstr "正在将 CD-ROM 速度设置为自动" -#: sys-utils/eject.c:834 +#: sys-utils/eject.c:830 #, c-format msgid "setting CD-ROM speed to %ldX" msgstr "正在将 CD-ROM 速度设置为 %ldX" -#: sys-utils/eject.c:860 +#: sys-utils/eject.c:856 #, c-format msgid "default device: `%s'" msgstr "默认设备：“%s”" -#: sys-utils/eject.c:866 +#: sys-utils/eject.c:862 #, c-format msgid "using default device `%s'" msgstr "使用默认设备“%s”" -#: sys-utils/eject.c:885 sys-utils/rtcwake.c:374 +#: sys-utils/eject.c:881 sys-utils/rtcwake.c:394 #, c-format msgid "%s: unable to find device" msgstr "%s：找不到设备" -#: sys-utils/eject.c:887 +#: sys-utils/eject.c:883 #, c-format msgid "device name is `%s'" msgstr "设备名称为“%s”" -#: sys-utils/eject.c:893 sys-utils/umount.c:309 sys-utils/umount.c:332 +#: sys-utils/eject.c:889 sys-utils/umount.c:309 sys-utils/umount.c:332 #, c-format msgid "%s: not mounted" msgstr "%s：未挂载" -#: sys-utils/eject.c:897 +#: sys-utils/eject.c:893 #, c-format msgid "%s: disc device: %s (disk device will be used for eject)" msgstr "%s：盘设备：%s(盘设备将用于弹出)" -#: sys-utils/eject.c:905 +#: sys-utils/eject.c:901 #, c-format msgid "%s: not found mountpoint or device with the given name" msgstr "%s：未找到指定名称的挂载点或设备" -#: sys-utils/eject.c:908 +#: sys-utils/eject.c:904 #, c-format msgid "%s: is whole-disk device" msgstr "%s：是 整盘 设备" -#: sys-utils/eject.c:912 +#: sys-utils/eject.c:908 #, c-format msgid "%s: is not hot-pluggable device" msgstr "%s：不是热插拔设备" -#: sys-utils/eject.c:916 +#: sys-utils/eject.c:912 #, c-format msgid "device is `%s'" msgstr "设备是“%s”" -#: sys-utils/eject.c:917 +#: sys-utils/eject.c:913 msgid "exiting due to -n/--noop option" msgstr "将因 -n/--noop 选项退出" -#: sys-utils/eject.c:931 +#: sys-utils/eject.c:927 #, c-format msgid "%s: enabling auto-eject mode" msgstr "%s：正在启用自动弹出模式" -#: sys-utils/eject.c:933 +#: sys-utils/eject.c:929 #, c-format msgid "%s: disabling auto-eject mode" msgstr "%s：正在禁用自动弹出模式" -#: sys-utils/eject.c:941 +#: sys-utils/eject.c:937 #, c-format msgid "%s: closing tray" msgstr "%s：正在关闭仓门" -#: sys-utils/eject.c:950 +#: sys-utils/eject.c:946 #, c-format msgid "%s: toggling tray" msgstr "%s：开关仓门" -#: sys-utils/eject.c:959 +#: sys-utils/eject.c:955 #, c-format msgid "%s: listing CD-ROM speed" msgstr "%s：正在列出 CD-ROM 速度" -#: sys-utils/eject.c:985 +#: sys-utils/eject.c:981 #, c-format msgid "error: %s: device in use" msgstr "错误：%s：设备正在使用" -#: sys-utils/eject.c:991 +#: sys-utils/eject.c:987 #, c-format msgid "%s: selecting CD-ROM disc #%ld" msgstr "%s：正在选择 CD-ROM 盘 #%ld" -#: sys-utils/eject.c:1007 +#: sys-utils/eject.c:1003 #, c-format msgid "%s: trying to eject using CD-ROM eject command" msgstr "%s：正在尝试使用 CD-ROM 弹出命令弹出" -#: sys-utils/eject.c:1009 +#: sys-utils/eject.c:1005 msgid "CD-ROM eject command succeeded" msgstr "CD-ROM 弹出命令成功" -#: sys-utils/eject.c:1014 +#: sys-utils/eject.c:1010 #, c-format msgid "%s: trying to eject using SCSI commands" msgstr "%s：正在尝试使用 SCSI 命令弹出" -#: sys-utils/eject.c:1016 +#: sys-utils/eject.c:1012 msgid "SCSI eject succeeded" msgstr "SCSI 弹出成功" -#: sys-utils/eject.c:1017 +#: sys-utils/eject.c:1013 msgid "SCSI eject failed" msgstr "SCSI 弹出失败" -#: sys-utils/eject.c:1021 +#: sys-utils/eject.c:1017 #, c-format msgid "%s: trying to eject using floppy eject command" msgstr "%s：正在尝试使用软盘弹出命令弹出" -#: sys-utils/eject.c:1023 +#: sys-utils/eject.c:1019 msgid "floppy eject command succeeded" msgstr "软盘弹出命令成功" -#: sys-utils/eject.c:1024 +#: sys-utils/eject.c:1020 msgid "floppy eject command failed" msgstr "软盘弹出命令失败" -#: sys-utils/eject.c:1028 +#: sys-utils/eject.c:1024 #, c-format msgid "%s: trying to eject using tape offline command" msgstr "%s：正在尝试使用磁带离线命令弹出" -#: sys-utils/eject.c:1030 +#: sys-utils/eject.c:1026 msgid "tape offline command succeeded" msgstr "磁带离线命令成功" -#: sys-utils/eject.c:1031 +#: sys-utils/eject.c:1027 msgid "tape offline command failed" msgstr "磁带离线命令失败" -#: sys-utils/eject.c:1035 +#: sys-utils/eject.c:1031 msgid "unable to eject" msgstr "无法弹出" @@ -12450,33 +12540,33 @@ msgstr "fallocate 失败；不支持保持大小(keep size) 模式" msgid "fallocate failed" msgstr "fallocate 失败" -#: sys-utils/fallocate.c:234 +#: sys-utils/fallocate.c:230 #, c-format msgid "%s: read failed" msgstr "%s：read 失败" -#: sys-utils/fallocate.c:280 +#: sys-utils/fallocate.c:271 #, c-format msgid "%s: %s (%ju bytes) converted to sparse holes.\n" msgstr "%s：已将 %s(%ju 字节) 转换为稀疏空洞。\n" -#: sys-utils/fallocate.c:363 +#: sys-utils/fallocate.c:354 msgid "posix_fallocate support is not compiled" msgstr "" -#: sys-utils/fallocate.c:377 sys-utils/fsfreeze.c:107 +#: sys-utils/fallocate.c:368 sys-utils/fsfreeze.c:107 msgid "no filename specified" msgstr "未指定文件名" -#: sys-utils/fallocate.c:389 sys-utils/fallocate.c:395 +#: sys-utils/fallocate.c:380 sys-utils/fallocate.c:386 msgid "invalid length value specified" msgstr "指定的长度值无效" -#: sys-utils/fallocate.c:393 +#: sys-utils/fallocate.c:384 msgid "no length argument specified" msgstr "没有指定长度参数" -#: sys-utils/fallocate.c:398 +#: sys-utils/fallocate.c:389 msgid "invalid offset value specified" msgstr "指定的偏移值无效" @@ -12620,83 +12710,84 @@ msgstr "%s：冻结失败" msgid "%s: unfreeze failed" msgstr "%s：解冻失败" -#: sys-utils/fstrim.c:82 +#: sys-utils/fstrim.c:81 #, c-format msgid "%s: not a directory" msgstr "%s：不是一个目录" -#: sys-utils/fstrim.c:91 +#: sys-utils/fstrim.c:90 #, c-format msgid "%s: FITRIM ioctl failed" msgstr "%s：FITRIM ioctl 失败" #. TRANSLATORS: The standard value here is a very large number. -#: sys-utils/fstrim.c:100 +#: sys-utils/fstrim.c:99 #, c-format msgid "%s: %s (%<PRIu64> bytes) trimmed\n" msgstr "%s：%s (%<PRIu64> 字节) 已修剪\n" -#: sys-utils/fstrim.c:191 sys-utils/swapon.c:734 sys-utils/umount.c:229 +#: sys-utils/fstrim.c:190 sys-utils/lsns.c:1069 sys-utils/swapon.c:733 +#: sys-utils/umount.c:229 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" -#: sys-utils/fstrim.c:252 +#: sys-utils/fstrim.c:251 #, c-format msgid " %s [options] <mount point>\n" msgstr " %s [选项] <挂臷点>\n" -#: sys-utils/fstrim.c:255 +#: sys-utils/fstrim.c:254 msgid "Discard unused blocks on a mounted filesystem.\n" msgstr "忽略已挂载文件系统上的未用锁。\n" -#: sys-utils/fstrim.c:258 +#: sys-utils/fstrim.c:257 msgid " -a, --all trim all mounted filesystems that are supported\n" msgstr " -a, --all 修剪不支持的所有已挂载文件系统\n" -#: sys-utils/fstrim.c:259 +#: sys-utils/fstrim.c:258 msgid " -o, --offset <num> the offset in bytes to start discarding from\n" msgstr " -o, --offset <数字> 开始丢弃的偏移量(字节)\n" -#: sys-utils/fstrim.c:260 +#: sys-utils/fstrim.c:259 msgid " -l, --length <num> the number of bytes to discard\n" msgstr " -l, --length <数字> 要丢弃的字符数\n" -#: sys-utils/fstrim.c:261 +#: sys-utils/fstrim.c:260 msgid " -m, --minimum <num> the minimum extent length to discard\n" msgstr " -m, --minimum <数字> 要丢弃的最小限制长度\n" -#: sys-utils/fstrim.c:262 +#: sys-utils/fstrim.c:261 msgid " -v, --verbose print number of discarded bytes\n" msgstr " -v, --verbose 打印丢弃的字节数\n" -#: sys-utils/fstrim.c:316 +#: sys-utils/fstrim.c:315 msgid "failed to parse minimum extent length" msgstr "解析 最小范围长度 失败" -#: sys-utils/fstrim.c:329 +#: sys-utils/fstrim.c:328 msgid "no mountpoint specified" msgstr "未指定挂载点" -#: sys-utils/fstrim.c:343 +#: sys-utils/fstrim.c:342 #, c-format msgid "%s: the discard operation is not supported" msgstr "%s：不支持丢弃操作" -#: sys-utils/hwclock.c:183 +#: sys-utils/hwclock.c:203 #, c-format msgid "Assuming hardware clock is kept in %s time.\n" msgstr "将假设硬件时钟保持为 %s 时间。\n" -#: sys-utils/hwclock.c:184 sys-utils/hwclock.c:248 +#: sys-utils/hwclock.c:204 sys-utils/hwclock.c:268 msgid "UTC" msgstr "UTC" -#: sys-utils/hwclock.c:184 sys-utils/hwclock.c:247 +#: sys-utils/hwclock.c:204 sys-utils/hwclock.c:267 msgid "local" msgstr "当地" -#: sys-utils/hwclock.c:234 +#: sys-utils/hwclock.c:254 msgid "" "Warning: unrecognized third line in adjtime file\n" "(Expected: `UTC' or `LOCAL' or nothing.)" @@ -12704,77 +12795,67 @@ msgstr "" "警告：adjtime 文件第三行无法识别\n" "(应为：“UTC”或“LOCAL”或空)" -#: sys-utils/hwclock.c:241 +#: sys-utils/hwclock.c:261 #, c-format msgid "Last drift adjustment done at %ld seconds after 1969\n" msgstr "上次漂移调整完成于1969(年)后 %ld 秒\n" -#: sys-utils/hwclock.c:243 +#: sys-utils/hwclock.c:263 #, c-format msgid "Last calibration done at %ld seconds after 1969\n" msgstr "上次校准完成于1969(年)后 %ld 秒\n" -#: sys-utils/hwclock.c:245 +#: sys-utils/hwclock.c:265 #, c-format msgid "Hardware clock is on %s time\n" msgstr "硬件时钟为 %s 时间\n" -#: sys-utils/hwclock.c:272 +#: sys-utils/hwclock.c:292 #, c-format msgid "Waiting for clock tick...\n" msgstr "正在等等时钟滴答...\n" -#: sys-utils/hwclock.c:278 +#: sys-utils/hwclock.c:298 #, c-format msgid "...synchronization failed\n" msgstr "...同步失败\n" -#: sys-utils/hwclock.c:280 +#: sys-utils/hwclock.c:300 #, c-format msgid "...got clock tick\n" msgstr "...已获取时钟滴答\n" -#: sys-utils/hwclock.c:321 +#: sys-utils/hwclock.c:341 #, 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:329 +#: sys-utils/hwclock.c:349 #, 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:356 +#: sys-utils/hwclock.c:376 #, 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:383 +#: sys-utils/hwclock.c:403 #, 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:479 -#, c-format -msgid "sleeping ~%d usec\n" -msgstr "将睡眠 ~%d 微秒\n" - -#: sys-utils/hwclock.c:490 +#: sys-utils/hwclock.c:505 #, c-format msgid "time jumped backward %.6f seconds to %ld.%06ld - retargeting\n" msgstr "时间倒退了 %.6f 秒到 %ld.%06ld - 正在重新定位\n" -#: sys-utils/hwclock.c:498 -#, c-format -msgid "%ld.%06ld < %ld.%06ld (%.6f)\n" -msgstr "%ld.%06ld < %ld.%06ld (%.6f)\n" - -#: sys-utils/hwclock.c:514 +#: sys-utils/hwclock.c:527 #, c-format msgid "missed it - %ld.%06ld is too far past %ld.%06ld (%.6f > %.6f)\n" msgstr "错过了- %ld.%06ld 在 %ld.%06ld 之后太长时间了(%.6f > %.6f)\n" -#: sys-utils/hwclock.c:542 +#: sys-utils/hwclock.c:555 #, fuzzy, c-format msgid "" "%ld.%06ld is close enough to %ld.%06ld (%.6f < %.6f)\n" @@ -12783,43 +12864,43 @@ msgstr "" "%ld.%06d 距 %ld.%06d 太近(%.6f < %.6f)\n" "请将 RTC 设为 %ld (%ld + %d; refsystime = %ld.%06d)\n" -#: sys-utils/hwclock.c:617 +#: sys-utils/hwclock.c:625 #, c-format msgid "Calling settimeofday(NULL, %d) to set persistent_clock_is_local.\n" msgstr "" -#: sys-utils/hwclock.c:620 +#: sys-utils/hwclock.c:628 msgid "Calling settimeofday(NULL, 0) to lock the warp function." msgstr "" -#: sys-utils/hwclock.c:623 +#: sys-utils/hwclock.c:631 #, fuzzy, c-format msgid "Calling settimeofday(%ld.%06ld, %d)\n" msgstr "正在调用 settimeofday：\n" -#: sys-utils/hwclock.c:626 +#: sys-utils/hwclock.c:634 #, fuzzy, c-format msgid "Calling settimeofday(NULL, %d) " msgstr "正在调用 settimeofday：\n" -#: sys-utils/hwclock.c:628 +#: sys-utils/hwclock.c:636 msgid "to set the kernel timezone." msgstr "" -#: sys-utils/hwclock.c:630 +#: sys-utils/hwclock.c:638 msgid "to warp System time." msgstr "" -#: sys-utils/hwclock.c:647 +#: sys-utils/hwclock.c:655 msgid "settimeofday() failed" msgstr "settimeofday() 失败" -#: sys-utils/hwclock.c:671 +#: sys-utils/hwclock.c:679 #, c-format msgid "Not adjusting drift factor because the --update-drift option was not used.\n" msgstr "将不调整漂移系数，因为没有使用 --update-drift 选项。\n" -#: sys-utils/hwclock.c:675 +#: sys-utils/hwclock.c:683 #, c-format msgid "" "Not adjusting drift factor because last calibration time is zero,\n" @@ -12828,12 +12909,12 @@ msgstr "" "将不调整漂移系数，因为上次校准时间为零，\n" "历史有问题；需要启动校准。\n" -#: sys-utils/hwclock.c:681 +#: sys-utils/hwclock.c:689 #, c-format msgid "Not adjusting drift factor because it has been less than four hours since the last calibration.\n" msgstr "将不调整漂移系数，因为距上次校正不到四个小时。\n" -#: sys-utils/hwclock.c:719 +#: sys-utils/hwclock.c:727 #, c-format msgid "" "Clock drift factor was calculated as %f seconds/day.\n" @@ -12842,7 +12923,7 @@ msgstr "" "时钟漂移系数会按 %f 秒/天计算。\n" "系数过大，将重置为 0。\n" -#: sys-utils/hwclock.c:726 +#: sys-utils/hwclock.c:734 #, fuzzy, c-format msgid "" "Clock drifted %f seconds in the past %f seconds\n" @@ -12850,229 +12931,234 @@ msgid "" "Adjusting drift factor by %f seconds/day\n" msgstr "在过去的 %2$d 秒内，时钟漂移了 %1$.1f 秒，而漂移系数为 %3$f 秒/天。会将漂移系数调整 %4$f 秒/天\n" -#: sys-utils/hwclock.c:770 +#: sys-utils/hwclock.c:778 #, fuzzy, c-format msgid "Time since last adjustment is %ld second\n" msgid_plural "Time since last adjustment is %ld seconds\n" msgstr[0] "距上次调整的时间为 %d 秒\n" -#: sys-utils/hwclock.c:774 +#: sys-utils/hwclock.c:782 #, c-format msgid "Calculated Hardware Clock drift is %ld.%06ld seconds\n" msgstr "计算出的硬件锁偏差为 %ld.%06ld 秒\n" -#: sys-utils/hwclock.c:799 +#: sys-utils/hwclock.c:807 #, c-format msgid "" "New %s data:\n" "%s" msgstr "" -#: sys-utils/hwclock.c:809 +#: sys-utils/hwclock.c:817 #, fuzzy, c-format msgid "cannot update %s" msgstr "打不开 %s" -#: sys-utils/hwclock.c:845 +#: sys-utils/hwclock.c:853 #, c-format msgid "Not setting clock because last adjustment time is zero, so history is bad.\n" msgstr "将不设置时钟，因为上次调整时间为零，历史有误。\n" -#: sys-utils/hwclock.c:849 +#: sys-utils/hwclock.c:857 #, c-format msgid "Not setting clock because drift factor %f is far too high.\n" msgstr "将不设置时钟，因为上次漂移系数 %f 过高。\n" -#: sys-utils/hwclock.c:877 +#: sys-utils/hwclock.c:885 #, c-format msgid "No usable clock interface found.\n" msgstr "未找到可用的时钟接口。\n" -#: sys-utils/hwclock.c:878 +#: sys-utils/hwclock.c:886 msgid "Cannot access the Hardware Clock via any known method." msgstr "无法通过已知的任何方式访问硬件时钟。" -#: sys-utils/hwclock.c:881 -msgid "Use the --debug option to see the details of our search for an access method." +#: sys-utils/hwclock.c:889 +#, fuzzy +msgid "Use the --verbose option to see the details of our search for an access method." msgstr "请使用 --debug 选项来观察程序搜索访问方法的详情。" -#: sys-utils/hwclock.c:931 +#: sys-utils/hwclock.c:939 #, c-format msgid "Target date: %ld\n" msgstr "" -#: sys-utils/hwclock.c:932 +#: sys-utils/hwclock.c:940 #, c-format msgid "Predicted RTC: %ld\n" msgstr "" -#: sys-utils/hwclock.c:963 +#: sys-utils/hwclock.c:970 msgid "RTC read returned an invalid value." msgstr "" -#: sys-utils/hwclock.c:991 +#: sys-utils/hwclock.c:998 #, c-format msgid "Needed adjustment is less than one second, so not setting clock.\n" msgstr "需要的调整不到一秒，将不设置时钟。\n" -#: sys-utils/hwclock.c:1028 +#: sys-utils/hwclock.c:1035 #, fuzzy msgid "unable to read the RTC epoch." msgstr "不能读超级块" -#: sys-utils/hwclock.c:1030 +#: sys-utils/hwclock.c:1037 #, c-format msgid "The RTC epoch is set to %lu.\n" msgstr "" -#: sys-utils/hwclock.c:1033 +#: sys-utils/hwclock.c:1040 msgid "--epoch is required for --setepoch." msgstr "" -#: sys-utils/hwclock.c:1036 +#: sys-utils/hwclock.c:1043 #, fuzzy msgid "unable to set the RTC epoch." msgstr "无法设置系统时钟。\n" -#: sys-utils/hwclock.c:1050 +#: sys-utils/hwclock.c:1057 #, fuzzy, c-format msgid " %s [function] [option...]\n" msgstr " hwclock [功能] [选项...]\n" -#: sys-utils/hwclock.c:1053 +#: sys-utils/hwclock.c:1060 msgid "Time clocks utility." msgstr "" -#: sys-utils/hwclock.c:1056 +#: sys-utils/hwclock.c:1063 #, fuzzy msgid " -r, --show display the RTC time" msgstr " -r, --raw 以原始方式显示\n" -#: sys-utils/hwclock.c:1057 +#: sys-utils/hwclock.c:1064 #, fuzzy msgid " --get display drift corrected RTC time" msgstr " -Z, --context 显示 SELinux 环境\n" -#: sys-utils/hwclock.c:1058 +#: sys-utils/hwclock.c:1065 #, fuzzy msgid " --set set the RTC according to --date" msgstr " -r, --reset 重置端口\n" -#: sys-utils/hwclock.c:1059 +#: sys-utils/hwclock.c:1066 msgid " -s, --hctosys set the system time from the RTC" msgstr "" -#: sys-utils/hwclock.c:1060 +#: sys-utils/hwclock.c:1067 #, fuzzy msgid " -w, --systohc set the RTC from the system time" msgstr " -t, --types <列表> 限制文件系统集合\n" -#: sys-utils/hwclock.c:1061 +#: sys-utils/hwclock.c:1068 msgid " --systz send timescale configurations to the kernel" msgstr "" -#: sys-utils/hwclock.c:1062 +#: sys-utils/hwclock.c:1069 msgid " -a, --adjust adjust the RTC to account for systematic drift" msgstr "" -#: sys-utils/hwclock.c:1064 +#: sys-utils/hwclock.c:1071 #, fuzzy msgid " --getepoch display the RTC epoch" msgstr " --help 显示此帮助并退出\n" -#: sys-utils/hwclock.c:1065 +#: sys-utils/hwclock.c:1072 msgid " --setepoch set the RTC epoch according to --epoch" msgstr "" -#: sys-utils/hwclock.c:1067 +#: sys-utils/hwclock.c:1074 msgid " --predict predict the drifted RTC time according to --date" msgstr "" -#: sys-utils/hwclock.c:1069 +#: sys-utils/hwclock.c:1076 #, fuzzy msgid " -u, --utc the RTC timescale is UTC" msgstr " -u, --utc RTC 使用 UTC\n" -#: sys-utils/hwclock.c:1070 +#: sys-utils/hwclock.c:1077 #, fuzzy msgid " -l, --localtime the RTC timescale is Local" msgstr " -l, --local RTC 使用本地时区\n" -#: sys-utils/hwclock.c:1073 +#: sys-utils/hwclock.c:1080 #, fuzzy, c-format msgid " -f, --rtc <file> use an alternate file to %1$s\n" msgstr " -F, --file <文件> 用指定文件代替 %s\n" -#: sys-utils/hwclock.c:1076 +#: sys-utils/hwclock.c:1083 #, c-format msgid " --directisa use the ISA bus instead of %1$s access\n" msgstr "" -#: sys-utils/hwclock.c:1077 +#: sys-utils/hwclock.c:1084 #, fuzzy msgid " --date <time> date/time input for --set and --predict" msgstr " --date <时间戳> 唤醒时间戳的日期时间\n" -#: sys-utils/hwclock.c:1079 +#: sys-utils/hwclock.c:1086 msgid " --epoch <year> epoch input for --setepoch" msgstr "" -#: sys-utils/hwclock.c:1081 +#: sys-utils/hwclock.c:1088 msgid " --update-drift update the RTC drift factor" msgstr "" -#: sys-utils/hwclock.c:1083 +#: sys-utils/hwclock.c:1090 #, fuzzy, c-format msgid " --noadjfile do not use %1$s\n" msgstr " --noheadings 不打印标题\n" -#: sys-utils/hwclock.c:1085 +#: sys-utils/hwclock.c:1092 #, fuzzy, c-format msgid " --adjfile <file> use an alternate file to %1$s\n" msgstr " -F, --file <文件> 用指定文件代替 %s\n" -#: sys-utils/hwclock.c:1086 +#: sys-utils/hwclock.c:1093 #, fuzzy -msgid " --test dry run; implies --debug" +msgid " --test dry run; implies --verbose" msgstr " --fake 空运行；跳过 umount(2) 系统调用\n" -#: sys-utils/hwclock.c:1087 +#: sys-utils/hwclock.c:1094 #, fuzzy -msgid " -D, --debug display more details" +msgid " -v, --verbose display more details" msgstr " --verbose 打印更多细节\n" -#: sys-utils/hwclock.c:1177 +#: sys-utils/hwclock.c:1186 msgid "Unable to connect to audit system" msgstr "无法连接到审计系统" -#: sys-utils/hwclock.c:1295 +#: sys-utils/hwclock.c:1210 +msgid "use --verbose, --debug has been deprecated." +msgstr "" + +#: sys-utils/hwclock.c:1309 #, fuzzy, c-format msgid "%d too many arguments given" msgstr "参数过多" -#: sys-utils/hwclock.c:1303 +#: sys-utils/hwclock.c:1317 msgid "--update-drift requires --set or --systohc" msgstr "" -#: sys-utils/hwclock.c:1308 +#: sys-utils/hwclock.c:1322 msgid "With --noadjfile, you must specify either --utc or --localtime" msgstr "指定 --noadjfile 时，您必须指定 --utc 或 --localtime" -#: sys-utils/hwclock.c:1315 +#: sys-utils/hwclock.c:1329 msgid "--date is required for --set or --predict" msgstr "" -#: sys-utils/hwclock.c:1321 +#: sys-utils/hwclock.c:1335 #, fuzzy, c-format msgid "invalid date '%s'" msgstr "无效 ID：%s" -#: sys-utils/hwclock.c:1335 +#: sys-utils/hwclock.c:1349 #, fuzzy, c-format msgid "System Time: %ld.%06ld\n" msgstr "当前系统时间：%ld = %s\n" -#: sys-utils/hwclock.c:1351 +#: sys-utils/hwclock.c:1365 #, fuzzy msgid "Test mode: nothing was changed." msgstr "上次更改时间" @@ -13196,7 +13282,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:715 sys-utils/zramctl.c:633 +#: sys-utils/ipcmk.c:110 sys-utils/losetup.c:715 sys-utils/zramctl.c:629 msgid "failed to parse size" msgstr "解析大小失败" @@ -14316,114 +14402,109 @@ msgstr "%s︰ 设置直接 io 失败" msgid "%s: set logical block size failed" msgstr "%s：获取大小失败" -#: sys-utils/lscpu.c:108 +#: sys-utils/lscpu.c:95 msgid "none" msgstr "无" -#: sys-utils/lscpu.c:109 +#: sys-utils/lscpu.c:96 msgid "para" msgstr "半" -#: sys-utils/lscpu.c:110 +#: sys-utils/lscpu.c:97 msgid "full" msgstr "完全" -#: sys-utils/lscpu.c:111 +#: sys-utils/lscpu.c:98 msgid "container" msgstr "容器" -#: sys-utils/lscpu.c:173 +#: sys-utils/lscpu.c:141 msgid "horizontal" msgstr "水平" -#: sys-utils/lscpu.c:174 +#: sys-utils/lscpu.c:142 msgid "vertical" msgstr "竖直" -#: sys-utils/lscpu.c:347 +#: sys-utils/lscpu.c:194 msgid "logical CPU number" msgstr "逻辑 CPU 数量" -#: sys-utils/lscpu.c:348 +#: sys-utils/lscpu.c:195 msgid "logical core number" msgstr "逻辑核心数量" -#: sys-utils/lscpu.c:349 +#: sys-utils/lscpu.c:196 msgid "logical socket number" msgstr "逻辑(CPU)座数量" -#: sys-utils/lscpu.c:350 +#: sys-utils/lscpu.c:197 msgid "logical NUMA node number" msgstr "逻辑 NUMA 节点数量" -#: sys-utils/lscpu.c:351 +#: sys-utils/lscpu.c:198 msgid "logical book number" msgstr "逻辑 book 数" -#: sys-utils/lscpu.c:352 +#: sys-utils/lscpu.c:199 msgid "logical drawer number" msgstr "逻辑抽屉号" -#: sys-utils/lscpu.c:353 +#: sys-utils/lscpu.c:200 msgid "shows how caches are shared between CPUs" msgstr "显示 CPU 间是如何共享缓存的" -#: sys-utils/lscpu.c:354 +#: sys-utils/lscpu.c:201 msgid "CPU dispatching mode on virtual hardware" msgstr "虚拟硬件上的 CPU 调度模式" -#: sys-utils/lscpu.c:355 +#: sys-utils/lscpu.c:202 msgid "physical address of a CPU" msgstr "CPU 的物理地址" -#: sys-utils/lscpu.c:356 +#: sys-utils/lscpu.c:203 msgid "shows if the hypervisor has allocated the CPU" msgstr "显示超级监督(hypervisor)是否分配了 CPU" -#: sys-utils/lscpu.c:357 +#: sys-utils/lscpu.c:204 msgid "shows if Linux currently makes use of the CPU" msgstr "显示 Linux 当前是否在使用该 CPU" -#: sys-utils/lscpu.c:358 +#: sys-utils/lscpu.c:205 msgid "shows the maximum MHz of the CPU" msgstr "显示 CPU 的最大 MHz" -#: sys-utils/lscpu.c:359 +#: sys-utils/lscpu.c:206 msgid "shows the minimum MHz of the CPU" msgstr "显示 CPU 的最小 MHz" -#: sys-utils/lscpu.c:551 +#: sys-utils/lscpu.c:399 msgid "error: uname failed" msgstr "错误：uname 失败" -#: sys-utils/lscpu.c:635 +#: sys-utils/lscpu.c:486 #, c-format msgid "failed to determine number of CPUs: %s" msgstr "确定 CPU 数 失败：%s" -#: sys-utils/lscpu.c:897 +#: sys-utils/lscpu.c:748 #, fuzzy msgid "cannot restore signal handler" msgstr "无法设置信号处理函数" -#: sys-utils/lscpu.c:958 -#, c-format -msgid "failed to read from: %s" -msgstr "读取失败︰ %s" - -#: sys-utils/lscpu.c:1459 +#: sys-utils/lscpu.c:1307 msgid "Failed to extract the node number" msgstr "提取节点号失败" -#: sys-utils/lscpu.c:1585 sys-utils/lscpu.c:1595 +#: sys-utils/lscpu.c:1433 sys-utils/lscpu.c:1443 msgid "Y" msgstr "Y" -#: sys-utils/lscpu.c:1585 sys-utils/lscpu.c:1595 +#: sys-utils/lscpu.c:1433 sys-utils/lscpu.c:1443 msgid "N" msgstr "N" -#: sys-utils/lscpu.c:1679 +#: sys-utils/lscpu.c:1527 #, c-format msgid "" "# The following is the parsable format, which can be fed to other\n" @@ -14433,211 +14514,211 @@ msgstr "" "# 以下是可解析格式，可以输给其他程序。每列中的各个不同项有一个惟一\n" "# 的从 0 开始的 ID。\n" -#: sys-utils/lscpu.c:1876 +#: sys-utils/lscpu.c:1724 msgid "Architecture:" msgstr "架构：" -#: sys-utils/lscpu.c:1889 +#: sys-utils/lscpu.c:1737 msgid "CPU op-mode(s):" msgstr "CPU 运行模式：" -#: sys-utils/lscpu.c:1892 sys-utils/lscpu.c:1894 +#: sys-utils/lscpu.c:1740 sys-utils/lscpu.c:1742 msgid "Byte Order:" msgstr "字节序：" -#: sys-utils/lscpu.c:1896 +#: sys-utils/lscpu.c:1744 msgid "CPU(s):" msgstr "CPU:" -#: sys-utils/lscpu.c:1899 +#: sys-utils/lscpu.c:1747 msgid "On-line CPU(s) mask:" msgstr "在线 CPU 掩码：" -#: sys-utils/lscpu.c:1900 +#: sys-utils/lscpu.c:1748 msgid "On-line CPU(s) list:" msgstr "在线 CPU 列表：" -#: sys-utils/lscpu.c:1919 +#: sys-utils/lscpu.c:1767 msgid "Off-line CPU(s) mask:" msgstr "离线 CPU 掩码：" -#: sys-utils/lscpu.c:1920 +#: sys-utils/lscpu.c:1768 msgid "Off-line CPU(s) list:" msgstr "离线 CPU 列表：" -#: sys-utils/lscpu.c:1955 +#: sys-utils/lscpu.c:1803 msgid "Thread(s) per core:" msgstr "每个核的线程数：" -#: sys-utils/lscpu.c:1957 +#: sys-utils/lscpu.c:1805 msgid "Core(s) per socket:" msgstr "每个座的核数：" -#: sys-utils/lscpu.c:1960 +#: sys-utils/lscpu.c:1808 msgid "Socket(s) per book:" msgstr "每个 book 的座数：" -#: sys-utils/lscpu.c:1963 +#: sys-utils/lscpu.c:1811 msgid "Book(s) per drawer:" msgstr "每个抽屉里的 Book 数︰" -#: sys-utils/lscpu.c:1965 +#: sys-utils/lscpu.c:1813 msgid "Drawer(s):" msgstr "抽屉：" -#: sys-utils/lscpu.c:1967 +#: sys-utils/lscpu.c:1815 msgid "Book(s):" msgstr "Book：" -#: sys-utils/lscpu.c:1970 +#: sys-utils/lscpu.c:1818 msgid "Socket(s):" msgstr "座：" -#: sys-utils/lscpu.c:1974 +#: sys-utils/lscpu.c:1822 msgid "NUMA node(s):" msgstr "NUMA 节点：" -#: sys-utils/lscpu.c:1976 +#: sys-utils/lscpu.c:1824 msgid "Vendor ID:" msgstr "厂商 ID：" -#: sys-utils/lscpu.c:1978 +#: sys-utils/lscpu.c:1826 msgid "Machine type:" msgstr "机器类型︰" -#: sys-utils/lscpu.c:1980 +#: sys-utils/lscpu.c:1828 msgid "CPU family:" msgstr "CPU 系列：" -#: sys-utils/lscpu.c:1982 +#: sys-utils/lscpu.c:1830 msgid "Model:" msgstr "型号：" -#: sys-utils/lscpu.c:1984 +#: sys-utils/lscpu.c:1832 msgid "Model name:" msgstr "型号名称：" -#: sys-utils/lscpu.c:1986 +#: sys-utils/lscpu.c:1834 msgid "Stepping:" msgstr "步进：" -#: sys-utils/lscpu.c:1988 +#: sys-utils/lscpu.c:1836 msgid "CPU MHz:" msgstr "CPU MHz：" -#: sys-utils/lscpu.c:1990 +#: sys-utils/lscpu.c:1838 msgid "CPU dynamic MHz:" msgstr "CPU 动态 MHz:" -#: sys-utils/lscpu.c:1992 +#: sys-utils/lscpu.c:1840 msgid "CPU static MHz:" msgstr "CPU 静态 MHz:" -#: sys-utils/lscpu.c:1994 +#: sys-utils/lscpu.c:1842 msgid "CPU max MHz:" msgstr "CPU 最大 MHz：" -#: sys-utils/lscpu.c:1996 +#: sys-utils/lscpu.c:1844 msgid "CPU min MHz:" msgstr "CPU 最小 MHz：" -#: sys-utils/lscpu.c:1998 +#: sys-utils/lscpu.c:1846 msgid "BogoMIPS:" msgstr "BogoMIPS：" -#: sys-utils/lscpu.c:2001 sys-utils/lscpu.c:2003 +#: sys-utils/lscpu.c:1849 sys-utils/lscpu.c:1851 msgid "Virtualization:" msgstr "虚拟化：" -#: sys-utils/lscpu.c:2006 +#: sys-utils/lscpu.c:1854 msgid "Hypervisor:" msgstr "超管理器：" -#: sys-utils/lscpu.c:2008 +#: sys-utils/lscpu.c:1856 msgid "Hypervisor vendor:" msgstr "超管理器厂商：" -#: sys-utils/lscpu.c:2009 +#: sys-utils/lscpu.c:1857 msgid "Virtualization type:" msgstr "虚拟化类型：" -#: sys-utils/lscpu.c:2012 +#: sys-utils/lscpu.c:1860 msgid "Dispatching mode:" msgstr "分派模式：" -#: sys-utils/lscpu.c:2016 sys-utils/lscpu.c:2023 +#: sys-utils/lscpu.c:1864 sys-utils/lscpu.c:1871 #, c-format msgid "%s cache:" msgstr "%s 缓存：" -#: sys-utils/lscpu.c:2029 +#: sys-utils/lscpu.c:1877 #, c-format msgid "NUMA node%d CPU(s):" msgstr "NUMA 节点%d CPU：" -#: sys-utils/lscpu.c:2034 +#: sys-utils/lscpu.c:1882 msgid "Physical sockets:" msgstr "物理套接字︰" -#: sys-utils/lscpu.c:2035 +#: sys-utils/lscpu.c:1883 msgid "Physical chips:" msgstr "物理芯片︰" -#: sys-utils/lscpu.c:2036 +#: sys-utils/lscpu.c:1884 msgid "Physical cores/chip:" msgstr "物理核心/芯片︰" -#: sys-utils/lscpu.c:2040 +#: sys-utils/lscpu.c:1888 msgid "Flags:" msgstr "标记：" -#: sys-utils/lscpu.c:2055 +#: sys-utils/lscpu.c:1903 msgid "Display information about the CPU architecture.\n" msgstr "显示 CPU 架构信息。\n" -#: sys-utils/lscpu.c:2058 +#: sys-utils/lscpu.c:1906 msgid " -a, --all print both online and offline CPUs (default for -e)\n" msgstr " -a, --all 同时打印在线和离线 CPU (-e 选项默认值)\n" -#: sys-utils/lscpu.c:2059 +#: sys-utils/lscpu.c:1907 msgid " -b, --online print online CPUs only (default for -p)\n" msgstr " -b, --online 只打印在线 CPU (-p 选项默认值)\n" -#: sys-utils/lscpu.c:2060 +#: sys-utils/lscpu.c:1908 msgid " -c, --offline print offline CPUs only\n" msgstr " -c, --offline 只打印离线 CPU\n" -#: sys-utils/lscpu.c:2061 +#: sys-utils/lscpu.c:1909 #, fuzzy msgid " -J, --json use JSON for default or extended format\n" msgstr " -J, --json 使用 JSON 输出格式\n" -#: sys-utils/lscpu.c:2062 +#: sys-utils/lscpu.c:1910 msgid " -e, --extended[=<list>] print out an extended readable format\n" msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n" -#: sys-utils/lscpu.c:2063 +#: sys-utils/lscpu.c:1911 msgid " -p, --parse[=<list>] print out a parsable format\n" msgstr " -p, --parse[=<列表>] 打印可解析格式\n" -#: sys-utils/lscpu.c:2064 +#: sys-utils/lscpu.c:1912 msgid " -s, --sysroot <dir> use specified directory as system root\n" msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n" -#: sys-utils/lscpu.c:2065 +#: sys-utils/lscpu.c:1913 msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n" msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n" -#: sys-utils/lscpu.c:2066 +#: sys-utils/lscpu.c:1914 msgid " -y, --physical print physical instead of logical IDs\n" msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n" -#: sys-utils/lscpu.c:2151 sys-utils/lsmem.c:475 +#: sys-utils/lscpu.c:1999 sys-utils/lsmem.c:596 #, fuzzy, c-format msgid "invalid argument to %s" msgstr "无效参数：%s" -#: sys-utils/lscpu.c:2170 +#: sys-utils/lscpu.c:2018 #, 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" @@ -15025,179 +15106,202 @@ msgstr "解析 IPC 标识符失败" msgid "--global is mutually exclusive with --creator, --id and --time" msgstr "--global 与 --creator, --id 和 --time 互斥" -#: sys-utils/lsmem.c:99 +#: sys-utils/lsmem.c:128 msgid "start and end address of the memory range" msgstr "" -#: sys-utils/lsmem.c:100 +#: sys-utils/lsmem.c:129 #, fuzzy msgid "size of the memory range" msgstr "磁盘容量" -#: sys-utils/lsmem.c:101 +#: sys-utils/lsmem.c:130 msgid "online status of the memory range" msgstr "" -#: sys-utils/lsmem.c:102 +#: sys-utils/lsmem.c:131 #, fuzzy msgid "memory is removable" msgstr " 可移动" -#: sys-utils/lsmem.c:103 +#: sys-utils/lsmem.c:132 msgid "memory block number or blocks range" msgstr "" -#: sys-utils/lsmem.c:104 +#: sys-utils/lsmem.c:133 #, fuzzy msgid "numa node of memory" msgstr "内存不足" -#: sys-utils/lsmem.c:193 +#: sys-utils/lsmem.c:134 +#, fuzzy +msgid "valid zones for the memory range" +msgstr "磁盘容量" + +#: sys-utils/lsmem.c:261 #, fuzzy msgid "online" msgstr "，在线" -#: sys-utils/lsmem.c:194 +#: sys-utils/lsmem.c:262 #, fuzzy msgid "offline" msgstr "，在线" -#: sys-utils/lsmem.c:195 +#: sys-utils/lsmem.c:263 msgid "on->off" msgstr "" -#: sys-utils/lsmem.c:235 sys-utils/lsmem.c:239 +#: sys-utils/lsmem.c:322 sys-utils/lsmem.c:326 #, fuzzy msgid "Memory block size:" msgstr "获得块大小" -#: sys-utils/lsmem.c:236 sys-utils/lsmem.c:241 +#: sys-utils/lsmem.c:323 sys-utils/lsmem.c:328 #, fuzzy msgid "Total online memory:" msgstr "最大总共享内存" -#: sys-utils/lsmem.c:237 sys-utils/lsmem.c:243 +#: sys-utils/lsmem.c:324 sys-utils/lsmem.c:330 msgid "Total offline memory:" msgstr "" -#: sys-utils/lsmem.c:257 +#: sys-utils/lsmem.c:344 #, fuzzy, c-format msgid "Failed to open %s" msgstr "解析 %s 失败" -#: sys-utils/lsmem.c:353 +#: sys-utils/lsmem.c:467 #, fuzzy msgid "This system does not support memory blocks" msgstr "该系统不支持重新扫描 CPU" -#: sys-utils/lsmem.c:376 +#: sys-utils/lsmem.c:494 msgid "List the ranges of available memory with their online status.\n" msgstr "" -#: sys-utils/lsmem.c:381 +#: sys-utils/lsmem.c:499 #, fuzzy msgid " -a, --all list each individual memory block\n" msgstr " -a, --all 打印所有设备\n" -#: sys-utils/lsmem.c:386 +#: sys-utils/lsmem.c:504 +#, fuzzy +msgid " -S, --split <list> split ranges by specified columns\n" +msgstr " -o, --output <列表> 输出列\n" + +#: sys-utils/lsmem.c:505 #, fuzzy msgid " -s, --sysroot <dir> use the specified directory as system root\n" msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n" -#: sys-utils/lsmem.c:387 +#: sys-utils/lsmem.c:506 msgid " --summary[=when] print summary information (never,always or only)\n" msgstr "" -#: sys-utils/lsmem.c:489 +#: sys-utils/lsmem.c:613 #, fuzzy msgid "unsupported --summary argument" msgstr "不支持的 --setgroups 参数“%s”" -#: sys-utils/lsmem.c:504 +#: sys-utils/lsmem.c:628 #, fuzzy msgid "options --{raw,json,pairs} and --summary=only are mutually exclusive" msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的" -#: sys-utils/lsmem.c:535 sys-utils/lsns.c:511 +#: sys-utils/lsmem.c:659 sys-utils/lsns.c:784 msgid "failed to initialize output table" msgstr "初始化输出表失败" -#: sys-utils/lsmem.c:547 +#: sys-utils/lsmem.c:671 #, fuzzy msgid "Failed to initialize output column" msgstr "初始化输出列失败" -#: sys-utils/lsns.c:83 +#: sys-utils/lsns.c:99 msgid "namespace identifier (inode number)" msgstr "名字空间标识符 (inode 号)" -#: sys-utils/lsns.c:84 +#: sys-utils/lsns.c:100 msgid "kind of namespace" msgstr "名字空间类型" -#: sys-utils/lsns.c:85 +#: sys-utils/lsns.c:101 msgid "path to the namespace" msgstr "名字空间路径" -#: sys-utils/lsns.c:86 +#: sys-utils/lsns.c:102 msgid "number of processes in the namespace" msgstr "名字空间中的进程数" -#: sys-utils/lsns.c:87 +#: sys-utils/lsns.c:103 msgid "lowest PID in the namespace" msgstr "名字空间中的最低 PID" -#: sys-utils/lsns.c:88 +#: sys-utils/lsns.c:104 msgid "PPID of the PID" msgstr "PID 的 PPID" -#: sys-utils/lsns.c:89 +#: sys-utils/lsns.c:105 msgid "command line of the PID" msgstr "PID 的命令行" -#: sys-utils/lsns.c:90 +#: sys-utils/lsns.c:106 msgid "UID of the PID" msgstr "PID 的 UID" -#: sys-utils/lsns.c:91 +#: sys-utils/lsns.c:107 msgid "username of the PID" msgstr "PID 的用户名" -#: sys-utils/lsns.c:456 +#: sys-utils/lsns.c:108 +msgid "namespace ID as used by network subsystem" +msgstr "" + +#: sys-utils/lsns.c:109 +msgid "nsfs mountpoint (usually used network subsystem)" +msgstr "" + +#: sys-utils/lsns.c:722 msgid "failed to add line to output" msgstr "向输出添加行出错" -#: sys-utils/lsns.c:614 +#: sys-utils/lsns.c:898 #, c-format msgid " %s [options] [<namespace>]\n" msgstr " %s [选项] [<名字空间>]\n" -#: sys-utils/lsns.c:617 +#: sys-utils/lsns.c:901 msgid "List system namespaces.\n" msgstr "列出系统名字空间。\n" -#: sys-utils/lsns.c:624 +#: sys-utils/lsns.c:908 msgid " -p, --task <pid> print process namespaces\n" msgstr " -p, --task <pid> 打印进程名字空间\n" -#: sys-utils/lsns.c:627 +#: sys-utils/lsns.c:911 +#, fuzzy +msgid " -W, --nowrap don't use multi-line representation\n" +msgstr " -n, --no-mtab 不写 /etc/mtab\n" + +#: sys-utils/lsns.c:912 msgid " -t, --type <name> namespace type (mnt, net, ipc, user, pid, uts, cgroup)\n" msgstr " -t, --type <name> 名字空间类型(mnt, net, ipc, user, pid, uts, cgroup)\n" -#: sys-utils/lsns.c:715 +#: sys-utils/lsns.c:1003 #, c-format msgid "unknown namespace type: %s" msgstr "未知的名字空间类型︰ %s" -#: sys-utils/lsns.c:733 +#: sys-utils/lsns.c:1027 msgid "--task is mutually exclusive with <namespace>" msgstr "--task 与 <名字空间> 互斥" -#: sys-utils/lsns.c:734 +#: sys-utils/lsns.c:1028 msgid "invalid namespace argument" msgstr "无效的名字空间参数" -#: sys-utils/lsns.c:772 +#: sys-utils/lsns.c:1080 #, c-format msgid "not found namespace: %ju" msgstr "找不到名字空间︰ %ju" @@ -15493,7 +15597,7 @@ msgstr "%s 不是一个挂载点\n" msgid "%s is a mountpoint\n" msgstr "%s 是一个挂载点\n" -#: sys-utils/nsenter.c:73 sys-utils/setarch.c:93 sys-utils/unshare.c:246 +#: sys-utils/nsenter.c:73 sys-utils/setarch.c:92 sys-utils/unshare.c:248 #, c-format msgid " %s [options] [<program> [<argument>...]]\n" msgstr " %s [选项] [<程序> [<参数>...]]\n" @@ -16013,7 +16117,7 @@ msgstr "%d (%s) 旧优先级为 %d，新优先级为 %d\n" #: sys-utils/renice.c:152 #, fuzzy, c-format -msgid "invalid priorty '%s'" +msgid "invalid priority '%s'" msgstr "无效 ID：%s" #: sys-utils/renice.c:179 @@ -16028,76 +16132,76 @@ msgstr "未知用户 %s" msgid "bad %s value: %s" msgstr "错误的 %s 值：%s" -#: sys-utils/rfkill.c:124 +#: sys-utils/rfkill.c:129 #, fuzzy msgid "kernel device name" msgstr "内部内核设备名称" -#: sys-utils/rfkill.c:125 +#: sys-utils/rfkill.c:130 #, fuzzy msgid "device identifier value" msgstr "设备标识符" -#: sys-utils/rfkill.c:126 +#: sys-utils/rfkill.c:131 msgid "device type name that can be used as identifier" msgstr "" -#: sys-utils/rfkill.c:127 +#: sys-utils/rfkill.c:132 #, fuzzy msgid "device type description" msgstr "标志描述" -#: sys-utils/rfkill.c:128 +#: sys-utils/rfkill.c:133 #, fuzzy msgid "status of software block" msgstr "锁的大小" -#: sys-utils/rfkill.c:129 +#: sys-utils/rfkill.c:134 #, fuzzy msgid "status of hardware block" msgstr "显示硬件看门狗的状态。\n" -#: sys-utils/rfkill.c:193 +#: sys-utils/rfkill.c:198 #, fuzzy, c-format msgid "cannot set non-blocking %s" msgstr "无法锁定 %s" -#: sys-utils/rfkill.c:214 +#: sys-utils/rfkill.c:219 #, c-format msgid "wrong size of rfkill event: %zu < %d" msgstr "" -#: sys-utils/rfkill.c:244 +#: sys-utils/rfkill.c:249 #, fuzzy, c-format msgid "failed to poll %s" msgstr "解析 %s 失败" -#: sys-utils/rfkill.c:312 +#: sys-utils/rfkill.c:313 #, fuzzy msgid "invalid identifier" msgstr "设备标识符" -#: sys-utils/rfkill.c:392 sys-utils/rfkill.c:395 +#: sys-utils/rfkill.c:393 sys-utils/rfkill.c:396 #, fuzzy msgid "blocked" msgstr "已锁定" -#: sys-utils/rfkill.c:392 sys-utils/rfkill.c:395 +#: sys-utils/rfkill.c:393 sys-utils/rfkill.c:396 #, fuzzy msgid "unblocked" msgstr "已锁定" -#: sys-utils/rfkill.c:414 sys-utils/rfkill.c:479 sys-utils/rfkill.c:523 +#: sys-utils/rfkill.c:415 sys-utils/rfkill.c:480 sys-utils/rfkill.c:524 #, fuzzy, c-format msgid "invalid identifier: %s" msgstr "磁盘标识符：%s" -#: sys-utils/rfkill.c:565 +#: sys-utils/rfkill.c:566 #, fuzzy, c-format msgid " %s [options] command [identifier ...]\n" msgstr " %s [选项] [<设备> ...]\n" -#: sys-utils/rfkill.c:568 +#: sys-utils/rfkill.c:569 msgid "Tool for enabling and disabling wireless devices.\n" msgstr "" @@ -16106,39 +16210,39 @@ msgstr "" #. * #. list [identifier] (lista [tarkenne]) #. -#: sys-utils/rfkill.c:591 +#: sys-utils/rfkill.c:592 #, fuzzy msgid " help\n" msgstr " -help\n" -#: sys-utils/rfkill.c:592 +#: sys-utils/rfkill.c:593 msgid " event\n" msgstr "" -#: sys-utils/rfkill.c:593 +#: sys-utils/rfkill.c:594 #, fuzzy msgid " list [identifier]\n" msgstr "磁盘标识符" -#: sys-utils/rfkill.c:594 +#: sys-utils/rfkill.c:595 #, fuzzy msgid " block identifier\n" msgstr "磁盘标识符" -#: sys-utils/rfkill.c:595 +#: sys-utils/rfkill.c:596 #, fuzzy msgid " unblock identifier\n" msgstr "磁盘标识符" -#: sys-utils/rtcwake.c:99 +#: sys-utils/rtcwake.c:101 msgid "Enter a system sleep state until a specified wakeup time.\n" msgstr "进入系统睡眠状态，直到指定的唤醒时间。\n" -#: sys-utils/rtcwake.c:102 +#: sys-utils/rtcwake.c:104 msgid " -a, --auto reads the clock mode from adjust file (default)\n" msgstr " -a, --auto 从 adjust 文件读取时钟模式(默认)\n" -#: sys-utils/rtcwake.c:104 +#: sys-utils/rtcwake.c:106 #, c-format msgid "" " -A, --adjfile <file> specifies the path to the adjust file\n" @@ -16147,180 +16251,185 @@ msgstr "" " -A, --adjfile <文件> 指定 adjust 文件的路径\n" " 默认为 %s\n" -#: sys-utils/rtcwake.c:106 +#: sys-utils/rtcwake.c:108 msgid " --date <timestamp> date time of timestamp to wake\n" msgstr " --date <时间戳> 唤醒时间戳的日期时间\n" -#: sys-utils/rtcwake.c:107 +#: sys-utils/rtcwake.c:109 msgid " -d, --device <device> select rtc device (rtc0|rtc1|...)\n" msgstr " -d, --device <设备> 选择 rtc 设备(rtc0|rtc1|...)\n" -#: sys-utils/rtcwake.c:108 +#: sys-utils/rtcwake.c:110 msgid " -n, --dry-run does everything, but suspend\n" msgstr " -n, --dry-run 演示操作但不执行(suspend)\n" -#: sys-utils/rtcwake.c:109 +#: sys-utils/rtcwake.c:111 msgid " -l, --local RTC uses local timezone\n" msgstr " -l, --local RTC 使用本地时区\n" -#: sys-utils/rtcwake.c:110 +#: sys-utils/rtcwake.c:112 msgid " --list-modes list available modes\n" msgstr " --list-modes 列出可用模式\n" -#: sys-utils/rtcwake.c:111 +#: sys-utils/rtcwake.c:113 msgid " -m, --mode <mode> standby|mem|... sleep mode\n" msgstr " -m, --mode <模式> 指定 standby|mem|... 等睡眠模式\n" -#: sys-utils/rtcwake.c:112 +#: sys-utils/rtcwake.c:114 msgid " -s, --seconds <seconds> seconds to sleep\n" msgstr " -s, --seconds <秒数> 指定睡眠的秒数\n" -#: sys-utils/rtcwake.c:113 +#: sys-utils/rtcwake.c:115 msgid " -t, --time <time_t> time to wake\n" msgstr " -t, --time <time_t> 指定唤醒时刻\n" -#: sys-utils/rtcwake.c:114 +#: sys-utils/rtcwake.c:116 msgid " -u, --utc RTC uses UTC\n" msgstr " -u, --utc RTC 使用 UTC\n" -#: sys-utils/rtcwake.c:115 +#: sys-utils/rtcwake.c:117 msgid " -v, --verbose verbose messages\n" msgstr " -v, --verbose 输出详尽消息\n" -#: sys-utils/rtcwake.c:165 +#: sys-utils/rtcwake.c:167 msgid "read rtc time failed" msgstr "读取 rtc 时间失败" -#: sys-utils/rtcwake.c:171 +#: sys-utils/rtcwake.c:173 msgid "read system time failed" msgstr "读取系统时间失败" -#: sys-utils/rtcwake.c:187 +#: sys-utils/rtcwake.c:189 msgid "convert rtc time failed" msgstr "转换 rtc 时间失败" -#: sys-utils/rtcwake.c:235 +#: sys-utils/rtcwake.c:237 msgid "set rtc wake alarm failed" msgstr "设置 rtc 唤醒闹钟失败" -#: sys-utils/rtcwake.c:305 +#: sys-utils/rtcwake.c:274 +#, fuzzy +msgid "discarding stdin" +msgstr "忽略对齐偏移量" + +#: sys-utils/rtcwake.c:325 #, c-format msgid "unexpected third line in: %s: %s" msgstr "第 3 行异常：%s：%s" -#: sys-utils/rtcwake.c:318 sys-utils/rtcwake.c:622 +#: sys-utils/rtcwake.c:338 sys-utils/rtcwake.c:642 msgid "read rtc alarm failed" msgstr "读取 rtc 闹钟失败" -#: sys-utils/rtcwake.c:323 +#: sys-utils/rtcwake.c:343 #, c-format msgid "alarm: off\n" msgstr "闹钟：关\n" -#: sys-utils/rtcwake.c:336 +#: sys-utils/rtcwake.c:356 msgid "convert time failed" msgstr "转换时间失败" -#: sys-utils/rtcwake.c:341 +#: sys-utils/rtcwake.c:361 #, c-format msgid "alarm: on %s" msgstr "闹钟：于 %s" -#: sys-utils/rtcwake.c:385 +#: sys-utils/rtcwake.c:405 #, c-format msgid "could not read: %s" msgstr "无法读取︰%s" -#: sys-utils/rtcwake.c:465 +#: sys-utils/rtcwake.c:485 #, c-format msgid "unrecognized suspend state '%s'" msgstr "不支持的挂起状态“%s”" -#: sys-utils/rtcwake.c:473 +#: sys-utils/rtcwake.c:493 msgid "invalid seconds argument" msgstr "无效的 秒数 参数" -#: sys-utils/rtcwake.c:477 +#: sys-utils/rtcwake.c:497 msgid "invalid time argument" msgstr "无效的 时间 参数" -#: sys-utils/rtcwake.c:504 +#: sys-utils/rtcwake.c:524 #, c-format msgid "%s: assuming RTC uses UTC ...\n" msgstr "%s：将假设 RTC 使用 UTC...\n" -#: sys-utils/rtcwake.c:509 +#: sys-utils/rtcwake.c:529 msgid "Using UTC time.\n" msgstr "使用 UTC 时间。\n" -#: sys-utils/rtcwake.c:510 +#: sys-utils/rtcwake.c:530 msgid "Using local time.\n" msgstr "使用当地时间。\n" -#: sys-utils/rtcwake.c:513 +#: sys-utils/rtcwake.c:533 msgid "must provide wake time (see --seconds, --time and --date options)" msgstr "必须提供唤醒时间(见 --seconds, --time 和 --date 选项)" -#: sys-utils/rtcwake.c:519 +#: sys-utils/rtcwake.c:539 #, c-format msgid "%s not enabled for wakeup events" msgstr "%s 没有为唤醒事件启用" -#: sys-utils/rtcwake.c:526 +#: sys-utils/rtcwake.c:546 #, 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:533 +#: sys-utils/rtcwake.c:553 #, c-format msgid "time doesn't go backward to %s" msgstr "时间不能返回到 %s" -#: sys-utils/rtcwake.c:543 +#: sys-utils/rtcwake.c:563 #, c-format msgid "%s: wakeup using %s at %s" msgstr "%1$s：用 %3$s 的 %2$s 唤醒" -#: sys-utils/rtcwake.c:547 +#: sys-utils/rtcwake.c:567 #, c-format msgid "%s: wakeup from \"%s\" using %s at %s" msgstr "%s：从“%s”唤醒，使用 %s，时间 %s" -#: sys-utils/rtcwake.c:557 +#: sys-utils/rtcwake.c:577 #, c-format msgid "suspend mode: no; leaving\n" msgstr "挂起模式：无；将离开\n" -#: sys-utils/rtcwake.c:566 +#: sys-utils/rtcwake.c:586 #, c-format msgid "suspend mode: off; executing %s\n" msgstr "挂起模式：关；正在执行 %s\n" -#: sys-utils/rtcwake.c:585 +#: sys-utils/rtcwake.c:605 #, c-format msgid "suspend mode: on; reading rtc\n" msgstr "挂起模式：开；正在读 rtc\n" -#: sys-utils/rtcwake.c:590 +#: sys-utils/rtcwake.c:610 msgid "rtc read failed" msgstr "读 rtc 失败" -#: sys-utils/rtcwake.c:602 +#: sys-utils/rtcwake.c:622 #, c-format msgid "suspend mode: disable; disabling alarm\n" msgstr "挂起模式：禁用；正在禁用闹钟\n" -#: sys-utils/rtcwake.c:606 +#: sys-utils/rtcwake.c:626 #, c-format msgid "suspend mode: show; printing alarm info\n" msgstr "挂起模式：显示；正在打印闹钟信息\n" -#: sys-utils/rtcwake.c:613 +#: sys-utils/rtcwake.c:633 #, c-format msgid "suspend mode: %s; suspending system\n" msgstr "挂起模式：%s；正在挂起系统\n" -#: sys-utils/rtcwake.c:627 +#: sys-utils/rtcwake.c:647 msgid "disable rtc alarm interrupt failed" msgstr "禁用 rtc 闹钟中断失败" @@ -16329,104 +16438,104 @@ msgstr "禁用 rtc 闹钟中断失败" msgid "Switching on %s.\n" msgstr "正在打开 %s。\n" -#: sys-utils/setarch.c:91 +#: sys-utils/setarch.c:90 #, c-format msgid " %s <arch> [options] [<program> [<argument>...]]\n" msgstr " %s <架构> [选项] [<程序> [<参数>...]]\n" -#: sys-utils/setarch.c:96 +#: sys-utils/setarch.c:95 msgid "Change the reported architecture and set personality flags.\n" msgstr "更改报告的架构并设置人格标志(personality flag) 。\n" -#: sys-utils/setarch.c:99 +#: sys-utils/setarch.c:98 msgid " -B, --32bit turns on ADDR_LIMIT_32BIT\n" msgstr " -B, --32bit 开启 ADDR_LIMIT_32BIT\n" -#: sys-utils/setarch.c:100 +#: sys-utils/setarch.c:99 msgid " -F, --fdpic-funcptrs makes function pointers point to descriptors\n" msgstr " -F, --fdpic-funcptrs 将程序指针指向描述符\n" -#: sys-utils/setarch.c:101 +#: sys-utils/setarch.c:100 msgid " -I, --short-inode turns on SHORT_INODE\n" msgstr " -I, --short-inode 开启 SHORT_INODE\n" -#: sys-utils/setarch.c:102 +#: sys-utils/setarch.c:101 msgid " -L, --addr-compat-layout changes the way virtual memory is allocated\n" msgstr " -L, --addr-compat-layout 更改虚拟内存分配的方式\n" -#: sys-utils/setarch.c:103 +#: sys-utils/setarch.c:102 msgid " -R, --addr-no-randomize disables randomization of the virtual address space\n" msgstr " -R, --addr-no-randomize 禁止随机化虚拟地址空间\n" -#: sys-utils/setarch.c:104 +#: sys-utils/setarch.c:103 msgid " -S, --whole-seconds turns on WHOLE_SECONDS\n" msgstr " -S, --whole-seconds 开启 WHOLE_SECONDS\n" -#: sys-utils/setarch.c:105 +#: sys-utils/setarch.c:104 msgid " -T, --sticky-timeouts turns on STICKY_TIMEOUTS\n" msgstr " -T, --sticky-timeouts 开启 STICKY_TIMEOUTS\n" -#: sys-utils/setarch.c:106 +#: sys-utils/setarch.c:105 msgid " -X, --read-implies-exec turns on READ_IMPLIES_EXEC\n" msgstr " -X, --read-implies-exec 开启 READ_IMPLIES_EXEC\n" -#: sys-utils/setarch.c:107 +#: sys-utils/setarch.c:106 msgid " -Z, --mmap-page-zero turns on MMAP_PAGE_ZERO\n" msgstr " -Z, --mmap-page-zero 开启 MMAP_PAGE_ZERO\n" -#: sys-utils/setarch.c:108 +#: sys-utils/setarch.c:107 msgid " -3, --3gb limits the used address space to a maximum of 3 GB\n" msgstr " -3, --3gb 将用户地址空间限制为最多 3 GB\n" -#: sys-utils/setarch.c:109 +#: sys-utils/setarch.c:108 msgid " --4gb ignored (for backward compatibility only)\n" msgstr " --4gb 忽略(纯为兼容)\n" -#: sys-utils/setarch.c:110 +#: sys-utils/setarch.c:109 msgid " --uname-2.6 turns on UNAME26\n" msgstr " --uname-2.6 开启 UNAME26\n" -#: sys-utils/setarch.c:111 +#: sys-utils/setarch.c:110 msgid " -v, --verbose say what options are being switched on\n" msgstr " -v, --verbose 告知打开了哪些选项\n" -#: sys-utils/setarch.c:114 +#: sys-utils/setarch.c:113 msgid " --list list settable architectures, and exit\n" msgstr " --list 列出可设置的架构并退出\n" -#: sys-utils/setarch.c:225 +#: sys-utils/setarch.c:217 #, c-format msgid "%s: Unrecognized architecture" msgstr "%s：未识别的架构" -#: sys-utils/setarch.c:246 +#: sys-utils/setarch.c:238 #, c-format msgid "Kernel cannot set architecture to %s" msgstr "内核不能设置为 %s 的架构" -#: sys-utils/setarch.c:293 +#: sys-utils/setarch.c:286 msgid "Not enough arguments" msgstr "参数不够" -#: sys-utils/setarch.c:311 +#: sys-utils/setarch.c:295 #, c-format msgid "Failed to set personality to %s" msgstr "无法将人格(personality)设置为 %s" -#: sys-utils/setarch.c:368 +#: sys-utils/setarch.c:360 msgid "unrecognized option '--list'" msgstr "无法识别的“--list”选项" -#: sys-utils/setarch.c:376 +#: sys-utils/setarch.c:368 msgid "no architecture argument specified" msgstr "未指定架构参数" -#: sys-utils/setarch.c:382 +#: sys-utils/setarch.c:374 #, c-format msgid "failed to set personality to %s" msgstr "无法将人格(personality)设置为 %s" -#: sys-utils/setarch.c:385 +#: sys-utils/setarch.c:377 #, c-format msgid "Execute command `%s'.\n" msgstr "执行命令“%s”。\n" @@ -16851,11 +16960,6 @@ msgstr "应用绑定集" msgid "apply capabilities" msgstr "应用权能" -#: sys-utils/setpriv.c:994 -#, c-format -msgid "cannot execute: %s" -msgstr "无法执行：%s" - #: sys-utils/setsid.c:33 #, c-format msgid " %s [options] <program> [arguments ...]\n" @@ -16870,50 +16974,55 @@ msgid " -c, --ctty set the controlling terminal to the current one\n" msgstr " -c, --ctty 将控制终端设置为当前终端\n" #: sys-utils/setsid.c:41 +#, fuzzy +msgid " -f, --fork always fork\n" +msgstr " -f, --force 强制检查\n" + +#: sys-utils/setsid.c:42 msgid " -w, --wait wait program to exit, and use the same return\n" msgstr " -w, --wait 等待程序退出，并使用它的返回值\n" -#: sys-utils/setsid.c:95 +#: sys-utils/setsid.c:100 msgid "fork" msgstr "fork" -#: sys-utils/setsid.c:107 +#: sys-utils/setsid.c:112 #, c-format msgid "child %d did not exit normally" msgstr "子 %d 未正常退出" -#: sys-utils/setsid.c:112 +#: sys-utils/setsid.c:117 msgid "setsid failed" msgstr "setsid 失败" -#: sys-utils/setsid.c:115 +#: sys-utils/setsid.c:120 msgid "failed to set the controlling terminal" msgstr "设置控制终端失败" -#: sys-utils/swapoff.c:86 +#: sys-utils/swapoff.c:85 #, c-format msgid "swapoff %s\n" msgstr "swapoff %s\n" -#: sys-utils/swapoff.c:105 +#: sys-utils/swapoff.c:104 msgid "Not superuser." msgstr "非超级用户。" -#: sys-utils/swapoff.c:108 +#: sys-utils/swapoff.c:107 #, c-format msgid "%s: swapoff failed" msgstr "%s：swapoff 失败" -#: sys-utils/swapoff.c:123 sys-utils/swapon.c:795 +#: sys-utils/swapoff.c:122 sys-utils/swapon.c:794 #, c-format msgid " %s [options] [<spec>]\n" msgstr " %s [选项] [<指定>]\n" -#: sys-utils/swapoff.c:126 +#: sys-utils/swapoff.c:125 msgid "Disable devices and files for paging and swapping.\n" msgstr "禁止将设备和文件用于分页和交换。\n" -#: sys-utils/swapoff.c:129 +#: sys-utils/swapoff.c:128 msgid "" " -a, --all disable all swaps from /proc/swaps\n" " -v, --verbose verbose mode\n" @@ -16921,7 +17030,7 @@ msgstr "" " -a, --all 禁用 /proc/swaps 中的所有交换区\n" " -v, --verbose verbose mode\n" -#: sys-utils/swapoff.c:135 +#: sys-utils/swapoff.c:134 msgid "" "\n" "The <spec> parameter:\n" @@ -16941,181 +17050,181 @@ msgstr "" " <设备> 要使用设备的名称\n" " <文件> 要使用文件的名称\n" -#: sys-utils/swapon.c:97 +#: sys-utils/swapon.c:96 msgid "device file or partition path" msgstr "设备文件或分区路径" -#: sys-utils/swapon.c:98 +#: sys-utils/swapon.c:97 msgid "type of the device" msgstr "设备的类型" -#: sys-utils/swapon.c:99 +#: sys-utils/swapon.c:98 msgid "size of the swap area" msgstr "交换区大小" -#: sys-utils/swapon.c:100 +#: sys-utils/swapon.c:99 msgid "bytes in use" msgstr "已使用字节数" -#: sys-utils/swapon.c:101 +#: sys-utils/swapon.c:100 msgid "swap priority" msgstr "交换优先级" -#: sys-utils/swapon.c:102 +#: sys-utils/swapon.c:101 msgid "swap uuid" msgstr "swap uuid" -#: sys-utils/swapon.c:103 +#: sys-utils/swapon.c:102 msgid "swap label" msgstr "swap 标签" -#: sys-utils/swapon.c:251 +#: sys-utils/swapon.c:250 #, 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:251 +#: sys-utils/swapon.c:250 msgid "Filename" msgstr "文件名" -#: sys-utils/swapon.c:317 +#: sys-utils/swapon.c:316 #, c-format msgid "%s: reinitializing the swap." msgstr "%s：正在重新初始化交换区。" -#: sys-utils/swapon.c:381 +#: sys-utils/swapon.c:380 #, c-format msgid "%s: lseek failed" msgstr "%s：lseek 失败" -#: sys-utils/swapon.c:387 +#: sys-utils/swapon.c:386 #, c-format msgid "%s: write signature failed" msgstr "%s：写签名失败" -#: sys-utils/swapon.c:541 +#: sys-utils/swapon.c:540 #, c-format msgid "%s: skipping - it appears to have holes." msgstr "%s：将跳过 - 它似乎有空洞。" -#: sys-utils/swapon.c:549 +#: sys-utils/swapon.c:548 #, c-format msgid "%s: get size failed" msgstr "%s：获取大小失败" -#: sys-utils/swapon.c:555 +#: sys-utils/swapon.c:554 #, c-format msgid "%s: read swap header failed" msgstr "%s：读交换区头失败" -#: sys-utils/swapon.c:560 +#: sys-utils/swapon.c:559 #, c-format msgid "%s: found signature [pagesize=%d, signature=%s]" msgstr "%s：找到签名[页尺寸=%d, 签名=%s]" -#: sys-utils/swapon.c:571 +#: sys-utils/swapon.c:570 #, c-format msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu" msgstr "%s：页大小=%d，交换区大小=%llu，设备大小=%llu" -#: sys-utils/swapon.c:576 +#: sys-utils/swapon.c:575 #, c-format msgid "%s: last_page 0x%08llx is larger than actual size of swapspace" msgstr "%s：末页 0x%08llx 大于交换空间的实际大小" -#: sys-utils/swapon.c:586 +#: sys-utils/swapon.c:585 #, c-format msgid "%s: swap format pagesize does not match." msgstr "%s：交换格式 页大小 不匹配。" -#: sys-utils/swapon.c:592 +#: sys-utils/swapon.c:591 #, c-format msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)" msgstr "%s：交换格式 页大小 不匹配。(使用 --fixpgsz 来重新对它初始化。)" -#: sys-utils/swapon.c:601 +#: sys-utils/swapon.c:600 #, c-format msgid "%s: software suspend data detected. Rewriting the swap signature." msgstr "%s：检测到软件挂起数据。将重新写交换签名。" -#: sys-utils/swapon.c:671 +#: sys-utils/swapon.c:670 #, c-format msgid "swapon %s\n" msgstr "swapon %s\n" -#: sys-utils/swapon.c:675 +#: sys-utils/swapon.c:674 #, c-format msgid "%s: swapon failed" msgstr "%s：swapon 失败" -#: sys-utils/swapon.c:748 +#: sys-utils/swapon.c:747 #, c-format msgid "%s: noauto option -- ignored" msgstr "%s：无自动选项 -- 已忽略" -#: sys-utils/swapon.c:770 +#: sys-utils/swapon.c:769 #, c-format msgid "%s: already active -- ignored" msgstr "%s：已激活 -- 已忽略" -#: sys-utils/swapon.c:776 +#: sys-utils/swapon.c:775 #, c-format msgid "%s: inaccessible -- ignored" msgstr "%s：无法访问 -- 已忽略" -#: sys-utils/swapon.c:798 +#: sys-utils/swapon.c:797 msgid "Enable devices and files for paging and swapping.\n" msgstr "允许将设备和文件用于分页和交换。\n" -#: sys-utils/swapon.c:801 +#: sys-utils/swapon.c:800 msgid " -a, --all enable all swaps from /etc/fstab\n" msgstr " -a, --all 启用 /etc/fstab 中的所有交换区\n" -#: sys-utils/swapon.c:802 +#: sys-utils/swapon.c:801 msgid " -d, --discard[=<policy>] enable swap discards, if supported by device\n" msgstr " -d, --discard[=<policy>] 如果设备支持，启用 swap 丢弃\n" -#: sys-utils/swapon.c:803 +#: sys-utils/swapon.c:802 msgid " -e, --ifexists silently skip devices that do not exist\n" msgstr " -e, --ifexists 自动跳过不存在的设备而不提示\n" -#: sys-utils/swapon.c:804 +#: sys-utils/swapon.c:803 msgid " -f, --fixpgsz reinitialize the swap space if necessary\n" msgstr " -f, --fixpgsz 必要时重新初始化交换区\n" -#: sys-utils/swapon.c:805 +#: sys-utils/swapon.c:804 msgid " -o, --options <list> comma-separated list of swap options\n" msgstr " -o, --options <列表> 以英文逗号分隔的 swap 选项\n" -#: sys-utils/swapon.c:806 +#: sys-utils/swapon.c:805 msgid " -p, --priority <prio> specify the priority of the swap device\n" msgstr " -p, --priority <优先级> 指定交换设备的优先级\n" -#: sys-utils/swapon.c:807 +#: sys-utils/swapon.c:806 msgid " -s, --summary display summary about used swap devices (DEPRECATED)\n" msgstr " -s, --summary 显示已使用交换设备的摘要(已废弃)\n" -#: sys-utils/swapon.c:808 +#: sys-utils/swapon.c:807 msgid " --show[=<columns>] display summary in definable table\n" msgstr " --show[=<列>] 以可自定义的表格形式打印摘要\n" -#: sys-utils/swapon.c:809 +#: sys-utils/swapon.c:808 msgid " --noheadings don't print table heading (with --show)\n" msgstr " --noheadings 不打印表头(与 --show 合用)\n" -#: sys-utils/swapon.c:810 +#: sys-utils/swapon.c:809 msgid " --raw use the raw output format (with --show)\n" msgstr " --raw 使用原生输出格式(与 --show 合用)\n" -#: sys-utils/swapon.c:811 +#: sys-utils/swapon.c:810 msgid " --bytes display swap size in bytes in --show output\n" msgstr " --bytes 在 --show 输出中以字节数显示交换区大小\n" -#: sys-utils/swapon.c:812 +#: sys-utils/swapon.c:811 msgid " -v, --verbose verbose mode\n" msgstr " -v, --verbose 详尽模式\n" -#: sys-utils/swapon.c:817 +#: sys-utils/swapon.c:816 msgid "" "\n" "The <spec> parameter:\n" @@ -17139,7 +17248,7 @@ msgstr "" " <设备> 要使用设备的名称\n" " <文件> 要使用文件的名称\n" -#: sys-utils/swapon.c:827 +#: sys-utils/swapon.c:826 msgid "" "\n" "Available discard policy types (for --discard):\n" @@ -17153,11 +17262,11 @@ msgstr "" " pages\t ：对释放的页在重新使用前丢弃\n" " * 如果未选择策略，则两者都将启用。(默认)\n" -#: sys-utils/swapon.c:910 +#: sys-utils/swapon.c:909 msgid "failed to parse priority" msgstr "解析优先级失败" -#: sys-utils/swapon.c:929 +#: sys-utils/swapon.c:928 #, c-format msgid "unsupported discard policy: %s" msgstr "不支持的丢弃策略：%s" @@ -17438,88 +17547,92 @@ 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:89 +#: sys-utils/unshare.c:91 #, c-format msgid "unsupported --setgroups argument '%s'" msgstr "不支持的 --setgroups 参数“%s”" -#: sys-utils/unshare.c:110 sys-utils/unshare.c:125 +#: sys-utils/unshare.c:112 sys-utils/unshare.c:127 #, c-format msgid "write failed %s" msgstr "写失败：%s" -#: sys-utils/unshare.c:148 +#: sys-utils/unshare.c:150 #, c-format msgid "unsupported propagation mode: %s" msgstr "不受支持的传播模式︰%s" -#: sys-utils/unshare.c:157 +#: sys-utils/unshare.c:159 msgid "cannot change root filesystem propagation" msgstr "无法更改根文件系统传播" -#: sys-utils/unshare.c:188 +#: sys-utils/unshare.c:190 #, c-format msgid "mount %s on %s failed" msgstr "将 %s 挂载到 %s 失败" -#: sys-utils/unshare.c:202 +#: sys-utils/unshare.c:204 #, c-format msgid "cannot stat %s" msgstr "无法 stat %s" -#: sys-utils/unshare.c:213 +#: sys-utils/unshare.c:215 msgid "pipe failed" msgstr "pipe 失败" -#: sys-utils/unshare.c:227 +#: sys-utils/unshare.c:229 msgid "failed to read pipe" msgstr "读取管道失败" -#: sys-utils/unshare.c:250 +#: sys-utils/unshare.c:252 msgid "Run a program with some namespaces unshared from the parent.\n" msgstr "以某些未与父(进程)共享的名字空间运行某个程序。\n" -#: sys-utils/unshare.c:253 +#: sys-utils/unshare.c:255 msgid " -m, --mount[=<file>] unshare mounts namespace\n" msgstr " -m, --mount[=<文件>] 取消共享 mounts 名字空间\n" -#: sys-utils/unshare.c:254 +#: sys-utils/unshare.c:256 msgid " -u, --uts[=<file>] unshare UTS namespace (hostname etc)\n" msgstr " -u, --uts[=<文件>] 取消共享 UTS 名字空间(主机名等)\n" -#: sys-utils/unshare.c:255 +#: sys-utils/unshare.c:257 msgid " -i, --ipc[=<file>] unshare System V IPC namespace\n" msgstr " -i, --ipc[=<文件>] 取消共享 System V IPC 名字空间\n" -#: sys-utils/unshare.c:256 +#: sys-utils/unshare.c:258 msgid " -n, --net[=<file>] unshare network namespace\n" msgstr " -n, --net[=<file>] 取消共享网络名字空间\n" -#: sys-utils/unshare.c:257 +#: sys-utils/unshare.c:259 msgid " -p, --pid[=<file>] unshare pid namespace\n" msgstr " -p, --pid[=<文件>] 取消共享 pid 名字空间\n" -#: sys-utils/unshare.c:258 +#: sys-utils/unshare.c:260 msgid " -U, --user[=<file>] unshare user namespace\n" msgstr " -U, --user[=<文件>] 取消共享用户名字空间\n" -#: sys-utils/unshare.c:259 +#: sys-utils/unshare.c:261 msgid " -C, --cgroup[=<file>] unshare cgroup namespace\n" msgstr " -C, --cgroup[=<文件>] 取消共享 cgroup 名字空间\n" -#: sys-utils/unshare.c:260 +#: sys-utils/unshare.c:262 msgid " -f, --fork fork before launching <program>\n" msgstr " -f, --fork 在启动<程序>前 fork\n" -#: sys-utils/unshare.c:261 +#: sys-utils/unshare.c:263 +msgid " --kill-child[=<signame>] when dying, kill the forked child (implies --fork); defaults to SIGKILL\n" +msgstr "" + +#: sys-utils/unshare.c:264 msgid " --mount-proc[=<dir>] mount proc filesystem first (implies --mount)\n" msgstr " --mount-proc[=<目录>] 先挂载 proc 文件系统(连带打开 --mount)\n" -#: sys-utils/unshare.c:262 +#: sys-utils/unshare.c:265 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:263 +#: sys-utils/unshare.c:266 msgid "" " --propagation slave|shared|private|unchanged\n" " modify mount propagation in mount namespace\n" @@ -17527,23 +17640,23 @@ msgstr "" " --propagation slave|shared|private|unchanged\n" " 修改 mount 名字空间中的 mount 传播\n" -#: sys-utils/unshare.c:265 +#: sys-utils/unshare.c:268 msgid " -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n" msgstr " -s, --setgroups allow|deny 控制用户名字空间中的 setgroups 系统调用\n" -#: sys-utils/unshare.c:385 +#: sys-utils/unshare.c:401 msgid "unshare failed" msgstr "unshare 失败" -#: sys-utils/unshare.c:429 +#: sys-utils/unshare.c:445 msgid "child exit failed" msgstr "子进程退出失败" -#: sys-utils/unshare.c:436 +#: sys-utils/unshare.c:454 msgid "options --setgroups=allow and --map-root-user are mutually exclusive" msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的" -#: sys-utils/unshare.c:456 +#: sys-utils/unshare.c:474 #, c-format msgid "mount %s failed" msgstr "挂载 %s 失败" @@ -17763,7 +17876,7 @@ msgstr "通过压实迁移的对象数" msgid "Failed to parse mm_stat" msgstr "解析 mm_stat 失败" -#: sys-utils/zramctl.c:533 +#: sys-utils/zramctl.c:532 #, c-format msgid "" " %1$s [options] <device>\n" @@ -17773,229 +17886,225 @@ msgstr "" " %1$s [选项] [<回环设备>]\n" " %1$s [选项] -f | <回环设备> <文件>\n" -#: sys-utils/zramctl.c:539 +#: sys-utils/zramctl.c:538 msgid "Set up and control zram devices.\n" msgstr "设置和控制 zram 设备。\n" -#: sys-utils/zramctl.c:542 -msgid " -a, --algorithm lzo|lz4 compression algorithm to use\n" +#: sys-utils/zramctl.c:541 +#, fuzzy +msgid " -a, --algorithm lzo|lz4|lz4hc|deflate|842 compression algorithm to use\n" msgstr " -a, --algorithm lzo|lz4 要使用的压缩算法\n" -#: sys-utils/zramctl.c:543 +#: sys-utils/zramctl.c:542 msgid " -b, --bytes print sizes in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为打印尺寸，而非易读格式\n" -#: sys-utils/zramctl.c:544 +#: sys-utils/zramctl.c:543 msgid " -f, --find find a free device\n" msgstr " -f, --find 查找空闲设备\n" -#: sys-utils/zramctl.c:545 +#: sys-utils/zramctl.c:544 msgid " -n, --noheadings don't print headings\n" msgstr " -n, --noheadings 不打印标题\n" -#: sys-utils/zramctl.c:546 +#: sys-utils/zramctl.c:545 msgid " -o, --output <list> columns to use for status output\n" msgstr " -o, --output <list> 用于状态输出的列\n" -#: sys-utils/zramctl.c:547 +#: sys-utils/zramctl.c:546 msgid " --raw use raw status output format\n" msgstr " --raw 使用原生状态输出格式\n" -#: sys-utils/zramctl.c:548 +#: sys-utils/zramctl.c:547 msgid " -r, --reset reset all specified devices\n" msgstr " -r, --reset 重置所有指定的设备\n" -#: sys-utils/zramctl.c:549 +#: sys-utils/zramctl.c:548 msgid " -s, --size <size> device size\n" msgstr " -s, --size <尺寸> 设备尺寸\n" -#: sys-utils/zramctl.c:550 +#: sys-utils/zramctl.c:549 msgid " -t, --streams <number> number of compression streams\n" msgstr " -t, --streams <数字> 压缩流数量\n" -#: sys-utils/zramctl.c:615 -#, c-format -msgid "unsupported algorithm: %s" -msgstr "不支持的算法︰%s" - -#: sys-utils/zramctl.c:637 +#: sys-utils/zramctl.c:633 msgid "failed to parse streams" msgstr "解析流失败" -#: sys-utils/zramctl.c:659 +#: sys-utils/zramctl.c:655 msgid "option --find is mutually exclusive with <device>" msgstr "--find 选项与<设备>互斥" -#: sys-utils/zramctl.c:665 +#: sys-utils/zramctl.c:661 msgid "only one <device> at a time is allowed" msgstr "一次只允许一个 <设备>" -#: sys-utils/zramctl.c:668 +#: sys-utils/zramctl.c:664 msgid "options --algorithm and --streams must be combined with --size" msgstr "--algorithm 和 --streams 必须与 --size 合用" -#: sys-utils/zramctl.c:698 sys-utils/zramctl.c:727 +#: sys-utils/zramctl.c:694 sys-utils/zramctl.c:723 #, c-format msgid "%s: failed to reset" msgstr "%s︰重置失败" -#: sys-utils/zramctl.c:709 sys-utils/zramctl.c:717 +#: sys-utils/zramctl.c:705 sys-utils/zramctl.c:713 msgid "no free zram device found" msgstr "未找到空闲的 zram 设备" -#: sys-utils/zramctl.c:731 +#: sys-utils/zramctl.c:727 #, c-format msgid "%s: failed to set number of streams" msgstr "%s︰设置流数量失败" -#: sys-utils/zramctl.c:735 +#: sys-utils/zramctl.c:731 #, c-format msgid "%s: failed to set algorithm" msgstr "%s︰设置算法失败" -#: sys-utils/zramctl.c:738 +#: sys-utils/zramctl.c:734 #, c-format msgid "%s: failed to set disksize (%ju bytes)" msgstr "%s：设置磁盘大小失败(%ju 个字节)" -#: term-utils/agetty.c:463 +#: term-utils/agetty.c:470 #, c-format msgid "%s%s (automatic login)\n" msgstr "%s%s (自动登录)\n" -#: term-utils/agetty.c:519 +#: term-utils/agetty.c:526 #, c-format msgid "%s: can't change root directory %s: %m" msgstr "%s：无法更改根目录 %s：%m" -#: term-utils/agetty.c:522 +#: term-utils/agetty.c:529 #, c-format msgid "%s: can't change working directory %s: %m" msgstr "%s：无法更改工作目录 %s：%m" -#: term-utils/agetty.c:525 +#: term-utils/agetty.c:532 #, c-format msgid "%s: can't change process priority: %m" msgstr "%s：无法更改进程优先级：%m" -#: term-utils/agetty.c:536 +#: term-utils/agetty.c:543 #, c-format msgid "%s: can't exec %s: %m" msgstr "%s：无法执行 %s：%m" -#: term-utils/agetty.c:567 term-utils/agetty.c:892 term-utils/agetty.c:1410 -#: term-utils/agetty.c:1428 term-utils/agetty.c:1465 term-utils/agetty.c:1475 -#: term-utils/agetty.c:1517 term-utils/agetty.c:1960 term-utils/agetty.c:2517 +#: term-utils/agetty.c:574 term-utils/agetty.c:901 term-utils/agetty.c:1419 +#: term-utils/agetty.c:1437 term-utils/agetty.c:1474 term-utils/agetty.c:1484 +#: term-utils/agetty.c:1526 term-utils/agetty.c:2093 term-utils/agetty.c:2655 #, c-format msgid "failed to allocate memory: %m" msgstr "分配内存失败：%m" -#: term-utils/agetty.c:654 +#: term-utils/agetty.c:664 #, fuzzy, c-format msgid "%s from %s" msgstr "%s，来自 %s\n" -#: term-utils/agetty.c:738 +#: term-utils/agetty.c:748 msgid "invalid delay argument" msgstr "无效的延迟参数" -#: term-utils/agetty.c:777 +#: term-utils/agetty.c:786 msgid "invalid argument of --local-line" msgstr "--local-line 选项参数无效" -#: term-utils/agetty.c:796 +#: term-utils/agetty.c:805 msgid "invalid nice argument" msgstr "无效的 nice 参数" -#: term-utils/agetty.c:897 +#: term-utils/agetty.c:906 #, c-format msgid "bad speed: %s" msgstr "速度有误：%s" -#: term-utils/agetty.c:899 +#: term-utils/agetty.c:908 msgid "too many alternate speeds" msgstr "备选速度过多" -#: term-utils/agetty.c:1006 term-utils/agetty.c:1010 term-utils/agetty.c:1063 +#: term-utils/agetty.c:1015 term-utils/agetty.c:1019 term-utils/agetty.c:1072 #, c-format msgid "/dev/%s: cannot open as standard input: %m" msgstr "/dev/%s：无法以标准输入打开：%m" -#: term-utils/agetty.c:1029 +#: term-utils/agetty.c:1038 #, c-format msgid "/dev/%s: not a character device" msgstr "/dev/%s：不是字符设备" -#: term-utils/agetty.c:1031 +#: term-utils/agetty.c:1040 #, c-format msgid "/dev/%s: not a tty" msgstr "/dev/%s：不是终端" -#: term-utils/agetty.c:1035 term-utils/agetty.c:1067 +#: term-utils/agetty.c:1044 term-utils/agetty.c:1076 #, c-format msgid "/dev/%s: cannot get controlling tty: %m" msgstr "/dev/%s：无法获取控制 tty：%m" -#: term-utils/agetty.c:1057 +#: term-utils/agetty.c:1066 #, c-format msgid "/dev/%s: vhangup() failed: %m" msgstr "/dev/%s：vhangup() 失败：%m" -#: term-utils/agetty.c:1078 +#: term-utils/agetty.c:1087 #, c-format msgid "%s: not open for read/write" msgstr "%s：未打开(就)读/写" -#: term-utils/agetty.c:1083 +#: term-utils/agetty.c:1092 #, c-format msgid "/dev/%s: cannot set process group: %m" msgstr "/dev/%s：无法设置进程组：%m" -#: term-utils/agetty.c:1097 +#: term-utils/agetty.c:1106 #, c-format msgid "%s: dup problem: %m" msgstr "%s：dup 问题：%m" -#: term-utils/agetty.c:1114 +#: term-utils/agetty.c:1123 #, c-format msgid "%s: failed to get terminal attributes: %m" msgstr "%s：获取终端属性失败：%m" -#: term-utils/agetty.c:1316 term-utils/agetty.c:1336 +#: term-utils/agetty.c:1325 term-utils/agetty.c:1345 #, c-format msgid "setting terminal attributes failed: %m" msgstr "设置终端属性失败：%m" -#: term-utils/agetty.c:1455 +#: term-utils/agetty.c:1464 msgid "cannot open os-release file" msgstr "无法打开 os-release 文件" -#: term-utils/agetty.c:1622 +#: term-utils/agetty.c:1631 #, c-format msgid "failed to create reload file: %s: %m" msgstr "未能创建 reload 文件︰%s：%m" -#: term-utils/agetty.c:1709 +#: term-utils/agetty.c:1835 msgid "[press ENTER to login]" msgstr "[按 ENTER 键登录]" -#: term-utils/agetty.c:1733 +#: term-utils/agetty.c:1859 msgid "Num Lock off" msgstr "Num Lock 关" -#: term-utils/agetty.c:1736 +#: term-utils/agetty.c:1862 msgid "Num Lock on" msgstr "Num Lock 开" -#: term-utils/agetty.c:1739 +#: term-utils/agetty.c:1865 msgid "Caps Lock on" msgstr "Caps Lock 开" -#: term-utils/agetty.c:1742 +#: term-utils/agetty.c:1868 msgid "Scroll Lock on" msgstr "Scroll Lock 开" -#: term-utils/agetty.c:1745 +#: term-utils/agetty.c:1871 #, c-format msgid "" "Hint: %s\n" @@ -18004,32 +18113,32 @@ msgstr "" "提示：%s\n" "\n" -#: term-utils/agetty.c:1880 +#: term-utils/agetty.c:2008 #, c-format msgid "%s: read: %m" msgstr "%s：read：%m" -#: term-utils/agetty.c:1939 +#: term-utils/agetty.c:2072 #, c-format msgid "%s: input overrun" msgstr "%s：输入过载" -#: term-utils/agetty.c:1956 term-utils/agetty.c:1964 +#: term-utils/agetty.c:2089 term-utils/agetty.c:2097 #, c-format msgid "%s: invalid character conversion for login name" msgstr "%s：登录名字符转换无效" -#: term-utils/agetty.c:1970 +#: term-utils/agetty.c:2103 #, c-format msgid "%s: invalid character 0x%x in login name" msgstr "%s：登录名中的字符 0x%x 无效" -#: term-utils/agetty.c:2055 +#: term-utils/agetty.c:2188 #, c-format msgid "%s: failed to set terminal attributes: %m" msgstr "%s：设置终端属性失败：%m" -#: term-utils/agetty.c:2093 +#: term-utils/agetty.c:2226 #, c-format msgid "" " %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n" @@ -18038,160 +18147,160 @@ msgstr "" " %1$s [选项] <线路> [<波特率>,...] [<终端类型>]\n" " %1$s [选项] <波特率>,... <线路> [<终端类型>]\n" -#: term-utils/agetty.c:2097 +#: term-utils/agetty.c:2230 msgid "Open a terminal and set its mode.\n" msgstr "打开一个终端并设置其模式。\n" -#: term-utils/agetty.c:2100 +#: term-utils/agetty.c:2233 msgid " -8, --8bits assume 8-bit tty\n" msgstr " -8, --8bits 采用 8 位 tty\n" -#: term-utils/agetty.c:2101 +#: term-utils/agetty.c:2234 msgid " -a, --autologin <user> login the specified user automatically\n" msgstr " -a, --autologin <用户> 以指定用户自动登录\n" -#: term-utils/agetty.c:2102 +#: term-utils/agetty.c:2235 msgid " -c, --noreset do not reset control mode\n" msgstr " -c, --noreset 不重置控制模式\n" -#: term-utils/agetty.c:2103 +#: term-utils/agetty.c:2236 msgid " -E, --remote use -r <hostname> for login(1)\n" msgstr " -E, --remote 使用 -r <主机名> 选项调用 login(1)\n" -#: term-utils/agetty.c:2104 +#: term-utils/agetty.c:2237 msgid " -f, --issue-file <file> display issue file\n" msgstr " -f, --issue-file <文件> 指定要显示的预登录消息(issue)文件\n" -#: term-utils/agetty.c:2105 +#: term-utils/agetty.c:2238 msgid " -h, --flow-control enable hardware flow control\n" msgstr " -h, --flow-control 启用硬件流控制\n" -#: term-utils/agetty.c:2106 +#: term-utils/agetty.c:2239 msgid " -H, --host <hostname> specify login host\n" msgstr " -H, --host <主机名> 指定登录主机\n" -#: term-utils/agetty.c:2107 +#: term-utils/agetty.c:2240 msgid " -i, --noissue do not display issue file\n" msgstr " -i, --noissue 不显示预登录消息(issue)文件\n" -#: term-utils/agetty.c:2108 +#: term-utils/agetty.c:2241 msgid " -I, --init-string <string> set init string\n" msgstr " -I, --init-string <字符串> 设置初始字符串\n" -#: term-utils/agetty.c:2109 +#: term-utils/agetty.c:2242 msgid " -J --noclear do not clear the screen before prompt\n" msgstr " -J --noclear 提示之前不清屏\n" -#: term-utils/agetty.c:2110 +#: term-utils/agetty.c:2243 msgid " -l, --login-program <file> specify login program\n" msgstr " -l, --login-program <文件> 指定登录程序\n" -#: term-utils/agetty.c:2111 +#: term-utils/agetty.c:2244 msgid " -L, --local-line[=<mode>] control the local line flag\n" msgstr " -L, --local-line[=<模式>] 控制本地线路标志\n" -#: term-utils/agetty.c:2112 +#: term-utils/agetty.c:2245 msgid " -m, --extract-baud extract baud rate during connect\n" msgstr " -m, --extract-baud 连接过程中提取波特率\n" -#: term-utils/agetty.c:2113 +#: term-utils/agetty.c:2246 msgid " -n, --skip-login do not prompt for login\n" msgstr " -n, --skip-login 不提示登录\n" -#: term-utils/agetty.c:2114 +#: term-utils/agetty.c:2247 msgid " -N --nonewline do not print a newline before issue\n" msgstr " -N --nonewline 预登录消息(issue)前不打印换行(newline)\n" -#: term-utils/agetty.c:2115 +#: term-utils/agetty.c:2248 msgid " -o, --login-options <opts> options that are passed to login\n" msgstr " -o, --login-options <选项> 传递给登录程序的选项\n" -#: term-utils/agetty.c:2116 +#: term-utils/agetty.c:2249 msgid " -p, --login-pause wait for any key before the login\n" msgstr " -p, --login-pause 登录前等待按下任意键来继续\n" -#: term-utils/agetty.c:2117 +#: term-utils/agetty.c:2250 msgid " -r, --chroot <dir> change root to the directory\n" msgstr " -r, --chroot <目录> 将根目录更改为指定目录\n" -#: term-utils/agetty.c:2118 +#: term-utils/agetty.c:2251 msgid " -R, --hangup do virtually hangup on the tty\n" msgstr " -R, --hangup 对 tty 执行虚拟挂起(virtual hangup)\n" -#: term-utils/agetty.c:2119 +#: term-utils/agetty.c:2252 msgid " -s, --keep-baud try to keep baud rate after break\n" msgstr " -s, --keep-baud 中断(break)后尝试保持波特率\n" -#: term-utils/agetty.c:2120 +#: term-utils/agetty.c:2253 msgid " -t, --timeout <number> login process timeout\n" msgstr " -t, --timeout <数字> 登录进程超时(秒)\n" -#: term-utils/agetty.c:2121 +#: term-utils/agetty.c:2254 msgid " -U, --detect-case detect uppercase terminal\n" msgstr " -U, --detect-case 检测纯大写终端\n" -#: term-utils/agetty.c:2122 +#: term-utils/agetty.c:2255 msgid " -w, --wait-cr wait carriage-return\n" msgstr " -w, --wait-cr 等待回车\n" -#: term-utils/agetty.c:2123 +#: term-utils/agetty.c:2256 msgid " --nohints do not print hints\n" msgstr " --nohints 不打印提示信息\n" -#: term-utils/agetty.c:2124 +#: term-utils/agetty.c:2257 msgid " --nohostname no hostname at all will be shown\n" msgstr " --nohostname 将完全不显示主机名\n" -#: term-utils/agetty.c:2125 +#: term-utils/agetty.c:2258 msgid " --long-hostname show full qualified hostname\n" msgstr " --long-hostname 显示完全限定主机名\n" -#: term-utils/agetty.c:2126 +#: term-utils/agetty.c:2259 msgid " --erase-chars <string> additional backspace chars\n" msgstr " --erase-chars <字符串> 附加的退格字符\n" -#: term-utils/agetty.c:2127 +#: term-utils/agetty.c:2260 msgid " --kill-chars <string> additional kill chars\n" msgstr " --kill-chars <字符串> 附加的杀死(kill)字符\n" -#: term-utils/agetty.c:2128 +#: term-utils/agetty.c:2261 msgid " --chdir <directory> chdir before the login\n" msgstr " --chdir <目录> 登录前切换目录(chdir)\n" -#: term-utils/agetty.c:2129 +#: term-utils/agetty.c:2262 msgid " --delay <number> sleep seconds before prompt\n" msgstr " --delay <数字> 提示前睡眠的秒数\n" -#: term-utils/agetty.c:2130 +#: term-utils/agetty.c:2263 msgid " --nice <number> run login with this priority\n" msgstr " --nice <数字> 以指定优先级运行 login\n" -#: term-utils/agetty.c:2131 +#: term-utils/agetty.c:2264 msgid " --reload reload prompts on running agetty instances\n" msgstr " --reload 在运行 agetty 实例时重新载入提示\n" -#: term-utils/agetty.c:2132 +#: term-utils/agetty.c:2265 #, fuzzy msgid " --list-speeds display supported baud rates\n" msgstr " --list 列出可设置的架构并退出\n" -#: term-utils/agetty.c:2477 +#: term-utils/agetty.c:2615 #, c-format msgid "%d user" msgid_plural "%d users" msgstr[0] "%d 位用户" -#: term-utils/agetty.c:2605 +#: term-utils/agetty.c:2743 #, c-format msgid "checkname failed: %m" msgstr "checkname 失败：%m" -#: term-utils/agetty.c:2617 +#: term-utils/agetty.c:2755 #, c-format msgid "cannot touch file %s" msgstr "无法 touch 文件 %s" -#: term-utils/agetty.c:2621 +#: term-utils/agetty.c:2759 msgid "--reload is unsupported on your system" msgstr "您的系统不支持 --reload" @@ -18298,12 +18407,12 @@ msgstr "" "\n" "会话已终止。\n" -#: term-utils/script.c:478 +#: term-utils/script.c:476 #, fuzzy, c-format msgid "Script started on %s\n" msgstr "脚本已于 %s 启动" -#: term-utils/script.c:552 +#: term-utils/script.c:548 #, fuzzy, c-format msgid "" "\n" @@ -18312,15 +18421,15 @@ msgstr "" "\n" "脚本完成，于 %s" -#: term-utils/script.c:643 +#: term-utils/script.c:639 msgid "openpty failed" msgstr "openpty 失败" -#: term-utils/script.c:681 +#: term-utils/script.c:677 msgid "out of pty's" msgstr "pty 的输出" -#: term-utils/script.c:781 +#: term-utils/script.c:777 #, c-format msgid "Script started, file is %s\n" msgstr "脚本已启动，文件为 %s\n" @@ -18814,7 +18923,7 @@ msgstr "越过第一行" msgid "-- line already flushed" msgstr "-- 行已经被冲洗(flushed)" -#: text-utils/colcrt.c:82 text-utils/column.c:564 +#: text-utils/colcrt.c:82 text-utils/column.c:631 #, c-format msgid " %s [options] [<file>...]\n" msgstr " %s [选项] [<文件>...]\n" @@ -18854,166 +18963,171 @@ msgstr "第一个参数" msgid "second argument" msgstr "第二个参数" -#: text-utils/column.c:230 +#: text-utils/column.c:235 #, fuzzy msgid "failed to parse column" msgstr "解析 终点 失败" -#: text-utils/column.c:240 +#: text-utils/column.c:245 #, fuzzy, c-format msgid "undefined column name '%s'" msgstr "未定义的挂载点" -#: text-utils/column.c:291 +#: text-utils/column.c:321 #, fuzzy msgid "failed to parse --table-order list" msgstr "解析 --timeout 失败" -#: text-utils/column.c:364 +#: text-utils/column.c:394 #, fuzzy msgid "failed to parse --table-right list" msgstr "解析 起点 失败" -#: text-utils/column.c:368 +#: text-utils/column.c:398 #, fuzzy msgid "failed to parse --table-trunc list" msgstr "解析 --timeout 失败" -#: text-utils/column.c:372 +#: text-utils/column.c:402 #, fuzzy msgid "failed to parse --table-noextreme list" msgstr "解析 --timeout 失败" -#: text-utils/column.c:376 +#: text-utils/column.c:406 #, fuzzy msgid "failed to parse --table-wrap list" msgstr "解析 起点 失败" -#: text-utils/column.c:380 +#: text-utils/column.c:410 #, fuzzy msgid "failed to parse --table-hide list" msgstr "解析 --timeout 失败" -#: text-utils/column.c:411 +#: text-utils/column.c:441 #, c-format msgid "line %zu: for JSON the name of the column %zu is required" msgstr "" -#: text-utils/column.c:424 +#: text-utils/column.c:455 #, fuzzy msgid "failed to allocate output data" msgstr "分配输出表失败" -#: text-utils/column.c:567 +#: text-utils/column.c:634 msgid "Columnate lists.\n" msgstr "成列输出内容。\n" -#: text-utils/column.c:570 +#: text-utils/column.c:637 #, fuzzy msgid " -t, --table create a table\n" msgstr " -t, --table 创建表格\n" -#: text-utils/column.c:571 +#: text-utils/column.c:638 #, fuzzy msgid " -n, --table-name <name> table name for JSON output\n" msgstr " -n, --name <progname> 要报告其错误的程序名称\n" -#: text-utils/column.c:572 +#: text-utils/column.c:639 #, fuzzy msgid " -O, --table-order <columns> specify order of output columns\n" msgstr " -x, --sort <列> 按<列>对输出排序\n" -#: text-utils/column.c:573 +#: text-utils/column.c:640 #, fuzzy msgid " -N, --table-columns <names> comma separated columns names\n" msgstr " -o, --options <列表> 以英文逗号分隔的 swap 选项\n" -#: text-utils/column.c:574 +#: text-utils/column.c:641 msgid " -E, --table-noextreme <columns> don't count long text from the columns to column width\n" msgstr "" -#: text-utils/column.c:575 +#: text-utils/column.c:642 +#, fuzzy +msgid " -d, --table-noheadings don't print header\n" +msgstr " -n, --noheadings 不打印标题\n" + +#: text-utils/column.c:643 msgid " -e, --table-header-repeat repeat header for each page\n" msgstr "" -#: text-utils/column.c:576 +#: text-utils/column.c:644 #, fuzzy msgid " -H, --table-hide <columns> don't print the columns\n" msgstr " -n, --noheadings 不打印列标题\n" -#: text-utils/column.c:577 +#: text-utils/column.c:645 msgid " -R, --table-right <columns> right align text in these columns\n" msgstr "" -#: text-utils/column.c:578 +#: text-utils/column.c:646 #, fuzzy msgid " -T, --table-truncate <columns> truncate text in the columns when necessary\n" msgstr " -u, --notruncate 不截断列中的文本\n" -#: text-utils/column.c:579 +#: text-utils/column.c:647 msgid " -W, --table-wrap <columns> wrap text in the columns when necessary\n" msgstr "" -#: text-utils/column.c:580 +#: text-utils/column.c:648 #, fuzzy msgid " -J, --json use JSON output format for table\n" msgstr " -J, --json 使用 JSON --list 输出格式\n" -#: text-utils/column.c:583 +#: text-utils/column.c:651 #, fuzzy msgid " -r, --tree <column> column to use tree-like output for the table\n" msgstr " -O, --output <列> 指定 --list 选项要输出的列\n" -#: text-utils/column.c:584 +#: text-utils/column.c:652 #, fuzzy msgid " -i, --tree-id <column> line ID to specify child-parent relation\n" msgstr " -i, --irq <数字> 指定并口中断号\n" -#: text-utils/column.c:585 +#: text-utils/column.c:653 #, fuzzy msgid " -p, --tree-parent <column> parent to specify child-parent relation\n" msgstr " -N, --partno <数字> 指定分区号\n" -#: text-utils/column.c:588 +#: text-utils/column.c:656 #, fuzzy msgid " -c, --output-width <width> width of output in number of characters\n" msgstr " -c, --columns <宽度> 输出宽度(字符数)\n" -#: text-utils/column.c:589 +#: text-utils/column.c:657 #, fuzzy msgid " -o, --output-separator <string> columns separator for table output (default is two spaces)\n" msgstr "" " -o, --output-separator <字符串>\n" " 表格输出列分隔符，默认为两个空格\n" -#: text-utils/column.c:590 +#: text-utils/column.c:658 #, fuzzy msgid " -s, --separator <string> possible table delimiters\n" msgstr " -s, --separator <字符串> 可用的表格分隔符\n" -#: text-utils/column.c:591 +#: text-utils/column.c:659 #, fuzzy msgid " -x, --fillrows fill rows before columns\n" msgstr " -x, --fillrows 先填充行，再填充列\n" -#: text-utils/column.c:657 +#: text-utils/column.c:728 msgid "invalid columns argument" msgstr "无效的 列数 参数" -#: text-utils/column.c:679 +#: text-utils/column.c:753 #, fuzzy msgid "failed to parse column names" msgstr "解析挂臷表失败" -#: text-utils/column.c:732 +#: text-utils/column.c:808 msgid "options --tree-id and --tree-parent are required for tree formatting" msgstr "" -#: text-utils/column.c:740 +#: text-utils/column.c:816 msgid "option --table required for all --table-*" msgstr "" -#: text-utils/column.c:743 +#: text-utils/column.c:819 msgid "option --table-columns required for --json" msgstr "" @@ -19310,15 +19424,15 @@ msgstr "" msgid "Pattern not found" msgstr "找不到模式" -#: text-utils/more.c:1650 +#: text-utils/more.c:1652 msgid "exec failed\n" msgstr "exec 失败\n" -#: text-utils/more.c:1664 +#: text-utils/more.c:1666 msgid "can't fork\n" msgstr "无法 fork\n" -#: text-utils/more.c:1698 +#: text-utils/more.c:1700 msgid "" "\n" "...Skipping " @@ -19326,19 +19440,19 @@ msgstr "" "\n" "...跳过 " -#: text-utils/more.c:1702 +#: text-utils/more.c:1704 msgid "...Skipping to file " msgstr "...跳到文件 " -#: text-utils/more.c:1704 +#: text-utils/more.c:1706 msgid "...Skipping back to file " msgstr "...将跳回文件 " -#: text-utils/more.c:1993 +#: text-utils/more.c:1995 msgid "Line too long" msgstr "行过长" -#: text-utils/more.c:2030 +#: text-utils/more.c:2032 msgid "No previous command to substitute for" msgstr "没有要替换的前一命令" @@ -19508,20 +19622,20 @@ msgstr "已保存" msgid ": !command not allowed in rflag mode.\n" msgstr ": !命令 在 rflag 模式下不许使用。\n" -#: text-utils/pg.c:1388 +#: text-utils/pg.c:1387 msgid "fork() failed, try again later\n" msgstr "fork() 失败，请稍后重试\n" -#: text-utils/pg.c:1476 +#: text-utils/pg.c:1475 msgid "(Next file: " msgstr "(下个文件：" -#: text-utils/pg.c:1542 +#: text-utils/pg.c:1541 #, 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:1595 text-utils/pg.c:1668 +#: text-utils/pg.c:1594 text-utils/pg.c:1667 msgid "failed to parse number of lines per page" msgstr "解析每页的行数失败" @@ -19569,6 +19683,34 @@ msgstr "输入中有未知转义序列：%o，%o" msgid "Input line too long." msgstr "输入行过长。" +#~ msgid "Geometry" +#~ msgstr "几何属性" + +#~ msgid "kind of lock: FL_FLOCK or FL_POSIX." +#~ msgstr "锁类型：FL_FLOCK 或 FL_POSIX。" + +#~ msgid "unable to exec /bin/umount of `%s'" +#~ msgstr "无法对“%s”执行 /bin/umount" + +#~ msgid "sleeping ~%d usec\n" +#~ msgstr "将睡眠 ~%d 微秒\n" + +#~ msgid "%ld.%06ld < %ld.%06ld (%.6f)\n" +#~ msgstr "%ld.%06ld < %ld.%06ld (%.6f)\n" + +#, fuzzy +#~ msgid " -D, --debug display more details" +#~ msgstr " --verbose 打印更多细节\n" + +#~ msgid "failed to read from: %s" +#~ msgstr "读取失败︰ %s" + +#~ msgid "cannot execute: %s" +#~ msgstr "无法执行：%s" + +#~ msgid "unsupported algorithm: %s" +#~ msgstr "不支持的算法︰%s" + #, fuzzy #~ msgid "" #~ "Test mode: %s was not updated with:\n" @@ -21753,9 +21895,6 @@ msgstr "输入行过长。" #~ msgid " s - Table ordered by sectors" #~ msgstr " s - 按扇区排序的表" -#~ msgid " t - Table in raw format" -#~ msgstr " t - 原生格式的表" - #~ msgid " u Change units of the partition size display" #~ msgstr " u 更改分区大小的显示单位" |