From ac31e6f8238dd5cbda3ba29913315b740e37a41d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 7 Sep 2015 09:47:51 +0200 Subject: po: merge changes Signed-off-by: Karel Zak --- po/zh_CN.po | 375 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 191 insertions(+), 184 deletions(-) (limited to 'po/zh_CN.po') diff --git a/po/zh_CN.po b/po/zh_CN.po index cefa96688..f1525bad1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: util-linux-2.25.1-rc1\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2015-08-24 12:23+0200\n" +"POT-Creation-Date: 2015-09-07 09:45+0200\n" "PO-Revision-Date: 2014-11-29 21:39+0800\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" @@ -218,7 +218,7 @@ msgstr "%s 失败.\n" msgid "%s succeeded.\n" msgstr "%s 成功.\n" -#: disk-utils/blockdev.c:457 misc-utils/lsblk.c:1175 misc-utils/lsblk.c:1182 +#: disk-utils/blockdev.c:457 misc-utils/lsblk.c:1177 misc-utils/lsblk.c:1184 #, c-format msgid "%s: failed to initialize sysfs handler" msgstr "%s：初始化 sysfs 处理函数失败" @@ -265,8 +265,8 @@ msgstr "退出" msgid "Quit program without writing partition table" msgstr "退出程序而不写入分区表" -#: disk-utils/cfdisk.c:184 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1016 -#: libfdisk/src/dos.c:2306 libfdisk/src/gpt.c:2765 libfdisk/src/sgi.c:1162 +#: disk-utils/cfdisk.c:184 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1020 +#: libfdisk/src/dos.c:2305 libfdisk/src/gpt.c:2774 libfdisk/src/sgi.c:1162 #: libfdisk/src/sun.c:1113 msgid "Type" msgstr "类型" @@ -612,8 +612,8 @@ msgstr "您确定想将分区表写入磁盘吗？" msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog." msgstr "输入“yes”或“no”或按 ESC 取消对话框。" -#: disk-utils/cfdisk.c:2381 login-utils/lslogins.c:208 sys-utils/lscpu.c:1267 -#: sys-utils/lscpu.c:1277 +#: disk-utils/cfdisk.c:2381 login-utils/lslogins.c:208 sys-utils/lscpu.c:1262 +#: sys-utils/lscpu.c:1272 msgid "yes" msgstr "是" @@ -664,7 +664,7 @@ msgid " -z, --zero start with zeroed partition table\n" msgstr " -z, --zero 以空分区表开始\n" #: disk-utils/cfdisk.c:2597 disk-utils/fdisk.c:863 disk-utils/sfdisk.c:1663 -#: misc-utils/cal.c:402 sys-utils/dmesg.c:1333 text-utils/hexdump.c:114 +#: misc-utils/cal.c:411 sys-utils/dmesg.c:1333 text-utils/hexdump.c:114 msgid "unsupported color mode" msgstr "不支持的颜色模式" @@ -778,7 +778,7 @@ msgstr "无效参数：%s" msgid "stat of %s failed" msgstr "stat 失败" -#: disk-utils/fdformat.c:223 disk-utils/partx.c:950 misc-utils/lsblk.c:1468 +#: disk-utils/fdformat.c:223 disk-utils/partx.c:950 misc-utils/lsblk.c:1470 #: sys-utils/blkdiscard.c:159 sys-utils/mountpoint.c:107 #, c-format msgid "%s: not a block device" @@ -963,7 +963,7 @@ msgid " -b, --sector-size physical and logical sector size\n" msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n" #: disk-utils/fdisk.c:726 -msgid " -B, --protect-boot don't erase bootbits when creat a new label\n" +msgid " -B, --protect-boot don't erase bootbits when create a new label\n" msgstr "" #: disk-utils/fdisk.c:727 @@ -1127,23 +1127,23 @@ msgstr "分区 %i 未起始于物理扇区边界。\n" msgid "Partition table entries are not in disk order." msgstr "分区表记录没有按磁盘顺序。" -#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1011 libfdisk/src/dos.c:2300 -#: libfdisk/src/gpt.c:2761 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1107 +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2299 +#: libfdisk/src/gpt.c:2770 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1107 msgid "Start" msgstr "起点" -#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1012 libfdisk/src/dos.c:2301 -#: libfdisk/src/gpt.c:2762 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1108 +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1016 libfdisk/src/dos.c:2300 +#: libfdisk/src/gpt.c:2771 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1108 msgid "End" msgstr "末尾" -#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1013 libfdisk/src/dos.c:2302 -#: libfdisk/src/gpt.c:2763 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1109 +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1017 libfdisk/src/dos.c:2301 +#: libfdisk/src/gpt.c:2772 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1109 msgid "Sectors" msgstr "扇区" -#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2304 -#: libfdisk/src/gpt.c:2764 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1111 +#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2303 +#: libfdisk/src/gpt.c:2773 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1111 msgid "Size" msgstr "大小" @@ -3537,15 +3537,15 @@ msgid "failed to add data to output table" msgstr "向输出表添加数据出错" #: disk-utils/partx.c:633 login-utils/lslogins.c:928 misc-utils/findmnt.c:1582 -#: misc-utils/lsblk.c:1849 misc-utils/lslocks.c:465 sys-utils/losetup.c:304 -#: sys-utils/lscpu.c:1438 sys-utils/lsipc.c:338 sys-utils/prlimit.c:297 +#: misc-utils/lsblk.c:1851 misc-utils/lslocks.c:465 sys-utils/losetup.c:304 +#: sys-utils/lscpu.c:1433 sys-utils/lsipc.c:338 sys-utils/prlimit.c:297 #: sys-utils/swapon.c:266 sys-utils/wdctl.c:259 sys-utils/zramctl.c:418 msgid "failed to initialize output table" msgstr "初始化输出表失败" -#: disk-utils/partx.c:644 misc-utils/findmnt.c:1608 misc-utils/lsblk.c:1869 +#: disk-utils/partx.c:644 misc-utils/findmnt.c:1608 misc-utils/lsblk.c:1871 #: misc-utils/lslocks.c:479 sys-utils/losetup.c:316 sys-utils/losetup.c:352 -#: sys-utils/lscpu.c:1443 sys-utils/prlimit.c:306 sys-utils/swapon.c:275 +#: sys-utils/lscpu.c:1438 sys-utils/prlimit.c:306 sys-utils/swapon.c:275 #: sys-utils/wdctl.c:270 sys-utils/zramctl.c:427 msgid "failed to initialize output column" msgstr "初始化输出列失败" @@ -3599,7 +3599,7 @@ msgstr "" " -s, --show 列出分区\n" "\n" -#: disk-utils/partx.c:725 misc-utils/lsblk.c:1606 +#: disk-utils/partx.c:725 misc-utils/lsblk.c:1608 msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n" msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n" @@ -3615,11 +3615,11 @@ msgstr " -n, --nr 指定分区范围(例如：--nr 2:4)\n" msgid " -o, --output define which output columns to use\n" msgstr " -o, --output <列表> 定义使用哪个输出列\n" -#: disk-utils/partx.c:729 misc-utils/lsblk.c:1620 +#: disk-utils/partx.c:729 misc-utils/lsblk.c:1622 msgid " -P, --pairs use key=\"value\" output format\n" msgstr " -P, --pairs 使用 key=“value” 输出格式\n" -#: disk-utils/partx.c:730 misc-utils/lsblk.c:1621 +#: disk-utils/partx.c:730 misc-utils/lsblk.c:1623 msgid " -r, --raw use raw output format\n" msgstr " -r, --raw 使用原生输出格式\n" @@ -4936,7 +4936,7 @@ msgstr "磁道/柱面" msgid "Sectors/Cylinder" msgstr "扇区/柱面" -#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1014 libfdisk/src/dos.c:2303 +#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1018 libfdisk/src/dos.c:2302 #: libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:196 libfdisk/src/sun.c:1110 msgid "Cylinders" msgstr "柱面" @@ -5034,37 +5034,42 @@ msgstr "引导程序与磁盘标签重叠！" msgid "Bootstrap installed on %s." msgstr "已在 %s 上安装引导程序。" -#: libfdisk/src/bsd.c:899 +#: libfdisk/src/bsd.c:900 +#, c-format +msgid "Disklabel written to %s (don't forget to write %s disklable too)." +msgstr "" + +#: libfdisk/src/bsd.c:903 #, c-format msgid "Disklabel written to %s." msgstr "磁盘标签已写入 %s。" -#: libfdisk/src/bsd.c:905 libfdisk/src/context.c:611 +#: libfdisk/src/bsd.c:909 libfdisk/src/context.c:611 msgid "Syncing disks." msgstr "正在同步磁盘。" -#: libfdisk/src/bsd.c:946 +#: libfdisk/src/bsd.c:950 msgid "BSD label is not nested within a DOS partition." msgstr "BSD 标签未嵌套在 DOS 分区中。" -#: libfdisk/src/bsd.c:974 +#: libfdisk/src/bsd.c:978 #, c-format msgid "BSD partition '%c' linked to DOS partition %zu." msgstr "BSD 分区“%c”已链接到 DOS 分区 %zu。" -#: libfdisk/src/bsd.c:1010 +#: libfdisk/src/bsd.c:1014 msgid "Slice" msgstr "片" -#: libfdisk/src/bsd.c:1017 +#: libfdisk/src/bsd.c:1021 msgid "Fsize" msgstr "Fsize" -#: libfdisk/src/bsd.c:1018 +#: libfdisk/src/bsd.c:1022 msgid "Bsize" msgstr "Bsize" -#: libfdisk/src/bsd.c:1019 +#: libfdisk/src/bsd.c:1023 msgid "Cpg" msgstr "Cpg" @@ -5346,63 +5351,59 @@ msgid "Type 0 means free space to many systems. Having partitions of type 0 is p msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。" #: libfdisk/src/dos.c:1963 -msgid "Cannot change type of the extended partition which is already used by logical partitons. Delete logical partitions first." +msgid "Cannot change type of the extended partition which is already used by logical partitions. Delete logical partitions first." msgstr "" -#: libfdisk/src/dos.c:2142 +#: libfdisk/src/dos.c:2142 libfdisk/src/gpt.c:2679 msgid "Nothing to do. Ordering is correct already." msgstr "无须操作。顺序已经是正确的了。" -#: libfdisk/src/dos.c:2171 libfdisk/src/gpt.c:2680 -msgid "Done." -msgstr "完成。" - -#: libfdisk/src/dos.c:2192 +#: libfdisk/src/dos.c:2191 #, c-format msgid "Partition %zu: no data area." msgstr "分区 %zu：无数据区。" -#: libfdisk/src/dos.c:2222 +#: libfdisk/src/dos.c:2221 msgid "New beginning of data" msgstr "新数据起点" -#: libfdisk/src/dos.c:2278 +#: libfdisk/src/dos.c:2277 #, c-format msgid "Partition %zu: is an extended partition." msgstr "分区 %zu：是一个扩展分区。" -#: libfdisk/src/dos.c:2284 +#: libfdisk/src/dos.c:2283 #, c-format msgid "The bootable flag on partition %zu is enabled now." msgstr "分区 %zu 的 可启动 标志已启用。" -#: libfdisk/src/dos.c:2285 +#: libfdisk/src/dos.c:2284 #, c-format msgid "The bootable flag on partition %zu is disabled now." msgstr "分区 %zu 的 可启动 标志已禁用。" -#: libfdisk/src/dos.c:2298 libfdisk/src/gpt.c:2760 libfdisk/src/sgi.c:1155 +#: libfdisk/src/dos.c:2297 libfdisk/src/gpt.c:2769 libfdisk/src/sgi.c:1155 #: libfdisk/src/sun.c:1106 msgid "Device" msgstr "设备" -#: libfdisk/src/dos.c:2299 libfdisk/src/sun.c:41 +#: libfdisk/src/dos.c:2298 libfdisk/src/sun.c:41 msgid "Boot" msgstr "启动" -#: libfdisk/src/dos.c:2305 libfdisk/src/sgi.c:1161 libfdisk/src/sun.c:1112 +#: libfdisk/src/dos.c:2304 libfdisk/src/sgi.c:1161 libfdisk/src/sun.c:1112 msgid "Id" msgstr "Id" -#: libfdisk/src/dos.c:2309 +#: libfdisk/src/dos.c:2308 msgid "Start-C/H/S" msgstr "始-C/H/S" -#: libfdisk/src/dos.c:2310 +#: libfdisk/src/dos.c:2309 msgid "End-C/H/S" msgstr "终-C/H/S" -#: libfdisk/src/dos.c:2311 libfdisk/src/gpt.c:2770 libfdisk/src/sgi.c:1163 +#: libfdisk/src/dos.c:2310 libfdisk/src/gpt.c:2779 libfdisk/src/sgi.c:1163 msgid "Attrs" msgstr "属性" @@ -5976,15 +5977,15 @@ msgstr "分区 %2$zu 上的标志 %1$s 现已启用。" msgid "The %s flag on partition %zu is disabled now." msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。" -#: libfdisk/src/gpt.c:2767 +#: libfdisk/src/gpt.c:2776 msgid "Type-UUID" msgstr "类型-UUID" -#: libfdisk/src/gpt.c:2768 +#: libfdisk/src/gpt.c:2777 msgid "UUID" msgstr "UUID" -#: libfdisk/src/gpt.c:2769 login-utils/chfn.c:151 login-utils/chfn.c:153 +#: libfdisk/src/gpt.c:2778 login-utils/chfn.c:151 login-utils/chfn.c:153 #: login-utils/chfn.c:308 msgid "Name" msgstr "名称" @@ -6414,7 +6415,7 @@ msgstr "" msgid "waitpid failed (%s)" msgstr "waitpid 失败(%s)" -#: lib/path.c:209 sys-utils/lscpu.c:1543 +#: lib/path.c:209 sys-utils/lscpu.c:1538 msgid "failed to callocate cpu set" msgstr "分配(callocate) CPU 组 失败" @@ -6918,7 +6919,7 @@ msgstr "" "\n" "登录不正确\n" -#: login-utils/login.c:893 login-utils/login.c:1237 login-utils/login.c:1260 +#: login-utils/login.c:893 login-utils/login.c:1240 login-utils/login.c:1263 msgid "" "\n" "Session setup problem, abort." @@ -6936,64 +6937,64 @@ msgstr "%s:%d 中是空(NULL)用户名。中止。" msgid "TIOCSCTTY failed: %m" msgstr "TIOCSCTTY 失败：%m" -#: login-utils/login.c:1179 +#: login-utils/login.c:1182 #, c-format msgid "login: -h is for superuser only\n" msgstr "login：-h 是超级用户专用选项\n" -#: login-utils/login.c:1194 +#: login-utils/login.c:1197 #, c-format msgid "Usage: login [-p] [-h ] [-H] [[-f] ]\n" msgstr "用法：login [-p] [-h <主机>] [-H] [[-f] <用户名>]\n" -#: login-utils/login.c:1196 +#: login-utils/login.c:1199 #, fuzzy msgid "Begin a session on the system.\n" msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n" -#: login-utils/login.c:1238 +#: login-utils/login.c:1241 #, c-format msgid "Invalid user name \"%s\" in %s:%d. Abort." msgstr "%2$s:%3$d 中是无效用户名“%1$s”。中止。" -#: login-utils/login.c:1259 +#: login-utils/login.c:1262 #, c-format msgid "groups initialization failed: %m" msgstr "组初始化失败：%m" -#: login-utils/login.c:1284 +#: login-utils/login.c:1287 msgid "setgid() failed" msgstr "setgid() 失败" -#: login-utils/login.c:1314 +#: login-utils/login.c:1317 #, c-format msgid "You have new mail.\n" msgstr "有您的新邮件。\n" -#: login-utils/login.c:1316 +#: login-utils/login.c:1319 #, c-format msgid "You have mail.\n" msgstr "有您的邮件。\n" -#: login-utils/login.c:1330 +#: login-utils/login.c:1333 msgid "setuid() failed" msgstr "setuid() 失败" -#: login-utils/login.c:1336 login-utils/sulogin.c:763 +#: login-utils/login.c:1339 login-utils/sulogin.c:763 #, c-format msgid "%s: change directory failed" msgstr "%s：更改目录失败" -#: login-utils/login.c:1343 login-utils/sulogin.c:764 +#: login-utils/login.c:1346 login-utils/sulogin.c:764 #, c-format msgid "Logging in with home = \"/\".\n" msgstr "以 home = “/” 登录。\n" -#: login-utils/login.c:1372 +#: login-utils/login.c:1375 msgid "couldn't exec shell script" msgstr "无法执行(exec) shell 脚本" -#: login-utils/login.c:1374 +#: login-utils/login.c:1377 msgid "no shell" msgstr "无 shell" @@ -7006,7 +7007,7 @@ msgstr "%s：%s 包含无效的数字值：%s" msgid "hush login status: restore original IDs failed" msgstr "静默(hush)登录状态：恢复原 ID 失败" -#: login-utils/lslogins.c:207 sys-utils/lscpu.c:1267 sys-utils/lscpu.c:1277 +#: login-utils/lslogins.c:207 sys-utils/lscpu.c:1262 sys-utils/lscpu.c:1272 msgid "no" msgstr "否" @@ -7247,7 +7248,7 @@ msgstr "" #: login-utils/lslogins.c:1234 login-utils/nologin.c:25 #: misc-utils/lslocks.c:515 misc-utils/mcookie.c:82 misc-utils/uuidd.c:73 #: misc-utils/uuidgen.c:33 sys-utils/dmesg.c:264 sys-utils/ipcmk.c:66 -#: sys-utils/lscpu.c:1651 sys-utils/lsipc.c:277 sys-utils/readprofile.c:104 +#: sys-utils/lscpu.c:1646 sys-utils/lsipc.c:277 sys-utils/readprofile.c:104 #: sys-utils/rtcwake.c:95 term-utils/setterm.c:388 text-utils/line.c:30 #, c-format msgid " %s [options]\n" @@ -7343,7 +7344,7 @@ msgid " --btmp-file set an alternate path for btmp\n" msgstr " --btmp-file <路径> 设置 btmp 的可选路径\n" #: login-utils/lslogins.c:1265 misc-utils/findmnt.c:1262 -#: sys-utils/lscpu.c:1668 +#: sys-utils/lscpu.c:1663 #, c-format msgid "" "\n" @@ -7825,112 +7826,113 @@ msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n" msgid "Would you like to edit %s now [y/n]? " msgstr "您想现在编辑 %s 吗[y/n]？" -#: misc-utils/cal.c:387 +#: misc-utils/cal.c:396 #, fuzzy msgid "invalid month argument" msgstr "无效的长度参数" -#: misc-utils/cal.c:392 +#: misc-utils/cal.c:401 msgid "invalid week argument" msgstr "无效的 周 参数" -#: misc-utils/cal.c:394 -msgid "illegal week value: use 1-53" +#: misc-utils/cal.c:403 +#, fuzzy +msgid "illegal week value: use 1-54" msgstr "非法的 周 值：请使用 1-53" -#: misc-utils/cal.c:430 +#: misc-utils/cal.c:439 msgid "illegal day value" msgstr "日 值不合法" -#: misc-utils/cal.c:432 misc-utils/cal.c:448 +#: misc-utils/cal.c:441 misc-utils/cal.c:457 #, c-format msgid "illegal day value: use 1-%d" msgstr "日 值不合法：请使用 1-%d" -#: misc-utils/cal.c:435 misc-utils/cal.c:437 +#: misc-utils/cal.c:444 misc-utils/cal.c:446 msgid "illegal month value: use 1-12" msgstr "月份值不合法：请使用 1-12" -#: misc-utils/cal.c:440 misc-utils/cal.c:444 +#: misc-utils/cal.c:449 misc-utils/cal.c:453 msgid "illegal year value" msgstr "年份值不合法" -#: misc-utils/cal.c:442 +#: misc-utils/cal.c:451 msgid "illegal year value: use positive integer" msgstr "年份值不合法：请使用正整数" -#: misc-utils/cal.c:473 misc-utils/cal.c:486 +#: misc-utils/cal.c:482 misc-utils/cal.c:495 #, c-format msgid "illegal week value: year %d doesn't have week %d" msgstr "非法的 周 值：%d 年没有第 %d 周" -#: misc-utils/cal.c:627 +#: misc-utils/cal.c:634 #, c-format msgid "%s" msgstr "%s" -#: misc-utils/cal.c:633 +#: misc-utils/cal.c:640 #, c-format msgid "%d" msgstr "%d" -#: misc-utils/cal.c:639 +#: misc-utils/cal.c:646 #, c-format msgid "%s %d" msgstr "%s %d" -#: misc-utils/cal.c:942 +#: misc-utils/cal.c:948 #, c-format msgid " %s [options] [[[day] month] year]\n" msgstr " %s [选项] [[[日] 月] 年]\n" -#: misc-utils/cal.c:945 +#: misc-utils/cal.c:951 msgid "Display a calendar, or some part of it.\n" msgstr "显示日历或部分日历。\n" -#: misc-utils/cal.c:946 +#: misc-utils/cal.c:952 msgid "Without any arguments, display the current month.\n" msgstr "不带参数时，显示当月日历。\n" -#: misc-utils/cal.c:949 +#: misc-utils/cal.c:955 msgid " -1, --one show only a single month (default)\n" msgstr " -1, --one 只显示一个月(默认)\n" -#: misc-utils/cal.c:950 +#: misc-utils/cal.c:956 msgid " -3, --three show three months spanning the date\n" msgstr " -3, --three 显示该日期前后三个月\n" -#: misc-utils/cal.c:951 +#: misc-utils/cal.c:957 #, fuzzy msgid " -n, --months show num months starting with date's month\n" msgstr " -3, --three 显示该日期前后三个月\n" -#: misc-utils/cal.c:952 +#: misc-utils/cal.c:958 msgid " -s, --sunday Sunday as first day of week\n" msgstr " -s, --sunday 周日作为一周的第一天\n" -#: misc-utils/cal.c:953 +#: misc-utils/cal.c:959 msgid " -m, --monday Monday as first day of week\n" msgstr " -m, --monday 周一作为一周的第一天\n" -#: misc-utils/cal.c:954 +#: misc-utils/cal.c:960 msgid " -j, --julian output Julian dates\n" msgstr " -j, --julian 输出儒略日期\n" -#: misc-utils/cal.c:955 +#: misc-utils/cal.c:961 msgid " -y, --year show the whole year\n" msgstr " -y, --year 显示全年\n" -#: misc-utils/cal.c:956 +#: misc-utils/cal.c:962 #, fuzzy msgid " -Y, --twelve show the next twelve months\n" msgstr " -y, --year 显示全年\n" -#: misc-utils/cal.c:957 +#: misc-utils/cal.c:963 msgid " -w, --week[=] show US or ISO-8601 week numbers\n" msgstr " -w, --week[=<数字>] 显示美国或 ISO-8601 周数\n" -#: misc-utils/cal.c:958 +#: misc-utils/cal.c:964 msgid " --color[=] colorize messages (auto, always or never)\n" msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n" @@ -8853,147 +8855,147 @@ msgstr "设备修订版本" msgid "device vendor" msgstr "设备制造商" -#: misc-utils/lsblk.c:1161 +#: misc-utils/lsblk.c:1163 #, c-format msgid "%s: failed to get device path" msgstr "%s：获取设备路径失败" -#: misc-utils/lsblk.c:1169 +#: misc-utils/lsblk.c:1171 #, c-format msgid "%s: unknown device name" msgstr "%s：未知设备名称" -#: misc-utils/lsblk.c:1206 +#: misc-utils/lsblk.c:1208 #, c-format msgid "%s: failed to get dm name" msgstr "%s：获取 dm 名称失败" -#: misc-utils/lsblk.c:1255 +#: misc-utils/lsblk.c:1257 msgid "failed to open device directory in sysfs" msgstr "打开 sysfs 中的设备目录失败" -#: misc-utils/lsblk.c:1445 +#: misc-utils/lsblk.c:1447 #, c-format msgid "%s: failed to compose sysfs path" msgstr "%s：组成 sysfs 路径失败" -#: misc-utils/lsblk.c:1451 +#: misc-utils/lsblk.c:1453 #, c-format msgid "%s: failed to read link" msgstr "%s：读链接失败" -#: misc-utils/lsblk.c:1473 +#: misc-utils/lsblk.c:1475 #, c-format msgid "%s: failed to get sysfs name" msgstr "%s：获取 sysfs 名称失败" -#: misc-utils/lsblk.c:1482 +#: misc-utils/lsblk.c:1484 #, c-format msgid "%s: failed to get whole-disk device number" msgstr "%s：获取 整盘 设备号失败" -#: misc-utils/lsblk.c:1534 misc-utils/lsblk.c:1536 misc-utils/lsblk.c:1561 -#: misc-utils/lsblk.c:1563 +#: misc-utils/lsblk.c:1536 misc-utils/lsblk.c:1538 misc-utils/lsblk.c:1563 +#: misc-utils/lsblk.c:1565 #, c-format msgid "failed to parse list '%s'" msgstr "解析列表“%s”失败" #. TRANSLATORS: The standard value for %d is 256. -#: misc-utils/lsblk.c:1541 +#: misc-utils/lsblk.c:1543 #, c-format msgid "the list of excluded devices is too large (limit is %d devices)" msgstr "排除设备列表过大(限制为 %d 台设备)" #. TRANSLATORS: The standard value for %d is 256. -#: misc-utils/lsblk.c:1568 +#: misc-utils/lsblk.c:1570 #, c-format msgid "the list of included devices is too large (limit is %d devices)" msgstr "包含设备列表过大(限制为 %d 台设备)" -#: misc-utils/lsblk.c:1599 sys-utils/wdctl.c:174 +#: misc-utils/lsblk.c:1601 sys-utils/wdctl.c:174 #, c-format msgid " %s [options] [ ...]\n" msgstr " %s [选项] [<设备> ...]\n" -#: misc-utils/lsblk.c:1602 +#: misc-utils/lsblk.c:1604 #, fuzzy msgid "List information about block devices.\n" msgstr "%s：不是一个块设备" -#: misc-utils/lsblk.c:1605 +#: misc-utils/lsblk.c:1607 msgid " -a, --all print all devices\n" msgstr " -a, --all 打印所有设备\n" -#: misc-utils/lsblk.c:1607 +#: misc-utils/lsblk.c:1609 msgid " -d, --nodeps don't print slaves or holders\n" msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n" -#: misc-utils/lsblk.c:1608 +#: misc-utils/lsblk.c:1610 msgid " -D, --discard print discard capabilities\n" msgstr " -D, --discard 打印时丢弃能力\n" -#: misc-utils/lsblk.c:1609 +#: misc-utils/lsblk.c:1611 msgid " -e, --exclude exclude devices by major number (default: RAM disks)\n" msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认：内存盘)\n" -#: misc-utils/lsblk.c:1610 +#: misc-utils/lsblk.c:1612 msgid " -f, --fs output info about filesystems\n" msgstr " -f, --fs 输出文件系统信息\n" -#: misc-utils/lsblk.c:1611 +#: misc-utils/lsblk.c:1613 msgid " -i, --ascii use ascii characters only\n" msgstr " -i, --ascii 只使用 ascii 字符\n" -#: misc-utils/lsblk.c:1612 +#: misc-utils/lsblk.c:1614 msgid " -I, --include show only devices with specified major numbers\n" msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n" -#: misc-utils/lsblk.c:1613 +#: misc-utils/lsblk.c:1615 #, fuzzy msgid " -J, --json use JSON output format\n" msgstr " -r, --raw 使用原生输出格式\n" -#: misc-utils/lsblk.c:1614 +#: misc-utils/lsblk.c:1616 msgid " -l, --list use list format output\n" msgstr " -l, --list 使用列表格式的输出\n" -#: misc-utils/lsblk.c:1615 +#: misc-utils/lsblk.c:1617 msgid " -m, --perms output info about permissions\n" msgstr " -m, --perms 输出权限信息\n" -#: misc-utils/lsblk.c:1616 +#: misc-utils/lsblk.c:1618 msgid " -n, --noheadings don't print headings\n" msgstr " -n, --noheadings 不打印标题\n" -#: misc-utils/lsblk.c:1617 +#: misc-utils/lsblk.c:1619 msgid " -o, --output output columns\n" msgstr " -o, --output <列表> 输出列\n" -#: misc-utils/lsblk.c:1618 +#: misc-utils/lsblk.c:1620 msgid " -O, --output-all output all columns\n" msgstr " -O, --output-all 输出所有列\n" -#: misc-utils/lsblk.c:1619 +#: misc-utils/lsblk.c:1621 msgid " -p, --paths print complete device path\n" msgstr " -p, --paths 打印完整设备路径\n" -#: misc-utils/lsblk.c:1622 +#: misc-utils/lsblk.c:1624 msgid " -s, --inverse inverse dependencies\n" msgstr " -s, --inverse 反向依赖\n" -#: misc-utils/lsblk.c:1623 +#: misc-utils/lsblk.c:1625 msgid " -S, --scsi output info about SCSI devices\n" msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n" -#: misc-utils/lsblk.c:1624 +#: misc-utils/lsblk.c:1626 msgid " -t, --topology output info about topology\n" msgstr " -t, --topology 输出拓扑信息\n" -#: misc-utils/lsblk.c:1625 +#: misc-utils/lsblk.c:1627 msgid " -x, --sort sort output by \n" msgstr " -x, --sort <列> 按<列>对输出排序\n" -#: misc-utils/lsblk.c:1630 misc-utils/lslocks.c:532 sys-utils/prlimit.c:196 +#: misc-utils/lsblk.c:1632 misc-utils/lslocks.c:532 sys-utils/prlimit.c:196 #: sys-utils/zramctl.c:478 #, c-format msgid "" @@ -9003,12 +9005,12 @@ msgstr "" "\n" "可用列(用于 --output)：\n" -#: misc-utils/lsblk.c:1643 +#: misc-utils/lsblk.c:1645 #, c-format msgid "failed to access sysfs directory: %s" msgstr "无法访问 sysfs 目录：%s" -#: misc-utils/lsblk.c:1840 +#: misc-utils/lsblk.c:1842 msgid "the sort column has to be among the output columns" msgstr "排序列必须是输出的列" @@ -10375,7 +10377,8 @@ msgid " -e, --reltime show local time and time delta in readable f msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n" #: sys-utils/dmesg.c:292 -msgid " -T, --ctime show human readable timestamp\n" +#, fuzzy +msgid " -T, --ctime show human readable timestamp (may be inaccurate!)\n" msgstr " -T, --ctime 显示易读的时间戳\n" #: sys-utils/dmesg.c:293 @@ -10829,7 +10832,8 @@ msgid " -z, --zero-range zero and ensure allocation of a range\n" msgstr " -z, --zero-range 清零并保证分配某个范围\n" #: sys-utils/fallocate.c:126 -msgid "keep size mode (-n option) unsupported" +#, fuzzy +msgid "fallocate failed: keep size mode is unsupported" msgstr "不支持保持大小模式(-n 选项)" #: sys-utils/fallocate.c:127 @@ -11431,8 +11435,8 @@ msgid "To set the epoch value, you must use the 'epoch' option to tell to what v msgstr "要设置纪元(epoch)值，您必须使用“epoch”选项来指定设置的值。" #: sys-utils/hwclock.c:1461 -#, c-format -msgid "Not setting the epoch to %d - testing only.\n" +#, fuzzy, c-format +msgid "Not setting the epoch to %lu - testing only.\n" msgstr "不会将纪元(epoch)设置为 %d - 纯测试。\n" #: sys-utils/hwclock.c:1465 @@ -12689,7 +12693,7 @@ msgstr "，加密 %s(类型 %u)" msgid "%s: detach failed" msgstr "%s：断开失败" -#: sys-utils/losetup.c:323 sys-utils/lscpu.c:1460 sys-utils/prlimit.c:229 +#: sys-utils/losetup.c:323 sys-utils/lscpu.c:1455 sys-utils/prlimit.c:229 #: sys-utils/swapon.c:162 sys-utils/wdctl.c:215 sys-utils/zramctl.c:339 msgid "failed to initialize output line" msgstr "初始化输出行失败" @@ -12912,27 +12916,27 @@ msgstr "错误：uname 失败" msgid "failed to determine number of CPUs: %s" msgstr "确定 CPU 数 失败：%s" -#: sys-utils/lscpu.c:732 +#: sys-utils/lscpu.c:727 msgid "error: can not set signal handler" msgstr "错误：无法设置信号处理函数" -#: sys-utils/lscpu.c:737 +#: sys-utils/lscpu.c:732 msgid "error: can not restore signal handler" msgstr "错误：无法恢复信号处理函数" -#: sys-utils/lscpu.c:1172 +#: sys-utils/lscpu.c:1167 msgid "Failed to extract the node number" msgstr "提取节点号失败" -#: sys-utils/lscpu.c:1264 sys-utils/lscpu.c:1274 +#: sys-utils/lscpu.c:1259 sys-utils/lscpu.c:1269 msgid "Y" msgstr "Y" -#: sys-utils/lscpu.c:1264 sys-utils/lscpu.c:1274 +#: sys-utils/lscpu.c:1259 sys-utils/lscpu.c:1269 msgid "N" msgstr "N" -#: sys-utils/lscpu.c:1356 +#: sys-utils/lscpu.c:1351 #, c-format msgid "" "# The following is the parsable format, which can be fed to other\n" @@ -12942,166 +12946,166 @@ msgstr "" "# 以下是可解析格式，可以输给其他程序。每列中的各个不同项有一个惟一\n" "# 的从 0 开始的 ID。\n" -#: sys-utils/lscpu.c:1506 +#: sys-utils/lscpu.c:1501 msgid "Architecture:" msgstr "架构：" -#: sys-utils/lscpu.c:1520 +#: sys-utils/lscpu.c:1515 msgid "CPU op-mode(s):" msgstr "CPU 运行模式：" -#: sys-utils/lscpu.c:1523 sys-utils/lscpu.c:1525 +#: sys-utils/lscpu.c:1518 sys-utils/lscpu.c:1520 msgid "Byte Order:" msgstr "字节序：" -#: sys-utils/lscpu.c:1527 +#: sys-utils/lscpu.c:1522 msgid "CPU(s):" msgstr "CPU(s):" -#: sys-utils/lscpu.c:1530 +#: sys-utils/lscpu.c:1525 msgid "On-line CPU(s) mask:" msgstr "在线 CPU 掩码：" -#: sys-utils/lscpu.c:1531 +#: sys-utils/lscpu.c:1526 msgid "On-line CPU(s) list:" msgstr "在线 CPU 列表：" -#: sys-utils/lscpu.c:1550 +#: sys-utils/lscpu.c:1545 msgid "Off-line CPU(s) mask:" msgstr "离线 CPU 掩码：" -#: sys-utils/lscpu.c:1551 +#: sys-utils/lscpu.c:1546 msgid "Off-line CPU(s) list:" msgstr "离线 CPU 列表：" -#: sys-utils/lscpu.c:1582 +#: sys-utils/lscpu.c:1577 msgid "Thread(s) per core:" msgstr "每个核的线程数：" -#: sys-utils/lscpu.c:1583 +#: sys-utils/lscpu.c:1578 msgid "Core(s) per socket:" msgstr "每个座的核数：" -#: sys-utils/lscpu.c:1586 +#: sys-utils/lscpu.c:1581 msgid "Socket(s) per book:" msgstr "每个 book 的座数：" -#: sys-utils/lscpu.c:1588 +#: sys-utils/lscpu.c:1583 msgid "Book(s):" msgstr "Book：" -#: sys-utils/lscpu.c:1590 +#: sys-utils/lscpu.c:1585 msgid "Socket(s):" msgstr "座：" -#: sys-utils/lscpu.c:1594 +#: sys-utils/lscpu.c:1589 msgid "NUMA node(s):" msgstr "NUMA 节点：" -#: sys-utils/lscpu.c:1596 +#: sys-utils/lscpu.c:1591 msgid "Vendor ID:" msgstr "厂商 ID：" -#: sys-utils/lscpu.c:1598 +#: sys-utils/lscpu.c:1593 msgid "CPU family:" msgstr "CPU 系列：" -#: sys-utils/lscpu.c:1600 +#: sys-utils/lscpu.c:1595 msgid "Model:" msgstr "型号：" -#: sys-utils/lscpu.c:1602 +#: sys-utils/lscpu.c:1597 msgid "Model name:" msgstr "型号名称：" -#: sys-utils/lscpu.c:1604 +#: sys-utils/lscpu.c:1599 msgid "Stepping:" msgstr "步进：" -#: sys-utils/lscpu.c:1606 +#: sys-utils/lscpu.c:1601 msgid "CPU MHz:" msgstr "CPU MHz：" -#: sys-utils/lscpu.c:1608 +#: sys-utils/lscpu.c:1603 msgid "CPU max MHz:" msgstr "CPU 最大 MHz：" -#: sys-utils/lscpu.c:1610 +#: sys-utils/lscpu.c:1605 msgid "CPU min MHz:" msgstr "CPU 最小 MHz：" -#: sys-utils/lscpu.c:1612 +#: sys-utils/lscpu.c:1607 msgid "BogoMIPS:" msgstr "BogoMIPS：" -#: sys-utils/lscpu.c:1615 sys-utils/lscpu.c:1617 +#: sys-utils/lscpu.c:1610 sys-utils/lscpu.c:1612 msgid "Virtualization:" msgstr "虚拟化：" -#: sys-utils/lscpu.c:1620 +#: sys-utils/lscpu.c:1615 msgid "Hypervisor:" msgstr "超管理器：" -#: sys-utils/lscpu.c:1622 +#: sys-utils/lscpu.c:1617 msgid "Hypervisor vendor:" msgstr "超管理器厂商：" -#: sys-utils/lscpu.c:1623 +#: sys-utils/lscpu.c:1618 msgid "Virtualization type:" msgstr "虚拟化类型：" -#: sys-utils/lscpu.c:1626 +#: sys-utils/lscpu.c:1621 msgid "Dispatching mode:" msgstr "分派模式：" -#: sys-utils/lscpu.c:1632 +#: sys-utils/lscpu.c:1627 #, c-format msgid "%s cache:" msgstr "%s 缓存：" -#: sys-utils/lscpu.c:1638 +#: sys-utils/lscpu.c:1633 #, c-format msgid "NUMA node%d CPU(s):" msgstr "NUMA 节点%d CPU：" -#: sys-utils/lscpu.c:1643 +#: sys-utils/lscpu.c:1638 #, fuzzy msgid "Flags:" msgstr "标志" -#: sys-utils/lscpu.c:1654 +#: sys-utils/lscpu.c:1649 msgid "Display information about the CPU architecture.\n" msgstr "" -#: sys-utils/lscpu.c:1657 +#: sys-utils/lscpu.c:1652 msgid " -a, --all print both online and offline CPUs (default for -e)\n" msgstr " -a, --all 同时打印在线和离线 CPU (-e 选项默认值)\n" -#: sys-utils/lscpu.c:1658 +#: sys-utils/lscpu.c:1653 msgid " -b, --online print online CPUs only (default for -p)\n" msgstr " -b, --online 只打印在线 CPU (-p 选项默认值)\n" -#: sys-utils/lscpu.c:1659 +#: sys-utils/lscpu.c:1654 msgid " -c, --offline print offline CPUs only\n" msgstr " -c, --offline 只打印离线 CPU\n" -#: sys-utils/lscpu.c:1660 +#: sys-utils/lscpu.c:1655 msgid " -e, --extended[=] print out an extended readable format\n" msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n" -#: sys-utils/lscpu.c:1661 +#: sys-utils/lscpu.c:1656 msgid " -p, --parse[=] print out a parsable format\n" msgstr " -p, --parse[=<列表>] 打印可解析格式\n" -#: sys-utils/lscpu.c:1662 +#: sys-utils/lscpu.c:1657 msgid " -s, --sysroot use specified directory as system root\n" msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n" -#: sys-utils/lscpu.c:1663 +#: sys-utils/lscpu.c:1658 msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n" msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n" -#: sys-utils/lscpu.c:1760 +#: sys-utils/lscpu.c:1755 #, 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" @@ -16243,7 +16247,7 @@ msgid "memory zram have consumed to store compressed data" msgstr "" #: sys-utils/zramctl.c:81 -msgid "number of objects migrated migrated by compaction" +msgid "number of objects migrated by compaction" msgstr "" #: sys-utils/zramctl.c:297 sys-utils/zramctl.c:308 @@ -17991,6 +17995,9 @@ msgstr "输入中有未知转义序列：%o，%o" msgid "Input line too long." msgstr "输入行过长。" +#~ msgid "Done." +#~ msgstr "完成。" + #~ msgid "Device open in read-only mode." #~ msgstr "设备以只读方式打开。" -- cgit v1.2.3-55-g7522