Binary files /tmp/tmpTPo1PK/xv4qnvEF61/language-pack-zh-hans-base-14.04+20150219/data/extra.tar and /tmp/tmpTPo1PK/26BNx1w8Ct/language-pack-zh-hans-base-14.04+20160720/data/extra.tar differ diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/acl.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/acl.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/acl.po 2015-02-19 15:26:07.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/acl.po 2016-07-20 16:51:47.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 11:18+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 11:50+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: ../chacl/chacl.c:46 #, c-format diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/adduser.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/adduser.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/adduser.po 2015-02-19 15:26:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/adduser.po 2016-07-20 16:51:57.000000000 +0000 @@ -17,324 +17,324 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:30+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:31+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" #. everyone can issue "--help" and "--version", but only root can go on -#: ../adduser:152 +#: ../adduser:154 msgid "Only root may add a user or group to the system.\n" msgstr "只有 root 才能将用户或组添加到系统。\n" -#: ../adduser:178 ../deluser:137 +#: ../adduser:180 ../deluser:137 msgid "Only one or two names allowed.\n" msgstr "只允许一个或者两个名字。\n" #. must be addusertogroup -#: ../adduser:183 +#: ../adduser:185 msgid "Specify only one name in this mode.\n" msgstr "这个模式下只能指定一个名字。\n" -#: ../adduser:199 +#: ../adduser:201 msgid "The --group, --ingroup, and --gid options are mutually exclusive.\n" msgstr "--group，--ingroup，和 --gid 选项是不能同时使用的。\n" -#: ../adduser:204 +#: ../adduser:206 msgid "The home dir must be an absolute path.\n" msgstr "主目录必须是一个绝对路径。\n" -#: ../adduser:208 +#: ../adduser:210 #, perl-format msgid "Warning: The home dir %s you specified already exists.\n" msgstr "警告：您指定的主目录 %s 已存在。\n" -#: ../adduser:210 +#: ../adduser:212 #, perl-format msgid "Warning: The home dir %s you specified can't be accessed: %s\n" msgstr "警告：您指定的主目录 %s 不能够访问：%s\n" -#: ../adduser:277 +#: ../adduser:279 #, perl-format msgid "The group `%s' already exists as a system group. Exiting.\n" msgstr "组\"%s\"已经是系统组。退出。\n" -#: ../adduser:283 +#: ../adduser:285 #, perl-format msgid "The group `%s' already exists and is not a system group. Exiting.\n" msgstr "组 %s 已经存在，且不是系统组。退出。\n" -#: ../adduser:289 +#: ../adduser:291 #, perl-format msgid "The group `%s' already exists, but has a different GID. Exiting.\n" msgstr "组\"%s\"已经存在，但是 GID 不同。退出。\n" -#: ../adduser:293 ../adduser:323 +#: ../adduser:295 ../adduser:329 #, perl-format msgid "The GID `%s' is already in use.\n" msgstr "GID \" %s\"已被占用。\n" -#: ../adduser:301 +#: ../adduser:303 #, perl-format msgid "" "No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n" msgstr "范围 %d-%d (FIRST_SYS_GID - LAST_SYS_GID)里没有可用的 GID。\n" -#: ../adduser:302 ../adduser:332 +#: ../adduser:304 ../adduser:338 #, perl-format msgid "The group `%s' was not created.\n" msgstr "组\"%s\"没有被创建。\n" -#: ../adduser:307 ../adduser:336 +#: ../adduser:309 ../adduser:342 #, perl-format msgid "Adding group `%s' (GID %d) ...\n" msgstr "正在添加组\"%s\" (GID %d)...\n" -#: ../adduser:312 ../adduser:341 ../adduser:366 ../deluser:387 ../deluser:424 +#: ../adduser:318 ../adduser:351 ../adduser:376 ../deluser:387 ../deluser:424 #: ../deluser:461 msgid "Done.\n" msgstr "完成。\n" -#: ../adduser:321 ../adduser:808 +#: ../adduser:327 ../adduser:840 #, perl-format msgid "The group `%s' already exists.\n" msgstr "\"%s\"组已经存在。\n" -#: ../adduser:331 +#: ../adduser:337 #, perl-format msgid "No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n" msgstr "范围 %d-%d (FIRST_GID - LAST_GID)里没有可用的 GID。\n" -#: ../adduser:350 ../deluser:229 ../deluser:433 +#: ../adduser:360 ../deluser:229 ../deluser:433 #, perl-format msgid "The user `%s' does not exist.\n" msgstr "用户\"%s\"不存在。\n" -#: ../adduser:352 ../adduser:598 ../adduser:815 ../deluser:395 ../deluser:436 +#: ../adduser:362 ../adduser:630 ../adduser:847 ../deluser:395 ../deluser:436 #, perl-format msgid "The group `%s' does not exist.\n" msgstr "\"%s\"组不存在。\n" -#: ../adduser:355 ../adduser:602 +#: ../adduser:365 ../adduser:634 #, perl-format msgid "The user `%s' is already a member of `%s'.\n" msgstr "用户\"%s\"已经属于\"%s\"组。\n" -#: ../adduser:360 ../adduser:608 +#: ../adduser:370 ../adduser:640 #, perl-format msgid "Adding user `%s' to group `%s' ...\n" msgstr "正在添加用户\"%s\"到\"%s\"组...\n" -#: ../adduser:380 +#: ../adduser:390 #, perl-format msgid "The system user `%s' already exists. Exiting.\n" msgstr "系统用户\"%s\"已经存在，退出。\n" -#: ../adduser:383 +#: ../adduser:393 #, perl-format msgid "The user `%s' already exists. Exiting.\n" msgstr "用户\"%s\"已经存在，退出。\n" -#: ../adduser:387 +#: ../adduser:397 #, perl-format msgid "The user `%s' already exists with a different UID. Exiting.\n" msgstr "用户\"%s\"已经存在，但是 UID 不同，退出。\n" -#: ../adduser:401 +#: ../adduser:411 #, perl-format msgid "" "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - " "LAST_SYS_UID).\n" msgstr "范围 %d-%d (FIRST_SYS_UID - LAST_SYS_UID)里没有可用的 UID/GID。\n" -#: ../adduser:402 ../adduser:414 ../adduser:494 ../adduser:506 +#: ../adduser:412 ../adduser:424 ../adduser:513 ../adduser:525 #, perl-format msgid "The user `%s' was not created.\n" msgstr "用户\"%s\"未创建成功。\n" -#: ../adduser:413 +#: ../adduser:423 #, perl-format msgid "" "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n" msgstr "范围 %d-%d (FIRST_SYS_UID - LAST_SYS_UID)里没有可用的 UID。\n" -#: ../adduser:418 ../adduser:424 ../adduser:510 ../adduser:516 +#: ../adduser:428 ../adduser:434 ../adduser:529 ../adduser:535 msgid "Internal error" msgstr "内部错误" -#: ../adduser:426 +#: ../adduser:436 #, perl-format msgid "Adding system user `%s' (UID %d) ...\n" msgstr "正在添加系统用户\"%s\" (UID %d)...\n" -#: ../adduser:431 +#: ../adduser:441 #, perl-format msgid "Adding new group `%s' (GID %d) ...\n" msgstr "正在添加新组\"%s\" (GID %d)...\n" -#: ../adduser:438 +#: ../adduser:452 #, perl-format msgid "Adding new user `%s' (UID %d) with group `%s' ...\n" msgstr "正在将新用户\"%s\" (UID %d)添加到组\"%s\"...\n" -#: ../adduser:456 ../AdduserCommon.pm:162 +#: ../adduser:475 ../AdduserCommon.pm:162 #, perl-format msgid "`%s' returned error code %d. Exiting.\n" msgstr "\"%s\"返回错误代码 %d，退出。\n" -#: ../adduser:458 ../AdduserCommon.pm:164 +#: ../adduser:477 ../AdduserCommon.pm:164 #, perl-format msgid "`%s' exited from signal %d. Exiting.\n" msgstr "\"%s\"从信号 %d 中退出，退出。\n" -#: ../adduser:460 +#: ../adduser:479 #, perl-format msgid "" "%s failed with return code 15, shadow not enabled, password aging cannot be " "set. Continuing.\n" msgstr "%s 出错，返回代码 15，未启用影子(shadow)，无法设定密码时效，继续。\n" -#: ../adduser:485 +#: ../adduser:504 #, perl-format msgid "Adding user `%s' ...\n" msgstr "正在添加用户\"%s\"...\n" -#: ../adduser:493 +#: ../adduser:512 #, perl-format msgid "" "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n" msgstr "范围 %d-%d (FIRST_UID - LAST_UID) 里没有可用的 UID/GID。\n" -#: ../adduser:505 +#: ../adduser:524 #, perl-format msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n" msgstr "范围 %d-%d (FIRST_UID - LAST_UID) 里没有可用的 UID。\n" -#: ../adduser:521 +#: ../adduser:540 #, perl-format msgid "Adding new group `%s' (%d) ...\n" msgstr "正在添加新组\"%s\" (%d)...\n" -#: ../adduser:528 +#: ../adduser:551 #, perl-format msgid "Adding new user `%s' (%d) with group `%s' ...\n" msgstr "正在添加新用户\"%s\" (%d) 到组\"%s\"...\n" #. hm, error, should we break now? -#: ../adduser:552 +#: ../adduser:580 msgid "Permission denied\n" msgstr "权限不足\n" -#: ../adduser:553 +#: ../adduser:581 msgid "invalid combination of options\n" msgstr "选项组合无效\n" -#: ../adduser:554 +#: ../adduser:582 msgid "unexpected failure, nothing done\n" msgstr "未知错误，操作取消\n" -#: ../adduser:555 +#: ../adduser:583 msgid "unexpected failure, passwd file missing\n" msgstr "未知错误，passwd 文件遗失\n" -#: ../adduser:556 +#: ../adduser:584 msgid "passwd file busy, try again\n" msgstr "passwd 文件忙，请再试\n" -#: ../adduser:557 +#: ../adduser:585 msgid "invalid argument to option\n" msgstr "无效的参数\n" #. Translators: [y/N] has to be replaced by values defined in your #. locale. You can see by running "locale noexpr" which regular #. expression will be checked to find positive answer. -#: ../adduser:562 +#: ../adduser:590 msgid "Try again? [y/N] " msgstr "再试一次？[y/N] " #. Translators: [y/N] has to be replaced by values defined in your #. locale. You can see by running "locale yesexpr" which regular #. expression will be checked to find positive answer. -#: ../adduser:588 +#: ../adduser:620 msgid "Is the information correct? [Y/n] " msgstr "这些信息是否正确？ [Y/n] " -#: ../adduser:595 +#: ../adduser:627 #, perl-format msgid "Adding new user `%s' to extra groups ...\n" msgstr "正在添加用户\"%s\"到附加组...\n" -#: ../adduser:621 +#: ../adduser:653 #, perl-format msgid "Setting quota for user `%s' to values of user `%s' ...\n" msgstr "设定磁盘配额，用户\"%s\"的配额与\"%s\"的相同 ...\n" -#: ../adduser:658 +#: ../adduser:690 #, perl-format msgid "Not creating home directory `%s'.\n" msgstr "无法创建主目录\"%s\"\n" -#: ../adduser:661 +#: ../adduser:693 #, perl-format msgid "The home directory `%s' already exists. Not copying from `%s'.\n" msgstr "主目录\"%s\"已经存在。没有从\"%s\"复制文件。\n" -#: ../adduser:667 +#: ../adduser:699 #, perl-format msgid "" "Warning: The home directory `%s' does not belong to the user you are " "currently creating.\n" msgstr "警告：主目录 %s 不属于您当前创建的用户。\n" -#: ../adduser:672 +#: ../adduser:704 #, perl-format msgid "Creating home directory `%s' ...\n" msgstr "创建主目录\"%s\"...\n" -#: ../adduser:674 +#: ../adduser:706 #, perl-format msgid "Couldn't create home directory `%s': %s.\n" msgstr "无法创建主目录\"%s\"：%s。\n" -#: ../adduser:682 +#: ../adduser:714 msgid "Setting up encryption ...\n" msgstr "加密设置 ...\n" -#: ../adduser:687 +#: ../adduser:719 #, perl-format msgid "Copying files from `%s' ...\n" msgstr "正在从\"%s\"复制文件...\n" -#: ../adduser:689 +#: ../adduser:721 #, perl-format msgid "fork for `find' failed: %s\n" msgstr "创建\"find\"子进程失败：%s\n" -#: ../adduser:798 +#: ../adduser:830 #, perl-format msgid "The user `%s' already exists, and is not a system user.\n" msgstr "用户\"%s\"已存在，但不是系统用户。\n" -#: ../adduser:800 +#: ../adduser:832 #, perl-format msgid "The user `%s' already exists.\n" msgstr "用户\"%s\"已经存在。\n" -#: ../adduser:803 +#: ../adduser:835 #, perl-format msgid "The UID %d is already in use.\n" msgstr "UID %d 已经被使用。\n" -#: ../adduser:810 +#: ../adduser:842 #, perl-format msgid "The GID %d is already in use.\n" msgstr "GID %d 已经被使用。\n" -#: ../adduser:817 +#: ../adduser:849 #, perl-format msgid "The GID %d does not exist.\n" msgstr "GID %d 不存在。\n" -#: ../adduser:864 +#: ../adduser:896 #, perl-format msgid "" "Cannot deal with %s.\n" @@ -343,7 +343,7 @@ "无法处理 %s。\n" "它不是目录，文件或链接。\n" -#: ../adduser:885 +#: ../adduser:917 #, perl-format msgid "" "%s: To avoid problems, the username should consist only of\n" @@ -356,11 +356,11 @@ "号、＠和横线，并且不以横线开头(IEEE Std 1003.1-2001 对此有\n" "所定义)。为了与 Samba 机器帐户的兼容性，支持以 $ 结尾的用户名\n" -#: ../adduser:895 +#: ../adduser:927 msgid "Allowing use of questionable username.\n" msgstr "允许使用可疑的用户名.\n" -#: ../adduser:899 +#: ../adduser:931 #, perl-format msgid "" "%s: Please enter a username matching the regular expression configured\n" @@ -368,45 +368,47 @@ "badname'\n" "option to relax this check or reconfigure NAME_REGEX.\n" msgstr "" +"%s: 请输入匹配 NAME_REGEX[_SYSTEM] 配置选项配置的正则表达式的用户名。\n" +"使用 ｀--force-badname‘ 选项可以放松检查或者重新配置 NAME_REGEX。\n" -#: ../adduser:915 +#: ../adduser:947 #, perl-format msgid "Selecting UID from range %d to %d ...\n" msgstr "从 %d 到 %d 中选择 UID...\n" -#: ../adduser:933 +#: ../adduser:965 #, perl-format msgid "Selecting GID from range %d to %d ...\n" msgstr "从 %d 到 %d 中选择 GID...\n" -#: ../adduser:977 +#: ../adduser:1023 #, perl-format msgid "Stopped: %s\n" msgstr "停止：%s\n" -#: ../adduser:979 +#: ../adduser:1025 #, perl-format msgid "Removing directory `%s' ...\n" msgstr "删除目录'%s'。\n" -#: ../adduser:983 ../deluser:375 +#: ../adduser:1029 ../deluser:375 #, perl-format msgid "Removing user `%s' ...\n" msgstr "正在删除用户 '%s'...\n" -#: ../adduser:987 ../deluser:420 +#: ../adduser:1033 ../deluser:420 #, perl-format msgid "Removing group `%s' ...\n" msgstr "正在删除组 '%s'...\n" #. Translators: the variable %s is INT, QUIT, or HUP. #. Please do not insert a space character between SIG and %s. -#: ../adduser:998 +#: ../adduser:1044 #, perl-format msgid "Caught a SIG%s.\n" msgstr "捕获 SIG%s.\n" -#: ../adduser:1003 +#: ../adduser:1049 #, perl-format msgid "" "adduser version %s\n" @@ -415,7 +417,7 @@ "adduser 版本 %s\n" "\n" -#: ../adduser:1004 +#: ../adduser:1050 msgid "" "Adds a user or group to the system.\n" " \n" @@ -431,7 +433,7 @@ " Ted Hajek \n" "\n" -#: ../adduser:1011 ../deluser:483 +#: ../adduser:1057 ../deluser:483 msgid "" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/alsa-utils.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/alsa-utils.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/alsa-utils.po 2015-02-19 15:26:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/alsa-utils.po 2016-07-20 16:51:53.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:31+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:31+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: alsamixer/card_select.c:126 alsamixer/device_name.c:126 msgid "Sound Card" @@ -204,7 +204,7 @@ msgid "Rear" msgstr "" -#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:124 +#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:125 msgid "Center" msgstr "中间" @@ -424,7 +424,7 @@ " --fatal-errors treat all errors as fatal\n" msgstr "" -#: aplay/aplay.c:244 speaker-test/speaker-test.c:1021 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:1023 #, c-format msgid "Recognized sample formats are:" msgstr "認可的取樣格式是︰" @@ -511,7 +511,7 @@ msgid "bad speed value %i" msgstr "错误的速度值： %i" -#: aplay/aplay.c:700 speaker-test/speaker-test.c:665 +#: aplay/aplay.c:700 speaker-test/speaker-test.c:666 #, c-format msgid "Unable to parse channel map string: %s\n" msgstr "" @@ -536,8 +536,8 @@ msgid "nonblock setting error: %s" msgstr "未设置块错误： %s" -#: aplay/aplay.c:744 aplay/aplay.c:868 aplay/aplay.c:1158 aplay/aplay.c:1351 -#: aplay/aplay.c:1867 aplay/aplay.c:1897 +#: aplay/aplay.c:744 aplay/aplay.c:868 aplay/aplay.c:1158 aplay/aplay.c:1352 +#: aplay/aplay.c:1868 aplay/aplay.c:1898 msgid "not enough memory" msgstr "記憶體不足" @@ -607,8 +607,8 @@ msgid "Warning: format is changed to S16_BE\n" msgstr "警告：格式已變更至 S16_BE\n" -#: aplay/aplay.c:1106 aplay/aplay.c:2182 aplay/aplay.c:2189 aplay/aplay.c:2715 -#: aplay/aplay.c:2727 +#: aplay/aplay.c:1106 aplay/aplay.c:2183 aplay/aplay.c:2190 aplay/aplay.c:2716 +#: aplay/aplay.c:2728 msgid "read error" msgstr "讀取錯誤" @@ -670,238 +670,238 @@ msgid "unable to install sw params:" msgstr "无法安装sw参数：" -#: aplay/aplay.c:1369 +#: aplay/aplay.c:1370 #, c-format msgid "snd_pcm_mmap_begin problem: %s" msgstr "" -#: aplay/aplay.c:1398 +#: aplay/aplay.c:1399 #, c-format msgid "stdin O_NONBLOCK flag setup failed\n" msgstr "" -#: aplay/aplay.c:1422 +#: aplay/aplay.c:1423 #, c-format msgid "\rPAUSE command ignored (no hw support)\n" msgstr "" -#: aplay/aplay.c:1427 +#: aplay/aplay.c:1428 #, c-format msgid "pause push error: %s" msgstr "" -#: aplay/aplay.c:1436 +#: aplay/aplay.c:1437 #, c-format msgid "pause release error: %s" msgstr "" -#: aplay/aplay.c:1452 +#: aplay/aplay.c:1453 #, c-format msgid "" "\r=== PAUSE === " msgstr "" -#: aplay/aplay.c:1494 +#: aplay/aplay.c:1495 #, c-format msgid "status error: %s" msgstr "状态错误：%s" -#: aplay/aplay.c:1499 +#: aplay/aplay.c:1500 #, c-format msgid "fatal %s: %s" msgstr "" -#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1514 aplay/aplay.c:1522 +#: aplay/aplay.c:1501 aplay/aplay.c:1512 aplay/aplay.c:1515 aplay/aplay.c:1523 msgid "underrun" msgstr "后台运行" -#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1522 +#: aplay/aplay.c:1501 aplay/aplay.c:1512 aplay/aplay.c:1523 msgid "overrun" msgstr "前台运行" -#: aplay/aplay.c:1510 aplay/aplay.c:1521 +#: aplay/aplay.c:1511 aplay/aplay.c:1522 #, c-format msgid "%s!!! (at least %.3f ms long)\n" msgstr "%s（至少%.3f ms长）\n" -#: aplay/aplay.c:1526 +#: aplay/aplay.c:1527 #, c-format msgid "Status:\n" msgstr "状态：\n" -#: aplay/aplay.c:1530 +#: aplay/aplay.c:1531 #, c-format msgid "xrun: prepare error: %s" msgstr "xrun:准备错误：%s" -#: aplay/aplay.c:1536 +#: aplay/aplay.c:1537 #, c-format msgid "Status(DRAINING):\n" msgstr "状态（DRAINING）:\n" -#: aplay/aplay.c:1540 +#: aplay/aplay.c:1541 #, c-format msgid "capture stream format change? attempting recover...\n" msgstr "捕捉流格式变化？尝试恢复...\n" -#: aplay/aplay.c:1542 +#: aplay/aplay.c:1543 #, c-format msgid "xrun(DRAINING): prepare error: %s" msgstr "xrun(DRAINING):准备错误：%s" -#: aplay/aplay.c:1549 +#: aplay/aplay.c:1550 #, c-format msgid "Status(R/W):\n" msgstr "状态（R/W）：\n" -#: aplay/aplay.c:1552 +#: aplay/aplay.c:1553 #, c-format msgid "read/write error, state = %s" msgstr "读/写错误，状态=%s" -#: aplay/aplay.c:1562 +#: aplay/aplay.c:1563 #, c-format msgid "Suspended. Trying resume. " msgstr "停止了，正尝试恢复 " -#: aplay/aplay.c:1567 +#: aplay/aplay.c:1568 #, c-format msgid "Failed. Restarting stream. " msgstr "失败，正重新开始流 " -#: aplay/aplay.c:1569 +#: aplay/aplay.c:1570 #, c-format msgid "suspend: prepare error: %s" msgstr "停止：准备错误：%s" -#: aplay/aplay.c:1574 +#: aplay/aplay.c:1575 #, c-format msgid "Done.\n" msgstr "完成。\n" -#: aplay/aplay.c:1596 +#: aplay/aplay.c:1597 #, c-format msgid " !clip " msgstr " !clip " -#: aplay/aplay.c:1743 +#: aplay/aplay.c:1744 #, c-format msgid "Unsupported bit size %d.\n" msgstr "不支持的比特大小%d。\n" -#: aplay/aplay.c:1777 +#: aplay/aplay.c:1778 #, c-format msgid "Max peak (%li samples): 0x%08x " msgstr "最大峰值（%li 样本）：0x%08x " -#: aplay/aplay.c:1811 +#: aplay/aplay.c:1812 #, c-format msgid "" "Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = " "%li\n" msgstr "可疑的缓冲位置（总共 %li）：作用=%li，延迟=%li，缓冲=%li\n" -#: aplay/aplay.c:1939 +#: aplay/aplay.c:1940 #, c-format msgid "write error: %s" msgstr "写入错误：%s" -#: aplay/aplay.c:1987 +#: aplay/aplay.c:1988 #, c-format msgid "writev error: %s" msgstr "writev 错误: %s" -#: aplay/aplay.c:2031 +#: aplay/aplay.c:2032 #, c-format msgid "read error: %s" msgstr "读取错误：%s" -#: aplay/aplay.c:2075 +#: aplay/aplay.c:2076 #, c-format msgid "readv error: %s" msgstr "readv 错误: %s" -#: aplay/aplay.c:2123 +#: aplay/aplay.c:2124 msgid "can't allocate buffer for silence" msgstr "不能为无声分配缓冲" -#: aplay/aplay.c:2132 aplay/aplay.c:2360 aplay/aplay.c:2365 aplay/aplay.c:2412 -#: aplay/aplay.c:2421 aplay/aplay.c:2428 aplay/aplay.c:2438 aplay/aplay.c:2444 -#: aplay/aplay.c:2516 aplay/aplay.c:2546 aplay/aplay.c:2560 +#: aplay/aplay.c:2133 aplay/aplay.c:2361 aplay/aplay.c:2366 aplay/aplay.c:2413 +#: aplay/aplay.c:2422 aplay/aplay.c:2429 aplay/aplay.c:2439 aplay/aplay.c:2445 +#: aplay/aplay.c:2517 aplay/aplay.c:2547 aplay/aplay.c:2561 msgid "write error" msgstr "写入错误" -#: aplay/aplay.c:2145 +#: aplay/aplay.c:2146 #, c-format msgid "voc_pcm_flush - silence error" msgstr "voc_pcm_flush - 无声错误" -#: aplay/aplay.c:2148 +#: aplay/aplay.c:2149 msgid "voc_pcm_flush error" msgstr "voc_pcm_flush 错误" -#: aplay/aplay.c:2173 +#: aplay/aplay.c:2174 msgid "malloc error" msgstr "分配错误" -#: aplay/aplay.c:2177 +#: aplay/aplay.c:2178 #, c-format msgid "Playing Creative Labs Channel file '%s'...\n" msgstr "正在播放Creative Labs Channel 文件 '%s'...\n" -#: aplay/aplay.c:2245 aplay/aplay.c:2340 +#: aplay/aplay.c:2246 aplay/aplay.c:2341 msgid "can't play packed .voc files" msgstr "无法播放打包的.voc文件" -#: aplay/aplay.c:2300 +#: aplay/aplay.c:2301 #, c-format msgid "can't play loops; %s isn't seekable\n" msgstr "无法播放循环;%s不可取\n" -#: aplay/aplay.c:2349 +#: aplay/aplay.c:2350 #, c-format msgid "unknown blocktype %d. terminate." msgstr "未知块类型 %d。结束。" -#: aplay/aplay.c:2480 +#: aplay/aplay.c:2481 #, c-format msgid "Wave doesn't support %s format..." msgstr "波不支持%s格式..." -#: aplay/aplay.c:2540 +#: aplay/aplay.c:2541 #, c-format msgid "Sparc Audio doesn't support %s format..." msgstr "Sparc Audio不支持%s格式..." -#: aplay/aplay.c:2621 +#: aplay/aplay.c:2622 msgid "Playing" msgstr "正在播放" -#: aplay/aplay.c:2621 +#: aplay/aplay.c:2622 msgid "Recording" msgstr "正在录音" -#: aplay/aplay.c:2625 +#: aplay/aplay.c:2626 #, c-format msgid "Rate %d Hz, " msgstr "频率%dHz， " -#: aplay/aplay.c:2627 +#: aplay/aplay.c:2628 #, c-format msgid "Mono" msgstr "Mono" -#: aplay/aplay.c:2629 +#: aplay/aplay.c:2630 #, c-format msgid "Stereo" msgstr "Stereo" -#: aplay/aplay.c:2631 +#: aplay/aplay.c:2632 #, c-format msgid "Channels %i" msgstr "频道 %i" -#: aplay/aplay.c:3145 aplay/aplay.c:3198 +#: aplay/aplay.c:3150 aplay/aplay.c:3203 #, c-format msgid "You need to specify %d files" msgstr "你需要指定%d个文件" @@ -1182,257 +1182,257 @@ msgid "disconnected\n" msgstr "未连接\n" -#: speaker-test/speaker-test.c:120 +#: speaker-test/speaker-test.c:121 msgid "Front Left" msgstr "左前方" -#: speaker-test/speaker-test.c:121 +#: speaker-test/speaker-test.c:122 msgid "Front Right" msgstr "右前方" -#: speaker-test/speaker-test.c:122 +#: speaker-test/speaker-test.c:123 msgid "Rear Left" msgstr "左后方" -#: speaker-test/speaker-test.c:123 +#: speaker-test/speaker-test.c:124 msgid "Rear Right" msgstr "右后方" -#: speaker-test/speaker-test.c:125 +#: speaker-test/speaker-test.c:126 msgid "LFE" msgstr "LEF" -#: speaker-test/speaker-test.c:126 +#: speaker-test/speaker-test.c:127 msgid "Side Left" msgstr "左边" -#: speaker-test/speaker-test.c:127 +#: speaker-test/speaker-test.c:128 msgid "Side Right" msgstr "右边" -#: speaker-test/speaker-test.c:128 +#: speaker-test/speaker-test.c:129 msgid "Channel 9" msgstr "频道 9" -#: speaker-test/speaker-test.c:129 +#: speaker-test/speaker-test.c:130 msgid "Channel 10" msgstr "频道 10" -#: speaker-test/speaker-test.c:130 +#: speaker-test/speaker-test.c:131 msgid "Channel 11" msgstr "频道 11" -#: speaker-test/speaker-test.c:131 +#: speaker-test/speaker-test.c:132 msgid "Channel 12" msgstr "频道 12" -#: speaker-test/speaker-test.c:132 +#: speaker-test/speaker-test.c:133 msgid "Channel 13" msgstr "频道 13" -#: speaker-test/speaker-test.c:133 +#: speaker-test/speaker-test.c:134 msgid "Channel 14" msgstr "频道 14" -#: speaker-test/speaker-test.c:134 +#: speaker-test/speaker-test.c:135 msgid "Channel 15" msgstr "频道 15" -#: speaker-test/speaker-test.c:135 +#: speaker-test/speaker-test.c:136 msgid "Channel 16" msgstr "频道 16" -#: speaker-test/speaker-test.c:518 +#: speaker-test/speaker-test.c:519 #, c-format msgid "Broken configuration for playback: no configurations available: %s\n" msgstr "被破坏的重播配置：没有可用的配置文件：%s\n" -#: speaker-test/speaker-test.c:525 +#: speaker-test/speaker-test.c:526 #, c-format msgid "Access type not available for playback: %s\n" msgstr "重播类型不可用:%s\n" -#: speaker-test/speaker-test.c:532 +#: speaker-test/speaker-test.c:533 #, c-format msgid "Sample format not available for playback: %s\n" msgstr "样本格式无法被重播：%s\n" -#: speaker-test/speaker-test.c:539 +#: speaker-test/speaker-test.c:540 #, c-format msgid "Channels count (%i) not available for playbacks: %s\n" msgstr "频道计数（%i）无法被重播：%s\n" -#: speaker-test/speaker-test.c:547 +#: speaker-test/speaker-test.c:548 #, c-format msgid "Rate %iHz not available for playback: %s\n" msgstr "频率 %iHz无法被重播：%s\n" -#: speaker-test/speaker-test.c:552 +#: speaker-test/speaker-test.c:553 #, c-format msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n" msgstr "频率不匹配（要求 %iHz，收到 %iHz，错误 %d）\n" -#: speaker-test/speaker-test.c:556 +#: speaker-test/speaker-test.c:557 #, c-format msgid "Rate set to %iHz (requested %iHz)\n" msgstr "频率被设为 %iHz（被要求为%iHz）\n" -#: speaker-test/speaker-test.c:562 +#: speaker-test/speaker-test.c:563 #, c-format msgid "Buffer size range from %lu to %lu\n" msgstr "缓冲大小在范围%lu到%lu\n" -#: speaker-test/speaker-test.c:563 +#: speaker-test/speaker-test.c:564 #, c-format msgid "Period size range from %lu to %lu\n" msgstr "时间段大小从%lu到%lu\n" -#: speaker-test/speaker-test.c:565 +#: speaker-test/speaker-test.c:566 #, c-format msgid "Requested period time %u us\n" msgstr "要求时间段%u us\n" -#: speaker-test/speaker-test.c:568 +#: speaker-test/speaker-test.c:569 #, c-format msgid "Unable to set period time %u us for playback: %s\n" msgstr "无法设置重播时间段%u us：%s\n" -#: speaker-test/speaker-test.c:574 +#: speaker-test/speaker-test.c:575 #, c-format msgid "Requested buffer time %u us\n" msgstr "要求的缓冲时间 %u us\n" -#: speaker-test/speaker-test.c:577 +#: speaker-test/speaker-test.c:578 #, c-format msgid "Unable to set buffer time %u us for playback: %s\n" msgstr "无法设置重播的缓冲时间 %u us:%s\n" -#: speaker-test/speaker-test.c:586 +#: speaker-test/speaker-test.c:587 #, c-format msgid "Using max buffer size %lu\n" msgstr "使用最大缓冲大小 %lu\n" -#: speaker-test/speaker-test.c:589 +#: speaker-test/speaker-test.c:590 #, c-format msgid "Unable to set buffer size %lu for playback: %s\n" msgstr "无法设置重播的缓冲大小 %lu：%s\n" -#: speaker-test/speaker-test.c:595 +#: speaker-test/speaker-test.c:596 #, c-format msgid "Periods = %u\n" msgstr "时间段=%u\n" -#: speaker-test/speaker-test.c:598 +#: speaker-test/speaker-test.c:599 #, c-format msgid "Unable to set nperiods %u for playback: %s\n" msgstr "无法设置重播的n时间段%u: %s\n" -#: speaker-test/speaker-test.c:607 +#: speaker-test/speaker-test.c:608 #, c-format msgid "Unable to set hw params for playback: %s\n" msgstr "无法设置重播的hw参数：%s\n" -#: speaker-test/speaker-test.c:613 +#: speaker-test/speaker-test.c:614 #, c-format msgid "was set period_size = %lu\n" msgstr "时间段大小被设为=%lu\n" -#: speaker-test/speaker-test.c:614 +#: speaker-test/speaker-test.c:615 #, c-format msgid "was set buffer_size = %lu\n" msgstr "缓冲大小被设为=%lu\n" -#: speaker-test/speaker-test.c:616 +#: speaker-test/speaker-test.c:617 #, c-format msgid "buffer to small, could not use\n" msgstr "缓冲太小，不能用\n" -#: speaker-test/speaker-test.c:629 +#: speaker-test/speaker-test.c:630 #, c-format msgid "Unable to determine current swparams for playback: %s\n" msgstr "不能判定当前重播的sw参数：%s\n" -#: speaker-test/speaker-test.c:636 +#: speaker-test/speaker-test.c:637 #, c-format msgid "Unable to set start threshold mode for playback: %s\n" msgstr "不能设置重播的起点模式：%s\n" -#: speaker-test/speaker-test.c:643 +#: speaker-test/speaker-test.c:644 #, c-format msgid "Unable to set avail min for playback: %s\n" msgstr "无法设置重播的无用的分钟数：%s\n" -#: speaker-test/speaker-test.c:650 +#: speaker-test/speaker-test.c:651 #, c-format msgid "Unable to set sw params for playback: %s\n" msgstr "无法设置重播的sw参数：%s\n" -#: speaker-test/speaker-test.c:670 +#: speaker-test/speaker-test.c:671 #, c-format msgid "Unable to set channel map: %s\n" msgstr "" -#: speaker-test/speaker-test.c:695 +#: speaker-test/speaker-test.c:696 #, c-format msgid "Can't recovery from underrun, prepare failed: %s\n" msgstr "无法从后台恢复，修复失败：%s\n" -#: speaker-test/speaker-test.c:706 +#: speaker-test/speaker-test.c:707 #, c-format msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "无法从休眠中恢复，修复失败:%s\n" -#: speaker-test/speaker-test.c:770 speaker-test/speaker-test.c:1261 +#: speaker-test/speaker-test.c:771 speaker-test/speaker-test.c:1272 #, c-format msgid "No enough memory\n" msgstr "内存不足\n" -#: speaker-test/speaker-test.c:775 +#: speaker-test/speaker-test.c:776 #, c-format msgid "Cannot open WAV file %s\n" msgstr "无法打开WAV文件 %s\n" -#: speaker-test/speaker-test.c:779 speaker-test/speaker-test.c:808 +#: speaker-test/speaker-test.c:780 speaker-test/speaker-test.c:809 #, c-format msgid "Invalid WAV file %s\n" msgstr "无效的WAV文件 %s\n" -#: speaker-test/speaker-test.c:784 +#: speaker-test/speaker-test.c:785 #, c-format msgid "Not a WAV file: %s\n" msgstr "不是WAV 文件: %s\n" -#: speaker-test/speaker-test.c:788 +#: speaker-test/speaker-test.c:789 #, c-format msgid "Unsupported WAV format %d for %s\n" msgstr "不支持WAV格式 %d对于%s\n" -#: speaker-test/speaker-test.c:793 +#: speaker-test/speaker-test.c:794 #, c-format msgid "%s is not a mono stream (%d channels)\n" msgstr "%s不是一个单声道流（%d 频道）\n" -#: speaker-test/speaker-test.c:798 +#: speaker-test/speaker-test.c:799 #, c-format msgid "Sample rate doesn't match (%d) for %s\n" msgstr "样本频率不符（%d）对于%s\n" -#: speaker-test/speaker-test.c:803 +#: speaker-test/speaker-test.c:804 #, c-format msgid "Unsupported sample format bits %d for %s\n" msgstr "不支持的样本格式比特%d对于%s\n" -#: speaker-test/speaker-test.c:864 +#: speaker-test/speaker-test.c:865 #, c-format msgid "Undefined channel %d\n" msgstr "为定义的频道 %d\n" -#: speaker-test/speaker-test.c:915 +#: speaker-test/speaker-test.c:916 #, c-format msgid "Write error: %d,%s\n" msgstr "写入错误：%d,%s\n" -#: speaker-test/speaker-test.c:917 +#: speaker-test/speaker-test.c:918 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "xrun_recovery失败：%d,%s\n" @@ -1459,72 +1459,72 @@ "\n" msgstr "" -#: speaker-test/speaker-test.c:1132 +#: speaker-test/speaker-test.c:1136 #, c-format msgid "Invalid number of periods %d\n" msgstr "无效的时间间隔个数 %d\n" -#: speaker-test/speaker-test.c:1148 speaker-test/speaker-test.c:1152 +#: speaker-test/speaker-test.c:1152 speaker-test/speaker-test.c:1156 #, c-format msgid "Invalid test type %s\n" msgstr "无效的测试类型 %s\n" -#: speaker-test/speaker-test.c:1164 +#: speaker-test/speaker-test.c:1203 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "-s选项的无效参数。\n" -#: speaker-test/speaker-test.c:1186 +#: speaker-test/speaker-test.c:1189 #, c-format msgid "Unknown option '%c'\n" msgstr "未知参数 '%c'\n" -#: speaker-test/speaker-test.c:1207 +#: speaker-test/speaker-test.c:1218 #, c-format msgid "Playback device is %s\n" msgstr "重播设备是%s\n" -#: speaker-test/speaker-test.c:1208 +#: speaker-test/speaker-test.c:1219 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "流参数是 %iHz，%s，%i 频道\n" -#: speaker-test/speaker-test.c:1211 +#: speaker-test/speaker-test.c:1222 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "正使用朋克噪声16个8音度\n" -#: speaker-test/speaker-test.c:1214 +#: speaker-test/speaker-test.c:1225 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "Sine波形频率是%.4fHz\n" -#: speaker-test/speaker-test.c:1217 +#: speaker-test/speaker-test.c:1228 #, c-format msgid "WAV file(s)\n" msgstr "WAV文件\n" -#: speaker-test/speaker-test.c:1227 +#: speaker-test/speaker-test.c:1238 #, c-format msgid "Playback open error: %d,%s\n" msgstr "重播打开错误: %d,%s\n" -#: speaker-test/speaker-test.c:1233 +#: speaker-test/speaker-test.c:1244 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "对hw参数的设置失败：%s\n" -#: speaker-test/speaker-test.c:1237 +#: speaker-test/speaker-test.c:1248 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "设置sw参数失败:%s\n" -#: speaker-test/speaker-test.c:1284 speaker-test/speaker-test.c:1306 +#: speaker-test/speaker-test.c:1295 speaker-test/speaker-test.c:1317 #, c-format msgid "Transfer failed: %s\n" msgstr "转变失败:%s\n" -#: speaker-test/speaker-test.c:1292 +#: speaker-test/speaker-test.c:1303 #, c-format msgid "Time per period = %lf\n" msgstr "每时间段时间=%lf\n" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apparmorapplet.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apparmorapplet.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2015-02-19 15:26:19.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2016-07-20 16:51:47.000000000 +0000 @@ -12,8 +12,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 12:26+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 13:17+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apparmor-parser.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apparmor-parser.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apparmor-parser.po 2015-02-19 15:26:19.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apparmor-parser.po 2016-07-20 16:51:58.000000000 +0000 @@ -14,14 +14,14 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 12:26+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 13:17+0000\n" +"X-Generator: Launchpad (build 18147)\n" -#: ../parser_include.c:113 ../parser_include.c:111 +#: ../parser_include.c:113 msgid "Error: Out of memory.\n" msgstr "错误：内存不足。\n" -#: ../parser_include.c:123 ../parser_include.c:121 +#: ../parser_include.c:123 #, c-format msgid "Error: basedir %s is not a directory, skipping.\n" msgstr "错误：basedir %s 不是目录，正在跳过。\n" @@ -31,106 +31,97 @@ msgid "Error: Could not add directory %s to search path.\n" msgstr "错误：无法将目录 %s 添加到搜索路径。\n" -#: ../parser_include.c:147 ../parser_include.c:151 +#: ../parser_include.c:147 msgid "Error: Could not allocate memory.\n" msgstr "错误：无法分配内存。\n" -#: ../parser_interface.c:69 ../parser_interface.c:72 ../parser_interface.c:49 +#: ../parser_interface.c:69 ../parser_interface.c:72 msgid "Bad write position\n" msgstr "写入位置无效\n" -#: ../parser_interface.c:72 ../parser_interface.c:75 ../parser_interface.c:52 +#: ../parser_interface.c:72 ../parser_interface.c:75 msgid "Permission denied\n" msgstr "拒绝许可权限\n" -#: ../parser_interface.c:75 ../parser_interface.c:78 ../parser_interface.c:55 +#: ../parser_interface.c:75 ../parser_interface.c:78 msgid "Out of memory\n" msgstr "内存不足\n" -#: ../parser_interface.c:78 ../parser_interface.c:81 ../parser_interface.c:58 +#: ../parser_interface.c:78 ../parser_interface.c:81 msgid "Couldn't copy profile: Bad memory address\n" msgstr "" -#: ../parser_interface.c:81 ../parser_interface.c:84 ../parser_interface.c:61 +#: ../parser_interface.c:81 ../parser_interface.c:84 msgid "Profile doesn't conform to protocol\n" msgstr "配置文件未遵守协议\n" -#: ../parser_interface.c:84 ../parser_interface.c:87 ../parser_interface.c:64 +#: ../parser_interface.c:84 ../parser_interface.c:87 msgid "Profile does not match signature\n" msgstr "配置文件和签名不匹配\n" -#: ../parser_interface.c:87 ../parser_interface.c:90 ../parser_interface.c:67 +#: ../parser_interface.c:87 ../parser_interface.c:90 msgid "Profile version not supported by Apparmor module\n" msgstr "配置文件版本不受 Apparmor 模块支持\n" -#: ../parser_interface.c:90 ../parser_interface.c:93 ../parser_interface.c:70 +#: ../parser_interface.c:90 ../parser_interface.c:93 msgid "Profile already exists\n" msgstr "配置文件已存在\n" -#: ../parser_interface.c:93 ../parser_interface.c:96 ../parser_interface.c:73 +#: ../parser_interface.c:93 ../parser_interface.c:96 msgid "Profile doesn't exist\n" msgstr "配置文件不存在\n" -#: ../parser_interface.c:96 ../parser_interface.c:99 ../parser_interface.c:76 +#: ../parser_interface.c:96 ../parser_interface.c:99 msgid "Permission denied; attempted to load a profile while confined?\n" msgstr "" -#: ../parser_interface.c:99 ../parser_interface.c:102 ../parser_interface.c:79 +#: ../parser_interface.c:99 ../parser_interface.c:102 #, c-format msgid "Unknown error (%d): %s\n" msgstr "" #: ../parser_interface.c:116 ../parser_interface.c:119 -#: ../parser_interface.c:96 #, c-format msgid "%s: Unable to add \"%s\". " msgstr "%s: 无法添加\"%s\"。 " #: ../parser_interface.c:121 ../parser_interface.c:124 -#: ../parser_interface.c:101 #, c-format msgid "%s: Unable to replace \"%s\". " msgstr "%s: 无法替换\"%s\"。 " #: ../parser_interface.c:126 ../parser_interface.c:129 -#: ../parser_interface.c:106 #, c-format msgid "%s: Unable to remove \"%s\". " msgstr "%s: 无法去除\"%s\"。 " #: ../parser_interface.c:131 ../parser_interface.c:134 -#: ../parser_interface.c:111 #, c-format msgid "%s: Unable to write to stdout\n" msgstr "%s: 无法写入 stdout\n" #: ../parser_interface.c:135 ../parser_interface.c:138 -#: ../parser_interface.c:115 #, c-format msgid "%s: Unable to write to output file\n" msgstr "" #: ../parser_interface.c:138 ../parser_interface.c:162 #: ../parser_interface.c:141 ../parser_interface.c:165 -#: ../parser_interface.c:118 ../parser_interface.c:142 #, c-format msgid "%s: ASSERT: Invalid option: %d\n" msgstr "%s: 声明：无效选项： %d\n" #: ../parser_interface.c:147 ../parser_interface.c:150 -#: ../parser_interface.c:127 #, c-format msgid "Addition succeeded for \"%s\".\n" msgstr "添加\"%s\"成功。\n" #: ../parser_interface.c:151 ../parser_interface.c:154 -#: ../parser_interface.c:131 #, c-format msgid "Replacement succeeded for \"%s\".\n" msgstr "替换\"%s\"成功。\n" #: ../parser_interface.c:155 ../parser_interface.c:158 -#: ../parser_interface.c:135 #, c-format msgid "Removal succeeded for \"%s\".\n" msgstr "去除\"%s\"成功。\n" @@ -141,7 +132,6 @@ msgstr "PANIC 无效的递增缓冲区：%p pos %p ext %p size %d res %p\n" #: ../parser_interface.c:656 ../parser_interface.c:658 -#: ../parser_interface.c:446 #, c-format msgid "profile %s network rules not enforced\n" msgstr "" @@ -152,19 +142,16 @@ #: ../parser_interface.c:750 ../parser_interface.c:902 #: ../parser_interface.c:743 ../parser_interface.c:894 -#: ../parser_interface.c:518 ../parser_interface.c:669 #, c-format msgid "Unable to open %s - %s\n" msgstr "无法打开 %s － %s\n" #: ../parser_interface.c:776 ../parser_interface.c:768 -#: ../parser_interface.c:543 #, c-format msgid "Memory Allocation Error: Unable to remove ^%s\n" msgstr "内存分配错误：无法去除 ^%s\n" #: ../parser_interface.c:789 ../parser_interface.c:781 -#: ../parser_interface.c:556 #, c-format msgid "Memory Allocation Error: Unable to remove %s:%s." msgstr "内存分配错误：无法去除 %s:%s。" @@ -180,23 +167,21 @@ #: ../parser_interface.c:829 ../parser_interface.c:916 #: ../parser_interface.c:821 ../parser_interface.c:908 -#: ../parser_interface.c:582 #, c-format msgid "%s: Unable to write entire profile entry\n" msgstr "%s: 无法写入整个配置文件项\n" #: ../parser_interface.c:839 ../parser_interface.c:831 -#: ../parser_interface.c:593 #, c-format msgid "%s: Unable to write entire profile entry to cache\n" msgstr "" -#: parser_lex.l:100 parser_lex.l:163 parser_lex.l:169 +#: parser_lex.l:100 parser_lex.l:163 #, c-format msgid "Could not open '%s'" msgstr "" -#: parser_lex.l:104 parser_lex.l:167 parser_lex.l:173 +#: parser_lex.l:104 parser_lex.l:167 #, c-format msgid "fstat failed for '%s'" msgstr "" @@ -211,18 +196,18 @@ msgid "stat failed for '%s'" msgstr "" -#: parser_lex.l:155 parser_lex.l:133 parser_lex.l:139 +#: parser_lex.l:155 parser_lex.l:133 #, c-format msgid "Could not open '%s' in '%s'" msgstr "" #: parser_lex.l:284 parser_lex.l:322 parser_lex.l:362 parser_lex.l:399 -#: parser_lex.l:469 parser_lex.l:655 parser_lex.l:586 parser_lex.l:638 +#: parser_lex.l:469 parser_lex.l:655 parser_lex.l:586 #, c-format msgid "Found unexpected character: '%s'" msgstr "发现意外字符： '%s'" -#: parser_lex.l:386 parser_lex.l:418 parser_lex.l:428 +#: parser_lex.l:386 parser_lex.l:418 msgid "Variable declarations do not accept trailing commas" msgstr "" @@ -231,7 +216,7 @@ msgid "(network_mode) Found unexpected character: '%s'" msgstr "(network_mode) 发现意外字符：“%s”" -#: ../parser_main.c:333 ../parser_common.c:61 ../parser_common.c:106 +#: ../parser_main.c:333 ../parser_common.c:61 #, c-format msgid "Warning from %s (%s%sline %d): %s" msgstr "" @@ -241,7 +226,7 @@ msgid "%s: Could not allocate memory for subdomainbase mount point\n" msgstr "%s: 无法为子域基底装入点分配内存\n" -#: ../parser_main.c:577 ../parser_main.c:616 ../parser_main.c:479 +#: ../parser_main.c:577 ../parser_main.c:616 #, c-format msgid "" "Warning: unable to find a suitable fs in %s, is it mounted?\n" @@ -250,7 +235,7 @@ "警告：无法在 %s 中找到合适的 fs，是否已装入？\n" "使用 --subdomainfs 覆盖。\n" -#: ../parser_main.c:597 ../parser_main.c:635 ../parser_main.c:498 +#: ../parser_main.c:597 ../parser_main.c:635 #, c-format msgid "" "%s: Sorry. You need root privileges to run this program.\n" @@ -259,7 +244,7 @@ "%s：对不起。您需要 root 特权才能运行此程序。\n" "\n" -#: ../parser_main.c:604 ../parser_main.c:642 ../parser_main.c:505 +#: ../parser_main.c:604 ../parser_main.c:642 #, c-format msgid "" "%s: Warning! You've set this program setuid root.\n" @@ -271,7 +256,7 @@ "\n" #: ../parser_main.c:704 ../parser_main.c:813 ../parser_main.c:836 -#: ../parser_main.c:946 ../parser_main.c:860 +#: ../parser_main.c:946 #, c-format msgid "Error: Could not read profile %s: %s.\n" msgstr "错误：无法读取配置文件 %s: %s。\n" @@ -287,32 +272,25 @@ #: parser_yacc.y:1042 parser_yacc.y:1078 parser_yacc.y:1082 parser_yacc.y:1092 #: parser_yacc.y:1102 parser_yacc.y:1201 parser_yacc.y:1223 parser_yacc.y:1234 #: parser_yacc.y:1309 parser_yacc.y:1327 parser_yacc.y:1334 parser_yacc.y:1385 -#: ../parser_main.c:735 ../parser_main.c:923 ../parser_main.c:1133 -#: ../parser_main.c:1187 parser_yacc.y:311 parser_yacc.y:462 parser_yacc.y:472 -#: parser_yacc.y:583 parser_yacc.y:662 parser_yacc.y:669 parser_yacc.y:1130 -#: parser_yacc.y:1166 parser_yacc.y:1170 parser_yacc.y:1180 parser_yacc.y:1190 -#: parser_yacc.y:1298 parser_yacc.y:1376 parser_yacc.y:1479 parser_yacc.y:1490 -#: parser_yacc.y:1565 parser_yacc.y:1583 parser_yacc.y:1590 parser_yacc.y:1639 -#: ../network.c:314 ../af_unix.cc:203 msgid "Memory allocation error." msgstr "内存分配错误。" -#: ../parser_main.c:740 ../parser_main.c:872 ../parser_main.c:757 +#: ../parser_main.c:740 ../parser_main.c:872 #, c-format msgid "Cached load succeeded for \"%s\".\n" msgstr "" -#: ../parser_main.c:744 ../parser_main.c:876 ../parser_main.c:761 +#: ../parser_main.c:744 ../parser_main.c:876 #, c-format msgid "Cached reload succeeded for \"%s\".\n" msgstr "" -#: ../parser_main.c:910 ../parser_main.c:1058 ../parser_main.c:967 +#: ../parser_main.c:910 ../parser_main.c:1058 #, c-format msgid "%s: Errors found in file. Aborting.\n" msgstr "%s: 文件中发现错误。正在中止。\n" -#: ../parser_misc.c:426 ../parser_misc.c:597 ../parser_misc.c:339 +#: ../parser_misc.c:426 ../parser_misc.c:597 msgid "" "Uppercase qualifiers \"RWLIMX\" are deprecated, please convert to lowercase\n" "See the apparmor.d(5) manpage for details.\n" @@ -321,15 +299,15 @@ "有关细节，请参见 apparmor.d(5) 手册页。\n" #: ../parser_misc.c:467 ../parser_misc.c:474 ../parser_misc.c:638 -#: ../parser_misc.c:645 ../parser_misc.c:380 ../parser_misc.c:387 +#: ../parser_misc.c:645 msgid "Conflict 'a' and 'w' perms are mutually exclusive." msgstr "冲突的“a”和“w”许可权限互相排斥。" -#: ../parser_misc.c:491 ../parser_misc.c:662 ../parser_misc.c:404 +#: ../parser_misc.c:491 ../parser_misc.c:662 msgid "Exec qualifier 'i' invalid, conflicting qualifier already specified" msgstr "Exec 限定符'i'无效，已指定了和其冲突的限定符" -#: ../parser_misc.c:502 ../parser_misc.c:673 ../parser_misc.c:415 +#: ../parser_misc.c:502 ../parser_misc.c:673 #, c-format msgid "" "Unconfined exec qualifier (%c%c) allows some dangerous environment variables " @@ -338,24 +316,24 @@ "无限制 exec 限定符 (%c%c) 允许将一些危险的环境变量传递到无限制的进程；有关细节，请参见“man 5 apparmor.d”。\n" #: ../parser_misc.c:510 ../parser_misc.c:551 ../parser_misc.c:681 -#: ../parser_misc.c:722 ../parser_misc.c:423 ../parser_misc.c:464 +#: ../parser_misc.c:722 #, c-format msgid "Exec qualifier '%c' invalid, conflicting qualifier already specified" msgstr "Exec 限定符“%c”无效，已指定了与其冲突的限定符" #: ../parser_misc.c:537 ../parser_misc.c:545 ../parser_misc.c:708 -#: ../parser_misc.c:716 ../parser_misc.c:450 ../parser_misc.c:458 +#: ../parser_misc.c:716 #, c-format msgid "" "Exec qualifier '%c%c' invalid, conflicting qualifier already specified" msgstr "执行限定符“%c%c”无效，与已经指定的限定符冲突" -#: ../parser_misc.c:593 ../parser_misc.c:764 ../parser_misc.c:506 +#: ../parser_misc.c:593 ../parser_misc.c:764 #, c-format msgid "Internal: unexpected mode character '%c' in input" msgstr "内部：输入中有意外方式字符“%c”" -#: ../parser_misc.c:615 ../parser_misc.c:786 ../parser_misc.c:528 +#: ../parser_misc.c:615 ../parser_misc.c:786 #, c-format msgid "Internal error generated invalid perm 0x%llx\n" msgstr "内部错误产生无效的权限 0x%llx\n" @@ -366,133 +344,131 @@ msgid "AppArmor parser error: %s\n" msgstr "AppArmor 语法分析器错误：%s\n" -#: ../parser_merge.c:92 ../parser_merge.c:91 ../parser_merge.c:83 +#: ../parser_merge.c:92 ../parser_merge.c:91 msgid "Couldn't merge entries. Out of Memory\n" msgstr "无法合并项。内存不足\n" -#: ../parser_merge.c:111 ../parser_merge.c:113 ../parser_merge.c:105 +#: ../parser_merge.c:111 ../parser_merge.c:113 #, c-format msgid "profile %s: has merged rule %s with conflicting x modifiers\n" msgstr "" -#: parser_yacc.y:236 parser_yacc.y:277 parser_yacc.y:320 +#: parser_yacc.y:236 parser_yacc.y:277 msgid "Profile attachment must begin with a '/'." msgstr "" -#: parser_yacc.y:260 parser_yacc.y:302 parser_yacc.y:348 +#: parser_yacc.y:260 parser_yacc.y:302 msgid "" "Profile names must begin with a '/', namespace or keyword 'profile' or 'hat'." msgstr "" -#: parser_yacc.y:296 parser_yacc.y:338 parser_yacc.y:384 +#: parser_yacc.y:296 parser_yacc.y:338 #, c-format msgid "Failed to create alias %s -> %s\n" msgstr "无法创建别名 %s -> %s\n" -#: parser_yacc.y:417 parser_yacc.y:460 parser_yacc.y:506 +#: parser_yacc.y:417 parser_yacc.y:460 msgid "Profile flag chroot_relative conflicts with namespace_relative" msgstr "" -#: parser_yacc.y:421 parser_yacc.y:464 parser_yacc.y:510 +#: parser_yacc.y:421 parser_yacc.y:464 msgid "Profile flag mediate_deleted conflicts with delegate_deleted" msgstr "" -#: parser_yacc.y:424 parser_yacc.y:467 parser_yacc.y:513 +#: parser_yacc.y:424 parser_yacc.y:467 msgid "" "Profile flag attach_disconnected conflicts with no_attach_disconnected" msgstr "" -#: parser_yacc.y:427 parser_yacc.y:470 parser_yacc.y:516 +#: parser_yacc.y:427 parser_yacc.y:470 msgid "Profile flag chroot_attach conflicts with chroot_no_attach" msgstr "" -#: parser_yacc.y:441 parser_yacc.y:484 parser_yacc.y:530 +#: parser_yacc.y:441 parser_yacc.y:484 msgid "Profile flag 'debug' is no longer valid." msgstr "配置文件标志“debug”不再有效。" -#: parser_yacc.y:463 parser_yacc.y:506 parser_yacc.y:552 +#: parser_yacc.y:463 parser_yacc.y:506 #, c-format msgid "Invalid profile flag: %s." msgstr "无效的配置文件标志：%s。" -#: parser_yacc.y:498 parser_yacc.y:520 parser_yacc.y:548 parser_yacc.y:594 +#: parser_yacc.y:498 parser_yacc.y:520 parser_yacc.y:548 msgid "Assert: `rule' returned NULL." msgstr "声明：`rule'返回 NULL。" #: parser_yacc.y:501 parser_yacc.y:546 parser_yacc.y:552 parser_yacc.y:584 -#: parser_yacc.y:598 parser_yacc.y:630 msgid "" "Invalid mode, in deny rules 'x' must not be preceded by exec qualifier 'i', " "'p', or 'u'" msgstr "模式无效，在拒绝规则中，“x”不能在执行限定符“i”、“p”或“u”之后" -#: parser_yacc.y:524 parser_yacc.y:556 parser_yacc.y:602 +#: parser_yacc.y:524 parser_yacc.y:556 msgid "" "Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', 'c', or 'u'" msgstr "模式无效，“x”必须在执行限定符“i”、“p”、“c”或“u”之后" -#: parser_yacc.y:549 parser_yacc.y:587 parser_yacc.y:633 +#: parser_yacc.y:549 parser_yacc.y:587 msgid "Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', or 'u'" msgstr "方式无效，“x”前面必须带有 exec 限定符“i”、“p”或“u”" -#: parser_yacc.y:574 parser_yacc.y:612 parser_yacc.y:614 parser_yacc.y:660 +#: parser_yacc.y:574 parser_yacc.y:612 parser_yacc.y:614 msgid "Assert: `network_rule' return invalid protocol." msgstr "声明：“network_rule”返回无效协议。" -#: parser_yacc.y:649 parser_yacc.y:696 parser_yacc.y:786 +#: parser_yacc.y:649 parser_yacc.y:696 msgid "Assert: `change_profile' returned NULL." msgstr "声明：“change_profile”返回 NULL。" -#: parser_yacc.y:680 parser_yacc.y:720 parser_yacc.y:810 +#: parser_yacc.y:680 parser_yacc.y:720 msgid "Assert: 'hat rule' returned NULL." msgstr "声明：'hat rule'返回 NULL。" -#: parser_yacc.y:689 parser_yacc.y:729 parser_yacc.y:819 +#: parser_yacc.y:689 parser_yacc.y:729 msgid "Assert: 'local_profile rule' returned NULL." msgstr "声明：“local_profile rule”返回 NULL。" -#: parser_yacc.y:824 parser_yacc.y:885 parser_yacc.y:992 +#: parser_yacc.y:824 parser_yacc.y:885 #, c-format msgid "Unset boolean variable %s used in if-expression" msgstr "取消设置 if 表达式中使用的布尔变量 %s" -#: parser_yacc.y:882 parser_yacc.y:986 parser_yacc.y:1092 +#: parser_yacc.y:882 parser_yacc.y:986 msgid "unsafe rule missing exec permissions" msgstr "不安全规则缺少 exec 许可权限" -#: parser_yacc.y:901 parser_yacc.y:954 parser_yacc.y:1060 +#: parser_yacc.y:901 parser_yacc.y:954 msgid "subset can only be used with link rules." msgstr "子集只能使用链接规则。" -#: parser_yacc.y:903 parser_yacc.y:956 parser_yacc.y:1062 +#: parser_yacc.y:903 parser_yacc.y:956 msgid "link and exec perms conflict on a file rule using ->" msgstr "链接和执行权限冲突，由于一个文件规则使用 ->" -#: parser_yacc.y:905 parser_yacc.y:958 parser_yacc.y:1064 +#: parser_yacc.y:905 parser_yacc.y:958 msgid "link perms are not allowed on a named profile transition.\n" msgstr "在命名的配置文件转换中，链接权限不受允许。\n" -#: parser_yacc.y:921 parser_yacc.y:1003 parser_yacc.y:1109 +#: parser_yacc.y:921 parser_yacc.y:1003 #, c-format msgid "missing an end of line character? (entry: %s)" msgstr "是否缺少行结束字符？（项：%s）" #: parser_yacc.y:975 parser_yacc.y:985 parser_yacc.y:1057 parser_yacc.y:1067 -#: parser_yacc.y:1145 parser_yacc.y:1155 msgid "Invalid network entry." msgstr "无效网络项。" -#: parser_yacc.y:1039 parser_yacc.y:1048 parser_yacc.y:1254 parser_yacc.y:1510 +#: parser_yacc.y:1039 parser_yacc.y:1048 parser_yacc.y:1254 #, c-format msgid "Invalid capability %s." msgstr "功能 %s 无效。" -#: parser_yacc.y:1066 parser_yacc.y:1269 parser_yacc.y:1525 +#: parser_yacc.y:1066 parser_yacc.y:1269 #, c-format msgid "AppArmor parser error for %s%s%s at line %d: %s\n" msgstr "" -#: parser_yacc.y:1072 parser_yacc.y:1275 parser_yacc.y:1531 +#: parser_yacc.y:1072 parser_yacc.y:1275 #, c-format msgid "AppArmor parser error,%s%s line %d: %s\n" msgstr "" @@ -502,18 +478,18 @@ msgid "%s: Illegal open {, nesting groupings not allowed\n" msgstr "%s: 不合法的左侧大括号 {，不允许嵌套分组\n" -#: ../parser_regex.c:265 ../parser_regex.c:274 ../parser_regex.c:278 +#: ../parser_regex.c:265 ../parser_regex.c:274 #, c-format msgid "%s: Regex grouping error: Invalid number of items between {}\n" msgstr "%s: Regex 分组错误：{} 内的项目数无效\n" -#: ../parser_regex.c:271 ../parser_regex.c:280 ../parser_regex.c:284 +#: ../parser_regex.c:271 ../parser_regex.c:280 #, c-format msgid "" "%s: Regex grouping error: Invalid close }, no matching open { detected\n" msgstr "%s: Regex 分组错误：无效的右侧花括号 }，未检测到匹配的左侧花括号 {\n" -#: ../parser_regex.c:337 ../parser_regex.c:343 ../parser_regex.c:361 +#: ../parser_regex.c:337 ../parser_regex.c:343 #, c-format msgid "" "%s: Regex grouping error: Unclosed grouping or character class, expecting " @@ -525,17 +501,17 @@ msgid "%s: Internal buffer overflow detected, %d characters exceeded\n" msgstr "%s: 检测到内部缓冲区溢出，超过 %d 个字符\n" -#: ../parser_regex.c:355 ../parser_regex.c:361 ../parser_regex.c:377 +#: ../parser_regex.c:355 ../parser_regex.c:361 #, c-format msgid "%s: Unable to parse input line '%s'\n" msgstr "%s: 无法对输入行'%s'进行语法分析\n" -#: ../parser_regex.c:397 ../parser_regex.c:405 ../parser_regex.c:421 +#: ../parser_regex.c:397 ../parser_regex.c:405 #, c-format msgid "%s: Invalid profile name '%s' - bad regular expression\n" msgstr "" -#: ../parser_policy.c:202 ../parser_policy.c:402 ../parser_policy.c:375 +#: ../parser_policy.c:202 ../parser_policy.c:402 #, c-format msgid "ERROR merging rules for profile %s, failed to load\n" msgstr "合并配置文件 %s 的规则时出错，无法装载\n" @@ -551,17 +527,17 @@ "\t不允许“*”、“?”、字符范围，也不允许“或”操作。\n" "\t“**”只能在规则结尾处使用。\n" -#: ../parser_policy.c:279 ../parser_policy.c:359 ../parser_policy.c:332 +#: ../parser_policy.c:279 ../parser_policy.c:359 #, c-format msgid "ERROR processing regexs for profile %s, failed to load\n" msgstr "处理配置文件 %s 的 regex 时出错，无法装载\n" -#: ../parser_policy.c:306 ../parser_policy.c:389 ../parser_policy.c:362 +#: ../parser_policy.c:306 ../parser_policy.c:389 #, c-format msgid "ERROR expanding variables for profile %s, failed to load\n" msgstr "扩展配置文件 %s 的变量时出错，无法装载\n" -#: ../parser_policy.c:390 ../parser_policy.c:382 ../parser_policy.c:355 +#: ../parser_policy.c:390 ../parser_policy.c:382 #, c-format msgid "ERROR adding hat access rule for profile %s\n" msgstr "为配置文件 %s 添加 hat 访问规则时出错\n" @@ -591,31 +567,30 @@ msgid "%s: Errors found in combining rules postprocessing. Aborting.\n" msgstr "%s: 在组合规则后处理中发现错误。正在中止。\n" -#: parser_lex.l:180 parser_lex.l:186 +#: parser_lex.l:180 #, c-format msgid "Could not process include directory '%s' in '%s'" msgstr "" -#: ../parser_main.c:660 ../parser_main.c:523 +#: ../parser_main.c:660 msgid "Feature buffer full." msgstr "" -#: ../parser_main.c:1115 ../parser_main.c:1132 ../parser_main.c:1024 -#: ../parser_main.c:1041 +#: ../parser_main.c:1115 ../parser_main.c:1132 msgid "Out of memory" msgstr "" -#: ../parser_main.c:1182 ../parser_main.c:1091 +#: ../parser_main.c:1182 #, c-format msgid "Can't create cache directory: %s\n" msgstr "" -#: ../parser_main.c:1185 ../parser_main.c:1094 +#: ../parser_main.c:1185 #, c-format msgid "File in cache directory location: %s\n" msgstr "" -#: ../parser_main.c:1188 ../parser_main.c:1097 +#: ../parser_main.c:1188 #, c-format msgid "Can't update cache directory: %s\n" msgstr "" @@ -630,11 +605,11 @@ msgid "Internal error generated invalid DBus perm 0x%x\n" msgstr "" -#: parser_yacc.y:575 parser_yacc.y:621 +#: parser_yacc.y:575 msgid "deny prefix not allowed" msgstr "" -#: parser_yacc.y:612 parser_yacc.y:658 +#: parser_yacc.y:612 msgid "owner prefix not allowed" msgstr "" @@ -650,41 +625,41 @@ msgid "owner prefix not allow on capability rules" msgstr "" -#: parser_yacc.y:1357 parser_yacc.y:1613 +#: parser_yacc.y:1357 #, c-format msgid "invalid mount conditional %s%s" msgstr "" -#: parser_yacc.y:1374 parser_yacc.y:1628 +#: parser_yacc.y:1374 msgid "bad mount rule" msgstr "" -#: parser_yacc.y:1381 parser_yacc.y:1635 +#: parser_yacc.y:1381 msgid "mount point conditions not currently supported" msgstr "" -#: parser_yacc.y:1398 parser_yacc.y:1650 +#: parser_yacc.y:1398 #, c-format msgid "invalid pivotroot conditional '%s'" msgstr "" -#: ../parser_regex.c:241 ../parser_regex.c:236 +#: ../parser_regex.c:241 #, c-format msgid "" "%s: Regex grouping error: Invalid close ], no matching open [ detected\n" msgstr "" -#: ../parser_regex.c:257 ../parser_regex.c:256 +#: ../parser_regex.c:257 #, c-format msgid "%s: Regex grouping error: Exceeded maximum nesting of {}\n" msgstr "" -#: ../parser_policy.c:366 ../parser_policy.c:339 +#: ../parser_policy.c:366 #, c-format msgid "ERROR processing policydb rules for profile %s, failed to load\n" msgstr "" -#: ../parser_policy.c:396 ../parser_policy.c:369 +#: ../parser_policy.c:396 #, c-format msgid "ERROR replacing aliases for profile %s, failed to load\n" msgstr "" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/app-install-data.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/app-install-data.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/app-install-data.po 2015-02-19 15:26:19.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/app-install-data.po 2016-07-20 16:51:52.000000000 +0000 @@ -10,8 +10,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 12:31+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 13:23+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" #: ../menu-data-additional/7zip.desktop.in.h:1 @@ -127,7 +127,7 @@ #: ../menu-data-additional/nvidia-driver-96.desktop.in.h:2 msgid "" "Optimized hardware acceleration of OpenGL with older nvidia graphic cards" -msgstr "为NVIDIA 老显卡优化的 OpenGL 硬件加速" +msgstr "为 NVIDIA 老显卡优化的 OpenGL 硬件加速" #: ../menu-data-additional/openclipart.desktop.in.h:1 msgid "Open ClipArt" @@ -181,7 +181,7 @@ msgid "" "Commonly used applications with restricted copyright (mp3, avi, mpeg, " "TrueType, Java, Flash, Codecs)" -msgstr "常用的版权受限应用程序 (mp3, avi, mpeg, TrueType, Java, Flash, Codecs)" +msgstr "常用的版权受限应用程序 (mp3、avi、mpeg、TrueType、Java、Flash 以及 Codecs)" #: ../menu-data-additional/ubuntu-restricted-extras.desktop.in.h:2 msgid "Ubuntu restricted extras" @@ -195,7 +195,7 @@ msgid "" "Commonly used applications with restricted copyright (mp3, avi, mpeg, " "TrueType, Java, Flash)" -msgstr "常用的版权受限软件 (mp3, avi, mpeg, TrueType, Java, Flash)" +msgstr "常用的版权受限软件 (mp3、avi、mpeg、TrueType、Java 以及 Flash)" #: ../menu-data-additional/xubuntu-restricted-extras.desktop.in.h:2 msgid "Xubuntu restricted extras" @@ -498,7 +498,7 @@ msgid "Actionaz" msgstr "actionaz" -#: ../menu-data/actionaz:actionaz.desktop.in.h:2 +#: ../menu-data/actiona:actiona.desktop.in.h:2 msgid "Automate tasks" msgstr "自动化任务" @@ -546,7 +546,7 @@ #: ../menu-data/activity-log-manager:activity-log-manager.desktop.in.h:2 msgid "Configure what gets logged in your Zeitgeist activity log" -msgstr "配置要在 Zeitgeist 活动日志中记录的内容" +msgstr "配置在 Zeitgeist 活动日志中记录的内容" #: ../menu-data/activity-log-manager:unity-activity-log-manager-panel.desktop.in.h:1 msgid "Security & Privacy" @@ -565,8 +565,7 @@ msgstr "在 4D 环境下驾驶您的飞船" #: ../menu-data/address-book-app:address-book-app.desktop.in.h:1 -#: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1 -#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1 +#: ../menu-data/gnome-contacts:org.gnome.Contacts.desktop.in.h:1 #: ../menu-data/sync-monitor-uoa:sync-monitor-contacts.desktop.in.h:2 #: ../menu-data/thunderbird:thunderbird.desktop.in.h:4 msgid "Contacts" @@ -622,7 +621,7 @@ #: ../menu-data/aeskulap:aeskulap.desktop.in.h:2 msgid "Medical image viewer and DICOM network client" -msgstr "医学图像查看器与医学数字影像和通讯客户端" +msgstr "医学影像查看器与 DICOM 网络客户端" #: ../menu-data/agave:agave.desktop.in.h:1 msgid "Agave" @@ -638,7 +637,7 @@ #: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:2 msgid "Simple agenda and calendar application for GNUstep" -msgstr "GNUstep 的简单日程表和日历程序" +msgstr "用于 GNUstep 的简单日程和日历程序" #: ../menu-data/aghermann:aghermann.desktop.in.h:1 msgid "Aghermann" @@ -681,11 +680,11 @@ msgid "Play many different solitaire games" msgstr "享受多种不同的纸牌游戏" -#: ../menu-data/akregator:kde4__akregator.desktop.in.h:1 +#: ../menu-data/akregator:org.kde.akregator.desktop.in.h:1 msgid "Akregator" msgstr "Akregator" -#: ../menu-data/akregator:kde4__akregator.desktop.in.h:2 +#: ../menu-data/akregator:org.kde.akregator.desktop.in.h:2 msgid "A KDE News Feed Reader" msgstr "KDE 新闻源阅读器" @@ -801,11 +800,11 @@ msgid "OpenAL-Soft Configuration Utility" msgstr "OpenAL-Soft 配置工具" -#: ../menu-data/altos:altos.desktop.in.h:1 +#: ../menu-data/altos:altusmetrum-altosui.desktop.in.h:1 msgid "AltOS UI" msgstr "AltOS UI" -#: ../menu-data/altos:altos.desktop.in.h:2 +#: ../menu-data/altos:altusmetrum-altosui.desktop.in.h:2 msgid "View and log downlink data from Altus Metrum products" msgstr "查看和记录 Altus Metrum 产品的下行数据" @@ -819,7 +818,7 @@ #: ../menu-data/amarok:kde4__amzdownloader.desktop.in.h:1 msgid "AMZ Downloader" -msgstr "AMZ Downloader" +msgstr "AMZ 下载器" #: ../menu-data/amarok:kde4__amzdownloader.desktop.in.h:2 msgid "Download with AMZ Downloader" @@ -911,11 +910,11 @@ #: ../menu-data/anagramarama:anagramarama.desktop.in.h:2 msgid "fast paced anagram puzzle game using SDL" -msgstr "使用SDL开发的高速拼词游戏" +msgstr "使用 SDL 开发的高速拼词游戏" #: ../menu-data/androidsdk-ddms:ddms.desktop.in.h:1 msgid "Dalvik Debug Monitor" -msgstr "Dalvik虚拟机调试监控器" +msgstr "Dalvik 虚拟机调试监控器" #: ../menu-data/androidsdk-hierarchyviewer:hierarchyviewer.desktop.in.h:1 msgid "Android Hierarchy Viewer" @@ -925,7 +924,6 @@ msgid "Angband (GTK)" msgstr "Angband (GTK)" -#: ../menu-data/angband:angband-gtk.desktop.in.h:2 #: ../menu-data/angband:angband-sdl.desktop.in.h:2 #: ../menu-data/angband:angband-x11.desktop.in.h:2 msgid "" @@ -1182,11 +1180,11 @@ msgid "Convert multimedia for all your devices" msgstr "为您的各种设备转换多媒体文件" -#: ../menu-data/ark:kde4__ark.desktop.in.h:1 +#: ../menu-data/ark:org.kde.ark.desktop.in.h:1 msgid "Archiving Tool" msgstr "压缩归档工具" -#: ../menu-data/ark:kde4__ark.desktop.in.h:2 +#: ../menu-data/ark:org.kde.ark.desktop.in.h:2 msgid "Ark" msgstr "Ark" @@ -1403,7 +1401,7 @@ #: ../menu-data/avahi-ui-utils:bssh.desktop.in.h:2 msgid "Browse for Zeroconf-enabled SSH Servers" -msgstr "浏览启用了零配置的 SSH 服务器" +msgstr "浏览启用了 Zeroconf 的 SSH 服务器" #: ../menu-data/avahi-ui-utils:bvnc.desktop.in.h:1 msgid "Avahi VNC Server Browser" @@ -1464,11 +1462,11 @@ #: ../menu-data/ayttm:ayttm.desktop.in.h:2 msgid "\"The GTK Unified Messaging Client\"" -msgstr "\"GTK 通用消息客户端\"" +msgstr "“GTK 通用消息客户端”" #: ../menu-data/azureus:azureus.desktop.in.h:1 msgid "Download and share files using the BitTorrent P2P network" -msgstr "通过 BitTorrent P2P 网络下载及分享文件" +msgstr "通过 BitTorrent P2P 网络下载及共享文件" #: ../menu-data/azureus:azureus.desktop.in.h:2 msgid "Vuze" @@ -1510,6 +1508,7 @@ msgstr "Bacula Monitor" #: ../menu-data/bacula-traymonitor:bacula-tray-monitor.desktop.in.h:2 +#: ../menu-data/bareos-traymonitor:bareos-tray-monitor.desktop.in.h:2 msgid "Notification Tray Monitor" msgstr "通知区域监视器" @@ -1659,7 +1658,7 @@ #: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:1 msgid "Beneath A Steel Sky" -msgstr "Beneath A Steel Sky" +msgstr "钢铁天空下" #: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:2 msgid "" @@ -1749,7 +1748,6 @@ #: ../menu-data/bijiben:bijiben.desktop.in.h:1 #: ../menu-data/notes-app:notes-app.desktop.in.h:1 -#: ../menu-data/notes-mobile:kde4__notes-mobile.desktop.in.h:1 msgid "Notes" msgstr "注释" @@ -1825,7 +1823,7 @@ #: ../menu-data/bittornado-gui:bittornado.desktop.in.h:1 msgid "Bittornado Client" -msgstr "Bittornado Client" +msgstr "Bittornado 客户端" #: ../menu-data/bittornado-gui:bittornado.desktop.in.h:2 msgid "Bittorrent Client" @@ -1879,11 +1877,11 @@ msgid "Edit binary files" msgstr "编辑二进制文件" -#: ../menu-data/blinken:kde4__blinken.desktop.in.h:1 +#: ../menu-data/blinken:org.kde.blinken.desktop.in.h:1 msgid "Blinken" msgstr "Blinken" -#: ../menu-data/blinken:kde4__blinken.desktop.in.h:2 +#: ../menu-data/blinken:org.kde.blinken.desktop.in.h:2 msgid "A memory enhancement game" msgstr "记忆强化游戏" @@ -1933,7 +1931,7 @@ #: ../menu-data/blockout2:blockout2.desktop.in.h:2 msgid "Play a 3D Tetris game" -msgstr "来玩个 3D 俄罗斯方块游戏" +msgstr "3D 俄罗斯方块游戏" #: ../menu-data/blocks-of-the-undead:blocks-of-the-undead.desktop.in.h:1 msgid "Blocks Of The Undead" @@ -1943,11 +1941,11 @@ msgid "Tetris Attack clone with spooky undertones" msgstr "令人毛骨悚然的俄罗斯方块类型游戏" -#: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:1 +#: ../menu-data/blogilo:org.kde.blogilo.desktop.in.h:1 msgid "Blogilo" msgstr "Blogilo" -#: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:2 +#: ../menu-data/blogilo:org.kde.blogilo.desktop.in.h:2 msgid "A KDE Blogging Client" msgstr "KDE 的博客客户端" @@ -2044,11 +2042,11 @@ msgid "Reverse engineering suite" msgstr "逆向工程套件" -#: ../menu-data/bomber:kde4__bomber.desktop.in.h:1 +#: ../menu-data/bomber:org.kde.bomber.desktop.in.h:1 msgid "Bomber" msgstr "Bomber" -#: ../menu-data/bomber:kde4__bomber.desktop.in.h:2 +#: ../menu-data/bomber:org.kde.bomber.desktop.in.h:2 msgid "Arcade Bombing Game" msgstr "街机轰炸游戏" @@ -2100,11 +2098,11 @@ msgid "Eat the yummy veggies in the garden (game for small kids)" msgstr "吃掉菜园里美味的蔬菜 (适合小孩)" -#: ../menu-data/bovo:kde4__bovo.desktop.in.h:1 +#: ../menu-data/bovo:org.kde.bovo.desktop.in.h:1 msgid "Bovo" msgstr "Bovo" -#: ../menu-data/bovo:kde4__bovo.desktop.in.h:2 +#: ../menu-data/bovo:org.kde.bovo.desktop.in.h:2 msgid "Five-in-a-row Board Game" msgstr "五子棋游戏" @@ -2116,7 +2114,7 @@ msgid "A fancy interface to the python interpreter!" msgstr "Python 直译器的花哨界面！" -#: ../menu-data/braindump:kde4__braindump.desktop.in.h:1 +#: ../menu-data/braindump:kde4__braindump.desktop.in.h:3 msgid "Braindump" msgstr "Braindump" @@ -2312,7 +2310,7 @@ msgid "Calligra" msgstr "Calligra 办公套件" -#: ../menu-data/calligraactive:calligraactive.desktop.in.h:1 +#: ../menu-data/krita-data:kde4__calligraactive.desktop.in.h:1 msgid "Calligra Active" msgstr "Calligra 活动" @@ -2419,11 +2417,11 @@ msgid "Music Player Client" msgstr "音乐播放客户端" -#: ../menu-data/cantor:kde4__cantor.desktop.in.h:1 +#: ../menu-data/cantor:org.kde.cantor.desktop.in.h:1 msgid "Cantor" msgstr "Cantor" -#: ../menu-data/cantor:kde4__cantor.desktop.in.h:2 +#: ../menu-data/cantor:org.kde.cantor.desktop.in.h:2 msgid "KDE Frontend to Mathematical Software" msgstr "数学软件的 KDE 前端" @@ -2436,10 +2434,12 @@ msgstr "智能卡阅读器" #: ../menu-data/caret:caret.desktop.in.h:1 +#: ../menu-data/neurodebian-desktop:neurodebian-caret.desktop.in.h:1 msgid "Cortical Surface Reconstruction and Visualization" msgstr "表面皮质重建及造影" #: ../menu-data/caret:caret.desktop.in.h:2 +#: ../menu-data/neurodebian-desktop:neurodebian-caret.desktop.in.h:2 msgid "Caret" msgstr "Caret" @@ -2577,10 +2577,12 @@ msgstr "Gmail 通知" #: ../menu-data/cheese:cheese.desktop.in.h:1 +#: ../menu-data/cheese:org.gnome.Cheese.desktop.in.h:1 msgid "Cheese Webcam Booth" msgstr "茄子大头贴" #: ../menu-data/cheese:cheese.desktop.in.h:2 +#: ../menu-data/cheese:org.gnome.Cheese.desktop.in.h:2 msgid "Take photos and videos with your webcam, with fun graphical effects" msgstr "使用摄像头拍照或录像，并加上有趣的图像效果" @@ -2668,7 +2670,7 @@ #: ../menu-data/chromium-browser:chromium-browser.desktop.in.h:3 #: ../menu-data/firefox:firefox.desktop.in.h:3 -#: ../menu-data/konsole:kde4__konsole.desktop.in.h:3 +#: ../menu-data/konsole:org.kde.konsole.desktop.in.h:3 #: ../menu-data/latexila-data:latexila.desktop.in.h:3 #: ../menu-data/terminator:terminator.desktop.in.h:3 msgid "Open a New Window" @@ -2783,16 +2785,19 @@ msgid "Plays music and last.fm streams" msgstr "播放音乐和 last.fm 流" +#: ../menu-data/cantata:kde4__cantata.desktop.in.h:4 #: ../menu-data/clementine:clementine.desktop.in.h:3 #: ../menu-data/qmmp:qmmp.desktop.in.h:3 msgid "Play" msgstr "播放" +#: ../menu-data/cantata:kde4__cantata.desktop.in.h:5 #: ../menu-data/clementine:clementine.desktop.in.h:4 #: ../menu-data/qmmp:qmmp.desktop.in.h:4 msgid "Pause" msgstr "暂停" +#: ../menu-data/cantata:kde4__cantata.desktop.in.h:6 #: ../menu-data/clementine:clementine.desktop.in.h:5 #: ../menu-data/qmmp:qmmp.desktop.in.h:5 msgid "Stop" @@ -2801,6 +2806,7 @@ #: ../menu-data/clementine:clementine.desktop.in.h:6 #: ../menu-data/minitube:minitube.desktop.in.h:5 #: ../menu-data/qmmp:qmmp.desktop.in.h:6 +#: ../menu-data/totem:org.gnome.Totem.desktop.in.h:5 #: ../menu-data/totem:totem.desktop.in.h:5 msgid "Previous" msgstr "上一曲" @@ -2808,12 +2814,12 @@ #: ../menu-data/clementine:clementine.desktop.in.h:7 #: ../menu-data/minitube:minitube.desktop.in.h:4 #: ../menu-data/qmmp:qmmp.desktop.in.h:7 +#: ../menu-data/totem:org.gnome.Totem.desktop.in.h:4 #: ../menu-data/totem:totem.desktop.in.h:4 msgid "Next" msgstr "下一曲" -#: ../menu-data/click-update-manager:click-update-manager.desktop.in.h:1 -#: ../menu-data/muon-updater:kde4__muon-updater.desktop.in.h:2 +#: ../menu-data/muon-updater:muon-updater.desktop.in.h:2 msgid "Update Manager" msgstr "更新管理器" @@ -3136,7 +3142,7 @@ #: ../menu-data/criticalmass-data:criticalmass.desktop.in.h:2 msgid "Play a shoot-em-up a la galaxian" -msgstr "玩类似“小蜜蜂”的射击游戏" +msgstr "类似“小蜜蜂”的射击游戏" #: ../menu-data/critterding:critterding.desktop.in.h:1 msgid "Critterding" @@ -3220,7 +3226,7 @@ #: ../menu-data/cuyo:cuyo.desktop.in.h:2 msgid "Play a tetris like game with many levels" -msgstr "玩一个有很多等级的俄罗斯方块游戏" +msgstr "有很多等级的俄罗斯方块游戏" #: ../menu-data/cycle:cycle.desktop.in.h:1 msgid "Cycle" @@ -3398,7 +3404,6 @@ msgstr "活跃开发中的 Twitter 与 Identi.ca 客户端" #: ../menu-data/declarative-plasmoids:kde4__active-news-reader.desktop.in.h:1 -#: ../menu-data/knode:kde4__KNode.desktop.in.h:2 msgid "News Reader" msgstr "新闻阅读器" @@ -3415,17 +3420,14 @@ msgstr "拯救企鹅" #: ../menu-data/deja-dup:deja-dup.desktop.in.h:1 -#: ../menu-data/deja-dup:gnome-deja-dup-panel.desktop.in.h:1 #: ../menu-data/deja-dup:unity-deja-dup-panel.desktop.in.h:1 msgid "Backups" -msgstr "Backups" +msgstr "备份" -#: ../menu-data/deja-dup:gnome-deja-dup-panel.desktop.in.h:2 #: ../menu-data/deja-dup:unity-deja-dup-panel.desktop.in.h:2 msgid "Change your backup settings" msgstr "更改备份设置" -#: ../menu-data/deja-dup:gnome-deja-dup-panel.desktop.in.h:3 #: ../menu-data/deja-dup:unity-deja-dup-panel.desktop.in.h:3 msgid "Back Up" msgstr "备份工具" @@ -3455,7 +3457,7 @@ #: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:2 #: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:2 msgid "Download and share files over BitTorrent" -msgstr "通过BitTorrent下载和共享文件" +msgstr "通过 BT 下载和共享文件" #: ../menu-data/denemo:denemo.desktop.in.h:1 msgid "GNU Denemo" @@ -3650,7 +3652,7 @@ #: ../menu-data/dispcalgui:dispcalGUI.desktop.in.h:2 msgid "" "A graphical user interface for the Argyll CMS display calibration utilities" -msgstr "Argyll CMS 校验工具的图形用户界面" +msgstr "用于 Argyll CMS 显示校验工具的图形用户界面" #: ../menu-data/distccmon-gnome:distccmon-gnome.desktop.in.h:1 msgid "distcc monitor" @@ -3726,12 +3728,12 @@ "foundations" msgstr "适用于中小企业和组织的简易 ERP & CRM 解决方案" -#: ../menu-data/dolphin:kde4__dolphin.desktop.in.h:1 +#: ../menu-data/dolphin:org.kde.dolphin.desktop.in.h:1 msgid "Dolphin" msgstr "Dolphin" #: ../menu-data/caja:caja.desktop.in.h:2 -#: ../menu-data/dolphin:kde4__dolphin.desktop.in.h:2 +#: ../menu-data/dolphin:org.kde.dolphin.desktop.in.h:2 #: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1 msgid "File Manager" msgstr "文件管理器" @@ -3762,7 +3764,7 @@ #: ../menu-data/dosemu:dosemu.desktop.in.h:2 msgid "DOS emulator \"dosemu\"" -msgstr "DOS 模拟器 \"dosemu\"" +msgstr "DOS 模拟器 “dosemu”" #: ../menu-data/dossizola:dossizola.desktop.in.h:1 msgid "Do'SSi Zo'la" @@ -3790,11 +3792,11 @@ msgid "Simulator for chemical mixtures" msgstr "化学混合物模拟器" -#: ../menu-data/dragonplayer:kde4__dragonplayer.desktop.in.h:1 +#: ../menu-data/dragonplayer:org.kde.dragonplayer.desktop.in.h:1 msgid "Dragon Player" msgstr "Dragon 播放器" -#: ../menu-data/dragonplayer:kde4__dragonplayer.desktop.in.h:2 +#: ../menu-data/dragonplayer:org.kde.dragonplayer.desktop.in.h:2 #: ../menu-data/xine-ui:xine.desktop.in.h:2 msgid "Video Player" msgstr "视频播放器" @@ -4025,7 +4027,7 @@ #: ../menu-data/easymp3gain-gtk:easymp3gain-gnome.desktop.in.h:2 #: ../menu-data/easymp3gain-qt:easymp3gain-kde.desktop.in.h:2 msgid "A GUI for mp3gain, vorbisgain and aacgain" -msgstr "一个 mp3gain, vorbisgain 和 aacgain 的图形用户界面" +msgstr "一款用于 mp3gain、vorbisgain 和 aacgain 的图形用户界面" #: ../menu-data/easystroke:easystroke.desktop.in.h:1 msgid "Easystroke Gesture Recognition" @@ -4243,7 +4245,6 @@ msgid "GNU Emacs 23" msgstr "GNU Emacs 23" -#: ../menu-data/emacs23:emacs23.desktop.in.h:2 #: ../menu-data/emacs24-lucid:emacs24-lucid.desktop.in.h:2 #: ../menu-data/emacs24:emacs24.desktop.in.h:2 #: ../menu-data/yi:yi-emacs.desktop.in.h:2 @@ -4415,11 +4416,11 @@ msgid "Epidemics Simulator" msgstr "疫情模拟器" -#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:1 +#: ../menu-data/epiphany-browser:epiphany.desktop.in.h:1 msgid "Epiphany Web Browser" msgstr "Epiphany 网页浏览器" -#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:2 +#: ../menu-data/epiphany-browser:epiphany.desktop.in.h:2 #: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2 msgid "Browse the web" msgstr "浏览网页" @@ -4487,7 +4488,7 @@ msgid "etm_qt" msgstr "etm_qt" -#: ../menu-data/etm-qt:etm_qt.desktop.in.h:2 +#: ../menu-data/etm:etm.desktop.in.h:2 msgid "Manage events and tasks using simple text files" msgstr "基于文本文件的事件和任务管理工具" @@ -4521,7 +4522,7 @@ #: ../menu-data/euler:euler.desktop.in.h:2 msgid "An interactive mathematical program" -msgstr "一个交互性数学程序" +msgstr "一个交互式数学程序" #: ../menu-data/eureka:eureka.desktop.in.h:1 msgid "Eureka DOOM Editor" @@ -4553,7 +4554,11 @@ msgstr "打印前先进行预览" #: ../menu-data/evince-common:evince.desktop.in.h:1 +#: ../menu-data/okular-backend-odp:kde4__okularApplication_doc_calligra.desktop.in.h:2 +#: ../menu-data/okular-backend-odp:kde4__okularApplication_docx_calligra.desktop.in.h:2 #: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:2 +#: ../menu-data/okular-backend-odp:kde4__okularApplication_odt.desktop.in.h:2 +#: ../menu-data/okular-backend-odp:kde4__okularApplication_wpd_calligra.desktop.in.h:2 #: ../menu-data/okular-extra-backends:kde4__okularApplication_chm.desktop.in.h:2 #: ../menu-data/okular:kde4__okular.desktop.in.h:2 #: ../menu-data/okular:kde4__okularApplication_mobi.desktop.in.h:2 @@ -4632,8 +4637,7 @@ #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:2 #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2 #: ../menu-data/mate-terminal:mate-terminal.desktop.in.h:2 -#: ../menu-data/roxterm-gtk2:roxterm.desktop.in.h:2 -#: ../menu-data/roxterm-gtk3:roxterm.desktop.in.h:2 +#: ../menu-data/roxterm:roxterm.desktop.in.h:2 #: ../menu-data/rxvt-unicode-256color:rxvt-unicode.desktop.in.h:2 #: ../menu-data/rxvt-unicode-lite:rxvt-unicode.desktop.in.h:2 #: ../menu-data/rxvt-unicode:rxvt-unicode.desktop.in.h:2 @@ -4664,7 +4668,7 @@ #: ../menu-data/expeyes-doc-common:progman-jr-doc.desktop.in.h:1 msgid "expEYES Junior Programmer Manual" -msgstr "expEYES 初级程序员手册" +msgstr "expEYES Junior 程序员手册" #: ../menu-data/expeyes:expeyes-junior.desktop.in.h:1 msgid "ExpEYES Junior" @@ -4906,19 +4910,21 @@ msgstr "通过 FGRun 启动 FlightGear" #: ../menu-data/file-roller:file-roller.desktop.in.h:1 +#: ../menu-data/file-roller:org.gnome.FileRoller.desktop.in.h:1 msgid "Archive Manager" msgstr "归档管理器" #: ../menu-data/engrampa:engrampa.desktop.in.h:2 #: ../menu-data/file-roller:file-roller.desktop.in.h:2 +#: ../menu-data/file-roller:org.gnome.FileRoller.desktop.in.h:2 msgid "Create and modify an archive" msgstr "创建和修改归档文件" -#: ../menu-data/filelight:kde4__filelight.desktop.in.h:1 +#: ../menu-data/filelight:org.kde.filelight.desktop.in.h:1 msgid "Filelight" msgstr "Filelight" -#: ../menu-data/filelight:kde4__filelight.desktop.in.h:2 +#: ../menu-data/filelight:org.kde.filelight.desktop.in.h:2 msgid "View disk usage information" msgstr "查看磁盘使用信息" @@ -4987,11 +4993,11 @@ msgid "Administration Tool for Firebird DBMS" msgstr "Firebird 数据库管理系统管理工具" -#: ../menu-data/flare:flare.desktop.in.h:1 +#: ../menu-data/flare-game:flare.desktop.in.h:1 msgid "Flare" msgstr "Flare" -#: ../menu-data/flare:flare.desktop.in.h:2 +#: ../menu-data/flare-game:flare.desktop.in.h:2 msgid "A single player, 2D-isometric, action Role-Playing Game" msgstr "单玩家的 2D 动作类角色扮演游戏" @@ -5009,7 +5015,7 @@ #: ../menu-data/fldigi:flarq.desktop.in.h:2 msgid "Amateur Radio Data Transfer with ARQ" -msgstr "使用 ARQ 的业余无线电的数据传送工具" +msgstr "使用 ARQ 的业余无线电数据传送工具" #: ../menu-data/fldigi:fldigi.desktop.in.h:1 msgid "Fldigi" @@ -5051,7 +5057,9 @@ msgid "flmsg" msgstr "flmsg" +#: ../menu-data/flamp:flamp.desktop.in.h:2 #: ../menu-data/flmsg:flmsg.desktop.in.h:2 +#: ../menu-data/flrig:flrig.desktop.in.h:2 #: ../menu-data/flwrap:flwrap.desktop.in.h:2 msgid "Amateur Radio Communications" msgstr "业余无线电通信" @@ -5200,7 +5208,7 @@ #: ../menu-data/fontypython:fontypython.desktop.in.h:2 msgid "View and temporarily install all kinds of fonts." -msgstr "查看和临时安装各类的字体。" +msgstr "查看和临时安装各类字体。" #: ../menu-data/foo-yc20:foo-yc20.desktop.in.h:1 msgid "Foo YC20" @@ -5254,7 +5262,6 @@ msgid "Figaro's Password Manager 2" msgstr "Figaro 的密码管理器 2" -#: ../menu-data/fpm2:fpm2.desktop.in.h:2 #: ../menu-data/kedpm-gtk:kedpm-gtk.desktop.in.h:2 msgid "Manage passwords" msgstr "管理密码" @@ -5336,7 +5343,7 @@ msgid "Freeciv modpack installer" msgstr "Freeciv modpack 安装程序" -#: ../menu-data/freeciv-client-extras:freeciv-modpack.desktop.in.h:2 +#: ../menu-data/freeciv-client-extras:freeciv-mp-gtk3.desktop.in.h:2 msgid "Download and install add-ons for Freeciv" msgstr "下载和安装 Freeciv 的插件" @@ -5344,8 +5351,8 @@ msgid "Freeciv" msgstr "Freeciv" -#: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:2 -#: ../menu-data/freeciv-client-gtk:freeciv-gtk3.desktop.in.h:2 +#: ../menu-data/freeciv-client-gtk:freeciv-gtk2.desktop.in.h:2 +#: ../menu-data/freeciv-client-qt:freeciv-qt.desktop.in.h:2 #: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:2 msgid "" "Turn-based strategy game inspired by the history of human civilization" @@ -5461,6 +5468,7 @@ msgid "FreeOrion" msgstr "FreeOrion" +#: ../menu-data/acm:acm.desktop.in.h:2 #: ../menu-data/freeorion:freeorion.desktop.in.h:2 msgid "turn-based space empire and galactic conquest computer game (client)" msgstr "回合制太空帝国与星际征服主题电脑游戏（客户端）" @@ -5554,7 +5562,6 @@ msgid "Rock out with your keyboard" msgstr "抱起键盘开始摇滚" -#: ../menu-data/friends-app:friends-app.desktop.in.h:1 #: ../menu-data/steam:steam.desktop.in.h:11 msgid "Friends" msgstr "Friends" @@ -5597,7 +5604,7 @@ #: ../menu-data/fs-uae-launcher:fs-uae-launcher.desktop.in.h:1 msgid "FS-UAE Launcher" -msgstr "FS-UAE Launcher" +msgstr "FS-UAE 启动器" #: ../menu-data/fs-uae-launcher:fs-uae-launcher.desktop.in.h:2 msgid "Launcher for FS-UAE Amiga Emulator" @@ -5612,10 +5619,11 @@ msgstr "FS-UAE Amiga 系统模拟器" #: ../menu-data/fsl-5.0-core:fsl-5.0-core.desktop.in.h:1 +#: ../menu-data/neurodebian-desktop:neurodebian-fsl-4.1.desktop.in.h:1 msgid "Software Collection for (f)MRI Data Analysis" msgstr "(f)MRI 数据分析软件集" -#: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:2 +#: ../menu-data/neurodebian-desktop:neurodebian-fsl-4.1.desktop.in.h:2 msgid "FSL 4.1" msgstr "FSL 4.1" @@ -6155,7 +6163,7 @@ #: ../menu-data/gdebi-kde:kde4__gdebi-kde.desktop.in.h:2 #: ../menu-data/gdebi:gdebi.desktop.in.h:2 -#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:2 +#: ../menu-data/qapt-deb-installer:qapt-deb-installer.desktop.in.h:2 msgid "Install and view software packages" msgstr "安装和查看软件包" @@ -6212,10 +6220,12 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "使用 GTK2 的快速轻量级集成开发环境" +#: ../menu-data/geary:geary-autostart.desktop.in.h:1 #: ../menu-data/geary:geary.desktop.in.h:1 msgid "Geary Mail" msgstr "Geary 邮件" +#: ../menu-data/geary:geary-autostart.desktop.in.h:2 #: ../menu-data/geary:geary.desktop.in.h:2 msgid "Send and receive email" msgstr "发送和接收电子邮件" @@ -6263,12 +6273,13 @@ #: ../menu-data/gedit:gedit.desktop.in.h:1 #: ../menu-data/jedit:jedit.desktop.in.h:2 #: ../menu-data/pluma:pluma.desktop.in.h:2 +#: ../menu-data/vim-common:vim.desktop.in.h:2 #: ../menu-data/vim-gui-common:gvim.desktop.in.h:2 msgid "Edit text files" msgstr "编辑文本文件" #: ../menu-data/gedit:gedit.desktop.in.h:2 -#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1 +#: ../menu-data/kwrite:org.kde.kwrite.desktop.in.h:1 #: ../menu-data/nedit:nedit.desktop.in.h:2 msgid "Text Editor" msgstr "文本编辑器" @@ -6974,7 +6985,7 @@ msgid "" "Browse a chronological log of your activities and easily find files, " "contacts, etc." -msgstr "浏览按时间顺序排列的活动志，轻松找到文件。" +msgstr "浏览按时间顺序排列的活动志，轻松找到文件、联系人等。" #: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:1 msgid "GNOME ALSA Mixer" @@ -7008,11 +7019,11 @@ msgid "Setup Bluetooth devices" msgstr "设置蓝牙设备" -#: ../menu-data/gnome-boxes:gnome-boxes.desktop.in.h:1 +#: ../menu-data/gnome-boxes:org.gnome.Boxes.desktop.in.h:1 msgid "Boxes" msgstr "Boxes" -#: ../menu-data/gnome-boxes:gnome-boxes.desktop.in.h:2 +#: ../menu-data/gnome-boxes:org.gnome.Boxes.desktop.in.h:2 msgid "View and use virtual machines" msgstr "查看和使用虚拟机" @@ -7032,11 +7043,11 @@ msgid "Download files with BitTorrent" msgstr "通过 BitTorrent 下载文件" -#: ../menu-data/gnome-calculator:gcalctool.desktop.in.h:1 +#: ../menu-data/gnome-calculator:gnome-calculator.desktop.in.h:1 msgid "Calculator" msgstr "计算器" -#: ../menu-data/gnome-calculator:gcalctool.desktop.in.h:2 +#: ../menu-data/gnome-calculator:gnome-calculator.desktop.in.h:2 msgid "Perform arithmetic, scientific or financial calculations" msgstr "进行算术、科学和财务计算" @@ -7142,13 +7153,13 @@ msgid "Schedule recordings and browse program guide" msgstr "定时录制和浏览节目指南" -#: ../menu-data/gnome-font-viewer:gnome-font-viewer.desktop.in.h:1 -#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:2 +#: ../menu-data/gnome-font-viewer:org.gnome.font-viewer.desktop.in.h:1 #: ../menu-data/mate-control-center:mate-font-viewer.desktop.in.h:1 +#: ../menu-data/plasma-desktop:org.kde.kfontview.desktop.in.h:2 msgid "Font Viewer" msgstr "字体查看器" -#: ../menu-data/gnome-font-viewer:gnome-font-viewer.desktop.in.h:2 +#: ../menu-data/gnome-font-viewer:org.gnome.font-viewer.desktop.in.h:2 msgid "View fonts on your system" msgstr "查看系统字体" @@ -7178,7 +7189,7 @@ #: ../menu-data/gnome-hearts:gnome-hearts.desktop.in.h:2 msgid "Play the popular Hearts card game" -msgstr "玩流行的红心大战游戏" +msgstr "流行的红心大战游戏" #: ../menu-data/gnome-klotski:gnome-klotski.desktop.in.h:1 msgid "Klotski" @@ -7204,12 +7215,12 @@ msgid "Disassemble a pile of tiles by removing matching pairs" msgstr "配对和消除麻将牌" -#: ../menu-data/gnome-maps:gnome-maps.desktop.in.h:1 +#: ../menu-data/gnome-maps:org.gnome.Maps.desktop.in.h:1 #: ../menu-data/openstreetmap-client:maps.desktop.in.h:1 msgid "Maps" msgstr "地图" -#: ../menu-data/gnome-maps:gnome-maps.desktop.in.h:2 +#: ../menu-data/gnome-maps:org.gnome.Maps.desktop.in.h:2 msgid "A simple maps application" msgstr "简易地图程序" @@ -7229,7 +7240,7 @@ msgid "A simple media player for GNOME" msgstr "GNOME 下的一个简易媒体播放器" -#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:1 +#: ../menu-data/gnome-sound-recorder:org.gnome.SoundRecorder.desktop.in.h:1 msgid "Sound Recorder" msgstr "录音机" @@ -7290,11 +7301,11 @@ msgid "View information about your network" msgstr "查看网络信息" -#: ../menu-data/gnome-nibbles:gnibbles.desktop.in.h:1 +#: ../menu-data/gnome-nibbles:gnome-nibbles.desktop.in.h:1 msgid "Nibbles" msgstr "Nibbles" -#: ../menu-data/gnome-nibbles:gnibbles.desktop.in.h:2 +#: ../menu-data/gnome-nibbles:gnome-nibbles.desktop.in.h:2 msgid "Guide a worm around a maze" msgstr "类似于百战天虫的迷宫游戏" @@ -7371,7 +7382,7 @@ #: ../menu-data/gnome-photos:org.gnome.Photos.desktop.in.h:2 msgid "Access, organize and share photos" -msgstr "查找、组织和分享照片" +msgstr "查找、组织和共享照片" #: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:1 msgid "Gnome-Pie" @@ -7399,11 +7410,11 @@ msgid "GNOME Dialup Tool" msgstr "GNOME 拨号工具" -#: ../menu-data/gnome-robots:gnobots2.desktop.in.h:1 +#: ../menu-data/gnome-robots:gnome-robots.desktop.in.h:1 msgid "Robots" msgstr "机器人" -#: ../menu-data/gnome-robots:gnobots2.desktop.in.h:2 +#: ../menu-data/gnome-robots:gnome-robots.desktop.in.h:2 msgid "Avoid the robots and make them crash into each other" msgstr "躲避机器人并让它们自相残杀" @@ -7417,9 +7428,8 @@ #: ../menu-data/gnome-session-flashback:gnome-flashback-services.desktop.in.h:1 msgid "GNOME Flashback Services" -msgstr "GNOME Flashback Services" +msgstr "GNOME Flashback 服务" -#: ../menu-data/gnome-session-flashback:gnome-wm.desktop.in.h:1 #: ../menu-data/unity-tweak-tool:unity-tweak-tool.desktop.in.h:4 #: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:1 msgid "Window Manager" @@ -7431,7 +7441,7 @@ #: ../menu-data/cinnamon:cinnamon.desktop.in.h:2 #: ../menu-data/cinnamon:cinnamon2d.desktop.in.h:2 -#: ../menu-data/gnome-shell-extensions:gnome-shell-classic.desktop.in.h:2 +#: ../menu-data/gnome-shell:gnome-shell-wayland.desktop.in.h:2 #: ../menu-data/gnome-shell:gnome-shell.desktop.in.h:2 msgid "Window management and application launching" msgstr "管理窗口、启动应用程序" @@ -7485,6 +7495,7 @@ msgstr "GNOME 桌面中的视频字幕程序" #: ../menu-data/gnome-sudoku:gnome-sudoku.desktop.in.h:1 +#: ../menu-data/sudoku:sudoku.desktop.in.h:1 msgid "Sudoku" msgstr "数独" @@ -7502,11 +7513,11 @@ msgstr "查看当前进程及监视系统状态" #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:1 -#: ../menu-data/konsole:kde4__konsole.desktop.in.h:2 +#: ../menu-data/konsole:org.kde.konsole.desktop.in.h:2 #: ../menu-data/terminal.app:Terminal.desktop.in.h:1 #: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1 msgid "Terminal" -msgstr "Terminal" +msgstr "终端" #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:3 msgid "New Terminal" @@ -7544,7 +7555,7 @@ #: ../menu-data/gnome-user-share:gnome-user-share-properties.desktop.in.h:2 #: ../menu-data/mate-user-share:mate-user-share-properties.desktop.in.h:2 msgid "Preferences for sharing of files" -msgstr "文件共享选项" +msgstr "文件共享首选项" #: ../menu-data/gnome-video-arcade:gnome-video-arcade.desktop.in.h:1 msgid "GNOME Video Arcade" @@ -7640,9 +7651,8 @@ msgstr "GNUbik" #: ../menu-data/gnubik:gnubik.desktop.in.h:2 -#: ../menu-data/pybik:pybik.desktop.in.h:2 msgid "3D Rubik's cube game" -msgstr "3D 魔方游戏" +msgstr "3D Rubik 魔方游戏" #: ../menu-data/gnucash:gnucash.desktop.in.h:1 msgid "Manage your finances, accounts, and investments" @@ -7748,12 +7758,11 @@ msgid "Gobby Collaborative Editor (0.4)" msgstr "Gobby 协作编辑器(0.4)" -#: ../menu-data/gobby-0.4:gobby.desktop.in.h:2 -#: ../menu-data/gobby-0.5:gobby-0.5.desktop.in.h:2 +#: ../menu-data/gobby:gobby-0.5.desktop.in.h:2 msgid "Edit text files collaboratively" msgstr "协作编辑文本文件" -#: ../menu-data/gobby-0.5:gobby-0.5.desktop.in.h:1 +#: ../menu-data/gobby:gobby-0.5.desktop.in.h:1 msgid "Gobby Collaborative Editor (0.5)" msgstr "Gobby 协作编辑器(0.5)" @@ -7947,7 +7956,7 @@ #: ../menu-data/gpointing-device-settings:gpointing-device-settings.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-mouse-panel.desktop.in.h:2 msgid "Set your mouse and touchpad preferences" -msgstr "设置您的鼠标和触摸板的偏好设置" +msgstr "设置鼠标和触摸板首选项" #: ../menu-data/gpomme:gpomme.desktop.in.h:1 msgid "pommed GTK client" @@ -8047,11 +8056,11 @@ "Manage genealogical information, perform genealogical research and analysis" msgstr "管理宗谱资料，进行宗谱的研究和分析" -#: ../menu-data/granatier:kde4__granatier.desktop.in.h:1 +#: ../menu-data/granatier:org.kde.granatier.desktop.in.h:1 msgid "Granatier" msgstr "Granatier" -#: ../menu-data/granatier:kde4__granatier.desktop.in.h:2 +#: ../menu-data/granatier:org.kde.granatier.desktop.in.h:2 msgid "Bomberman clone" msgstr "炸弹人克隆" @@ -8083,7 +8092,7 @@ msgid "GRASS GIS" msgstr "地理资源分析支持系统" -#: ../menu-data/grass-core:grass64.desktop.in.h:2 +#: ../menu-data/grass-core:grass70.desktop.in.h:2 #: ../menu-data/qgis:qbrowser.desktop.in.h:2 #: ../menu-data/qgis:qgis.desktop.in.h:2 msgid "Geographic Information System" @@ -8376,7 +8385,7 @@ #: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:2 msgid "A GUI based Gnutella Servent" -msgstr "图形用户界面的 Gnutella 小服务程序" +msgstr "基于 Gnutella Servent 的图形用户界面" #: ../menu-data/gtk-recordmydesktop:gtk-recordmydesktop.desktop.in.h:1 msgid "RecordMyDesktop" @@ -8683,11 +8692,11 @@ msgid "A batch renaming tool for KDE" msgstr "KDE 的批量重命名工具" -#: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:1 +#: ../menu-data/gwenview:org.kde.gwenview.desktop.in.h:1 msgid "Gwenview" msgstr "Gwenview" -#: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:2 +#: ../menu-data/gwenview:org.kde.gwenview.desktop.in.h:2 msgid "A simple image viewer" msgstr "一个简单的图像查看器" @@ -8702,8 +8711,8 @@ "to browse yours CDs or to make quick search without need to insert yours CDs " "in the drive repeatedly." msgstr "" -"GWhere 允许您管理您的 CD 数据库和其他可移动介质(硬盘、软盘驱动器 、Zip驱动器，光盘等...)。GWhere 非常容易浏览您的 CDs " -"或者无须反复插入 CDs 进行快速搜索。" +"GWhere 可以管理您的 CD 数据库和其他可移动介质(硬盘、软盘驱动器 、Zip驱动器，光盘等...)。使用 GWhere，您可以轻松浏览 CD " +"或者进行快速搜索而无须反复插入 CD 。" #: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:1 msgid "GWorkspace" @@ -8793,7 +8802,7 @@ #: ../menu-data/hamster-applet:hamster-time-tracker-overview.desktop.in.h:2 msgid "The overview window of hamster time tracker" -msgstr "仓鼠时间跟踪概览窗口" +msgstr "hamster 时间跟踪概览窗口" #: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:1 #: ../menu-data/hamster-applet:hamster-windows-service.desktop.in.h:1 @@ -8808,7 +8817,7 @@ #: ../menu-data/hamster-indicator:hamster-indicator.desktop.in.h:1 msgid "Hamster Indicator" -msgstr "仓鼠指示器" +msgstr "Hamster 指示器" #: ../menu-data/handbrake:ghb.desktop.in.h:1 msgid "HandBrake" @@ -9192,7 +9201,7 @@ #: ../menu-data/ibus-anthy:ibus-setup-anthy.desktop.in.h:2 msgid "Set up IBus Anthy engine" -msgstr "设置 IBUS Anthy 输入引擎" +msgstr "设置 IBus Anthy 输入引擎" #. The title of the preferences window for Cangjie #: ../menu-data/ibus-cangjie:ibus-setup-cangjie.desktop.in.h:2 @@ -9228,7 +9237,7 @@ #: ../menu-data/ibus-input-pad:ibus-setup-input-pad.desktop.in.h:2 msgid "Set up IBus Input Pad engine" -msgstr "设置 IBUS Input Pad 输入引擎" +msgstr "设置 IBus Input Pad 输入引擎" #: ../menu-data/ibus-libpinyin:ibus-setup-libbopomofo.desktop.in.h:1 msgid "IBus LibBopomofo Preferences" @@ -9252,7 +9261,7 @@ #: ../menu-data/ibus-pinyin:ibus-setup-bopomofo.desktop.in.h:2 msgid "Set ibus-Bopomofo Preferences" -msgstr "设置 IBUS-Bopomofo 输入法" +msgstr "设置 ibus-Bopomofo 首选项" #: ../menu-data/ibus-pinyin:ibus-setup-pinyin.desktop.in.h:1 msgid "IBus Pinyin Setup" @@ -9308,7 +9317,7 @@ #: ../menu-data/idle-python2.7:idle-python2.7.desktop.in.h:1 msgid "IDLE (using Python-2.7)" -msgstr "IDLE (using Python-2.7)" +msgstr "IDLE (使用 Python-2.7)" #: ../menu-data/idle-python2.7:idle-python2.7.desktop.in.h:2 msgid "Integrated Development Environment for Python (using Python-2.7)" @@ -9324,11 +9333,11 @@ #: ../menu-data/idle-python3.4:idle-python3.4.desktop.in.h:1 msgid "IDLE (using Python-3.4)" -msgstr "IDLE (using Python-3.4)" +msgstr "IDLE (使用 Python-3.4)" #: ../menu-data/idle-python3.4:idle-python3.4.desktop.in.h:2 msgid "Integrated Development Environment for Python (using Python-3.4)" -msgstr "Python 集成开发环境（适用于 Python-3.4）" +msgstr "Python 集成开发环境 (使用 Python-3.4)" #: ../menu-data/idle3:idle3.desktop.in.h:1 msgid "IDLE 3" @@ -9384,7 +9393,6 @@ msgstr "输入法" #: ../menu-data/im-config:im-config.desktop.in.h:2 -#: ../menu-data/im-switch:im-switch.desktop.in.h:2 msgid "Set Keyboard Input Method" msgstr "设置键盘输入法" @@ -9404,7 +9412,8 @@ msgid "ImageMagick (display)" msgstr "ImageMagick (display 命令)" -#: ../menu-data/imagemagick:display.im6.desktop.in.h:2 +#: ../menu-data/imagemagick-6.q16:display-im6.q16.desktop.in.h:2 +#: ../menu-data/imagemagick:display-im6.desktop.in.h:2 msgid "Display and edit image files" msgstr "显示和编辑图像文件" @@ -9594,11 +9603,11 @@ msgid "iTALC Master" msgstr "iTALC Master" -#: ../menu-data/itksnap:itksnap.desktop.in.h:1 +#: ../menu-data/neurodebian-desktop:neurodebian-itksnap.desktop.in.h:1 msgid "3D Structure Segmentation" msgstr "3D 结构分割工具" -#: ../menu-data/itksnap:itksnap.desktop.in.h:2 +#: ../menu-data/neurodebian-desktop:neurodebian-itksnap.desktop.in.h:2 msgid "ITK-SNAP" msgstr "ITK-SNAP" @@ -9764,7 +9773,7 @@ #: ../menu-data/jftp:jftp.desktop.in.h:2 msgid "Java GUI client for FTP, SMB, SFTP and NFS" -msgstr "FTP、SMB、SFTP 和 NFS 的 Java 图形用户界面" +msgstr "用于 FTP、SMB、SFTP 和 NFS 的 Java 图形用户界面客户端" #: ../menu-data/jhbuild:jhbuild.desktop.in.h:1 msgid "GNOME Build Tool" @@ -9895,7 +9904,7 @@ msgid "Advanced text editor" msgstr "高级文本编辑器" -#: ../menu-data/juk:kde4__juk.desktop.in.h:1 +#: ../menu-data/juk:kde4__juk.desktop.in.h:2 msgid "JuK" msgstr "JuK" @@ -9955,11 +9964,11 @@ msgid "Free-as-in-freedom 3D modeling and animation software" msgstr "自由的 3D 建模和动画软件" -#: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:1 +#: ../menu-data/k4dirstat:k4dirstat.desktop.in.h:1 msgid "K4DirStat" msgstr "K4DirStat" -#: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:2 +#: ../menu-data/k4dirstat:k4dirstat.desktop.in.h:2 msgid "Directory statistics and disk usage" msgstr "目录统计和磁盘使用情况" @@ -9971,11 +9980,11 @@ msgid "Manage large collections of notes" msgstr "大规模笔记数据管理工具" -#: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:1 +#: ../menu-data/kaddressbook:org.kde.kaddressbook.desktop.in.h:1 msgid "KAddressBook" msgstr "KAddressBook" -#: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:2 +#: ../menu-data/kaddressbook:org.kde.kaddressbook.desktop.in.h:2 msgid "Contact Manager" msgstr "联系人管理器" @@ -9999,27 +10008,27 @@ msgid "The ancient Chinese board game for 4 players" msgstr "KDE 的麻将游戏" -#: ../menu-data/kalarm:kde4__kalarm.desktop.in.h:1 +#: ../menu-data/kalarm:org.kde.kalarm.desktop.in.h:1 msgid "KAlarm" msgstr "KAlarm" -#: ../menu-data/kalarm:kde4__kalarm.desktop.in.h:2 +#: ../menu-data/kalarm:org.kde.kalarm.desktop.in.h:2 msgid "Personal Alarm Scheduler" msgstr "个人报警调度器" -#: ../menu-data/kalgebra:kde4__kalgebra.desktop.in.h:1 +#: ../menu-data/kalgebra:org.kde.kalgebra.desktop.in.h:1 msgid "KAlgebra" msgstr "KAlgebra" -#: ../menu-data/kalgebra:kde4__kalgebra.desktop.in.h:2 +#: ../menu-data/kalgebra:org.kde.kalgebra.desktop.in.h:2 msgid "Math Expression Solver and Plotter" msgstr "数学表达式解析器和绘图工具" -#: ../menu-data/kalgebramobile:kde4__kalgebramobile.desktop.in.h:1 +#: ../menu-data/kalgebramobile:kalgebramobile.desktop.in.h:1 msgid "KAlgebra Mobile" msgstr "KAlgebra Mobile" -#: ../menu-data/kalgebramobile:kde4__kalgebramobile.desktop.in.h:2 +#: ../menu-data/kalgebramobile:kalgebramobile.desktop.in.h:2 msgid "Pocket Math Expression Solver and Plotter" msgstr "小型数学表达式解析器和绘图机" @@ -10040,7 +10049,7 @@ msgid "Fancy-looking animated application for taking photos from webcam" msgstr "界面精致带有动画效果的摄像头拍照工具" -#: ../menu-data/kamoso:kde4__kamoso.desktop.in.h:1 +#: ../menu-data/kamoso:org.kde.kamoso.desktop.in.h:1 msgid "Kamoso" msgstr "Kamoso" @@ -10052,11 +10061,11 @@ msgid "Hira Drill" msgstr "Hira Drill" -#: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:1 +#: ../menu-data/kanagram:org.kde.kanagram.desktop.in.h:1 msgid "Kanagram" msgstr "Kanagram" -#: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:2 +#: ../menu-data/kanagram:org.kde.kanagram.desktop.in.h:2 msgid "KDE Letter Order Game" msgstr "KDE 字母顺序游戏" @@ -10076,19 +10085,19 @@ msgid "Bluetooth remote control for KDE" msgstr "KDE 蓝牙远程控制" -#: ../menu-data/kapman:kde4__kapman.desktop.in.h:1 +#: ../menu-data/kapman:org.kde.kapman.desktop.in.h:1 msgid "Kapman" msgstr "Kapman" -#: ../menu-data/kapman:kde4__kapman.desktop.in.h:2 +#: ../menu-data/kapman:org.kde.kapman.desktop.in.h:2 msgid "Eat pills escaping ghosts" msgstr "吞食药物，逃离魔爪" -#: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:1 +#: ../menu-data/kapptemplate:kapptemplate.desktop.in.h:1 msgid "KDE Template Generator" msgstr "KDE 模板生成器" -#: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:2 +#: ../menu-data/kapptemplate:kapptemplate.desktop.in.h:2 msgid "KAppTemplate" msgstr "KAppTemplate" @@ -10100,19 +10109,19 @@ msgid "Edit Anthy dictionary." msgstr "编辑 Anthy 词典。" -#: ../menu-data/kate:kde4__kate.desktop.in.h:1 +#: ../menu-data/kate:org.kde.kate.desktop.in.h:1 msgid "Advanced Text Editor" msgstr "高级文本编辑器" -#: ../menu-data/kate:kde4__kate.desktop.in.h:2 +#: ../menu-data/kate:org.kde.kate.desktop.in.h:2 msgid "Kate" msgstr "Kate" -#: ../menu-data/katomic:kde4__katomic.desktop.in.h:1 +#: ../menu-data/katomic:org.kde.katomic.desktop.in.h:1 msgid "KAtomic" msgstr "KAtomic" -#: ../menu-data/katomic:kde4__katomic.desktop.in.h:2 +#: ../menu-data/katomic:org.kde.katomic.desktop.in.h:2 msgid "Sokoban-like Logic Game" msgstr "类似推箱子的逻辑游戏" @@ -10180,43 +10189,43 @@ msgid "KDE-based editor for bibliographic files" msgstr "基于 KDE 的参考书目文件编辑器" -#: ../menu-data/kblackbox:kde4__kblackbox.desktop.in.h:1 +#: ../menu-data/kblackbox:org.kde.kblackbox.desktop.in.h:1 msgid "Blackbox Logic Game" msgstr "Blackbox 逻辑游戏" -#: ../menu-data/kblackbox:kde4__kblackbox.desktop.in.h:2 +#: ../menu-data/kblackbox:org.kde.kblackbox.desktop.in.h:2 msgid "KBlackBox" msgstr "KBlackBox" -#: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:1 +#: ../menu-data/kblocks:org.kde.kblocks.desktop.in.h:1 msgid "KBlocks" msgstr "KBlock" -#: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:2 +#: ../menu-data/kblocks:org.kde.kblocks.desktop.in.h:2 msgid "Falling Blocks Game" msgstr "积木掉落闪避游戏" -#: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:1 +#: ../menu-data/kbounce:org.kde.kbounce.desktop.in.h:1 msgid "KBounce" msgstr "KBounce" -#: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:2 +#: ../menu-data/kbounce:org.kde.kbounce.desktop.in.h:2 msgid "Ball Bouncing Game" msgstr "弹跳球游戏" -#: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:1 +#: ../menu-data/kbreakout:org.kde.kbreakout.desktop.in.h:1 msgid "KBreakOut" msgstr "KBreakOut" -#: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:2 +#: ../menu-data/kbreakout:org.kde.kbreakout.desktop.in.h:2 msgid "Breakout-like Game" msgstr "类似 Breakout 的游戏" -#: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:1 +#: ../menu-data/kbruch:kbruch__org.kde.kbruch.desktop.in.h:1 msgid "Practice exercises with fractions" msgstr "分数练习游戏" -#: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:2 +#: ../menu-data/kbruch:kbruch__org.kde.kbruch.desktop.in.h:2 msgid "KBruch" msgstr "KBruch" @@ -10228,11 +10237,11 @@ msgid "Visualization of Performance Profiling Data" msgstr "性能分析文件数据可视化工具" -#: ../menu-data/kcalc:kde4__kcalc.desktop.in.h:1 +#: ../menu-data/kcalc:org.kde.kcalc.desktop.in.h:1 msgid "KCalc" msgstr "KCalc" -#: ../menu-data/kcalc:kde4__kcalc.desktop.in.h:2 +#: ../menu-data/kcalc:org.kde.kcalc.desktop.in.h:2 msgid "Scientific Calculator" msgstr "科学计算器" @@ -10244,11 +10253,11 @@ msgid "Emulator for KC85 and compatible computer" msgstr "KC85 及其兼容机模拟器" -#: ../menu-data/kcharselect:kde4__KCharSelect.desktop.in.h:1 +#: ../menu-data/kcharselect:org.kde.KCharSelect.desktop.in.h:1 msgid "Character Selector" msgstr "字符选择器" -#: ../menu-data/kcharselect:kde4__KCharSelect.desktop.in.h:2 +#: ../menu-data/kcharselect:org.kde.KCharSelect.desktop.in.h:2 msgid "KCharSelect" msgstr "KCharSelect" @@ -10309,10 +10318,12 @@ msgstr "KDE 开发工具的元软件包" #: ../menu-data/kde-runtime:kde4__knetattach.desktop.in.h:1 +#: ../menu-data/plasma-desktop:org.kde.knetattach.desktop.in.h:1 msgid "KNetAttach" msgstr "KNetAttach" #: ../menu-data/kde-runtime:kde4__knetattach.desktop.in.h:2 +#: ../menu-data/plasma-desktop:org.kde.knetattach.desktop.in.h:2 msgid "Network Folder Wizard" msgstr "网络文件夹向导" @@ -10320,19 +10331,19 @@ msgid "KDE IM Contacts" msgstr "KDE 即时通讯联系人" -#: ../menu-data/kde-telepathy-contact-list:kde4__ktp-contactlist.desktop.in.h:2 +#: ../menu-data/kde-telepathy-contact-list:org.kde.ktpcontactlist.desktop.in.h:2 msgid "Displays your instant messenger contacts" msgstr "显示您的即时通讯联系人" -#: ../menu-data/kde-telepathy-text-ui:kde4__ktp-log-viewer.desktop.in.h:1 +#: ../menu-data/kde-telepathy-text-ui:ktp-log-viewer.desktop.in.h:1 msgid "KDE IM Log Viewer" msgstr "KDE 即时通讯聊天记录查看器" -#: ../menu-data/kde-telepathy-text-ui:kde4__ktp-log-viewer.desktop.in.h:2 +#: ../menu-data/kde-telepathy-text-ui:ktp-log-viewer.desktop.in.h:2 msgid "Displays your KDE Instant Messenger logs" msgstr "显示您的 KDE 即时通讯聊天记录" -#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1 +#: ../menu-data/plasma-desktop:org.kde.kfontview.desktop.in.h:1 msgid "KFontView" msgstr "KDE 字体查看器" @@ -10344,9 +10355,10 @@ msgid "A panel applet for resizing and reorientating X screens." msgstr "用于改变 X 屏幕尺寸和方向的面板小程序。" -#: ../menu-data/kdeconnect:kde4__kdeconnect.desktop.in.h:1 +#: ../menu-data/kdeconnect-plasma:kdeconnect-non-plasma.desktop.in.h:1 +#: ../menu-data/kdeconnect-plasma:kdeconnect.desktop.in.h:1 msgid "KDE Connect" -msgstr "KDE Connect" +msgstr "KDE 连接" #: ../menu-data/kdeconnect:kde4__kdeconnect.desktop.in.h:2 msgid "Connect smartphones to your KDE Plasma Workspace" @@ -10358,11 +10370,11 @@ msgid "KMailService" msgstr "KMailService" -#: ../menu-data/kdenlive:kde4__kdenlive.desktop.in.h:1 +#: ../menu-data/kdenlive:org.kde.kdenlive.desktop.in.h:1 msgid "Kdenlive" msgstr "Kdenlive" -#: ../menu-data/kdenlive:kde4__kdenlive.desktop.in.h:2 +#: ../menu-data/kdenlive:org.kde.kdenlive.desktop.in.h:2 msgid "Nonlinear video editor for KDE" msgstr "KDE 非线性视频编辑器" @@ -10370,11 +10382,11 @@ msgid "Change Password" msgstr "更改密码" -#: ../menu-data/kdepim-runtime:kde4__accountwizard.desktop.in.h:1 +#: ../menu-data/accountwizard:org.kde.accountwizard.desktop.in.h:1 msgid "Account Wizard" msgstr "帐户向导" -#: ../menu-data/kdepim-runtime:kde4__accountwizard.desktop.in.h:2 +#: ../menu-data/accountwizard:org.kde.accountwizard.desktop.in.h:2 msgid "Launch the account wizard to configure PIM accounts." msgstr "启动帐户向导以配置 PIM 帐户。" @@ -10386,15 +10398,15 @@ msgid "Akonadi Tray Utility" msgstr "Akonadi 托盘工具" -#: ../menu-data/kdepim-themeeditors:kde4__contactthemeeditor.desktop.in.h:1 +#: ../menu-data/kdepim-themeeditors:org.kde.contactthemeeditor.desktop.in.h:1 msgid "Contact Theme Editor" msgstr "Contact Theme Editor" -#: ../menu-data/kdepim-themeeditors:kde4__headerthemeeditor.desktop.in.h:1 +#: ../menu-data/kdepim-themeeditors:org.kde.headerthemeeditor.desktop.in.h:1 msgid "KMail Header Theme Editor" msgstr "KMail 邮件主题标题编辑器" -#: ../menu-data/kdepim-themeeditors:kde4__headerthemeeditor.desktop.in.h:2 +#: ../menu-data/kdepim-themeeditors:org.kde.headerthemeeditor.desktop.in.h:2 msgid "Mail Header Theme Editor" msgstr "邮件主题标题编辑器" @@ -10443,11 +10455,11 @@ msgid "View Disk Usage" msgstr "查看磁盘使用情况" -#: ../menu-data/kdiamond:kde4__kdiamond.desktop.in.h:1 +#: ../menu-data/kdiamond:org.kde.kdiamond.desktop.in.h:1 msgid "KDiamond" msgstr "KDiamond" -#: ../menu-data/kdiamond:kde4__kdiamond.desktop.in.h:2 +#: ../menu-data/kdiamond:org.kde.kdiamond.desktop.in.h:2 msgid "Three-in-a-row game" msgstr "三子连棋" @@ -10505,7 +10517,7 @@ #: ../menu-data/kepas:kde4__kepas.desktop.in.h:2 msgid "Kepas - KDE Easy Publish and Share" -msgstr "Kepas - KDE 轻松发布和分享" +msgstr "Kepas - KDE 轻松发布和共享" #: ../menu-data/ketm:ketm.desktop.in.h:1 msgid "KETM" @@ -10583,11 +10595,11 @@ msgid "KFloppy" msgstr "KFloppy" -#: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:1 +#: ../menu-data/kfourinline:org.kde.kfourinline.desktop.in.h:1 msgid "KFourInLine" msgstr "KFourInLine" -#: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:2 +#: ../menu-data/kfourinline:org.kde.kfourinline.desktop.in.h:2 msgid "Four-in-a-row Board Game" msgstr "四子棋" @@ -10609,11 +10621,11 @@ msgid "A graphical FTP client" msgstr "一个图形 FTP 客户端" -#: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:1 +#: ../menu-data/kgeography:org.kde.kgeography.desktop.in.h:1 msgid "KGeography" msgstr "KGeography" -#: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:2 +#: ../menu-data/kgeography:org.kde.kgeography.desktop.in.h:2 msgid "A Geography Learning Program" msgstr "地理学习程序" @@ -10658,11 +10670,11 @@ msgid "KGrab" msgstr "KGrab" -#: ../menu-data/khangman:kde4__khangman.desktop.in.h:1 +#: ../menu-data/khangman:org.kde.khangman.desktop.in.h:1 msgid "KDE Hangman Game" msgstr "KDE 猜字游戏" -#: ../menu-data/khangman:kde4__khangman.desktop.in.h:2 +#: ../menu-data/khangman:org.kde.khangman.desktop.in.h:2 msgid "KHangMan" msgstr "KHangMan" @@ -10711,11 +10723,11 @@ msgid "Kid3" msgstr "Kid3" -#: ../menu-data/kig:kde4__kig.desktop.in.h:1 +#: ../menu-data/kig:org.kde.kig.desktop.in.h:1 msgid "Kig" msgstr "Kig" -#: ../menu-data/kig:kde4__kig.desktop.in.h:2 +#: ../menu-data/kig:org.kde.kig.desktop.in.h:2 msgid "Explore Geometric Constructions" msgstr "探索几何作图的乐趣" @@ -10755,7 +10767,7 @@ msgid "Kile" msgstr "Kile" -#: ../menu-data/killbots:kde4__killbots.desktop.in.h:1 +#: ../menu-data/killbots:org.kde.killbots.desktop.in.h:1 msgid "Killbots" msgstr "Killbots" @@ -10767,11 +10779,11 @@ msgid "HTML Image Map Editor" msgstr "HTML 图像地图编辑器" -#: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:1 +#: ../menu-data/kinfocenter:org.kde.kinfocenter.desktop.in.h:1 msgid "KInfoCenter" msgstr "KInfoCenter" -#: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:2 +#: ../menu-data/kinfocenter:org.kde.kinfocenter.desktop.in.h:2 msgid "Info Center" msgstr "信息中心" @@ -10807,11 +10819,11 @@ msgid "Create beautiful and professional photo layouts from your photos" msgstr "从您的照片中创建美观和专业的照片布局" -#: ../menu-data/kiriki:kde4__kiriki.desktop.in.h:1 +#: ../menu-data/kiriki:org.kde.kiriki.desktop.in.h:1 msgid "Kiriki" msgstr "Kiriki" -#: ../menu-data/kiriki:kde4__kiriki.desktop.in.h:2 +#: ../menu-data/kiriki:org.kde.kiriki.desktop.in.h:2 msgid "Yahtzee-like Dice Game" msgstr "类似 Yahtzee 的骰子游戏" @@ -10827,19 +10839,19 @@ msgid "2ch client for KDE" msgstr "KDE的 2ch 客户端" -#: ../menu-data/kiten:kde4__kiten.desktop.in.h:1 +#: ../menu-data/kiten:org.kde.kiten.desktop.in.h:1 msgid "Japanese Reference and Study Tool" msgstr "日语参考和学习工具" -#: ../menu-data/kiten:kde4__kiten.desktop.in.h:2 +#: ../menu-data/kiten:org.kde.kiten.desktop.in.h:2 msgid "Kiten" msgstr "Kiten" -#: ../menu-data/kiten:kde4__kitenkanjibrowser.desktop.in.h:1 +#: ../menu-data/kiten:org.kde.kitenkanjibrowser.desktop.in.h:1 msgid "Kanji Browser" msgstr "Kanji 汉字浏览器" -#: ../menu-data/kiten:kde4__kitenradselect.desktop.in.h:1 +#: ../menu-data/kiten:kitenradselect.desktop.in.h:1 msgid "Radical Selector" msgstr "字根选择器" @@ -10859,11 +10871,11 @@ msgid "Note Taker" msgstr "Note Taker" -#: ../menu-data/kjumpingcube:kde4__kjumpingcube.desktop.in.h:1 +#: ../menu-data/kjumpingcube:org.kde.kjumpingcube.desktop.in.h:1 msgid "KJumpingCube" msgstr "KJumpingCube" -#: ../menu-data/kjumpingcube:kde4__kjumpingcube.desktop.in.h:2 +#: ../menu-data/kjumpingcube:org.kde.kjumpingcube.desktop.in.h:2 msgid "Territory Capture Game" msgstr "土地占领游戏" @@ -10887,21 +10899,21 @@ msgid "Yet another touch typing tutor" msgstr "触摸式输入训练器" -#: ../menu-data/kleopatra:kde4__kleopatra.desktop.in.h:1 -#: ../menu-data/kleopatra:kde4__kleopatra_import.desktop.in.h:1 +#: ../menu-data/kleopatra:kleopatra_import.desktop.in.h:1 +#: ../menu-data/kleopatra:org.kde.kleopatra.desktop.in.h:1 msgid "Kleopatra" msgstr "Kleopatra" -#: ../menu-data/kleopatra:kde4__kleopatra.desktop.in.h:2 -#: ../menu-data/kleopatra:kde4__kleopatra_import.desktop.in.h:2 +#: ../menu-data/kleopatra:kleopatra_import.desktop.in.h:2 +#: ../menu-data/kleopatra:org.kde.kleopatra.desktop.in.h:2 msgid "Certificate Manager and Unified Crypto GUI" msgstr "证书管理器及统一的加密图形用户界面" -#: ../menu-data/klettres:kde4__klettres.desktop.in.h:1 +#: ../menu-data/klettres:org.kde.klettres.desktop.in.h:1 msgid "a KDE program to learn the alphabet" msgstr "用于学习字母表的 KDE 程序" -#: ../menu-data/klettres:kde4__klettres.desktop.in.h:2 +#: ../menu-data/klettres:org.kde.klettres.desktop.in.h:2 msgid "KLettres" msgstr "KLettres" @@ -10917,11 +10929,11 @@ msgid "Board Game" msgstr "棋类游戏" -#: ../menu-data/klines:kde4__klines.desktop.in.h:1 +#: ../menu-data/klines:org.kde.klines.desktop.in.h:1 msgid "Tactical Game" msgstr "战略游戏" -#: ../menu-data/klines:kde4__klines.desktop.in.h:2 +#: ../menu-data/klines:org.kde.klines.desktop.in.h:2 msgid "Kolor Lines" msgstr "Kolor Lines" @@ -10933,11 +10945,11 @@ msgid "Link Checker" msgstr "链接检查器" -#: ../menu-data/klipper:kde4__klipper.desktop.in.h:1 +#: ../menu-data/plasma-workspace:org.kde.klipper.desktop.in.h:1 msgid "Klipper" msgstr "Klipper" -#: ../menu-data/klipper:kde4__klipper.desktop.in.h:2 +#: ../menu-data/plasma-workspace:org.kde.klipper.desktop.in.h:2 msgid "A cut & paste history utility" msgstr "剪切和粘贴历史工具" @@ -10978,7 +10990,7 @@ msgid "Mail" msgstr "邮件" -#: ../menu-data/kmail:kde4__KMail2.desktop.in.h:1 +#: ../menu-data/kmail:org.kde.kmail.desktop.in.h:1 msgid "KMail" msgstr "KMail" @@ -10986,21 +10998,21 @@ msgid "Mail Client" msgstr "邮件客户端" -#: ../menu-data/kmail:kde4__importwizard.desktop.in.h:1 +#: ../menu-data/kmail:org.kde.importwizard.desktop.in.h:1 msgid "KMail Import Wizard" msgstr "KMail 邮件导入向导" -#: ../menu-data/kmail:kde4__importwizard.desktop.in.h:2 +#: ../menu-data/kmail:org.kde.importwizard.desktop.in.h:2 msgid "" "Launch the import wizard to migrate data from mailer as " "thunderbird/evolution etc." msgstr "从雷鸟等 Linux 邮件客户端启动导入向导迁移数据" -#: ../menu-data/kmail:kde4__mboximporter.desktop.in.h:1 +#: ../menu-data/kmail:org.kde.mboximporter.desktop.in.h:1 msgid "MBoxImporter" msgstr "MBoxImporter" -#: ../menu-data/kmenuedit:kde4__kmenuedit.desktop.in.h:1 +#: ../menu-data/kmenuedit:org.kde.kmenuedit.desktop.in.h:1 #: ../menu-data/menulibre:menulibre.desktop.in.h:1 msgid "Menu Editor" msgstr "菜单编辑器" @@ -11011,7 +11023,7 @@ #: ../menu-data/kmess:kde4__kmess.desktop.in.h:2 msgid "Live Messenger Client for KDE" -msgstr "KDE Live Messenger 客户端" +msgstr "KDE Live Messenger 软件客户端" #: ../menu-data/kmetronome:kde4__kmetronome.desktop.in.h:1 msgid "KMetronome" @@ -11029,11 +11041,11 @@ msgid "ALSA Sequencer MIDI monitor" msgstr "ALSA 定序器 MIDI 监控器" -#: ../menu-data/kmines:kde4__kmines.desktop.in.h:1 +#: ../menu-data/kmines:org.kde.kmines.desktop.in.h:1 msgid "KMines" msgstr "KMines" -#: ../menu-data/kmines:kde4__kmines.desktop.in.h:2 +#: ../menu-data/kmines:org.kde.kmines.desktop.in.h:2 msgid "Minesweeper-like Game" msgstr "扫雷游戏" @@ -11077,11 +11089,11 @@ msgid "KMPlayer" msgstr "KMPlayer" -#: ../menu-data/kmplot:kde4__kmplot.desktop.in.h:1 +#: ../menu-data/kmplot:org.kde.kmplot.desktop.in.h:1 msgid "Function Plotter" msgstr "函数绘图器" -#: ../menu-data/kmplot:kde4__kmplot.desktop.in.h:2 +#: ../menu-data/kmplot:org.kde.kmplot.desktop.in.h:2 msgid "KmPlot" msgstr "KmPlot" @@ -11109,11 +11121,11 @@ msgid "Network Monitor" msgstr "网络监视器" -#: ../menu-data/knetwalk:kde4__knetwalk.desktop.in.h:1 +#: ../menu-data/knetwalk:org.kde.knetwalk.desktop.in.h:1 msgid "KNetWalk" msgstr "KNetWalk" -#: ../menu-data/knetwalk:kde4__knetwalk.desktop.in.h:2 +#: ../menu-data/knetwalk:org.kde.knetwalk.desktop.in.h:2 msgid "Network Construction Game" msgstr "网络建设游戏" @@ -11123,17 +11135,17 @@ #: ../menu-data/knights:kde4__knights.desktop.in.h:2 msgid "Chess game" -msgstr "Knights" +msgstr "棋类游戏" #: ../menu-data/knode:kde4__KNode.desktop.in.h:1 msgid "KNode" msgstr "KNode" -#: ../menu-data/knotes:kde4__knotes.desktop.in.h:1 +#: ../menu-data/knotes:org.kde.knotes.desktop.in.h:1 msgid "Popup Notes" msgstr "弹出注释" -#: ../menu-data/knotes:kde4__knotes.desktop.in.h:2 +#: ../menu-data/knotes:org.kde.knotes.desktop.in.h:2 msgid "KNotes" msgstr "KNotes" @@ -11161,11 +11173,11 @@ msgid "Miniature Golf" msgstr "小型高尔夫游戏" -#: ../menu-data/kollision:kde4__kollision.desktop.in.h:1 +#: ../menu-data/kollision:org.kde.kollision.desktop.in.h:1 msgid "Kollision" msgstr "Kollision" -#: ../menu-data/kollision:kde4__kollision.desktop.in.h:2 +#: ../menu-data/kollision:org.kde.kollision.desktop.in.h:2 msgid "A simple ball dodging game" msgstr "简单的球类躲闪游戏" @@ -11185,11 +11197,11 @@ msgid "A KDE Directory Synchronization Application" msgstr "一个 KDE 目录同步程序" -#: ../menu-data/kompare:kde4__kompare.desktop.in.h:1 +#: ../menu-data/kompare:kompare.desktop.in.h:1 msgid "Kompare" msgstr "Kompare" -#: ../menu-data/kompare:kde4__kompare.desktop.in.h:2 +#: ../menu-data/kompare:kompare.desktop.in.h:2 msgid "Diff/Patch Frontend" msgstr "Diff/Patch 前端" @@ -11201,19 +11213,19 @@ msgid "Galactic Strategy Game" msgstr "以银河系为背景的战略游戏" -#: ../menu-data/konsole:kde4__konsole.desktop.in.h:1 +#: ../menu-data/konsole:org.kde.konsole.desktop.in.h:1 msgid "Konsole" msgstr "Konsole" -#: ../menu-data/konsolekalendar:kde4__konsolekalendar.desktop.in.h:1 +#: ../menu-data/konsolekalendar:konsolekalendar.desktop.in.h:1 msgid "KonsoleKalendar" msgstr "KonsoleKalendar" -#: ../menu-data/kontact:kde4__Kontact.desktop.in.h:1 +#: ../menu-data/kontact:org.kde.kontact.desktop.in.h:1 msgid "Kontact" msgstr "Kontact" -#: ../menu-data/kontact:kde4__Kontact.desktop.in.h:2 +#: ../menu-data/kontact:org.kde.kontact.desktop.in.h:2 msgid "Personal Information Manager" msgstr "个人信息管理器" @@ -11225,11 +11237,11 @@ msgid "Remote shell command executor and LAN manager" msgstr "远程 shell 命令执行程序和局域网管理器" -#: ../menu-data/konversation:kde4__konversation.desktop.in.h:1 +#: ../menu-data/konversation:org.kde.konversation.desktop.in.h:1 msgid "IRC Client" msgstr "IRC 客户端" -#: ../menu-data/konversation:kde4__konversation.desktop.in.h:2 +#: ../menu-data/konversation:org.kde.konversation.desktop.in.h:2 msgid "Konversation" msgstr "Konversation" @@ -11243,16 +11255,18 @@ msgid "Instant Messenger" msgstr "即时通讯程序" -#: ../menu-data/korganizer-mobile:kde4__korganizer-mobile.desktop.in.h:1 +#: ../menu-data/gnome-calendar:org.gnome.Calendar.desktop.in.h:1 #: ../menu-data/sync-monitor-uoa:sync-monitor-calendar.desktop.in.h:2 msgid "Calendar" msgstr "日历" -#: ../menu-data/korganizer:kde4__korganizer.desktop.in.h:1 +#: ../menu-data/korganizer:korganizer-import.desktop.in.h:1 +#: ../menu-data/korganizer:org.kde.korganizer.desktop.in.h:1 msgid "Calendar and Scheduling Program" msgstr "日历和日程安排程序" -#: ../menu-data/korganizer:kde4__korganizer.desktop.in.h:2 +#: ../menu-data/korganizer:korganizer-import.desktop.in.h:2 +#: ../menu-data/korganizer:org.kde.korganizer.desktop.in.h:2 msgid "KOrganizer" msgstr "KOrganizer" @@ -11272,11 +11286,11 @@ msgid "Kover" msgstr "Kover" -#: ../menu-data/kpat:kde4__kpat.desktop.in.h:1 +#: ../menu-data/kpat:org.kde.kpat.desktop.in.h:1 msgid "KPatience" msgstr "KPatience" -#: ../menu-data/kpat:kde4__kpat.desktop.in.h:2 +#: ../menu-data/kpat:org.kde.kpat.desktop.in.h:2 msgid "Patience Card Game" msgstr "考验耐心的牌类游戏" @@ -11405,8 +11419,9 @@ msgid "Desktop Sharing" msgstr "桌面共享" +#: ../menu-data/krita-data:kde4__krita_heightmap.desktop.in.h:2 +#: ../menu-data/krita-data:kde4__krita_tga.desktop.in.h:1 #: ../menu-data/krita:kde4__krita.desktop.in.h:1 -#: ../menu-data/krita:kde4__krita_flipbook.desktop.in.h:1 #: ../menu-data/krita:kde4__krita_jp2.desktop.in.h:2 #: ../menu-data/krita:kde4__krita_odg.desktop.in.h:1 #: ../menu-data/krita:kde4__krita_psd.desktop.in.h:1 @@ -11414,8 +11429,6 @@ msgstr "Krita" #: ../menu-data/krita:kde4__krita.desktop.in.h:2 -#: ../menu-data/kritagemini:kde4__kritagemini.desktop.in.h:1 -#: ../menu-data/kritasketch:kde4__kritasketch.desktop.in.h:2 msgid "Digital Painting" msgstr "数字绘画" @@ -11431,12 +11444,12 @@ msgid "Krita Sketch" msgstr "Krita Sketch" -#: ../menu-data/kruler:kde4__kruler.desktop.in.h:1 +#: ../menu-data/kruler:org.kde.kruler.desktop.in.h:1 #: ../menu-data/screenruler:screenruler.desktop.in.h:1 msgid "Screen Ruler" msgstr "屏幕标尺" -#: ../menu-data/kruler:kde4__kruler.desktop.in.h:2 +#: ../menu-data/kruler:org.kde.kruler.desktop.in.h:2 msgid "KRuler" msgstr "KRuler" @@ -11460,11 +11473,11 @@ msgid "Source editing environment" msgstr "源代码编辑环境" -#: ../menu-data/kshisen:kde4__kshisen.desktop.in.h:1 +#: ../menu-data/kshisen:org.kde.kshisen.desktop.in.h:1 msgid "Shisen-Sho" msgstr "Shisen-Sho" -#: ../menu-data/kshisen:kde4__kshisen.desktop.in.h:2 +#: ../menu-data/kshisen:org.kde.kshisen.desktop.in.h:2 msgid "Shisen-Sho Mahjongg-like Tile Game" msgstr "类似麻将的棋牌游戏" @@ -11492,7 +11505,7 @@ msgid "KSnake" msgstr "KSnake" -#: ../menu-data/ksnakeduel:kde4__ktron.desktop.in.h:1 +#: ../menu-data/ksnakeduel:kde4__ksnakeduel.desktop.in.h:1 msgid "KSnakeDuel" msgstr "KSnakeDuel" @@ -11512,19 +11525,19 @@ msgid "Space Arcade Game" msgstr "太空街机游戏" -#: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:1 +#: ../menu-data/ksquares:org.kde.ksquares.desktop.in.h:1 msgid "KSquares" msgstr "KSquares" -#: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:2 +#: ../menu-data/ksquares:org.kde.ksquares.desktop.in.h:2 msgid "Connect the dots to create squares" msgstr "连接各点以创建正方形" -#: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:1 +#: ../menu-data/ksshaskpass:org.kde.ksshaskpass.desktop.in.h:1 msgid "SSH AskPass" msgstr "SSH AskPass" -#: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:2 +#: ../menu-data/ksshaskpass:org.kde.ksshaskpass.desktop.in.h:2 msgid "Enter passphrase to authenticate to the ssh agent" msgstr "输入密码以认证到 ssh 代理" @@ -11536,11 +11549,11 @@ msgid "Data Viewer" msgstr "数据浏览器" -#: ../menu-data/kstars:kde4__kstars.desktop.in.h:1 +#: ../menu-data/kstars:org.kde.kstars.desktop.in.h:1 msgid "Desktop Planetarium" msgstr "桌面天文馆" -#: ../menu-data/kstars:kde4__kstars.desktop.in.h:2 +#: ../menu-data/kstars:org.kde.kstars.desktop.in.h:2 msgid "KStars" msgstr "KStars" @@ -11552,11 +11565,11 @@ msgid "KSudoku, Sudoku game & more for KDE" msgstr "KSudoku、数独游戏及更多 KDE 游戏" -#: ../menu-data/ksysguard:kde4__ksysguard.desktop.in.h:1 +#: ../menu-data/ksysguard:org.kde.ksysguard.desktop.in.h:1 msgid "KSysGuard" msgstr "KSysGuard" -#: ../menu-data/ksysguard:kde4__ksysguard.desktop.in.h:2 +#: ../menu-data/ksysguard:org.kde.ksysguard.desktop.in.h:2 msgid "System Monitor" msgstr "系统监视器" @@ -11568,11 +11581,11 @@ msgid "System log viewer tool" msgstr "系统日志查看工具" -#: ../menu-data/kteatime:kde4__kteatime.desktop.in.h:1 +#: ../menu-data/kteatime:org.kde.kteatime.desktop.in.h:1 msgid "KTeaTime" msgstr "KTeaTime" -#: ../menu-data/kteatime:kde4__kteatime.desktop.in.h:2 +#: ../menu-data/kteatime:org.kde.kteatime.desktop.in.h:2 msgid "Tea Cooker" msgstr "泡茶辅助程序" @@ -11585,11 +11598,11 @@ msgid "Program for creating TikZ (from the LaTeX pgf package) diagrams" msgstr "从 LaTeX pgf 包创建 TikZ 图表" -#: ../menu-data/ktimer:kde4__ktimer.desktop.in.h:1 +#: ../menu-data/ktimer:org.kde.ktimer.desktop.in.h:1 msgid "Countdown Launcher" msgstr "倒计时启动" -#: ../menu-data/ktimer:kde4__ktimer.desktop.in.h:2 +#: ../menu-data/ktimer:org.kde.ktimer.desktop.in.h:2 msgid "KTimer" msgstr "KTimer" @@ -11601,11 +11614,11 @@ msgid "Personal Time Tracker" msgstr "个人时间跟踪器" -#: ../menu-data/ktnef:kde4__ktnef.desktop.in.h:1 +#: ../menu-data/ktnef:org.kde.ktnef.desktop.in.h:1 msgid "KTnef" msgstr "KTnef" -#: ../menu-data/ktnef:kde4__ktnef.desktop.in.h:2 +#: ../menu-data/ktnef:org.kde.ktnef.desktop.in.h:2 msgid "A viewer/extractor for TNEF files" msgstr "TNEF 文件查看/提取器" @@ -11633,11 +11646,11 @@ msgid "Picture Game for Children" msgstr "儿童图片游戏" -#: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:1 +#: ../menu-data/kturtle:org.kde.kturtle.desktop.in.h:1 msgid "KTurtle" msgstr "KTurtle" -#: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:2 +#: ../menu-data/kturtle:org.kde.kturtle.desktop.in.h:2 msgid "Educational Programming Environment" msgstr "编程教育环境" @@ -11697,11 +11710,12 @@ msgid "KVpnc" msgstr "KVpnc" -#: ../menu-data/kwalletmanager:kde4__kwalletmanager.desktop.in.h:1 +#: ../menu-data/kwalletmanager:org.kde.kwalletmanager5.desktop.in.h:1 msgid "KWalletManager" msgstr "KWalletManager" -#: ../menu-data/kwalletmanager:kde4__kwalletmanager.desktop.in.h:2 +#: ../menu-data/kwalletmanager:kwalletmanager5-kwalletd.desktop.in.h:1 +#: ../menu-data/kwalletmanager:org.kde.kwalletmanager5.desktop.in.h:2 msgid "Wallet Management Tool" msgstr "钱包管理工具" @@ -11713,15 +11727,15 @@ msgid "A sound editor for KDE" msgstr "KDE 声音编辑器" -#: ../menu-data/kwordquiz:kde4__kwordquiz.desktop.in.h:1 +#: ../menu-data/kwordquiz:org.kde.kwordquiz.desktop.in.h:1 msgid "A flashcard and vocabulary learning program" msgstr "抽认卡词汇学习程序" -#: ../menu-data/kwordquiz:kde4__kwordquiz.desktop.in.h:2 +#: ../menu-data/kwordquiz:org.kde.kwordquiz.desktop.in.h:2 msgid "KWordQuiz" msgstr "KWordQuiz" -#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:2 +#: ../menu-data/kwrite:org.kde.kwrite.desktop.in.h:2 msgid "KWrite" msgstr "KWrite" @@ -12330,7 +12344,7 @@ #: ../menu-data/llk-linux:llk_linux.desktop.in.h:2 msgid "Gtk based LianLianKan Game." -msgstr "基于 GTK 的连连看游戏" +msgstr "基于 GTK 的连连看游戏。" #: ../menu-data/lmarbles:lmarbles.desktop.in.h:1 msgid "LMarbles" @@ -12372,11 +12386,11 @@ msgid "Manage journal/weblog" msgstr "管理行程/网络日志" -#: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:1 +#: ../menu-data/lokalize:org.kde.lokalize.desktop.in.h:1 msgid "Lokalize" msgstr "Lokalize" -#: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:2 +#: ../menu-data/lokalize:org.kde.lokalize.desktop.in.h:2 msgid "Computer-Aided Translation System" msgstr "计算机辅助翻译系统" @@ -12525,7 +12539,7 @@ #: ../menu-data/lure-of-the-temptress:lure-of-the-temptress.desktop.in.h:1 msgid "Lure of the Temptress" -msgstr "Lure of the Temptress 巫女的诱惑" +msgstr "巫女的诱惑" #: ../menu-data/lure-of-the-temptress:lure-of-the-temptress.desktop.in.h:2 msgid "classic 2D point and click fantasy adventure game" @@ -12755,29 +12769,25 @@ msgid "Share mouse and pointer with other Computers" msgstr "与其他计算机共享鼠标和指针" -#: ../menu-data/marble-mobile:kde4__marble-mobile.desktop.in.h:1 -#: ../menu-data/marble-qt:kde4__marble-qt.desktop.in.h:1 -#: ../menu-data/marble-touch:kde4__marble-touch.desktop.in.h:1 -#: ../menu-data/marble:kde4__marble.desktop.in.h:1 -#: ../menu-data/marble:kde4__marble_geo.desktop.in.h:1 -#: ../menu-data/marble:kde4__marble_gpx.desktop.in.h:1 -#: ../menu-data/marble:kde4__marble_kml.desktop.in.h:1 -#: ../menu-data/marble:kde4__marble_kmz.desktop.in.h:1 -#: ../menu-data/marble:kde4__marble_osm.desktop.in.h:1 -#: ../menu-data/marble:kde4__marble_shp.desktop.in.h:1 -#: ../menu-data/marble:kde4__marble_worldwind.desktop.in.h:1 +#: ../menu-data/marble-mobile:marble-mobile.desktop.in.h:1 +#: ../menu-data/marble-touch:marble-touch.desktop.in.h:1 +#: ../menu-data/marble:marble.desktop.in.h:1 +#: ../menu-data/marble:marble_geo.desktop.in.h:1 +#: ../menu-data/marble:marble_gpx.desktop.in.h:1 +#: ../menu-data/marble:marble_kml.desktop.in.h:1 +#: ../menu-data/marble:marble_osm.desktop.in.h:1 +#: ../menu-data/marble:marble_shp.desktop.in.h:1 +#: ../menu-data/marble:marble_worldwind.desktop.in.h:1 msgid "Marble" msgstr "弹珠" -#: ../menu-data/marble-mobile:kde4__marble-mobile.desktop.in.h:2 -#: ../menu-data/marble-qt:kde4__marble-qt.desktop.in.h:2 -#: ../menu-data/marble-touch:kde4__marble-touch.desktop.in.h:2 -#: ../menu-data/marble:kde4__marble.desktop.in.h:2 -#: ../menu-data/marble:kde4__marble_gpx.desktop.in.h:2 -#: ../menu-data/marble:kde4__marble_kml.desktop.in.h:2 -#: ../menu-data/marble:kde4__marble_kmz.desktop.in.h:2 -#: ../menu-data/marble:kde4__marble_osm.desktop.in.h:2 -#: ../menu-data/marble:kde4__marble_shp.desktop.in.h:2 +#: ../menu-data/marble-mobile:marble-mobile.desktop.in.h:2 +#: ../menu-data/marble-touch:marble-touch.desktop.in.h:2 +#: ../menu-data/marble:marble.desktop.in.h:2 +#: ../menu-data/marble:marble_gpx.desktop.in.h:2 +#: ../menu-data/marble:marble_kml.desktop.in.h:2 +#: ../menu-data/marble:marble_osm.desktop.in.h:2 +#: ../menu-data/marble:marble_shp.desktop.in.h:2 msgid "Virtual Globe" msgstr "模拟地球" @@ -13034,7 +13044,7 @@ #: ../menu-data/mess-desktop-entries:mess-dc.desktop.in.h:1 msgid "Dreamcast ROM Player" -msgstr "Dreamcast 梦工厂光驱游戏" +msgstr "Dreamcast 梦工厂 ROM 运行器" #: ../menu-data/mess-desktop-entries:mess-dc.desktop.in.h:2 msgid "Play Sega Dreamcast games" @@ -13042,23 +13052,23 @@ #: ../menu-data/mess-desktop-entries:mess-gameboy.desktop.in.h:1 msgid "Game Boy ROM Player" -msgstr "Game Boy ROM Player" +msgstr "Game Boy ROM 运行器" #: ../menu-data/mess-desktop-entries:mess-gameboy.desktop.in.h:2 msgid "Play Nintendo Game Boy games" -msgstr "运行任天堂 Game Boy 游戏" +msgstr "玩任天堂 Game Boy 游戏" #: ../menu-data/mess-desktop-entries:mess-gba.desktop.in.h:1 msgid "Game Boy Advance ROM Player" -msgstr "Game Boy Advance ROM Player" +msgstr "Game Boy Advance ROM 运行器" #: ../menu-data/mess-desktop-entries:mess-gba.desktop.in.h:2 msgid "Play Nintendo Game Boy Advance games" -msgstr "运行任天堂 GBA 游戏" +msgstr "玩任天堂 GBA 游戏" #: ../menu-data/mess-desktop-entries:mess-genesis.desktop.in.h:1 msgid "Genesis ROM Player" -msgstr "Genesis 光驱游戏" +msgstr "Genesis ROM 运行器" #: ../menu-data/mess-desktop-entries:mess-genesis.desktop.in.h:2 msgid "Play Sega Genesis games" @@ -13066,7 +13076,7 @@ #: ../menu-data/mess-desktop-entries:mess-msx.desktop.in.h:1 msgid "MSX ROM Player" -msgstr "MSX 光驱游戏" +msgstr "MSX ROM 运行器" #: ../menu-data/mess-desktop-entries:mess-msx.desktop.in.h:2 msgid "Play MSX games" @@ -13074,7 +13084,7 @@ #: ../menu-data/mess-desktop-entries:mess-n64.desktop.in.h:1 msgid "Nintendo64 ROM Player" -msgstr "任天堂 64 精品光驱游戏" +msgstr "Nintendo64 ROM 运行器" #: ../menu-data/mess-desktop-entries:mess-n64.desktop.in.h:2 msgid "Play Nintendo 64 games" @@ -13082,7 +13092,7 @@ #: ../menu-data/mess-desktop-entries:mess-nes.desktop.in.h:1 msgid "NES ROM Player" -msgstr "任天堂红白机光驱游戏" +msgstr "任天堂红白机 ROM 运行器" #: ../menu-data/mess-desktop-entries:mess-nes.desktop.in.h:2 msgid "Play Nintendo Entertainment System games" @@ -13090,7 +13100,7 @@ #: ../menu-data/mess-desktop-entries:mess-sms.desktop.in.h:1 msgid "Sega Master System/Game Gear ROM Player" -msgstr "SMS/GG 光驱游戏" +msgstr "SMS/GG ROM 运行器" #: ../menu-data/mess-desktop-entries:mess-sms.desktop.in.h:2 msgid "Play Sega Master System and Game Gear games" @@ -13098,7 +13108,7 @@ #: ../menu-data/mess-desktop-entries:mess-snes.desktop.in.h:1 msgid "Super NES ROM Player" -msgstr "超级任天堂红白机光驱游戏" +msgstr "超级任天堂红白机 ROM 运行器" #: ../menu-data/mess-desktop-entries:mess-snes.desktop.in.h:2 msgid "Play Super Nintendo Entertainment System games" @@ -13270,6 +13280,7 @@ #: ../menu-data/minitube:minitube.desktop.in.h:3 #: ../menu-data/parole:parole.desktop.in.h:3 +#: ../menu-data/totem:org.gnome.Totem.desktop.in.h:3 #: ../menu-data/totem:totem.desktop.in.h:3 msgid "Play/Pause" msgstr "播放 / 暂停" @@ -13397,7 +13408,7 @@ #: ../menu-data/modem-manager-gui:modem-manager-gui.desktop.in.h:1 msgid "Modem Manager GUI" -msgstr "Modem Manager GUI" +msgstr "Modem Manager 图形用户界面" #: ../menu-data/modem-manager-gui:modem-manager-gui.desktop.in.h:2 msgid "Graphical interface for Modem manager daemon control" @@ -13543,7 +13554,7 @@ #: ../menu-data/mousepad:mousepad.desktop.in.h:2 msgid "Simple Text Editor" -msgstr "Simple Text Editor 简单文本编辑器" +msgstr "简单文本编辑器" #: ../menu-data/mozc-utils-gui:setup-mozc.desktop.in.h:1 msgid "Mozc Setup" @@ -13576,7 +13587,7 @@ #: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:2 msgid "GNUstep client for MPD" -msgstr "GNUstep 的 MPD 客户端" +msgstr "MPD 的 GNUstep 客户端" #: ../menu-data/mpdris2:mpdris2.desktop.in.h:1 msgid "Music Player Daemon" @@ -13591,6 +13602,7 @@ msgstr "MPlayer 媒体播放器" #: ../menu-data/mpv:mpv.desktop.in.h:2 +#: ../menu-data/snappy:snappy.desktop.in.h:2 msgid "Play movies and songs" msgstr "播放影片和歌曲" @@ -13607,34 +13619,42 @@ msgstr "mpv 媒体播放器" #: ../menu-data/mricron:dcm2niigui.desktop.in.h:1 +#: ../menu-data/neurodebian-desktop:neurodebian-dcm2niigui.desktop.in.h:1 msgid "DICOM to NIfTI Conversion" msgstr "DICOM 到 NIfTI 的转换" #: ../menu-data/mricron:dcm2niigui.desktop.in.h:2 +#: ../menu-data/neurodebian-desktop:neurodebian-dcm2niigui.desktop.in.h:2 msgid "dcm2nii" msgstr "dcm2nii" #: ../menu-data/mricron:mricron-npm.desktop.in.h:1 +#: ../menu-data/neurodebian-desktop:neurodebian-npm.desktop.in.h:1 msgid "Non-parametric MRI Analysis" msgstr "非参数 MRI 分析" #: ../menu-data/mricron:mricron-npm.desktop.in.h:2 +#: ../menu-data/neurodebian-desktop:neurodebian-npm.desktop.in.h:2 msgid "NPM" msgstr "NPM" #: ../menu-data/mricron:mricron.desktop.in.h:1 +#: ../menu-data/neurodebian-desktop:neurodebian-mricron.desktop.in.h:1 msgid "2D/3D MRI Image Viewer" msgstr "2D/3D MRI 图像浏览器" #: ../menu-data/mricron:mricron.desktop.in.h:2 +#: ../menu-data/neurodebian-desktop:neurodebian-mricron.desktop.in.h:2 msgid "MRIcron" msgstr "MRIcron" #: ../menu-data/mrtrix:mrtrix.desktop.in.h:1 +#: ../menu-data/neurodebian-desktop:neurodebian-mrtrix.desktop.in.h:1 msgid "MRI Tractography View" msgstr "MRI 纤维跟踪视图" #: ../menu-data/mrtrix:mrtrix.desktop.in.h:2 +#: ../menu-data/neurodebian-desktop:neurodebian-mrtrix.desktop.in.h:2 msgid "MRview" msgstr "MRview" @@ -13723,16 +13743,15 @@ msgid "A low-latency, high quality voice chat program for gaming" msgstr "低延迟高品质的语音聊天游戏程序" -#: ../menu-data/muon-discover:kde4__muon-discover-category.desktop.in.h:1 +#: ../menu-data/muon-discover:muon-discover-category.desktop.in.h:1 msgid "Install More..." msgstr "安装更多..." -#: ../menu-data/muon-discover:kde4__muon-discover.desktop.in.h:1 +#: ../menu-data/muon-discover:muon-discover.desktop.in.h:1 msgid "Muon Discover" msgstr "Muon Discover" -#: ../menu-data/muon-discover:kde4__muon-discover.desktop.in.h:2 -#: ../menu-data/muon-installer:kde4__muon-installer.desktop.in.h:2 +#: ../menu-data/muon-discover:muon-discover.desktop.in.h:2 msgid "Software Center" msgstr "软件中心" @@ -13740,15 +13759,15 @@ msgid "Muon Software Center" msgstr "Muon 软件中心" -#: ../menu-data/muon-updater:kde4__muon-updater.desktop.in.h:1 +#: ../menu-data/muon-updater:muon-updater.desktop.in.h:1 msgid "Muon Update Manager" msgstr "Muon 更新管理器" -#: ../menu-data/muon:kde4__muon.desktop.in.h:1 +#: ../menu-data/muon:muon.desktop.in.h:1 msgid "Muon Package Manager" msgstr "Muon 软件包管理器" -#: ../menu-data/muon:kde4__muon.desktop.in.h:2 +#: ../menu-data/muon:muon.desktop.in.h:2 msgid "Package Manager" msgstr "软件包管理器" @@ -14095,6 +14114,7 @@ #: ../menu-data/caja:mate-network-scheme.desktop.in.h:1 #: ../menu-data/cinnamon-control-center:cinnamon-network-panel.desktop.in.h:1 +#: ../menu-data/mate-system-tools:mate-network.desktop.in.h:1 #: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-network-panel.desktop.in.h:1 msgid "Network" @@ -14277,7 +14297,7 @@ #: ../menu-data/nrefactory-samples:nrefactory-demo-swf.desktop.in.h:2 msgid "NRefactory C# analysis library Demo (System.Windows.Forms)" -msgstr "NRefactory C# 分析库示例程序 (System.Windows.Forms)" +msgstr "NRefactory C# 分析库示例程序(System.Windows.Forms)" #: ../menu-data/nted:nted.desktop.in.h:1 msgid "NtEd" @@ -14313,7 +14333,7 @@ #: ../menu-data/nut-monitor:nut-monitor.desktop.in.h:2 msgid "Network UPS Tools GUI client" -msgstr "网络 UPS 工具 GUI 客户端" +msgstr "网络 UPS 工具图形用户界面客户端" #: ../menu-data/nvclock-gtk:nvclock.desktop.in.h:1 msgid "NVCLOCK" @@ -14369,7 +14389,7 @@ #: ../menu-data/obextool:obextool.desktop.in.h:2 msgid "A GUI for bluetooth transfers" -msgstr "蓝牙传输的一个 GUI" +msgstr "用于蓝牙传输的图形用户界面" #: ../menu-data/objcryst-fox:fox.desktop.in.h:1 msgid "Fox" @@ -14419,15 +14439,19 @@ msgid "A DVD encoder" msgstr "一个 DVD 编码器" -#: ../menu-data/okteta:kde4__okteta.desktop.in.h:1 +#: ../menu-data/okteta:org.kde.okteta.desktop.in.h:1 msgid "Okteta" msgstr "Okteta" -#: ../menu-data/okteta:kde4__okteta.desktop.in.h:2 +#: ../menu-data/okteta:org.kde.okteta.desktop.in.h:2 msgid "Hex Editor" msgstr "十六进制编辑器" +#: ../menu-data/okular-backend-odp:kde4__okularApplication_doc_calligra.desktop.in.h:1 +#: ../menu-data/okular-backend-odp:kde4__okularApplication_docx_calligra.desktop.in.h:1 #: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:1 +#: ../menu-data/okular-backend-odp:kde4__okularApplication_odt.desktop.in.h:1 +#: ../menu-data/okular-backend-odp:kde4__okularApplication_wpd_calligra.desktop.in.h:1 msgid "okular" msgstr "okular" @@ -14559,7 +14583,7 @@ #: ../menu-data/openfetion:openfetion.desktop.in.h:2 msgid "Fetion For Linux" -msgstr "Linux 上的飞信" +msgstr "Linux 版飞信" #: ../menu-data/openjdk-6-jre:openjdk-6-java.desktop.in.h:1 msgid "OpenJDK Java 6 Runtime" @@ -14569,7 +14593,7 @@ msgid "OpenJDK Java 7 Runtime" msgstr "OpenJDK Java 7 运行时" -#: ../menu-data/openlp:openlp.desktop.in.h:1 +#: ../menu-data/openlp:openlp.desktop.in.h:3 msgid "OpenLP" msgstr "OpenLP" @@ -14903,11 +14927,11 @@ msgid "Parcellite" msgstr "Parcellite" -#: ../menu-data/parley:kde4__parley.desktop.in.h:1 +#: ../menu-data/parley:org.kde.parley.desktop.in.h:1 msgid "Parley" msgstr "Parley" -#: ../menu-data/parley:kde4__parley.desktop.in.h:2 +#: ../menu-data/parley:org.kde.parley.desktop.in.h:2 msgid "Vocabulary Trainer" msgstr "词汇练习器" @@ -14915,10 +14939,12 @@ msgid "Parole Media Player" msgstr "Parole 媒体播放器" +#: ../menu-data/cantata:kde4__cantata.desktop.in.h:3 #: ../menu-data/parole:parole.desktop.in.h:4 msgid "Previous Track" msgstr "前一首" +#: ../menu-data/cantata:kde4__cantata.desktop.in.h:8 #: ../menu-data/parole:parole.desktop.in.h:5 msgid "Next Track" msgstr "后一首" @@ -14931,11 +14957,11 @@ msgid "Kenta Cho's PARSEC47" msgstr "PARSEC47 克隆版程序" -#: ../menu-data/partitionmanager:kde4__partitionmanager.desktop.in.h:1 +#: ../menu-data/partitionmanager:org.kde.PartitionManager.desktop.in.h:1 msgid "KDE Partition Manager" msgstr "KDE 分区管理器" -#: ../menu-data/partitionmanager:kde4__partitionmanager.desktop.in.h:2 +#: ../menu-data/partitionmanager:org.kde.PartitionManager.desktop.in.h:2 msgid "Manage disks, partitions and file systems" msgstr "管理磁盘、分区和文件系统" @@ -15230,7 +15256,6 @@ msgstr "Petri-Foo" #: ../menu-data/petri-foo:petri-foo.desktop.in.h:2 -#: ../menu-data/specimen:specimen.desktop.in.h:2 msgid "Sound Sampler" msgstr "声音取样器" @@ -15315,11 +15340,11 @@ msgid "Tag your music with the next generation MusicBrainz tagger" msgstr "使用下一代 MusicBrainz 标签标记您的音乐" -#: ../menu-data/picmi:kde4__picmi.desktop.in.h:1 +#: ../menu-data/picmi:org.kde.picmi.desktop.in.h:1 msgid "picmi" msgstr "picmi" -#: ../menu-data/picmi:kde4__picmi.desktop.in.h:2 +#: ../menu-data/picmi:org.kde.picmi.desktop.in.h:2 msgid "A number logic game" msgstr "数字逻辑游戏" @@ -15552,7 +15577,7 @@ msgid "A tool to setup visual and audio alarms for tablets" msgstr "为平板设备设置视觉和音频警告的工具" -#: ../menu-data/plasma-active:kde4__active-books.desktop.in.h:1 +#: ../menu-data/gnome-documents:org.gnome.Books.desktop.in.h:1 msgid "Books" msgstr "图书" @@ -15580,11 +15605,11 @@ msgid "A collection of widgets" msgstr "小部件的集合" -#: ../menu-data/plasma-mediacenter:kde4__plasma-mediacenter.desktop.in.h:1 +#: ../menu-data/plasma-mediacenter:plasma-mediacenter.desktop.in.h:1 msgid "Plasma Media Center" msgstr "Plasma 媒体中心" -#: ../menu-data/plasma-mediacenter:kde4__plasma-mediacenter.desktop.in.h:2 +#: ../menu-data/plasma-mediacenter:plasma-mediacenter.desktop.in.h:2 msgid "A mediacenter user interface written with the Plasma framework" msgstr "使用 Plasma 框架编写的媒体中心用户界面" @@ -15592,7 +15617,7 @@ msgid "kde-nm-connection-editor" msgstr "kde-nm-connection-editor" -#: ../menu-data/plasma-nm:kde4__kde-nm-connection-editor.desktop.in.h:2 +#: ../menu-data/plasma-nm:kde5-nm-connection-editor.desktop.in.h:2 msgid "Edit your network connections" msgstr "KDE 网络连接编辑器" @@ -15700,6 +15725,7 @@ msgid "Vorbis comment editor" msgstr "Vorbis 注释编辑器" +#: ../menu-data/poedit:poedit-uri.desktop.in.h:1 #: ../menu-data/poedit:poedit.desktop.in.h:1 msgid "Poedit" msgstr "Poedit" @@ -15720,7 +15746,7 @@ #: ../menu-data/polybori-gui:PolyGUI2.7.desktop.in.h:1 #: ../menu-data/polybori-gui:PolyGUI2.desktop.in.h:1 msgid "PolyBoRi GUI" -msgstr "PolyBoRi 图形界面" +msgstr "PolyBoRi 图形用户界面" #: ../menu-data/polybori-gui:PolyGUI.desktop.in.h:2 #: ../menu-data/polybori-gui:PolyGUI2.7.desktop.in.h:2 @@ -15786,7 +15812,7 @@ #: ../menu-data/pq:pq.desktop.in.h:1 msgid "Progress Quest" -msgstr "Progress Quest" +msgstr "无尽的进度条" #: ../menu-data/pq:pq.desktop.in.h:2 msgid "Watch your fantasy character advance" @@ -15806,7 +15832,7 @@ #: ../menu-data/prboom-plus:prboom-plus.desktop.in.h:2 msgid "enhanced clone of the classic first-person shooter Doom" -msgstr "经典第一人称射击游戏 Doom 的克隆加强版" +msgstr "经典第一人称射击游戏 Doom 的加强克隆版" #: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:1 msgid "PrefixSuffix" @@ -15966,10 +15992,12 @@ msgid "Analyze statistical data with a free alternative to SPSS" msgstr "使用 SPSS 自由的替代品分析统计数据" +#: ../menu-data/neurodebian-desktop:neurodebian-psychopy.desktop.in.h:1 #: ../menu-data/psychopy:psychopy.desktop.in.h:1 msgid "Psychology Stimuli IDE" msgstr "心理学模拟器 IDE" +#: ../menu-data/neurodebian-desktop:neurodebian-psychopy.desktop.in.h:2 #: ../menu-data/psychopy:psychopy.desktop.in.h:2 msgid "PsychoPy" msgstr "PsychoPy" @@ -16394,7 +16422,7 @@ #: ../menu-data/python-wxglade:wxglade.desktop.in.h:2 msgid "GUI designer written in Python with wxPython" -msgstr "用 Python 使用 wxPython 写的 GUI 设计器" +msgstr "用 wxPython 实现 Python 写的图形用户界面设计工具" #: ../menu-data/python3.3:python3.3.desktop.in.h:1 msgid "Python (v3.3)" @@ -16410,7 +16438,7 @@ #: ../menu-data/python3.4:python3.4.desktop.in.h:2 msgid "Python Interpreter (v3.4)" -msgstr "Python 编译器 (v3.4)" +msgstr "Python 解释器 (v3.4)" #: ../menu-data/pythoncad:pythoncad.desktop.in.h:1 msgid "PyCAD" @@ -16444,7 +16472,7 @@ msgid "Powerful and easy to use calculator" msgstr "功能强大而且易用的计算器" -#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:1 +#: ../menu-data/qapt-deb-installer:qapt-deb-installer.desktop.in.h:1 msgid "QApt Package Installer" msgstr "QApt 包安装程序" @@ -16564,7 +16592,7 @@ #: ../menu-data/qgit:qgit.desktop.in.h:2 msgid "git GUI viewer" -msgstr "git GUI 浏览器" +msgstr "git 图形用户界面浏览器" #: ../menu-data/qgo:qgo.desktop.in.h:1 msgid "qGo" @@ -16588,7 +16616,7 @@ #: ../menu-data/qjackctl:qjackctl.desktop.in.h:2 msgid "QjackCtl is a JACK Audio Connection Kit Qt GUI Interface" -msgstr "QjackCtl 是 JACK 音频连接工具包的 Qt 界面" +msgstr "QjackCtl 是 JACK 音频连接工具包的 Qt 图形用户界面" #: ../menu-data/qjackrcd:qjackrcd.desktop.in.h:1 msgid "QJackRcd" @@ -16598,11 +16626,11 @@ msgid "A simple Jack recorder" msgstr "简单的 Jack 录音机" -#: ../menu-data/qjoypad:kde4__qjoypad.desktop.in.h:1 +#: ../menu-data/qjoypad:qjoypad.desktop.in.h:1 msgid "QJoyPad" msgstr "QJoyPad" -#: ../menu-data/qjoypad:kde4__qjoypad.desktop.in.h:2 +#: ../menu-data/qjoypad:qjoypad.desktop.in.h:2 msgid "Trigger keystrokes and mouse actions with gamepads/joysticks" msgstr "管理游戏遥控器的按键和鼠标动作" @@ -16611,6 +16639,7 @@ msgstr "QLandkarteGT" #: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:2 +#: ../menu-data/qmapshack:qmapshack.desktop.in.h:2 msgid "GPS device mapping utility" msgstr "GPS 设备映射工具" @@ -16767,7 +16796,7 @@ #: ../menu-data/qsampler:qsampler.desktop.in.h:2 msgid "Qsampler is a LinuxSampler Qt GUI Interface" -msgstr "Qsampler 是 LinuxSampler 的 Qt 图形界面" +msgstr "Qsampler 是 LinuxSampler 的 Qt 图形用户界面" #: ../menu-data/qsapecng:qsapecng.desktop.in.h:1 msgid "QSapecNG" @@ -16803,7 +16832,7 @@ #: ../menu-data/qsynth:qsynth.desktop.in.h:2 msgid "Qsynth is a FluidSynth Qt GUI Interface" -msgstr "Qsynth 是 FluidSynth 的 Qt 界面" +msgstr "Qsynth 是 FluidSynth 的 Qt 图形用户界面" #: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:1 msgid "Qt 4 Designer" @@ -16958,7 +16987,7 @@ #: ../menu-data/quake2:quake2.desktop.in.h:1 msgid "Quake II" -msgstr "Quake II" +msgstr "雷神之锤二" #: ../menu-data/quake2:quake2.desktop.in.h:2 #: ../menu-data/quake:quake.desktop.in.h:2 @@ -16977,6 +17006,7 @@ msgid "Quake: Scourge of Armagon" msgstr "雷神之锤：Armagon 的祸患" +#: ../menu-data/quake2:quake2-reckoning.desktop.in.h:2 #: ../menu-data/quake:quake-armagon.desktop.in.h:2 msgid "Mission Pack 1 for the classic first person shooter" msgstr "经典第一人称射击游戏的任务包 1" @@ -16985,6 +17015,7 @@ msgid "Quake: Dissolution of Eternity" msgstr "雷神之锤：永生" +#: ../menu-data/quake2:quake2-groundzero.desktop.in.h:2 #: ../menu-data/quake:quake-dissolution.desktop.in.h:2 msgid "Mission Pack 2 for the classic first person shooter" msgstr "经典第一人称射击游戏的任务包 2" @@ -17001,20 +17032,16 @@ msgid "A multi-purpose board game GUI for Go, Amazons and Reversi" msgstr "用于亚马逊和黑白棋的多用途棋盘游戏图形用户界面" -#: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:1 -#: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:1 +#: ../menu-data/quassel-client:quasselclient.desktop.in.h:1 msgid "Quassel IRC (Client only)" msgstr "Quassel IRC (仅仅包含客户端)" -#: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:2 -#: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:2 -#: ../menu-data/quassel-qt4:quassel.desktop.in.h:2 -#: ../menu-data/quassel:kde4__quassel.desktop.in.h:2 +#: ../menu-data/quassel-client:quasselclient.desktop.in.h:2 +#: ../menu-data/quassel:quassel.desktop.in.h:2 msgid "Distributed IRC client with central core component" msgstr "带有中央核心组件的分布式 IRC 客户端" -#: ../menu-data/quassel-qt4:quassel.desktop.in.h:1 -#: ../menu-data/quassel:kde4__quassel.desktop.in.h:1 +#: ../menu-data/quassel:quassel.desktop.in.h:1 msgid "Quassel IRC" msgstr "Quassel IRC" @@ -17207,7 +17234,7 @@ #: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:2 #: ../menu-data/subcommander:subcommander.desktop.in.h:2 msgid "A GUI Client for Subversion" -msgstr "Subversion 的一个 GUI 客户端" +msgstr "Subversion 的一个图形用户界面客户端" #: ../menu-data/rasmol:rasmol-gtk.desktop.in.h:1 msgid "RasMol (GTK version)" @@ -17556,7 +17583,7 @@ #: ../menu-data/rkward:kde4__rkward.desktop.in.h:2 msgid "GUI for the R-project" -msgstr "R 项目的 GUI" +msgstr "R 项目的图形用户界面" #: ../menu-data/rlplot:rlplot.desktop.in.h:1 msgid "Rlplot Graph Generator" @@ -17607,11 +17634,11 @@ msgid "Rock Dodger" msgstr "Rock Dodger" -#: ../menu-data/rocs:kde4__rocs.desktop.in.h:1 +#: ../menu-data/rocs:org.kde.rocs.desktop.in.h:1 msgid "Rocs" msgstr "Rocs" -#: ../menu-data/rocs:kde4__rocs.desktop.in.h:2 +#: ../menu-data/rocs:org.kde.rocs.desktop.in.h:2 msgid "Graph Theory Tool for Professors and Students." msgstr "专家和学生用的图论工具" @@ -17640,8 +17667,7 @@ "A high quality, fast scrolling first-person perspective 3D action game" msgstr "高品质、快节奏的第一人称视角 3D 动作游戏" -#: ../menu-data/roxterm-gtk2:roxterm.desktop.in.h:1 -#: ../menu-data/roxterm-gtk3:roxterm.desktop.in.h:1 +#: ../menu-data/roxterm:roxterm.desktop.in.h:1 msgid "ROXTerm" msgstr "ROXTerm" @@ -18355,7 +18381,7 @@ #: ../menu-data/shelxle:shelxle.desktop.in.h:2 msgid "A Qt GUI for SHELX" -msgstr "SHELX 的 QT 图形界面" +msgstr "SHELX 的 QT 图形用户界面" #: ../menu-data/shisen.app:Shisen.desktop.in.h:1 msgid "Shisen" @@ -18425,6 +18451,7 @@ msgid "Login to online accounts" msgstr "登录到在线账户" +#: ../menu-data/neurodebian-desktop:neurodebian-sigviewer.desktop.in.h:1 #: ../menu-data/sigviewer:sigviewer.desktop.in.h:1 msgid "SigViewer" msgstr "SigViewer" @@ -18932,7 +18959,7 @@ #: ../menu-data/spatialite-gui:spatialite-gui.desktop.in.h:1 msgid "Spatialite GUI" -msgstr "Spatialite GUI" +msgstr "Spatialite 图形用户界面" #: ../menu-data/spe:spe.desktop.in.h:1 msgid "SPE (Stani's Python Editor)" @@ -19030,10 +19057,12 @@ msgid "Scientific PYthon Development EnviRonment" msgstr "科学 Python 开发环境" +#: ../menu-data/neurodebian-desktop:neurodebian-spykeviewer.desktop.in.h:1 #: ../menu-data/spykeviewer:spykeviewer.desktop.in.h:1 msgid "Spyke Viewer" msgstr "Spyke Viewer" +#: ../menu-data/neurodebian-desktop:neurodebian-spykeviewer.desktop.in.h:2 #: ../menu-data/spykeviewer:spykeviewer.desktop.in.h:2 msgid "Graphical utility for analyzing electrophysiological data" msgstr "图形化的电生理学数据分析工具" @@ -19155,20 +19184,20 @@ msgid "Open in window" msgstr "在窗口中打开" +#: ../menu-data/kodi:kodi.desktop.in.h:3 #: ../menu-data/stellarium:stellarium.desktop.in.h:4 -#: ../menu-data/xbmc:xbmc.desktop.in.h:3 msgid "Open in fullscreen" -msgstr "在全凭模式下打开" +msgstr "在全屏模式下打开" #: ../menu-data/stellarium:stellarium.desktop.in.h:5 msgid "Open in safe mode" msgstr "在安全模式下打开" -#: ../menu-data/step:kde4__step.desktop.in.h:1 +#: ../menu-data/step:org.kde.step.desktop.in.h:1 msgid "Step" msgstr "Step" -#: ../menu-data/step:kde4__step.desktop.in.h:2 +#: ../menu-data/step:org.kde.step.desktop.in.h:2 msgid "Simulate physics experiments" msgstr "模拟物理实验" @@ -19566,12 +19595,12 @@ msgid "Create, modify, and delete samba shares" msgstr "创建、修改和删除 samba 共享" -#: ../menu-data/systemsettings:kde4__kdesystemsettings.desktop.in.h:1 +#: ../menu-data/systemsettings:kdesystemsettings.desktop.in.h:1 msgid "KDE System Settings" msgstr "KDE 系统设置" #: ../menu-data/cinnamon:cinnamon-settings.desktop.in.h:1 -#: ../menu-data/systemsettings:kde4__systemsettings.desktop.in.h:1 +#: ../menu-data/systemsettings:systemsettings.desktop.in.h:1 #: ../menu-data/ubuntu-system-settings:ubuntu-system-settings.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-control-center.desktop.in.h:1 msgid "System Settings" @@ -19601,11 +19630,11 @@ msgid "A generic board game application." msgstr "通用棋盘游戏应用程序。" -#: ../menu-data/tali:gtali.desktop.in.h:1 +#: ../menu-data/tali:tali.desktop.in.h:1 msgid "Tali" msgstr "掷骰子" -#: ../menu-data/tali:gtali.desktop.in.h:2 +#: ../menu-data/tali:tali.desktop.in.h:2 msgid "Beat the odds in a poker-style dice game" msgstr "一种类似扑克的的骰子游戏" @@ -20057,7 +20086,7 @@ #: ../menu-data/tkgate:tkgate.desktop.in.h:2 msgid "Event driven digital circuit simulator with Tcl/Tk" -msgstr "具有工具包系统的事件驱动的数字电路模拟器" +msgstr "使用 Tcl/Tk 的事件驱动的数字电路模拟器" #: ../menu-data/tmw:tmw.desktop.in.h:1 msgid "The Mana world" @@ -20146,7 +20175,7 @@ #: ../menu-data/tortoisehg:thg.desktop.in.h:2 msgid "GUI application for using Mercurial" -msgstr "Mercurial 的图形化工具" +msgstr "Mercurial 的图形用户界面工具" #: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:1 msgid "Torus Trooper" @@ -20156,18 +20185,22 @@ msgid "Kenta Cho's Torus Trooper" msgstr "黑洞战机游戏" +#: ../menu-data/totem:org.gnome.Totem.desktop.in.h:1 #: ../menu-data/totem:totem.desktop.in.h:1 msgid "Videos" -msgstr "Videos" +msgstr "视频" +#: ../menu-data/totem:org.gnome.Totem.desktop.in.h:2 #: ../menu-data/totem:totem.desktop.in.h:2 msgid "Play movies" msgstr "电影播放器" +#: ../menu-data/totem:org.gnome.Totem.desktop.in.h:6 #: ../menu-data/totem:totem.desktop.in.h:6 msgid "Mute" msgstr "静音" +#: ../menu-data/totem:org.gnome.Totem.desktop.in.h:7 #: ../menu-data/totem:totem.desktop.in.h:7 msgid "Fullscreen" msgstr "全屏" @@ -20224,11 +20257,11 @@ #: ../menu-data/transgui:transgui.desktop.in.h:1 msgid "Transmission remote GUI" -msgstr "Transmission 远程控制界面" +msgstr "Transmission 远程控制图形用户界面" #: ../menu-data/transgui:transgui.desktop.in.h:2 msgid "GUI to remotely control a Transmission daemon" -msgstr "Transmission 的远程控制界面" +msgstr "Transmission 的远程控制图形用户界面" #: ../menu-data/transmageddon:transmageddon.desktop.in.h:1 msgid "Transmageddon Video Transcoder" @@ -20244,7 +20277,7 @@ #: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:1 msgid "Qtransmission Bittorrent Client" -msgstr "Qtransmission BT客户端" +msgstr "Qtransmission BT 客户端" #: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:3 msgid "Start Transmission Minimized" @@ -20369,13 +20402,13 @@ #: ../menu-data/ttb:ttb.desktop.in.h:2 msgid "Teletekst Browser" -msgstr "一个文字广播浏览器" +msgstr "文字广播浏览器" #: ../menu-data/tucnak2:tucnak2.desktop.in.h:1 msgid "Tucnak 2" msgstr "Tucnak 2" -#: ../menu-data/tucnak2:tucnak2.desktop.in.h:2 +#: ../menu-data/tucnak:tucnak.desktop.in.h:2 msgid "VHF Contest Logger" msgstr "VHF 比赛记录器" @@ -20461,7 +20494,7 @@ #: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:1 msgid "Tuxfootball" -msgstr "Tuxfootball" +msgstr "企鹅足球" #: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:2 msgid "2D Football Game" @@ -20469,7 +20502,7 @@ #: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:1 msgid "tuxguitar" -msgstr "tuxguitar" +msgstr "企鹅吉他" #: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:2 msgid "Edit, playback guitar tablatures" @@ -20485,7 +20518,7 @@ #: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:1 msgid "Tux Paint" -msgstr "Tux Paint" +msgstr "企鹅绘画" #: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:2 msgid "A drawing program for children." @@ -20513,7 +20546,7 @@ #: ../menu-data/tvtime:tvtime.desktop.in.h:2 msgid "TVTime Television Viewer" -msgstr "TVTime Television Viewer" +msgstr "TVTime 电视节目点播程序" #: ../menu-data/twclock:twclock.desktop.in.h:1 msgid "twclock" @@ -20553,7 +20586,7 @@ #: ../menu-data/typecatcher:typecatcher.desktop.in.h:1 msgid "TypeCatcher" -msgstr "TypeCatcher" +msgstr "安装字体工具" #: ../menu-data/typecatcher:typecatcher.desktop.in.h:2 msgid "Download Google webfonts for off-line use" @@ -20565,7 +20598,7 @@ #: ../menu-data/ubuntu-online-tour:ubuntu-online-tour.desktop.in.h:1 msgid "Ubuntu Tour" -msgstr "Ubuntu Tour" +msgstr "体验 Ubuntu" #: ../menu-data/ubuntu-online-tour:ubuntu-online-tour.desktop.in.h:2 msgid "Experience Ubuntu in your web browser" @@ -20767,7 +20800,7 @@ #: ../menu-data/udav:udav.desktop.in.h:1 msgid "UDAV" -msgstr "UDAV" +msgstr "数据阵列可视化工具" #: ../menu-data/udav:udav.desktop.in.h:2 msgid "Data handling and plotting tool" @@ -20775,7 +20808,7 @@ #: ../menu-data/udev-discover:udev-discover.desktop.in.h:1 msgid "Udev Discover" -msgstr "Udev Discover" +msgstr "设备管理器" #: ../menu-data/udev-discover:udev-discover.desktop.in.h:2 msgid "Sysfs tree browsing tool focused on helping udev users and developers" @@ -20791,7 +20824,7 @@ #: ../menu-data/ufraw:ufraw.desktop.in.h:1 msgid "UFRaw" -msgstr "UFRaw" +msgstr "原始图像处理工具" #: ../menu-data/ufraw:ufraw.desktop.in.h:2 msgid "A utility to read and manipulate raw images from digital cameras" @@ -20883,10 +20916,12 @@ #: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:1 #: ../menu-data/unison2.32.52-gtk:unison2.32.52-gtk.desktop.in.h:1 +#: ../menu-data/unison2.40.102-gtk:unison2.40.102-gtk.desktop.in.h:1 msgid "Unison" msgstr "Unison" #: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:2 +#: ../menu-data/unison2.40.102-gtk:unison2.40.102-gtk.desktop.in.h:2 msgid "GTK interface for the unison file synchronization tool 2.40.102" msgstr "unison 文件同步工具 2.40.102 的 GTK 界面" @@ -20913,12 +20948,10 @@ msgid "Change the background and the theme" msgstr "改变背景和主题" -#: ../menu-data/cinnamon-bluetooth:cinnamon-bluetooth-properties.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-bluetooth-panel.desktop.in.h:1 msgid "Bluetooth" msgstr "蓝牙" -#: ../menu-data/cinnamon-bluetooth:cinnamon-bluetooth-properties.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-bluetooth-panel.desktop.in.h:2 msgid "Configure Bluetooth settings" msgstr "配置蓝牙" @@ -20936,19 +20969,20 @@ msgid "Change your clock and date settings" msgstr "调整时间和日期设置" -#: ../menu-data/cinnamon-control-center:cinnamon-display-panel.desktop.in.h:1 +#: ../menu-data/mate-control-center:mate-display-properties.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-display-panel.desktop.in.h:1 msgid "Displays" msgstr "显示" #: ../menu-data/cinnamon-control-center:cinnamon-display-panel.desktop.in.h:2 +#: ../menu-data/mate-control-center:mate-display-properties.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-display-panel.desktop.in.h:2 msgid "Change resolution and position of monitors and projectors" msgstr "调整分辨率，控制显示器和投影仪位置" #: ../menu-data/unity-control-center:unity-info-panel.desktop.in.h:1 msgid "Details" -msgstr "细节" +msgstr "详细信息" #: ../menu-data/unity-control-center:unity-info-panel.desktop.in.h:2 msgid "System Information" @@ -20960,7 +20994,7 @@ #: ../menu-data/unity-control-center:unity-mouse-panel.desktop.in.h:1 msgid "Mouse & Touchpad" -msgstr "鼠标和触控板" +msgstr "鼠标和触摸板" #: ../menu-data/cinnamon-control-center:cinnamon-network-panel.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-network-panel.desktop.in.h:2 @@ -20993,20 +21027,18 @@ #: ../menu-data/cinnamon-control-center:cinnamon-sound-nua-panel.desktop.in.h:1 #: ../menu-data/cinnamon-control-center:cinnamon-sound-panel.desktop.in.h:1 -#: ../menu-data/mate-media-pulse:mate-volume-control.desktop.in.h:1 +#: ../menu-data/mate-media:mate-volume-control.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-sound-panel.desktop.in.h:1 msgid "Sound" msgstr "声音" #: ../menu-data/cinnamon-control-center:cinnamon-sound-nua-panel.desktop.in.h:2 #: ../menu-data/cinnamon-control-center:cinnamon-sound-panel.desktop.in.h:2 -#: ../menu-data/mate-media-gstreamer:mate-volume-control.desktop.in.h:2 -#: ../menu-data/mate-media-pulse:mate-volume-control.desktop.in.h:2 +#: ../menu-data/mate-media:mate-volume-control.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-sound-panel.desktop.in.h:2 msgid "Change sound volume and sound events" msgstr "调整音量和声音控制选项" -#: ../menu-data/cinnamon-control-center:cinnamon-universal-access-panel.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-universal-access-panel.desktop.in.h:1 msgid "Universal Access" msgstr "通用辅助功能" @@ -21014,12 +21046,13 @@ #: ../menu-data/cinnamon-control-center:cinnamon-universal-access-panel.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-universal-access-panel.desktop.in.h:2 msgid "Universal Access Preferences" -msgstr "辅助功能设置" +msgstr "辅助功能首选项" #: ../menu-data/unity-control-center:unity-user-accounts-panel.desktop.in.h:1 msgid "User Accounts" msgstr "用户帐户" +#: ../menu-data/mate-accountsdialog:mate-accountsdialog.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-user-accounts-panel.desktop.in.h:2 msgid "Add or remove users" msgstr "添加或移除用户" @@ -21084,7 +21117,7 @@ #: ../menu-data/unity-tweak-tool:unity-tweak-tool.desktop.in.h:1 msgid "Unity Tweak Tool" -msgstr "Unity Tweak Tool" +msgstr "Unity 配置工具" #: ../menu-data/unity-tweak-tool:unity-tweak-tool.desktop.in.h:2 msgid "Configuration frontend for the Unity desktop environment" @@ -21096,7 +21129,7 @@ #: ../menu-data/unity-tweak-tool:unity-tweak-tool.desktop.in.h:6 msgid "System" -msgstr "System" +msgstr "系统" #: ../menu-data/unity-webapps-amazoncloudreader:AmazonCloudReaderreadamazoncom.desktop.in.h:1 msgid "AmazonCloudReader" @@ -21116,7 +21149,7 @@ #: ../menu-data/unity-webapps-common:ubuntu-amazon-default.desktop.in.h:1 msgid "Amazon" -msgstr "Amazon" +msgstr "亚马逊" #: ../menu-data/unity-webapps-deezer:Deezerdeezercom.desktop.in.h:1 msgid "Deezer" @@ -21136,7 +21169,7 @@ #: ../menu-data/unity-webapps-googlecalendar:GoogleCalendargooglecom.desktop.in.h:1 msgid "GoogleCalendar" -msgstr "GoogleCalendar" +msgstr "Google 日历" #: ../menu-data/unity-webapps-googledocs:GoogleDocsdocsgooglecom.desktop.in.h:1 msgid "GoogleDocs" @@ -21144,7 +21177,7 @@ #: ../menu-data/unity-webapps-googlenews:GoogleNewsgooglecom.desktop.in.h:1 msgid "GoogleNews" -msgstr "GoogleNews" +msgstr "Google 新闻" #: ../menu-data/unity-webapps-googleplus:GooglePlusplusgooglecom.desktop.in.h:1 msgid "GooglePlus" @@ -21234,7 +21267,7 @@ #: ../menu-data/unity-webapps-qq-mail:qq-mailmailqqcom.desktop.in.h:1 msgid "qq-mail" -msgstr "qq-mail" +msgstr "QQ 邮箱" #: ../menu-data/unity-webapps-reddit:Redditredditcom.desktop.in.h:1 msgid "Reddit" @@ -21258,11 +21291,11 @@ #: ../menu-data/unity-webapps-yahoomail:YahooMailmailyahoocom.desktop.in.h:1 msgid "YahooMail" -msgstr "YahooMail" +msgstr "雅虎邮件" #: ../menu-data/unity-webapps-yahoonews:YahooNewsyahoocom.desktop.in.h:1 msgid "YahooNews" -msgstr "YahooNews" +msgstr "雅虎新闻" #: ../menu-data/unity-webapps-yandexmail:YandexMailyandexcom.desktop.in.h:1 msgid "YandexMail" @@ -21286,7 +21319,7 @@ #: ../menu-data/unity8:unity8.desktop.in.h:2 msgid "The converged Unity shell" -msgstr "The converged Unity shell" +msgstr "聚合 Unity shell 程序" #: ../menu-data/unknown-horizons:unknown-horizons.desktop.in.h:1 msgid "Unknown Horizons" @@ -21308,7 +21341,7 @@ #: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:1 msgid "UPnP Inspector" -msgstr "UPnP Inspector" +msgstr "UPnP 调试工具" #: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:2 msgid " DLNA/UPnP device and service analyzer,control-point and test-tool" @@ -21414,7 +21447,7 @@ #: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:1 msgid "Val & Rick" -msgstr "Val 和 Rick" +msgstr "Val & Rick" #: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:2 msgid "Kenta Cho's Val & Rick" @@ -21436,7 +21469,7 @@ msgid "Vavoom" msgstr "Vavoom" -#: ../menu-data/vavoom:vavoom.desktop.in.h:2 +#: ../menu-data/game-data-packager:doom2-masterlevels.desktop.in.h:2 msgid "First Person Shooter Game" msgstr "第一人称射击游戏" @@ -21454,7 +21487,7 @@ #: ../menu-data/vectoroids:vectoroids.desktop.in.h:2 msgid "A clone of the classic arcade game \"Asteroids\"" -msgstr "经典街机游戏 “小行星” 的一个克隆" +msgstr "经典街机游戏 “小行星” 的一个克隆版本" #: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:1 msgid "Verbiste" @@ -21542,11 +21575,11 @@ #: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:1 msgid "ViewPDF" -msgstr "阅览PDF文件" +msgstr "ViewPDF" #: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:2 msgid "PDF Reader for GNUstep" -msgstr "PDF Reader for GNUstep" +msgstr "GNUstep 下的 PDF 阅读器" #: ../menu-data/viking:viking.desktop.in.h:1 msgid "Viking" @@ -21601,7 +21634,7 @@ msgid "" "A translation tool to help a human translator translate files into other " "languages" -msgstr "一个帮助一个翻译者翻译文件到其它语言的翻译工具" +msgstr "一个帮助译者翻译文件到其它语言的翻译工具" #: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:1 msgid "VirtualBox" @@ -21727,12 +21760,14 @@ #: ../menu-data/vor:vor.desktop.in.h:2 msgid "Variations on Rockdodger" -msgstr "Rockdodger的一个变种" +msgstr "Rockdodger 的一个变种" +#: ../menu-data/neurodebian-desktop:neurodebian-vbview2.desktop.in.h:1 #: ../menu-data/voxbo:vbview2.desktop.in.h:1 msgid "VoxBo Image Viewer" msgstr "VoxBo 图像浏览器" +#: ../menu-data/neurodebian-desktop:neurodebian-vbview2.desktop.in.h:2 #: ../menu-data/voxbo:vbview2.desktop.in.h:2 msgid "VBView2" msgstr "VBView2" @@ -21747,7 +21782,7 @@ #: ../menu-data/vusb-analyzer:vusb-analyzer.desktop.in.h:2 msgid "visualizing logs of USB packets" -msgstr "可视化USB 数据包的日志" +msgstr "可视化 USB 数据包的日志" #: ../menu-data/vym:vym.desktop.in.h:1 msgid "VYM - View Your Mind" @@ -21844,7 +21879,7 @@ #: ../menu-data/wbar-config:wbar-config.desktop.in.h:2 msgid "GUI tool to configure Wbar" -msgstr "Wbar 的图形界面配置工具" +msgstr "Wbar 的图形用户界面配置工具" #: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:1 msgid "WebHTTrack Website Copier" @@ -21918,7 +21953,7 @@ #: ../menu-data/weboob-qt:qvideoob.desktop.in.h:2 msgid "Search for videos on many websites, and get info about them" -msgstr "聚合多个来源的视频搜索松菊" +msgstr "聚合多个来源的视频搜索工具" #: ../menu-data/weboob-qt:qwebcontentedit.desktop.in.h:1 msgid "QWebContentEdit" @@ -21978,7 +22013,7 @@ msgid "Battle for Wesnoth (1.10)" msgstr "韦诺之战 (1.10)" -#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10.desktop.in.h:2 +#: ../menu-data/wesnoth-1.12-core:wesnoth-1.12.desktop.in.h:2 msgid "A fantasy turn-based strategy game" msgstr "一个奇幻回合制战略游戏" @@ -21986,7 +22021,7 @@ msgid "Battle for Wesnoth Map Editor (1.10)" msgstr "韦诺之战地图编辑器 (1.10)" -#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10_editor.desktop.in.h:2 +#: ../menu-data/wesnoth-1.12-core:wesnoth-1.12_editor.desktop.in.h:2 msgid "A map editor for Battle for Wesnoth maps" msgstr "韦诺之战的地图编辑器" @@ -22048,7 +22083,7 @@ #: ../menu-data/winff:winff.desktop.in.h:2 msgid "GUI for avconv" -msgstr "avconv 的图形界面工具" +msgstr "avconv 的图形用户界面工具" #: ../menu-data/wing:wing.desktop.in.h:1 msgid "WING" @@ -22104,7 +22139,7 @@ #: ../menu-data/wmgui:wmgui.desktop.in.h:2 msgid "Simple GTK gui to the wiimote to test and display the wiimote data." -msgstr "Wiimote 的用来测试并显示 Wiimote 数据的简单 GTK 图形界面。" +msgstr "Wiimote 的用来测试并显示 Wiimote 数据的简单 GTK 图形用户界面。" #: ../menu-data/wmitime:wmitime.desktop.in.h:1 msgid "Wmitime" @@ -22177,7 +22212,7 @@ #: ../menu-data/writetype:writetype.desktop.in.h:2 msgid "A word processor to make typing easier" -msgstr "一个文字处理器，可使输入更为方便" +msgstr "一款可使输入更为方便的文字处理器" #: ../menu-data/wsjt:wsjt.desktop.in.h:1 msgid "wsjt" @@ -22198,7 +22233,7 @@ #: ../menu-data/wxbanker:wxbanker.desktop.in.h:2 msgid "A lightweight personal finance manager" -msgstr "一个轻量级的个人财务管理" +msgstr "一个轻量级的个人财务管理工具" #: ../menu-data/wxformbuilder:wxformbuilder.desktop.in.h:1 msgid "wxFormBuilder" @@ -22206,7 +22241,7 @@ #: ../menu-data/wxformbuilder:wxformbuilder.desktop.in.h:2 msgid "wxWidgets GUI Designer" -msgstr "wxWidgets GUI 设计器" +msgstr "wxWidgets 用户图形界面设计工具" #: ../menu-data/wxgeometrie:wxgeometrie.desktop.in.h:1 msgid "WxGeometrie" @@ -22224,7 +22259,7 @@ msgid "A hex editor for huge files and devices" msgstr "为大型文件和设备优化的十六进制编辑器" -#: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:1 +#: ../menu-data/wxmaxima:wxMaxima.desktop.in.h:1 msgid "wxMaxima" msgstr "wxMaxima" @@ -22257,7 +22292,6 @@ msgstr "X2Go 客户端" #: ../menu-data/xabacus:xabacus.desktop.in.h:1 -#: ../menu-data/xmabacus:xmabacus.desktop.in.h:1 msgid "Xabacus" msgstr "Xabacus" @@ -22313,7 +22347,7 @@ msgid "Manage and view your media " msgstr "管理和查看您的媒体资源 " -#: ../menu-data/xbmc:xbmc.desktop.in.h:4 +#: ../menu-data/kodi:kodi.desktop.in.h:4 msgid "Open in standalone mode" msgstr "在单机模式下打开" @@ -22869,7 +22903,7 @@ #: ../menu-data/xpra:xpra_launcher.desktop.in.h:1 msgid "Xpra Launcher" -msgstr "Xpra Launcher" +msgstr "Xpra 启动器" #: ../menu-data/xpuzzles:xbarrel.desktop.in.h:1 msgid "xbarrel" @@ -23043,7 +23077,7 @@ msgid "xxxterm Browser" msgstr "xxxterm 浏览器" -#: ../menu-data/xxxterm:xxxterm.desktop.in.h:2 +#: ../menu-data/xombrero:xombrero.desktop.in.h:2 msgid "Minimalist's Web Browser" msgstr "Minimalist 网页浏览器" @@ -23129,6 +23163,7 @@ msgid "Place phone calls over the Internet" msgstr "在互联网上进行电话呼叫" +#: ../menu-data/mate-user-guide:mate-user-guide.desktop.in.h:1 #: ../menu-data/yelp:yelp.desktop.in.h:1 msgid "Help" msgstr "帮助" @@ -23195,7 +23230,7 @@ #: ../menu-data/youker-assistant:youker-assistant.desktop.in.h:1 msgid "youker-assistant" -msgstr "youker-assistant" +msgstr "优客助手" #: ../menu-data/youtranslate:youtranslate.desktop.in.h:1 msgid "Online Translator YouTranslate!" @@ -23305,7 +23340,7 @@ #: ../menu-data/zenmap:zenmap.desktop.in.h:2 msgid "A cross-platform GUI for the Nmap Security Scanner." -msgstr "一个跨平台的 Nmap 安全扫描仪的 GUI。" +msgstr "Nmap 安全扫描仪的一个跨平台图形用户界面。" #: ../menu-data/zescrow-client:zEscrow.desktop.in.h:1 msgid "zEscrow" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apport.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apport.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apport.po 2015-02-19 15:26:17.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apport.po 2016-07-20 16:51:50.000000000 +0000 @@ -7,248 +7,173 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-07 15:59+0000\n" +"POT-Creation-Date: 2016-05-18 09:44+0000\n" "PO-Revision-Date: 2014-04-10 01:36+0000\n" "Last-Translator: shijing \n" "Language-Team: Chinese (China) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 12:16+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 13:02+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" -#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37 +#: ../debian/tmp/usr/bin/apport-valgrind.py:37 ../bin/apport-valgrind.py:37 msgid "See man page for details." msgstr "更多细节请查看 man 手册。" -#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43 +#: ../debian/tmp/usr/bin/apport-valgrind.py:43 ../bin/apport-valgrind.py:43 msgid "specify the log file name produced by valgrind" msgstr "请指定 valgrind 生成的日志文件名" -#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46 +#: ../debian/tmp/usr/bin/apport-valgrind.py:46 ../bin/apport-valgrind.py:46 msgid "" "reuse a previously created sandbox dir (SDIR) or, if it does not exist, " "create it" msgstr "重复使用以前创建的缓存目录 (SDIR) ，或者，如果它不存在，则创建它" -#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50 +#: ../debian/tmp/usr/bin/apport-valgrind.py:50 ../bin/apport-valgrind.py:50 msgid "" "do not create or reuse a sandbox directory for additional debug symbols " "but rely only on installed debug symbols." msgstr "不创建或重用额外的调试符号的沙箱目录，仅依靠安装调试符号。" -#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54 +#: ../debian/tmp/usr/bin/apport-valgrind.py:54 ../bin/apport-valgrind.py:54 msgid "" "reuse a previously created cache dir (CDIR) or, if it does not exist, create " "it" msgstr "重复使用以前创建的缓存目录(CDIR)，或者，如果它不存在，则创建它" -#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58 +#: ../debian/tmp/usr/bin/apport-valgrind.py:58 ../bin/apport-valgrind.py:58 msgid "" "report download/install progress when installing packages into sandbox" msgstr "安装包进入沙盒时报告下载/安装进度" -#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62 +#: ../debian/tmp/usr/bin/apport-valgrind.py:62 ../bin/apport-valgrind.py:62 msgid "" "the executable that is run under valgrind's memcheck tool for memory leak " "detection" msgstr "该可执行文件运行 Valgrind MemCheck 工具下的内存泄漏检测" -#: ../bin/apport-valgrind.py:66 ../debian/tmp/usr/bin/apport-valgrind.py:66 -#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59 +#: ../debian/tmp/usr/bin/apport-retrace.py:63 +#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-valgrind.py:66 +#: ../bin/apport-retrace.py:63 msgid "" "Install an extra package into the sandbox (can be specified multiple times)" msgstr "将其他软件包安装到沙盒(可多次加以指定)中" -#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97 +#: ../debian/tmp/usr/bin/apport-valgrind.py:97 ../bin/apport-valgrind.py:97 #, python-format msgid "Error: %s is not an executable. Stopping." msgstr "错误：%s 不是可执行文件，停止。" -#: ../apport/com.ubuntu.apport.policy.in.h:1 -msgid "Collect system information" -msgstr "收集系统信息" - -#: ../apport/com.ubuntu.apport.policy.in.h:2 -msgid "" -"Authentication is required to collect system information for this problem " -"report" -msgstr "为此问题报告收集系统信息需要授权" - -#: ../apport/com.ubuntu.apport.policy.in.h:3 -msgid "System problem reports" -msgstr "系统问题报告" - -#: ../apport/com.ubuntu.apport.policy.in.h:4 -msgid "" -"Please enter your password to access problem reports of system programs" -msgstr "请输入您的密码以查看系统程序问题报告。" +#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29 +msgid "Your system might become unstable now and might need to be restarted." +msgstr "您的系统现在可能变得不稳定，可能需要重新启动。" -#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:457 ../kde/apport-kde.py:493 -#: ../debian/tmp/usr/share/apport/apport-kde.py:457 -#: ../debian/tmp/usr/share/apport/apport-kde.py:493 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 +#: ../kde/apport-kde.py:468 ../kde/apport-kde.py:503 ../kde/apport-kde.py:522 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1 +#: ../debian/tmp/usr/share/apport/apport-kde.py:468 +#: ../debian/tmp/usr/share/apport/apport-kde.py:503 +#: ../debian/tmp/usr/share/apport/apport-kde.py:522 msgid "Apport" msgstr "Apport" -#: ../gtk/apport-gtk.ui.h:2 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 ../gtk/apport-gtk.ui.h:4 msgid "Crash report" msgstr "崩溃报告" -#: ../gtk/apport-gtk.ui.h:3 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5 msgid "Sorry, an internal error happened." msgstr "对不起，发生内部错误。" -#: ../gtk/apport-gtk.ui.h:4 ../kde/apport-kde.py:227 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:256 +#: ../kde/apport-kde.py:240 ../gtk/apport-gtk.py:300 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 +#: ../debian/tmp/usr/share/apport/apport-kde.py:240 #: ../debian/tmp/usr/share/apport/apport-gtk.py:300 -#: ../debian/tmp/usr/share/apport/apport-kde.py:227 ../gtk/apport-gtk.py:300 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:302 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:342 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 msgid "If you notice further problems, try restarting the computer." msgstr "如果您注意到更多问题，请尝试重新启动计算机。" -#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7 msgid "Send an error report to help fix this problem" msgstr "请发送错误报告，以帮助修复此问题" -#: ../gtk/apport-gtk.ui.h:6 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 msgid "Ignore future problems of this program version" msgstr "以后忽略此版本程序的问题" -#: ../gtk/apport-gtk.ui.h:7 ../kde/apport-kde.py:278 +#: ../kde/apport-kde.py:291 ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:573 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 ../gtk/apport-gtk.ui.h:9 +#: ../debian/tmp/usr/share/apport/apport-kde.py:291 #: ../debian/tmp/usr/share/apport/apport-gtk.py:204 #: ../debian/tmp/usr/share/apport/apport-gtk.py:573 -#: ../debian/tmp/usr/share/apport/apport-kde.py:278 ../gtk/apport-gtk.py:204 -#: ../gtk/apport-gtk.py:573 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 msgid "Show Details" msgstr "显示详细信息" -#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 ../gtk/apport-gtk.ui.h:10 msgid "_Examine locally" msgstr "本地检查(_E)" -#: ../gtk/apport-gtk.ui.h:9 ../kde/apport-kde.py:220 +#: ../kde/apport-kde.py:233 ../gtk/apport-gtk.py:287 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11 +#: ../debian/tmp/usr/share/apport/apport-kde.py:233 #: ../debian/tmp/usr/share/apport/apport-gtk.py:287 -#: ../debian/tmp/usr/share/apport/apport-kde.py:220 ../gtk/apport-gtk.py:287 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 msgid "Leave Closed" msgstr "保持关闭状态" -#: ../gtk/apport-gtk.ui.h:10 ../kde/apport-kde.py:217 ../kde/apport-kde.py:230 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:115 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:141 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:153 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:186 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:262 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:332 +#: ../kde/apport-kde.py:230 ../kde/apport-kde.py:243 ../gtk/apport-gtk.py:216 +#: ../gtk/apport-gtk.py:284 ../gtk/apport-gtk.py:303 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 +#: ../debian/tmp/usr/share/apport/apport-kde.py:230 +#: ../debian/tmp/usr/share/apport/apport-kde.py:243 #: ../debian/tmp/usr/share/apport/apport-gtk.py:216 #: ../debian/tmp/usr/share/apport/apport-gtk.py:284 #: ../debian/tmp/usr/share/apport/apport-gtk.py:303 -#: ../debian/tmp/usr/share/apport/apport-kde.py:217 -#: ../debian/tmp/usr/share/apport/apport-kde.py:230 ../gtk/apport-gtk.py:216 -#: ../gtk/apport-gtk.py:284 ../gtk/apport-gtk.py:303 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:115 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:144 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:157 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:192 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:310 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:350 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:479 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 msgid "Continue" msgstr "继续" -#: ../gtk/apport-gtk.ui.h:11 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../gtk/apport-gtk.ui.h:13 msgid "Collecting problem information" msgstr "正在收集问题信息" -#: ../gtk/apport-gtk.ui.h:12 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 msgid "" "Information is being collected that may help the developers fix the problem " "you report." msgstr "正在收集信息，这些信息将会帮助开发人员修复您报告的问题。" -#: ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:422 -#: ../debian/tmp/usr/share/apport/apport-kde.py:422 -#: ../debian/tmp/usr/bin/apport-cli.py:251 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../bin/apport-cli.py:251 +#: ../kde/apport-kde.py:434 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 +#: ../gtk/apport-gtk.ui.h:15 ../debian/tmp/usr/bin/apport-cli.py:251 +#: ../debian/tmp/usr/share/apport/apport-kde.py:434 ../bin/apport-cli.py:251 msgid "Uploading problem information" msgstr "上传问题信息" -#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 ../gtk/apport-gtk.ui.h:16 msgid "Uploading problem information" msgstr "正在上传问题信息" -#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:423 -#: ../debian/tmp/usr/share/apport/apport-kde.py:423 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 +#: ../kde/apport-kde.py:435 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 +#: ../gtk/apport-gtk.ui.h:17 ../debian/tmp/usr/share/apport/apport-kde.py:435 msgid "" "The collected information is being sent to the bug tracking system. This " "might take a few minutes." msgstr "所收集的信息正在发送到缺陷跟踪系统。这可能需要几分钟。" -#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 -#, python-format -msgid "Usage: %s " -msgstr "用法：%s <报告> <目标目录>" - -#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46 -msgid "Destination directory exists and is not empty." -msgstr "目标目录存在且不为空。" - -#: ../debian/tmp/usr/share/apport/kernel_oops.py:30 ../data/kernel_oops.py:30 -msgid "Your system might become unstable now and might need to be restarted." -msgstr "您的系统现在可能变得不稳定，可能需要重新启动。" - -#: ../kde/apport-kde.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1 -#: ../kde/apport-kde-mime.desktop.in.h:1 -msgid "Report a problem..." -msgstr "提交一份问题报告…" - -#: ../kde/apport-kde.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2 -#: ../kde/apport-kde-mime.desktop.in.h:2 -msgid "Report a malfunction to the developers" -msgstr "向开发者报告一个故障" - -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:130 -#: ../data/general-hooks/ubuntu.py:130 -msgid "" -"An Ubuntu package has a file conflict with a package that is not a genuine " -"Ubuntu package" -msgstr "Ubuntu 软件包与非原生 Ubuntu 软件包发生文件冲突" - -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:147 -#: ../data/general-hooks/ubuntu.py:147 -msgid "" -"Your system was initially configured with grub version 2, but you have " -"removed it from your system in favor of grub 1 without configuring it. To " -"ensure your bootloader configuration is updated whenever a new kernel is " -"available, open a terminal and run:\n" -"\n" -" sudo apt-get install grub-pc\n" -msgstr "" -"系统最初使用 grub2 配置，但是您已经在系统中将其删除，而没有配置grub 1。当一个新内核可用时，为了确保您的引导配置被更新，打开终端并运行：\n" -"\n" -" sudo apt-get install grub-pc\n" - -#: ../apport/ui.py:124 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:124 +#: ../apport/ui.py:124 msgid "This package does not seem to be installed correctly" msgstr "该软件包似乎没有被正确安装" -#: ../apport/ui.py:128 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:128 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:129 +#: ../apport/ui.py:129 #, python-format msgid "" "This is not an official %s package. Please remove any third party package " "and try again." msgstr "这不是官方的 %s 软件包。请删除所有第三方软件包，然后重试。" -#: ../apport/ui.py:145 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:145 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:146 +#: ../apport/ui.py:146 #, python-format msgid "" "You have some obsolete package versions installed. Please upgrade the " @@ -260,123 +185,121 @@ "\n" "%s" -#: ../apport/ui.py:269 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:269 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:270 +#: ../apport/ui.py:270 msgid "unknown program" msgstr "未知程序" -#: ../apport/ui.py:270 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:270 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:271 +#: ../apport/ui.py:271 #, python-format msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "对不起，%s 程序异常退出" -#: ../apport/ui.py:272 ../apport/ui.py:1303 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:272 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1303 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:273 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1312 +#: ../apport/ui.py:273 ../apport/ui.py:1312 #, python-format msgid "Problem in %s" msgstr "%s 中的问题" -#: ../apport/ui.py:273 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:273 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:274 +#: ../apport/ui.py:274 msgid "" "Your computer does not have enough free memory to automatically analyze the " "problem and send a report to the developers." msgstr "您的计算机剩余空间不足，程序无法自动诊断问题并向开发者发送问题报告。" -#: ../apport/ui.py:321 ../apport/ui.py:329 ../apport/ui.py:456 -#: ../apport/ui.py:459 ../apport/ui.py:660 ../apport/ui.py:1109 -#: ../apport/ui.py:1275 ../apport/ui.py:1279 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:321 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:329 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:456 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:459 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:660 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1109 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1275 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1279 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:276 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1049 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:322 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:330 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:457 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:460 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:661 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1118 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1284 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1288 +#: ../apport/ui.py:322 ../apport/ui.py:330 ../apport/ui.py:457 +#: ../apport/ui.py:460 ../apport/ui.py:661 ../apport/ui.py:1118 +#: ../apport/ui.py:1284 ../apport/ui.py:1288 msgid "Invalid problem report" msgstr "无效的问题报告" -#: ../apport/ui.py:322 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:322 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:323 +#: ../apport/ui.py:323 msgid "You are not allowed to access this problem report." msgstr "您没有访问这个问题报告的权限。" -#: ../apport/ui.py:325 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:325 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:326 +#: ../apport/ui.py:326 msgid "Error" msgstr "错误" -#: ../apport/ui.py:326 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:326 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:327 +#: ../apport/ui.py:327 msgid "There is not enough disk space available to process this report." msgstr "没有足够的磁盘空间来处理报告。" -#: ../apport/ui.py:410 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:410 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:411 +#: ../apport/ui.py:411 msgid "No package specified" msgstr "没有指定软件包" -#: ../apport/ui.py:411 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:411 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:412 +#: ../apport/ui.py:412 msgid "" "You need to specify a package or a PID. See --help for more information." msgstr "您需要指定一个软件包或者 PID。使用 --help 选项来获取更多信息。" -#: ../apport/ui.py:434 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:434 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:435 +#: ../apport/ui.py:435 msgid "Permission denied" msgstr "拒绝访问" -#: ../apport/ui.py:435 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:435 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:436 +#: ../apport/ui.py:436 msgid "" "The specified process does not belong to you. Please run this program as the " "process owner or as root." msgstr "指定的进程只能以进程的所有者或 root 身份运行。" -#: ../apport/ui.py:437 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:437 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:438 +#: ../apport/ui.py:438 msgid "Invalid PID" msgstr "无效的 PID" -#: ../apport/ui.py:438 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:438 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:439 +#: ../apport/ui.py:439 msgid "The specified process ID does not belong to a program." msgstr "指定的进程 ID 不属于一个程序。" -#: ../apport/ui.py:457 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:457 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:458 +#: ../apport/ui.py:458 #, python-format msgid "Symptom script %s did not determine an affected package" msgstr "症状脚本 %s 没有划定受影响的包" -#: ../apport/ui.py:460 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:460 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:461 +#: ../apport/ui.py:461 #, python-format msgid "Package %s does not exist" msgstr "软件包 %s 不存在" -#: ../apport/ui.py:484 ../apport/ui.py:672 ../apport/ui.py:677 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:484 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:672 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:677 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:485 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:673 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:678 +#: ../apport/ui.py:485 ../apport/ui.py:673 ../apport/ui.py:678 msgid "Cannot create report" msgstr "无法创建报告" -#: ../apport/ui.py:499 ../apport/ui.py:545 ../apport/ui.py:562 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:499 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:545 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:562 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:500 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:546 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:563 +#: ../apport/ui.py:500 ../apport/ui.py:546 ../apport/ui.py:563 msgid "Updating problem report" msgstr "更新问题报告" -#: ../apport/ui.py:500 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:500 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:501 +#: ../apport/ui.py:501 msgid "" "You are not the reporter or subscriber of this problem report, or the report " "is a duplicate or already closed.\n" @@ -386,8 +309,8 @@ "您不是该问题报告的报告者或订阅者，或者该报告被视为重复或已经关闭。\n" "请使用 apport-bug 新建一份报告。" -#: ../apport/ui.py:509 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:509 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:510 +#: ../apport/ui.py:510 msgid "" "You are not the reporter of this problem report. It is much easier to mark a " "bug as a duplicate of another than to move your comments and attachments to " @@ -402,65 +325,65 @@ "因此，我们建议您使用 apport-bug 来提交新的错误报告，并在当前报告中对您新提交的报告进行评论。\n" "您确定要继续么？" -#: ../apport/ui.py:546 ../apport/ui.py:563 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:546 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:563 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:547 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:564 +#: ../apport/ui.py:547 ../apport/ui.py:564 msgid "No additional information collected." msgstr "未收集更多信息。" -#: ../apport/ui.py:614 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:614 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:615 +#: ../apport/ui.py:615 msgid "What kind of problem do you want to report?" msgstr "您想报告什么类型的问题？" -#: ../apport/ui.py:631 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:631 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:632 +#: ../apport/ui.py:632 msgid "Unknown symptom" msgstr "未知症状" -#: ../apport/ui.py:632 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:632 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:633 +#: ../apport/ui.py:633 #, python-format msgid "The symptom \"%s\" is not known." msgstr "症状 %s 未知。" -#: ../apport/ui.py:663 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:663 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:664 +#: ../apport/ui.py:664 msgid "" "After closing this message please click on an application window to report a " "problem about it." msgstr "在关闭这个消息只后，请点击要报告问题的程序窗口。" -#: ../apport/ui.py:673 ../apport/ui.py:678 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:673 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:678 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:674 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:679 +#: ../apport/ui.py:674 ../apport/ui.py:679 msgid "xprop failed to determine process ID of the window" msgstr "xprop 无法确定窗口的进程 ID" -#: ../apport/ui.py:692 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:692 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:693 +#: ../apport/ui.py:693 msgid "%prog " msgstr "%prog <报告号>" -#: ../apport/ui.py:694 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:694 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:695 +#: ../apport/ui.py:695 msgid "Specify package name." msgstr "请指定包的名称。" -#: ../apport/ui.py:696 ../apport/ui.py:747 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:696 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:747 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:697 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:748 +#: ../apport/ui.py:697 ../apport/ui.py:748 msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "向报告中添加额外的标记，可多次指定。" -#: ../apport/ui.py:726 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:726 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:727 +#: ../apport/ui.py:727 msgid "" "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" msgstr "%prog [选项] [症状|PID|软件包|程序目录|.apport/.crash file]" -#: ../apport/ui.py:729 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:729 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:730 +#: ../apport/ui.py:730 msgid "" "Start in bug filing mode. Requires --package and an optional --pid, or just " "a --pid. If neither is given, display a list of known symptoms. (Implied if " @@ -468,164 +391,165 @@ msgstr "" "以填写 bug 模式启动。需要 --package 和可选的 --pid 参数，或单独使用 --pid 参数。如果二者均未给出，将显示一系列症状供选择。" -#: ../apport/ui.py:731 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:731 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:732 +#: ../apport/ui.py:732 msgid "Click a window as a target for filing a problem report." msgstr "点击一个窗口作为提交问题报告的目标。" -#: ../apport/ui.py:733 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:733 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:734 +#: ../apport/ui.py:734 msgid "Start in bug updating mode. Can take an optional --package." msgstr "启动错误更新模式。可以使用选项 --package 来指定软件包。" -#: ../apport/ui.py:735 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:735 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:736 +#: ../apport/ui.py:736 msgid "" "File a bug report about a symptom. (Implied if symptom name is given as only " "argument.)" msgstr "针对某个症状报告 bug。" -#: ../apport/ui.py:737 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:737 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:738 +#: ../apport/ui.py:738 msgid "" "Specify package name in --file-bug mode. This is optional if a --pid is " "specified. (Implied if package name is given as only argument.)" msgstr "--file-bug 模式中指定软件包名。如果指定了 --pid，则是可选的。(如果只给定软件包名这一个参数则为必需。)" -#: ../apport/ui.py:739 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:739 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:740 +#: ../apport/ui.py:740 msgid "" "Specify a running program in --file-bug mode. If this is specified, the bug " "report will contain more information. (Implied if pid is given as only " "argument.)" msgstr "在 --file-bug 模式中指定运行的程序。如果指定，该问题报告将包含更多的信息。(默认指定 pid 作为唯一参数。)" -#: ../apport/ui.py:741 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:741 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:742 +#: ../apport/ui.py:742 msgid "The provided pid is a hanging application." msgstr "此进程号的程序是挂起的。" -#: ../apport/ui.py:743 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:743 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:744 +#: ../apport/ui.py:744 #, python-format msgid "" "Report the crash from given .apport or .crash file instead of the pending " "ones in %s. (Implied if file is given as only argument.)" msgstr "从给定的 .apport 或者 .crash 文件，而不是从正在处理的 %s 中汇报崩溃。(如果文件只给定了参数时实现。)" -#: ../apport/ui.py:745 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:745 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:746 +#: ../apport/ui.py:746 msgid "" "In bug filing mode, save the collected information into a file instead of " "reporting it. This file can then be reported later on from a different " "machine." msgstr "在提交报告过程中，将收集到的信息保存到要报告的文件中。该文件可用于稍后在另一台机器上提交。" -#: ../apport/ui.py:749 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:749 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:750 +#: ../apport/ui.py:750 msgid "Print the Apport version number." msgstr "输出 Apport 版本号" -#: ../apport/ui.py:889 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:889 +#: ../apport/ui.py:889 msgid "" "This will launch apport-retrace in a terminal window to examine the crash." msgstr "这将在终端窗口中启动 apport-retrace，以检查此崩溃。" -#: ../apport/ui.py:890 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:890 +#: ../apport/ui.py:890 msgid "Run gdb session" msgstr "运行 gdb 会话" -#: ../apport/ui.py:891 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:891 +#: ../apport/ui.py:891 msgid "Run gdb session without downloading debug symbols" msgstr "不下载调试符号的情况下运行 gdb 会话" #. TRANSLATORS: %s contains the crash report file name -#: ../apport/ui.py:893 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:893 +#: ../apport/ui.py:893 #, python-format msgid "Update %s with fully symbolic stack trace" msgstr "利用全符号的堆栈跟踪更新 %s" -#: ../apport/ui.py:969 ../apport/ui.py:979 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:969 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:979 +#: ../apport/ui.py:969 ../apport/ui.py:979 msgid "" "This problem report applies to a program which is not installed any more." msgstr "这一问题报告适用于不再安装的程序。" -#: ../apport/ui.py:994 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:994 +#: ../apport/ui.py:994 #, python-format msgid "" "The problem happened with the program %s which changed since the crash " "occurred." msgstr "自崩溃发生起已更改的程序 %s 出现问题。" -#: ../apport/ui.py:1041 ../apport/ui.py:1281 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1041 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1281 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1075 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1290 +#: ../apport/ui.py:1041 ../apport/ui.py:1075 ../apport/ui.py:1290 msgid "This problem report is damaged and cannot be processed." msgstr "该问题报告已损坏，无法处理。" #. package does not exist -#: ../apport/ui.py:1044 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1044 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1045 +#: ../apport/ui.py:1045 msgid "The report belongs to a package that is not installed." msgstr "该报告属于一个未安装的软件包。" -#: ../apport/ui.py:1047 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1047 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1049 +#: ../apport/ui.py:1049 msgid "An error occurred while attempting to process this problem report:" msgstr "尝试处理此问题报告时出现错误：" -#: ../apport/ui.py:1110 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1110 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1119 +#: ../apport/ui.py:1119 msgid "Could not determine the package or source package name." msgstr "无法检测包或者源码包的名称。" -#: ../apport/ui.py:1128 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1128 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1137 +#: ../apport/ui.py:1137 msgid "Unable to start web browser" msgstr "无法打开浏览器" -#: ../apport/ui.py:1129 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1129 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1138 +#: ../apport/ui.py:1138 #, python-format msgid "Unable to start web browser to open %s." msgstr "无法使用浏览器打开网页 %s" -#: ../apport/ui.py:1229 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1229 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1238 +#: ../apport/ui.py:1238 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "请为 %s 错误追踪系统输入您的帐户信息" -#: ../apport/ui.py:1241 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1241 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1250 +#: ../apport/ui.py:1250 msgid "Network problem" msgstr "网络问题" -#: ../apport/ui.py:1243 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1243 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1252 +#: ../apport/ui.py:1252 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "无法连接到崩溃数据库，请检查您的 Internet 连接。" -#: ../apport/ui.py:1270 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1270 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1279 +#: ../apport/ui.py:1279 msgid "Memory exhaustion" msgstr "内存耗尽" -#: ../apport/ui.py:1271 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1271 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1280 +#: ../apport/ui.py:1280 msgid "Your system does not have enough memory to process this crash report." msgstr "您的系统没有足够的内存来处理此崩溃报告。" -#: ../apport/ui.py:1306 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1306 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1315 +#: ../apport/ui.py:1315 #, python-format msgid "" "The problem cannot be reported:\n" @@ -636,195 +560,34 @@ "\n" "%s" -#: ../apport/ui.py:1362 ../apport/ui.py:1369 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1362 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1369 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1371 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1378 +#: ../apport/ui.py:1371 ../apport/ui.py:1378 msgid "Problem already known" msgstr "该问题为已知问题" -#: ../apport/ui.py:1363 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1363 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1372 +#: ../apport/ui.py:1372 msgid "" "This problem was already reported in the bug report displayed in the web " "browser. Please check if you can add any further information that might be " "helpful for the developers." msgstr "关于这个问题，之前已经有如网页所示的报告。您是否有所补充？" -#: ../apport/ui.py:1370 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1370 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1379 +#: ../apport/ui.py:1379 msgid "This problem was already reported to developers. Thank you!" msgstr "已将此问题报告给开发人员。谢谢！" -#: ../kde/apport-kde.py:169 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:286 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:177 -#: ../debian/tmp/usr/share/apport/apport-kde.py:169 ../gtk/apport-gtk.py:177 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:404 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:429 -#: ../debian/tmp/usr/bin/apport-cli.py:178 ../bin/apport-cli.py:178 -msgid "Send problem report to the developers?" -msgstr "向开发者发送问题报告？" - -#: ../kde/apport-kde.py:177 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:292 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:186 -#: ../debian/tmp/usr/share/apport/apport-kde.py:177 ../gtk/apport-gtk.py:186 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:412 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:437 -msgid "Send" -msgstr "发送" - -#: ../kde/apport-kde.py:183 ../kde/apport-kde.py:224 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:110 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:254 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:165 -#: ../debian/tmp/usr/share/apport/apport-kde.py:183 -#: ../debian/tmp/usr/share/apport/apport-kde.py:224 ../gtk/apport-gtk.py:165 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:108 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:300 -#, python-format -msgid "Sorry, %s has experienced an internal error." -msgstr "对不起，%s 出现了内部错误。" - -#: ../kde/apport-kde.py:191 ../debian/tmp/usr/share/apport/apport-gtk.py:257 -#: ../debian/tmp/usr/share/apport/apport-kde.py:191 ../gtk/apport-gtk.py:257 -#, python-format -msgid "Package: %s" -msgstr "软件包：%s" - -#: ../kde/apport-kde.py:197 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:136 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:264 -#: ../debian/tmp/usr/share/apport/apport-kde.py:197 ../gtk/apport-gtk.py:264 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:137 -msgid "Sorry, a problem occurred while installing software." -msgstr "对不起，安装软件时出现问题。" - -#: ../kde/apport-kde.py:204 ../debian/tmp/usr/share/apport/apport-gtk.py:273 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:292 -#: ../debian/tmp/usr/share/apport/apport-kde.py:204 ../gtk/apport-gtk.py:273 -#: ../gtk/apport-gtk.py:292 -#, python-format -msgid "The application %s has experienced an internal error." -msgstr "应用程序 %s 发生内部错误。" - -#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-gtk.py:276 -#: ../debian/tmp/usr/share/apport/apport-kde.py:208 ../gtk/apport-gtk.py:276 -#, python-format -msgid "The application %s has closed unexpectedly." -msgstr "应用程序 %s 已意外关闭。" - -#: ../kde/apport-kde.py:221 ../kde/apport-kde.py:368 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:226 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:229 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:288 -#: ../debian/tmp/usr/share/apport/apport-kde.py:221 -#: ../debian/tmp/usr/share/apport/apport-kde.py:368 ../gtk/apport-gtk.py:229 -#: ../gtk/apport-gtk.py:288 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:232 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:273 -msgid "Relaunch" -msgstr "重新启动程序" - -#: ../kde/apport-kde.py:231 ../debian/tmp/usr/share/apport/apport-gtk.py:304 -#: ../debian/tmp/usr/share/apport/apport-kde.py:231 ../gtk/apport-gtk.py:304 -msgid "Ignore future problems of this type" -msgstr "以后忽略此类错误" - -#: ../kde/apport-kde.py:275 ../debian/tmp/usr/share/apport/apport-gtk.py:577 -#: ../debian/tmp/usr/share/apport/apport-kde.py:275 ../gtk/apport-gtk.py:577 -msgid "Hide Details" -msgstr "隐藏详细信息" - -#: ../kde/apport-kde.py:301 ../debian/tmp/usr/share/apport/apport-kde.py:301 -msgid "Username:" -msgstr "用户名：" - -#: ../kde/apport-kde.py:302 ../debian/tmp/usr/share/apport/apport-kde.py:302 -msgid "Password:" -msgstr "密码：" - -#: ../kde/apport-kde.py:349 ../debian/tmp/usr/share/apport/apport-gtk.py:142 -#: ../debian/tmp/usr/share/apport/apport-kde.py:349 ../gtk/apport-gtk.py:142 -#: ../debian/tmp/usr/bin/apport-cli.py:150 ../bin/apport-cli.py:150 -msgid "(binary data)" -msgstr "(二进制数据)" - -#: ../kde/apport-kde.py:393 ../debian/tmp/usr/share/apport/apport-kde.py:393 -msgid "Collecting Problem Information" -msgstr "正在收集问题信息" - -#: ../kde/apport-kde.py:394 ../debian/tmp/usr/share/apport/apport-kde.py:394 -#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238 -msgid "Collecting problem information" -msgstr "正在收集问题信息" - -#: ../kde/apport-kde.py:395 ../debian/tmp/usr/share/apport/apport-kde.py:395 -msgid "" -"The collected information can be sent to the developers to improve the " -"application. This might take a few minutes." -msgstr "收集到的信息可以发送给开发者来改进程序。这可能要花费几分钟的时间。" - -#: ../kde/apport-kde.py:421 ../debian/tmp/usr/share/apport/apport-kde.py:421 -msgid "Uploading Problem Information" -msgstr "上传问题信息" - -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:144 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:148 -msgid "Package: apport 1.2.3~0ubuntu1" -msgstr "软件包：apport 1.2.3~0ubuntu1" - -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:180 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:221 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:184 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:225 -msgid "The application Apport has closed unexpectedly." -msgstr "应用程序 Apport 意外关闭。" - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:157 ../gtk/apport-gtk.py:157 -#, python-format -msgid "Sorry, the application %s has stopped unexpectedly." -msgstr "对不起，应用程序 %s 意外停止。" - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:160 ../gtk/apport-gtk.py:160 -#, python-format -msgid "Sorry, %s has closed unexpectedly." -msgstr "对不起，%s 已意外关闭。" - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:228 ../gtk/apport-gtk.py:228 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:276 -msgid "Force Closed" -msgstr "强制关闭" - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:238 ../gtk/apport-gtk.py:238 -#, python-format -msgid "The application %s has stopped responding." -msgstr "应用程序 %s 停止响应。" - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:242 ../gtk/apport-gtk.py:242 -#, python-format -msgid "The program \"%s\" has stopped responding." -msgstr "程序 %s 停止响应。" - -#: ../kde/apport-kde-mimelnk.desktop.in.h:1 -msgid "Apport crash file" -msgstr "Apport 崩溃文件" - -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263 -msgid "The application Apport has stopped responding." -msgstr "应用程序 Apport 停止响应。" - -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:265 -msgid "You can wait to see if it wakes up, or close or relaunch it." -msgstr "您可以等待看它醒来，或关闭或重启它。" - -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340 -msgid "Sorry, the application apport has stopped unexpectedly." -msgstr "对不起，应用程序已经意外停止。" +#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 +#: ../kde/apport-kde-mime.desktop.in.h:1 +msgid "Report a problem..." +msgstr "提交一份问题报告…" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357 -msgid "Sorry, apport has closed unexpectedly." -msgstr "对不起，Apport 意外关闭。" +#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2 +#: ../kde/apport-kde-mime.desktop.in.h:2 +msgid "Report a malfunction to the developers" +msgstr "向开发者报告一个故障" #: ../data/apportcheckresume.py:73 #: ../debian/tmp/usr/share/apport/apportcheckresume.py:73 @@ -840,123 +603,25 @@ "properly." msgstr "这是在上一个休眠中发生的，并阻止了它正确地恢复。" -#: ../data/apportcheckresume.py:80 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:80 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 +#: ../data/apportcheckresume.py:74 msgid "" "The resume processing hung very near the end and will have appeared to have " "completed normally." msgstr "这个恢复过程已经非常接近尾声，将正常结束。" -#: ../bin/apport-retrace.py:31 ../debian/tmp/usr/bin/apport-retrace.py:31 -msgid "%prog [options] " -msgstr "%prog [选项] " +#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 +#, python-format +msgid "Usage: %s " +msgstr "用法：%s <报告> <目标目录>" -#: ../bin/apport-retrace.py:33 ../debian/tmp/usr/bin/apport-retrace.py:33 -msgid "Do not put the new traces into the report, but write them to stdout." -msgstr "不把新的痕迹写入到报告，但是把它们写入到标准输出。" +#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46 +msgid "Destination directory exists and is not empty." +msgstr "目标目录存在且不为空。" -#: ../bin/apport-retrace.py:35 ../debian/tmp/usr/bin/apport-retrace.py:35 -msgid "" -"Start an interactive gdb session with the report's core dump (-o ignored; " -"does not rewrite report)" -msgstr "启动一个交互式的 gdb 进程并载入提交的崩溃信息 (-o 不重新生成报告)" - -#: ../bin/apport-retrace.py:37 ../debian/tmp/usr/bin/apport-retrace.py:37 -msgid "" -"Write modified report to given file instead of changing the original report" -msgstr "将更改过的报告写入指定文件而非改变原始报告" - -#: ../bin/apport-retrace.py:39 ../debian/tmp/usr/bin/apport-retrace.py:39 -msgid "Remove the core dump from the report after stack trace regeneration" -msgstr "生成栈回溯后将内核转储从报告中删除" - -#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41 -msgid "Override report's CoreFile" -msgstr "覆盖报告核心文件" - -#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 -msgid "Override report's ExecutablePath" -msgstr "覆盖报告执行路径" - -#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 -msgid "Override report's ProcMaps" -msgstr "覆盖报告的进程表" - -#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 -msgid "Rebuild report's Package information" -msgstr "重建报告的包信息" - -#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 -msgid "" -"Build a temporary sandbox and download/install the necessary packages and " -"debug symbols in there; without this option it assumes that the necessary " -"packages and debug symbols are already installed in the system. The argument " -"points to the packaging system configuration base directory; if you specify " -"\"system\", it will use the system configuration files, but will then only " -"be able to retrace crashes that happened on the currently running release." -msgstr "" -"构建临时沙盒，以及下载/安装必要的软件包和调试符号；如果没有该选项，则会假设该系统中已安装了必要的软件包和调试符号。此参数指向该打包系统配置库目录；如果指" -"定 \"system\"，则其将使用系统配置文件，但之后，其将只能够追溯当前正在运行的版本上发生的崩溃。" - -#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51 -msgid "" -"Report download/install progress when installing packages into sandbox" -msgstr "在将软件包安装到沙盒中时，报告下载和安装的进度" - -#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 -msgid "Prepend timestamps to log messages, for batch operation" -msgstr "为进行批量操作，请预先设置时间戳，以记录消息" - -#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 -msgid "Cache directory for packages downloaded in the sandbox" -msgstr "下载到沙盒中软件包的缓存目录" - -#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57 -msgid "" -"Directory for unpacked packages. Future runs will assume that any already " -"downloaded package is also extracted to this sandbox." -msgstr "用于解压包目录。以后运行将假设任何已下载的包被提取到这个沙盒。" - -#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61 -msgid "" -"Path to a file with the crash database authentication information. This is " -"used when specifying a crash ID to upload the retraced stack traces (only if " -"neither -g, -o, nor -s are specified)" -msgstr "包含崩溃数据库访问信息文件之路径。此项将用于为特定崩溃代码上传堆栈的回溯调试信息(除非用户指定 -g, -o 或 -s)" - -#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63 -msgid "" -"Display retraced stack traces and ask for confirmation before sending them " -"to the crash database." -msgstr "显示返回的堆栈信息，并询求确认是否将其发送至崩溃数据库。" - -#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-retrace.py:65 -msgid "" -"Path to the duplicate sqlite database (default: no duplicate checking)" -msgstr "SQLite 数据库路径重复(默认：不重复检查)" - -#: ../bin/apport-retrace.py:70 ../debian/tmp/usr/bin/apport-retrace.py:70 -msgid "incorrect number of arguments; use --help for a short help" -msgstr "参数数量错误；使用 --help 获取简略帮助" - -#: ../bin/apport-retrace.py:76 ../debian/tmp/usr/bin/apport-retrace.py:76 -msgid "You cannot use -C without -S. Stopping." -msgstr "您不能在未指定 -S 选项的情况下使用 -C 选项，停止。" - -#: ../bin/apport-retrace.py:80 ../debian/tmp/usr/bin/apport-retrace.py:80 -msgid "" -"you either need to do a local operation (-s, -g, -o) or supply an " -"authentication file (--auth); see --help for a short help" -msgstr "您或需要进行一项本地操作(-s, -g, -o) 或提供一个认证文件(--auth)；参见 --help 以获取简单帮助。" - -#. translators: don't translate y/n, apport currently only checks for "y" -#: ../bin/apport-retrace.py:114 ../debian/tmp/usr/bin/apport-retrace.py:114 -msgid "OK to send these as attachments? [y/n]" -msgstr "确定以附件形式发送这些？[y/n]" - -#: ../debian/tmp/usr/bin/apport-cli.py:74 ../bin/apport-cli.py:74 -msgid "Press any key to continue..." -msgstr "按任意键继续…" +#: ../debian/tmp/usr/bin/apport-cli.py:74 ../bin/apport-cli.py:74 +msgid "Press any key to continue..." +msgstr "按任意键继续…" #: ../debian/tmp/usr/bin/apport-cli.py:81 ../bin/apport-cli.py:81 msgid "What would you like to do? Your options are:" @@ -972,6 +637,20 @@ msgid "(%i bytes)" msgstr "(%i 字节)" +#: ../kde/apport-kde.py:362 ../gtk/apport-gtk.py:142 +#: ../debian/tmp/usr/bin/apport-cli.py:150 +#: ../debian/tmp/usr/share/apport/apport-kde.py:362 ../bin/apport-cli.py:150 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:142 +msgid "(binary data)" +msgstr "(二进制数据)" + +#: ../kde/apport-kde.py:185 ../gtk/apport-gtk.py:177 +#: ../debian/tmp/usr/bin/apport-cli.py:178 +#: ../debian/tmp/usr/share/apport/apport-kde.py:185 ../bin/apport-cli.py:178 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:177 +msgid "Send problem report to the developers?" +msgstr "向开发者发送问题报告？" + #: ../debian/tmp/usr/bin/apport-cli.py:179 ../bin/apport-cli.py:179 msgid "" "After the problem report has been sent, please fill out the form in the\n" @@ -1024,6 +703,11 @@ msgid "Error: %s" msgstr "错误：%s" +#: ../kde/apport-kde.py:406 ../debian/tmp/usr/bin/apport-cli.py:238 +#: ../debian/tmp/usr/share/apport/apport-kde.py:406 ../bin/apport-cli.py:238 +msgid "Collecting problem information" +msgstr "正在收集问题信息" + #: ../debian/tmp/usr/bin/apport-cli.py:239 ../bin/apport-cli.py:239 msgid "" "The collected information can be sent to the developers to improve the\n" @@ -1087,8 +771,295 @@ msgid "No pending crash reports. Try --help for more information." msgstr "没有已知的崩溃报告，尝试 --help 以获得更多信息。" +#: ../data/general-hooks/ubuntu.py:133 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:133 +msgid "" +"An Ubuntu package has a file conflict with a package that is not a genuine " +"Ubuntu package" +msgstr "Ubuntu 软件包与非原生 Ubuntu 软件包发生文件冲突" + +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:166 +#: ../data/general-hooks/ubuntu.py:166 +msgid "" +"Your system was initially configured with grub version 2, but you have " +"removed it from your system in favor of grub 1 without configuring it. To " +"ensure your bootloader configuration is updated whenever a new kernel is " +"available, open a terminal and run:\n" +"\n" +" sudo apt-get install grub-pc\n" +msgstr "" +"系统最初使用 grub2 配置，但是您已经在系统中将其删除，而没有配置grub 1。当一个新内核可用时，为了确保您的引导配置被更新，打开终端并运行：\n" +"\n" +" sudo apt-get install grub-pc\n" + +#: ../apport/com.ubuntu.apport.policy.in.h:1 +msgid "Collect system information" +msgstr "收集系统信息" + +#: ../apport/com.ubuntu.apport.policy.in.h:2 +msgid "" +"Authentication is required to collect system information for this problem " +"report" +msgstr "为此问题报告收集系统信息需要授权" + +#: ../apport/com.ubuntu.apport.policy.in.h:3 +msgid "System problem reports" +msgstr "系统问题报告" + +#: ../apport/com.ubuntu.apport.policy.in.h:4 +msgid "" +"Please enter your password to access problem reports of system programs" +msgstr "请输入您的密码以查看系统程序问题报告。" + +#: ../kde/apport-kde-mimelnk.desktop.in.h:1 +msgid "Apport crash file" +msgstr "Apport 崩溃文件" + +#: ../kde/apport-kde.py:199 ../kde/apport-kde.py:237 ../gtk/apport-gtk.py:165 +#: ../debian/tmp/usr/share/apport/apport-kde.py:199 +#: ../debian/tmp/usr/share/apport/apport-kde.py:237 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:165 +#, python-format +msgid "Sorry, %s has experienced an internal error." +msgstr "对不起，%s 出现了内部错误。" + +#: ../kde/apport-kde.py:213 ../gtk/apport-gtk.py:264 +#: ../debian/tmp/usr/share/apport/apport-kde.py:213 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:264 +msgid "Sorry, a problem occurred while installing software." +msgstr "对不起，安装软件时出现问题。" + +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:148 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:144 +msgid "Package: apport 1.2.3~0ubuntu1" +msgstr "软件包：apport 1.2.3~0ubuntu1" + +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:184 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:225 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:180 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:221 +msgid "The application Apport has closed unexpectedly." +msgstr "应用程序 Apport 意外关闭。" + +#: ../kde/apport-kde.py:234 ../kde/apport-kde.py:380 ../gtk/apport-gtk.py:229 +#: ../gtk/apport-gtk.py:288 ../debian/tmp/usr/share/apport/apport-kde.py:234 +#: ../debian/tmp/usr/share/apport/apport-kde.py:380 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:229 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:288 +msgid "Relaunch" +msgstr "重新启动程序" + +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263 +msgid "The application Apport has stopped responding." +msgstr "应用程序 Apport 停止响应。" + +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:265 +msgid "You can wait to see if it wakes up, or close or relaunch it." +msgstr "您可以等待看它醒来，或关闭或重启它。" + +#: ../gtk/apport-gtk.py:228 ../debian/tmp/usr/share/apport/apport-gtk.py:228 +msgid "Force Closed" +msgstr "强制关闭" + +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340 +msgid "Sorry, the application apport has stopped unexpectedly." +msgstr "对不起，应用程序已经意外停止。" + +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357 +msgid "Sorry, apport has closed unexpectedly." +msgstr "对不起，Apport 意外关闭。" + +#: ../kde/apport-kde.py:193 ../gtk/apport-gtk.py:186 +#: ../debian/tmp/usr/share/apport/apport-kde.py:193 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:186 +msgid "Send" +msgstr "发送" + #: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1069 #: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1080 #: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1091 msgid "Problem in bash" msgstr "bash 中的问题" + +#: ../gtk/apport-gtk.py:157 ../debian/tmp/usr/share/apport/apport-gtk.py:157 +#, python-format +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "对不起，应用程序 %s 意外停止。" + +#: ../gtk/apport-gtk.py:160 ../debian/tmp/usr/share/apport/apport-gtk.py:160 +#, python-format +msgid "Sorry, %s has closed unexpectedly." +msgstr "对不起，%s 已意外关闭。" + +#: ../gtk/apport-gtk.py:238 ../debian/tmp/usr/share/apport/apport-gtk.py:238 +#, python-format +msgid "The application %s has stopped responding." +msgstr "应用程序 %s 停止响应。" + +#: ../gtk/apport-gtk.py:242 ../debian/tmp/usr/share/apport/apport-gtk.py:242 +#, python-format +msgid "The program \"%s\" has stopped responding." +msgstr "程序 %s 停止响应。" + +#: ../kde/apport-kde.py:207 ../gtk/apport-gtk.py:257 +#: ../debian/tmp/usr/share/apport/apport-kde.py:207 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:257 +#, python-format +msgid "Package: %s" +msgstr "软件包：%s" + +#: ../kde/apport-kde.py:219 ../gtk/apport-gtk.py:273 ../gtk/apport-gtk.py:292 +#: ../debian/tmp/usr/share/apport/apport-kde.py:219 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:273 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:292 +#, python-format +msgid "The application %s has experienced an internal error." +msgstr "应用程序 %s 发生内部错误。" + +#: ../kde/apport-kde.py:222 ../gtk/apport-gtk.py:276 +#: ../debian/tmp/usr/share/apport/apport-kde.py:222 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:276 +#, python-format +msgid "The application %s has closed unexpectedly." +msgstr "应用程序 %s 已意外关闭。" + +#: ../kde/apport-kde.py:244 ../gtk/apport-gtk.py:304 +#: ../debian/tmp/usr/share/apport/apport-kde.py:244 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:304 +msgid "Ignore future problems of this type" +msgstr "以后忽略此类错误" + +#: ../kde/apport-kde.py:288 ../gtk/apport-gtk.py:577 +#: ../debian/tmp/usr/share/apport/apport-kde.py:288 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:577 +msgid "Hide Details" +msgstr "隐藏详细信息" + +#: ../kde/apport-kde.py:314 ../debian/tmp/usr/share/apport/apport-kde.py:314 +msgid "Username:" +msgstr "用户名：" + +#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315 +msgid "Password:" +msgstr "密码：" + +#: ../kde/apport-kde.py:405 ../debian/tmp/usr/share/apport/apport-kde.py:405 +msgid "Collecting Problem Information" +msgstr "正在收集问题信息" + +#: ../kde/apport-kde.py:407 ../debian/tmp/usr/share/apport/apport-kde.py:407 +msgid "" +"The collected information can be sent to the developers to improve the " +"application. This might take a few minutes." +msgstr "收集到的信息可以发送给开发者来改进程序。这可能要花费几分钟的时间。" + +#: ../kde/apport-kde.py:433 ../debian/tmp/usr/share/apport/apport-kde.py:433 +msgid "Uploading Problem Information" +msgstr "上传问题信息" + +#: ../debian/tmp/usr/bin/apport-retrace.py:31 ../bin/apport-retrace.py:31 +msgid "%prog [options] " +msgstr "%prog [选项] " + +#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34 +msgid "Do not put the new traces into the report, but write them to stdout." +msgstr "不把新的痕迹写入到报告，但是把它们写入到标准输出。" + +#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36 +msgid "" +"Start an interactive gdb session with the report's core dump (-o ignored; " +"does not rewrite report)" +msgstr "启动一个交互式的 gdb 进程并载入提交的崩溃信息 (-o 不重新生成报告)" + +#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38 +msgid "" +"Write modified report to given file instead of changing the original report" +msgstr "将更改过的报告写入指定文件而非改变原始报告" + +#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 +msgid "Remove the core dump from the report after stack trace regeneration" +msgstr "生成栈回溯后将内核转储从报告中删除" + +#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 +msgid "Override report's CoreFile" +msgstr "覆盖报告核心文件" + +#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 +msgid "Override report's ExecutablePath" +msgstr "覆盖报告执行路径" + +#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 +msgid "Override report's ProcMaps" +msgstr "覆盖报告的进程表" + +#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 +msgid "Rebuild report's Package information" +msgstr "重建报告的包信息" + +#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 +msgid "" +"Build a temporary sandbox and download/install the necessary packages and " +"debug symbols in there; without this option it assumes that the necessary " +"packages and debug symbols are already installed in the system. The argument " +"points to the packaging system configuration base directory; if you specify " +"\"system\", it will use the system configuration files, but will then only " +"be able to retrace crashes that happened on the currently running release." +msgstr "" +"构建临时沙盒，以及下载/安装必要的软件包和调试符号；如果没有该选项，则会假设该系统中已安装了必要的软件包和调试符号。此参数指向该打包系统配置库目录；如果指" +"定 \"system\"，则其将使用系统配置文件，但之后，其将只能够追溯当前正在运行的版本上发生的崩溃。" + +#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 +msgid "" +"Report download/install progress when installing packages into sandbox" +msgstr "在将软件包安装到沙盒中时，报告下载和安装的进度" + +#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 +msgid "Prepend timestamps to log messages, for batch operation" +msgstr "为进行批量操作，请预先设置时间戳，以记录消息" + +#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59 +msgid "Cache directory for packages downloaded in the sandbox" +msgstr "下载到沙盒中软件包的缓存目录" + +#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 +msgid "" +"Directory for unpacked packages. Future runs will assume that any already " +"downloaded package is also extracted to this sandbox." +msgstr "用于解压包目录。以后运行将假设任何已下载的包被提取到这个沙盒。" + +#: ../debian/tmp/usr/bin/apport-retrace.py:65 ../bin/apport-retrace.py:65 +msgid "" +"Path to a file with the crash database authentication information. This is " +"used when specifying a crash ID to upload the retraced stack traces (only if " +"neither -g, -o, nor -s are specified)" +msgstr "包含崩溃数据库访问信息文件之路径。此项将用于为特定崩溃代码上传堆栈的回溯调试信息(除非用户指定 -g, -o 或 -s)" + +#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67 +msgid "" +"Display retraced stack traces and ask for confirmation before sending them " +"to the crash database." +msgstr "显示返回的堆栈信息，并询求确认是否将其发送至崩溃数据库。" + +#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69 +msgid "" +"Path to the duplicate sqlite database (default: no duplicate checking)" +msgstr "SQLite 数据库路径重复(默认：不重复检查)" + +#: ../debian/tmp/usr/bin/apport-retrace.py:70 ../bin/apport-retrace.py:70 +msgid "incorrect number of arguments; use --help for a short help" +msgstr "参数数量错误；使用 --help 获取简略帮助" + +#: ../debian/tmp/usr/bin/apport-retrace.py:78 ../bin/apport-retrace.py:78 +msgid "You cannot use -C without -S. Stopping." +msgstr "您不能在未指定 -S 选项的情况下使用 -C 选项，停止。" + +#: ../debian/tmp/usr/bin/apport-retrace.py:80 ../bin/apport-retrace.py:80 +msgid "" +"you either need to do a local operation (-s, -g, -o) or supply an " +"authentication file (--auth); see --help for a short help" +msgstr "您或需要进行一项本地操作(-s, -g, -o) 或提供一个认证文件(--auth)；参见 --help 以获取简单帮助。" + +#. translators: don't translate y/n, apport currently only checks for "y" +#: ../debian/tmp/usr/bin/apport-retrace.py:111 ../bin/apport-retrace.py:111 +msgid "OK to send these as attachments? [y/n]" +msgstr "确定以附件形式发送这些？[y/n]" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/aptitude.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/aptitude.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/aptitude.po 2015-02-19 15:26:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/aptitude.po 2016-07-20 16:51:46.000000000 +0000 @@ -22,8 +22,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-02-19 10:32+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:34+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" #. TRANSLATORS: These strings describing config items @@ -508,7 +508,7 @@ msgid "Dependency handling" msgstr "正在处理依赖关系" -#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1063 +#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:975 msgid "Miscellaneous" msgstr "杂项" @@ -517,73 +517,73 @@ msgid "%ls: Examine" msgstr "%ls：检测" -#: src/broken_indicator.cc:137 +#: src/broken_indicator.cc:138 #, c-format msgid "%ls: Apply" msgstr "%ls：应用" -#: src/broken_indicator.cc:142 +#: src/broken_indicator.cc:144 #, c-format msgid "%ls: Next" msgstr "%ls：下一个" -#: src/broken_indicator.cc:148 +#: src/broken_indicator.cc:151 #, c-format msgid "%ls: Previous" msgstr "%ls：上一个" -#: src/broken_indicator.cc:243 +#: src/broken_indicator.cc:246 msgid "Dependency resolution disabled." msgstr "依赖解决方案被禁用。" -#: src/broken_indicator.cc:254 +#: src/broken_indicator.cc:257 msgid "Unable to resolve dependencies." msgstr "无法解决依赖关系。" -#: src/broken_indicator.cc:265 +#: src/broken_indicator.cc:268 msgid "Fatal error in resolver" msgstr "解决器发生致命错误" -#: src/broken_indicator.cc:277 +#: src/broken_indicator.cc:280 #, c-format msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] 正在解决依赖关系" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/broken_indicator.cc:316 src/gtk/resolver.cc:1294 #: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "内部错误：意料之外的空解决方案。" -#: src/broken_indicator.cc:371 +#: src/broken_indicator.cc:374 msgid "Suggest keeping all packages at their current version." msgstr "建议保持所有软件包于其当前版本。" -#: src/broken_indicator.cc:379 +#: src/broken_indicator.cc:382 #, c-format msgid "%d install" msgid_plural "%d installs" msgstr[0] "安装 %d 个包" -#: src/broken_indicator.cc:389 +#: src/broken_indicator.cc:392 #, c-format msgid "%d removal" msgid_plural "%d removals" msgstr[0] "删除 %d 个包" -#: src/broken_indicator.cc:399 +#: src/broken_indicator.cc:402 #, c-format msgid "%d keep" msgid_plural "%d keeps" msgstr[0] "保持 %d 个包" -#: src/broken_indicator.cc:409 +#: src/broken_indicator.cc:412 #, c-format msgid "%d upgrade" msgid_plural "%d upgrades" msgstr[0] "升级 %d 个包" -#: src/broken_indicator.cc:419 +#: src/broken_indicator.cc:422 #, c-format msgid "%d downgrade" msgid_plural "%d downgrades" @@ -592,22 +592,22 @@ #. TRANSLATORS: %F is replaced with a comma separated list such as #. "n1 installs, n2 removals", ... #. -#: src/broken_indicator.cc:430 +#: src/broken_indicator.cc:433 #, c-format msgid "Suggest %F" msgstr "建议 %F" -#: src/cmdline/cmdline_action.cc:55 +#: src/cmdline/cmdline_action.cc:54 #, c-format msgid "Unable to find the source package for \"%s\".\n" msgstr "无法找到“%s”的源代码包。\n" -#: src/cmdline/cmdline_action.cc:212 +#: src/cmdline/cmdline_action.cc:211 #, c-format msgid "Unable to satisfy the build-depends: %s.\n" msgstr "无法满足构建依赖：%s。\n" -#: src/cmdline/cmdline_action.cc:249 +#: src/cmdline/cmdline_action.cc:248 #, c-format msgid "" "Note: \"%s\", providing the virtual package\n" @@ -616,7 +616,7 @@ "注意：“%s”，提供虚拟软件包\n" " “%s”，并且已经被安装。\n" -#: src/cmdline/cmdline_action.cc:257 +#: src/cmdline/cmdline_action.cc:256 #, c-format msgid "" "Note: \"%s\", providing the virtual package\n" @@ -625,7 +625,7 @@ "注意：“%s”，提供虚拟软件包\n" " “%s”，已经即将被安装。\n" -#: src/cmdline/cmdline_action.cc:280 +#: src/cmdline/cmdline_action.cc:279 #, c-format msgid "" "\"%s\" exists in the package database, but it is not a\n" @@ -634,77 +634,77 @@ "“%s”存在于软件包数据库中，但是它不是一个真实的软件\n" "包，而且没有其它软件包提供该软件包。\n" -#: src/cmdline/cmdline_action.cc:288 +#: src/cmdline/cmdline_action.cc:287 #, c-format msgid "\"%s\" is a virtual package provided by:\n" msgstr "“%s”是一个虚拟软件包，提供者：\n" -#: src/cmdline/cmdline_action.cc:291 +#: src/cmdline/cmdline_action.cc:290 #, c-format msgid "You must choose one to install.\n" msgstr "您必须选择一个来安装。\n" -#: src/cmdline/cmdline_action.cc:299 +#: src/cmdline/cmdline_action.cc:298 #, c-format msgid "" "Note: selecting \"%s\" instead of the\n" " virtual package \"%s\"\n" msgstr "注意：选择“%s”而不是虚拟软件包“%s”\n" -#: src/cmdline/cmdline_action.cc:321 +#: src/cmdline/cmdline_action.cc:320 #, c-format msgid "%s is already installed at the requested version (%s)\n" msgstr "%s 的 (%s) 版本已经按要求安装了\n" -#: src/cmdline/cmdline_action.cc:331 +#: src/cmdline/cmdline_action.cc:329 #, c-format msgid "%s is not currently installed, so it will not be upgraded.\n" msgstr "%s 目前未被安装，所以它不会被升级。\n" -#: src/cmdline/cmdline_action.cc:335 +#: src/cmdline/cmdline_action.cc:334 #, c-format msgid "" "%s is already installed at the latest version, so it will not be upgraded.\n" msgstr "%s 已经安装了最新版本，所以不会升级。\n" -#: src/cmdline/cmdline_action.cc:341 +#: src/cmdline/cmdline_action.cc:340 #, c-format msgid "%s is not currently installed, so it will not be reinstalled.\n" msgstr "%s 目前未被安装，所以它不会被重新安装。\n" -#: src/cmdline/cmdline_action.cc:349 src/cmdline/cmdline_action.cc:356 +#: src/cmdline/cmdline_action.cc:348 #, c-format msgid "Package %s is not installed, so it will not be removed\n" msgstr "软件包 %s 并未安装，所以不删除\n" -#: src/cmdline/cmdline_action.cc:375 +#: src/cmdline/cmdline_action.cc:380 #, c-format msgid "Package %s is not installed, cannot forbid an upgrade\n" msgstr "软件包 %s 并未安装，不能禁止升级\n" -#: src/cmdline/cmdline_action.cc:378 +#: src/cmdline/cmdline_action.cc:383 #, c-format msgid "Package %s is not upgradable, cannot forbid an upgrade\n" msgstr "软件包 %s 是不可升级的，不能设为禁止升级\n" -#: src/cmdline/cmdline_action.cc:483 +#: src/cmdline/cmdline_action.cc:488 #, c-format msgid "Note: selecting the task \"%s: %s\" for installation\n" msgstr "注意：选择软件集“%s：%s”安装\n" -#: src/cmdline/cmdline_action.cc:513 +#: src/cmdline/cmdline_action.cc:518 #, c-format msgid "" "You can only specify a package version with an 'install' command or a " "'forbid-version' command.\n" msgstr "您只能在“install”或“forbid-version”命令中指定一个软件包的版本。\n" -#: src/cmdline/cmdline_action.cc:522 +#: src/cmdline/cmdline_action.cc:527 #, c-format msgid "You can only specify a package archive with an 'install' command.\n" msgstr "在“install”命令中您只能指定一个软件包的存档\n" -#: src/cmdline/cmdline_action.cc:560 +#: src/cmdline/cmdline_action.cc:559 #, c-format msgid "" "Couldn't find package \"%s\", and more than 40\n" @@ -713,7 +713,7 @@ "无法找到软件包“%s”，同时有超过 40 个软件包\n" "名称中包含“%s”。\n" -#: src/cmdline/cmdline_action.cc:563 +#: src/cmdline/cmdline_action.cc:571 #, c-format msgid "" "Couldn't find package \"%s\". However, the following\n" @@ -722,12 +722,12 @@ "无法找到软件包“%s”。然而下列软件包名称中\n" "包含“%s”。\n" -#: src/cmdline/cmdline_action.cc:585 +#: src/cmdline/cmdline_action.cc:593 #, c-format msgid "Couldn't find any package whose name or description matched \"%s\"\n" msgstr "无法找到任何名称或者描述中匹配“%s”的软件包\n" -#: src/cmdline/cmdline_action.cc:587 +#: src/cmdline/cmdline_action.cc:586 #, c-format msgid "" "Couldn't find any package matching \"%s\", and more than 40\n" @@ -736,7 +736,7 @@ "无法找到任何软件包匹配“%s”，同时有超过40个软件包\n" "其描述中包含“%s”。\n" -#: src/cmdline/cmdline_action.cc:590 +#: src/cmdline/cmdline_action.cc:600 #, c-format msgid "" "Couldn't find any package matching \"%s\". However, the following\n" @@ -745,78 +745,78 @@ "无法找到任何软件包匹配“%s”。然而下列软件包的描述中\n" "包含“%s”：\n" -#: src/cmdline/cmdline_action.cc:732 +#: src/cmdline/cmdline_action.cc:742 #, c-format msgid "Bad action character '%c'\n" msgstr "非法的动作字符“%c”\n" -#: src/cmdline/cmdline_changelog.cc:134 -#: src/cmdline/cmdline_download_progress_display.cc:131 +#: src/cmdline/cmdline_changelog.cc:131 +#: src/cmdline/cmdline_download_progress_display.cc:138 msgid "Get:" msgstr "读取：" #. TRANSLATORS: this stands for "error" and should be the #. same width as the translation of "Ign". -#: src/cmdline/cmdline_changelog.cc:144 -#: src/cmdline/cmdline_download_progress_display.cc:185 +#: src/cmdline/cmdline_changelog.cc:141 +#: src/cmdline/cmdline_download_progress_display.cc:192 msgid "Err" msgstr "错误" -#: src/cmdline/cmdline_changelog.cc:177 +#: src/cmdline/cmdline_changelog.cc:174 #, c-format msgid "Changelog download failed: %s" msgstr "变更日志下载失败：%s" -#: src/cmdline/cmdline_changelog.cc:296 +#: src/cmdline/cmdline_changelog.cc:293 msgid "Can't execute sensible-pager, is this a working Debian system?" msgstr "无法执行 sensible-pager，这是一个正常运行的 Debian 系统吗？" -#: src/cmdline/cmdline_changelog.cc:347 +#: src/cmdline/cmdline_changelog.cc:344 #, c-format msgid "%s is not an official Debian package, cannot display its changelog." msgstr "%s 不是官方 Debian 软件包，无法显示其变更日志。" -#: src/cmdline/cmdline_changelog.cc:408 +#: src/cmdline/cmdline_changelog.cc:405 #, c-format msgid "Couldn't find a changelog for %s" msgstr "无法找到 %s 的变更日志" -#: src/cmdline/cmdline_changelog.cc:412 +#: src/cmdline/cmdline_changelog.cc:409 #, c-format msgid "Couldn't run pager %s" msgstr "" -#: src/cmdline/cmdline_clean.cc:60 +#: src/cmdline/cmdline_clean.cc:62 #, c-format msgid "E: The clean command takes no arguments\n" msgstr "E: clean 命令不接受任何参数\n" -#: src/cmdline/cmdline_clean.cc:66 +#: src/cmdline/cmdline_clean.cc:68 #, c-format msgid "Del %s* %spartial/*\n" msgstr "删除 %s* %s 部分 /*\n" -#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146 -#: src/ui.cc:1788 src/ui.cc:1876 +#: src/cmdline/cmdline_clean.cc:78 src/cmdline/cmdline_clean.cc:149 +#: src/ui.cc:1811 src/ui.cc:1899 msgid "Unable to lock the download directory" msgstr "" -#: src/cmdline/cmdline_clean.cc:106 +#: src/cmdline/cmdline_clean.cc:108 #, c-format msgid "Del %s %s [%sB]\n" msgstr "删除 %s %s [%sB]\n" -#: src/cmdline/cmdline_clean.cc:134 +#: src/cmdline/cmdline_clean.cc:137 #, c-format msgid "E: The autoclean command takes no arguments\n" msgstr "E: autoclean 命令不接受任何参数\n" -#: src/cmdline/cmdline_clean.cc:172 +#: src/cmdline/cmdline_clean.cc:175 #, c-format msgid "Would free %sB of disk space\n" msgstr "将释放 %sB 磁盘空间\n" -#: src/cmdline/cmdline_clean.cc:175 +#: src/cmdline/cmdline_clean.cc:178 #, c-format msgid "Freed %sB of disk space\n" msgstr "已释放 %sB 磁盘空间\n" @@ -836,8 +836,8 @@ "Unable to safely resolve dependencies, try running with --full-resolver.\n" msgstr "无法安全解决依赖关系，请尝试使用 --full-resolver 来运行。\n" -#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1223 +#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:59 +#: src/main.cc:1267 #, c-format msgid "Abort.\n" msgstr "放弃。\n" @@ -864,58 +864,58 @@ "package?" msgstr "%s 版本 %s 没有可下载的文件；也许它是一个本地软件包或者过期的软件包？" -#: src/cmdline/cmdline_download_progress_display.cc:154 +#: src/cmdline/cmdline_download_progress_display.cc:161 msgid "Hit" msgstr "命中" #. TRANSLATORS: this stands for "ignored" and should be #. the same width as the translation of "Err". -#: src/cmdline/cmdline_download_progress_display.cc:181 +#: src/cmdline/cmdline_download_progress_display.cc:188 msgid "Ign" msgstr "忽略" -#: src/cmdline/cmdline_download_progress_display.cc:211 +#: src/cmdline/cmdline_download_progress_display.cc:218 #, c-format msgid "Fetched %sB in %s (%sB/s)" msgstr "已下载 %sB，耗时 %s (%sB/s)" -#: src/cmdline/cmdline_download_progress_display.cc:230 +#: src/cmdline/cmdline_download_progress_display.cc:237 #, c-format msgid "" "Media change: Please insert the disc labeled '%s' into the drive '%s' and " "press [Enter]." msgstr "更换介质：请将标签为“%s”的磁盘插入驱动器“%s”并按[回车(Enter)]。" -#: src/cmdline/cmdline_download_progress_display.cc:436 +#: src/cmdline/cmdline_download_progress_display.cc:491 msgid "[Working]" msgstr "[正在工作]" -#: src/cmdline/cmdline_extract_cache_subset.cc:57 +#: src/cmdline/cmdline_extract_cache_subset.cc:58 #, c-format msgid "" "extract-cache-entries: at least one argument is required (the directory\n" "to which to write files).\n" msgstr "提取缓冲条目：需要至少一个参数(需要写入文件的目录)\n" -#: src/cmdline/cmdline_extract_cache_subset.cc:93 -#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131 -#: src/cmdline/cmdline_versions.cc:295 +#: src/cmdline/cmdline_extract_cache_subset.cc:94 +#: src/cmdline/cmdline_resolver.cc:356 src/cmdline/cmdline_user_tag.cc:132 +#: src/cmdline/cmdline_versions.cc:312 #, c-format msgid "No such package \"%s\"" msgstr "没有这个软件包“%s”" -#: src/cmdline/cmdline_extract_cache_subset.cc:133 +#: src/cmdline/cmdline_extract_cache_subset.cc:134 #, c-format msgid "" "No packages were selected by the given search pattern; nothing to do.\n" msgstr "所给的搜索模式未找到软件包；无事可做。\n" -#: src/cmdline/cmdline_forget_new.cc:56 +#: src/cmdline/cmdline_forget_new.cc:58 #, c-format msgid "E: The forget-new command takes no arguments\n" msgstr "E：forget-new 命令不接受任何参数\n" -#: src/cmdline/cmdline_forget_new.cc:83 +#: src/cmdline/cmdline_forget_new.cc:85 #, c-format msgid "Would forget what packages are new\n" msgstr "将忘记哪些软件包是新的\n" @@ -956,13 +956,13 @@ msgid "What is it? It's an elephant being eaten by a snake, of course.\n" msgstr "这是什么？当然是一只大象被一条蛇吞了。\n" -#: src/cmdline/cmdline_progress_display.cc:168 src/gtk/download.cc:204 +#: src/cmdline/cmdline_progress_display.cc:165 src/gtk/download.cc:204 msgid "Done" msgstr "完成" #. TRANSLATORS: the string replacing "DONE" #. be truncated or padded to 4 characters. -#: src/cmdline/cmdline_progress_display.cc:173 +#: src/cmdline/cmdline_progress_display.cc:170 msgid "DONE" msgstr "完成" @@ -1022,17 +1022,17 @@ msgid "The following partially installed packages will be configured:" msgstr "下列仅部分安装的软件包将被配置：" -#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1575 +#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1598 #, c-format msgid "The following ESSENTIAL packages will be REMOVED!\n" msgstr "下列“基本”软件包将被“删除”！\n" -#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1590 +#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1613 #, c-format msgid "The following ESSENTIAL packages will be BROKEN by this action:\n" msgstr "该动作将使下列“基本”软件包“破损”：\n" -#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1603 +#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1626 #, c-format msgid "" "WARNING: Performing this action will probably cause your system to break!\n" @@ -1045,7 +1045,7 @@ msgid "I am aware that this is a very bad idea" msgstr "我知道这是一个非常糟糕的主意" -#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1604 +#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1627 #, c-format msgid "To continue, type the phrase \"%s\":\n" msgstr "要继续的话，键入词组“%s”：\n" @@ -1116,181 +1116,181 @@ msgid "Unrecognized input. Enter either \"%s\" or \"%s\".\n" msgstr "未被识别的输入。请键入“%s”或“%s”。\n" -#: src/cmdline/cmdline_prompt.cc:707 +#: src/cmdline/cmdline_prompt.cc:705 #, c-format msgid "The following packages are RECOMMENDED but will NOT be installed:\n" msgstr "下列软件包被“推荐”安装但是将“不会”被安装：\n" -#: src/cmdline/cmdline_prompt.cc:713 +#: src/cmdline/cmdline_prompt.cc:711 #, c-format msgid "The following packages are SUGGESTED but will NOT be installed:\n" msgstr "下列软件包被“建议”安装但是将“不会”被安装：\n" -#: src/cmdline/cmdline_prompt.cc:719 +#: src/cmdline/cmdline_prompt.cc:717 #, c-format msgid "No packages will be installed, upgraded, or removed.\n" msgstr "将不会安装，升级或者删除任何软件包。\n" -#: src/cmdline/cmdline_prompt.cc:721 +#: src/cmdline/cmdline_prompt.cc:719 #, c-format msgid "%lu packages upgraded, %lu newly installed, " msgstr "%lu 个软件包被升级，新安装 %lu 个， " -#: src/cmdline/cmdline_prompt.cc:725 +#: src/cmdline/cmdline_prompt.cc:723 #, c-format msgid "%lu reinstalled, " msgstr "%lu 个被重新安装， " -#: src/cmdline/cmdline_prompt.cc:727 +#: src/cmdline/cmdline_prompt.cc:725 #, c-format msgid "%lu downgraded, " msgstr "%lu 个被降级， " -#: src/cmdline/cmdline_prompt.cc:729 +#: src/cmdline/cmdline_prompt.cc:727 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu 个将被删除， 同时 %lu 个将不升级。\n" -#: src/cmdline/cmdline_prompt.cc:736 +#: src/cmdline/cmdline_prompt.cc:734 #, c-format msgid "Need to get %sB/%sB of archives. " msgstr "需要获取 %sB/%sB 的存档。 " -#: src/cmdline/cmdline_prompt.cc:739 +#: src/cmdline/cmdline_prompt.cc:737 #, c-format msgid "Need to get %sB of archives. " msgstr "需要获取 %sB 的存档。 " -#: src/cmdline/cmdline_prompt.cc:746 +#: src/cmdline/cmdline_prompt.cc:744 #, c-format msgid "After unpacking %sB will be used.\n" msgstr "解包后将要使用 %sB。\n" -#: src/cmdline/cmdline_prompt.cc:749 +#: src/cmdline/cmdline_prompt.cc:747 #, c-format msgid "After unpacking %sB will be freed.\n" msgstr "解包后将释放 %sB。\n" -#: src/cmdline/cmdline_prompt.cc:771 +#: src/cmdline/cmdline_prompt.cc:769 #, c-format msgid "" "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "无可显示的软件包 -- 请在“i”之后的那一行输入软件包名称。\n" -#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792 -#: src/pkg_item.cc:411 src/ui.cc:1220 +#: src/cmdline/cmdline_prompt.cc:775 src/cmdline/cmdline_prompt.cc:790 +#: src/pkg_item.cc:407 src/ui.cc:1243 msgid "Press Return to continue." msgstr "按回车继续。" -#: src/cmdline/cmdline_prompt.cc:788 +#: src/cmdline/cmdline_prompt.cc:786 #, c-format msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "未发现软件包 -- 请在“c”之后的那一行输入软件包名称。\n" -#: src/cmdline/cmdline_prompt.cc:803 +#: src/cmdline/cmdline_prompt.cc:801 #, c-format msgid "" "No packages found -- enter zero or more roots of the search followed by the " "package to justify.\n" msgstr "未发现软件包 -- 请输入0个或多个搜索内容再接着输入要搜索的软件包。\n" -#: src/cmdline/cmdline_prompt.cc:836 +#: src/cmdline/cmdline_prompt.cc:834 #, c-format msgid "y: %F" msgstr "y: %F" -#: src/cmdline/cmdline_prompt.cc:838 +#: src/cmdline/cmdline_prompt.cc:836 msgid "continue with the installation" msgstr "继续安装" -#: src/cmdline/cmdline_prompt.cc:840 +#: src/cmdline/cmdline_prompt.cc:838 #, c-format msgid "n: %F" msgstr "n: %F" -#: src/cmdline/cmdline_prompt.cc:842 +#: src/cmdline/cmdline_prompt.cc:840 msgid "abort and quit" msgstr "放弃并退出" -#: src/cmdline/cmdline_prompt.cc:844 +#: src/cmdline/cmdline_prompt.cc:842 #, c-format msgid "i: %F" msgstr "i: %F" -#: src/cmdline/cmdline_prompt.cc:846 +#: src/cmdline/cmdline_prompt.cc:844 msgid "" "show information about one or more packages; the package names should follow " "the 'i'" msgstr "显示一个或者多个软件包的信息；软件包的名字将在字符“i”之后。" -#: src/cmdline/cmdline_prompt.cc:848 +#: src/cmdline/cmdline_prompt.cc:846 #, c-format msgid "c: %F" msgstr "c: %F" -#: src/cmdline/cmdline_prompt.cc:850 +#: src/cmdline/cmdline_prompt.cc:848 msgid "" "show the Debian changelogs of one or more packages; the package names should " "follow the 'c'" msgstr "显示一个或者多个软件包的变更记录；软件包的名字将在字符“c”之后。" -#: src/cmdline/cmdline_prompt.cc:852 +#: src/cmdline/cmdline_prompt.cc:850 #, c-format msgid "d: %F" msgstr "d: %F" -#: src/cmdline/cmdline_prompt.cc:854 +#: src/cmdline/cmdline_prompt.cc:852 msgid "toggle the display of dependency information" msgstr "切换是否显示依赖关系信息" -#: src/cmdline/cmdline_prompt.cc:856 +#: src/cmdline/cmdline_prompt.cc:854 #, c-format msgid "s: %F" msgstr "s: %F" -#: src/cmdline/cmdline_prompt.cc:858 +#: src/cmdline/cmdline_prompt.cc:856 msgid "toggle the display of changes in package sizes" msgstr "切换是否显示软件包的大小" -#: src/cmdline/cmdline_prompt.cc:860 +#: src/cmdline/cmdline_prompt.cc:858 #, c-format msgid "v: %F" msgstr "v: %F" -#: src/cmdline/cmdline_prompt.cc:862 +#: src/cmdline/cmdline_prompt.cc:860 msgid "toggle the display of version numbers" msgstr "切换是否显示版本号" -#: src/cmdline/cmdline_prompt.cc:864 +#: src/cmdline/cmdline_prompt.cc:862 #, c-format msgid "w: %F" msgstr "w: %F" -#: src/cmdline/cmdline_prompt.cc:866 +#: src/cmdline/cmdline_prompt.cc:864 msgid "" "try to find a reason for installing a single package, or explain why " "installing one package should lead to installing another package." msgstr "尝试寻找安装某个软件包的理由，或解释为什么安装一个软件包会导致安装另一个软件包。" -#: src/cmdline/cmdline_prompt.cc:869 +#: src/cmdline/cmdline_prompt.cc:867 #, c-format msgid "r: %F" msgstr "r: %F" -#: src/cmdline/cmdline_prompt.cc:871 +#: src/cmdline/cmdline_prompt.cc:869 msgid "run the automatic dependency resolver to fix the broken dependencies." msgstr "运行自动依赖解决器来修正被破坏的依赖关系。" -#: src/cmdline/cmdline_prompt.cc:873 +#: src/cmdline/cmdline_prompt.cc:871 #, c-format msgid "e: %F" msgstr "e: %F" -#: src/cmdline/cmdline_prompt.cc:875 +#: src/cmdline/cmdline_prompt.cc:873 msgid "enter the full visual interface" msgstr "进入全可视化界面" -#: src/cmdline/cmdline_prompt.cc:878 +#: src/cmdline/cmdline_prompt.cc:876 msgid "" "You may also specify modification to the actions which will be taken. To do " "so, type an action character followed by one or more package names (or " @@ -1300,45 +1300,45 @@ "您也可以对将要实施的动作进行修改。方法是，输入一个动作字符后输入一个或者多个软件包的名称(或者模式)。该动作将被实施到您所选择的全部软件包。下列动作可供选" "择：" -#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267 +#: src/cmdline/cmdline_prompt.cc:883 src/cmdline/cmdline_resolver.cc:262 msgid "'+' to install packages" msgstr "按'+'键来安装软件包" -#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269 +#: src/cmdline/cmdline_prompt.cc:886 src/cmdline/cmdline_resolver.cc:264 msgid "" "'+M' to install packages and immediately flag them as automatically installed" msgstr "按 '+M' 安装软件包并且立即将它们标记为已安装状态" -#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271 +#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:266 msgid "'-' to remove packages" msgstr "按 '-' 卸载软件包" -#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273 +#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:268 msgid "'_' to purge packages" msgstr "按 '_' 清除软件包" -#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275 +#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:270 msgid "'=' to place packages on hold" msgstr "按 '=' 将软件包置于保持状态" -#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277 +#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:272 msgid "" "':' to keep packages in their current state without placing them on hold" msgstr "按 ':' 将维持软件包当前状态但是并不将其置于保持状态" -#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279 +#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:274 msgid "'&M' to mark packages as automatically installed" msgstr "按 '&M' 将软件包标记为自动安装" -#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281 +#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:276 msgid "'&m' to mark packages as manually installed" msgstr "按 'm' 将软件包标记为手动安装" -#: src/cmdline/cmdline_prompt.cc:902 +#: src/cmdline/cmdline_prompt.cc:900 msgid "'&BD' to install the build-dependencies of a package." msgstr "'&BD' 以安装软件包的编译依赖。" -#: src/cmdline/cmdline_prompt.cc:905 +#: src/cmdline/cmdline_prompt.cc:903 msgid "" "In the list of actions to be performed, some packages will be followed by " "one or more characters enclosed in braces; for instance: \"aptitude{u}\". " @@ -1348,52 +1348,52 @@ "在要执行的动作列表中，一些包后边将有包含在括号中的一个或多个字符；例如 " "\"aptitude{u}\"。这些字符提供关于包状态的额外信息，并且可能包含如下的任意组合：" -#: src/cmdline/cmdline_prompt.cc:909 +#: src/cmdline/cmdline_prompt.cc:907 msgid "'a': the package was automatically installed or removed." msgstr "'a'：此软件包是自动安装或删除的。" -#: src/cmdline/cmdline_prompt.cc:911 +#: src/cmdline/cmdline_prompt.cc:909 msgid "" "'b': some of the package's dependencies are violated by the proposed changes." msgstr "'b'：包的一些依赖被建议的更改破坏。" -#: src/cmdline/cmdline_prompt.cc:913 +#: src/cmdline/cmdline_prompt.cc:911 msgid "'p': the package will be purged in addition to being removed." msgstr "'p'：此包在删除时也同时清除配置文件。" -#: src/cmdline/cmdline_prompt.cc:915 +#: src/cmdline/cmdline_prompt.cc:913 msgid "'u': the package is being removed because it is unused." msgstr "'u'：此包将被删除，因为其未被使用。" -#: src/cmdline/cmdline_prompt.cc:920 +#: src/cmdline/cmdline_prompt.cc:918 msgid "Commands:" msgstr "命令：" -#: src/cmdline/cmdline_prompt.cc:1036 +#: src/cmdline/cmdline_prompt.cc:1034 msgid "" "aptitude failed to find a solution to these dependencies. You can solve " "them yourself by hand or type 'n' to quit." msgstr "aptitude 未能找到这些依赖的解决方法。您可以自己手动解决或输入“n”来退出。" -#: src/cmdline/cmdline_prompt.cc:1055 +#: src/cmdline/cmdline_prompt.cc:1053 msgid "Do you want to continue? [Y/n/?] " msgstr "您要继续吗？[Y/n/?] " -#: src/cmdline/cmdline_prompt.cc:1056 +#: src/cmdline/cmdline_prompt.cc:1054 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] " msgstr "手动解决这些依赖吗？ [N/+/-/_/:/?] " -#: src/cmdline/cmdline_prompt.cc:1074 +#: src/cmdline/cmdline_prompt.cc:1072 msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "非法响应。请输入一个合法命令或者“?”请求帮助。\n" -#: src/cmdline/cmdline_prompt.cc:1080 +#: src/cmdline/cmdline_prompt.cc:1078 msgid "" "Enter a package management command (such as '+ package' to install a " "package), 'R' to attempt automatic dependency resolution or 'N' to abort." msgstr "输入一个软件包管理命令(例如‘+ 软件包’来安装某个软件包)，‘R’ 来试图自动解决依赖关系或 ‘N’ 来中止。" -#: src/cmdline/cmdline_prompt.cc:1112 +#: src/cmdline/cmdline_prompt.cc:1110 #, c-format msgid "" "\n" @@ -1404,7 +1404,7 @@ "将显示依赖关系信息。\n" "\n" -#: src/cmdline/cmdline_prompt.cc:1114 +#: src/cmdline/cmdline_prompt.cc:1112 #, c-format msgid "" "\n" @@ -1415,7 +1415,7 @@ "将不显示依赖关系信息。\n" "\n" -#: src/cmdline/cmdline_prompt.cc:1120 +#: src/cmdline/cmdline_prompt.cc:1118 #, c-format msgid "" "\n" @@ -1426,7 +1426,7 @@ "将显示版本号。\n" "\n" -#: src/cmdline/cmdline_prompt.cc:1122 +#: src/cmdline/cmdline_prompt.cc:1120 #, c-format msgid "" "\n" @@ -1437,7 +1437,7 @@ "将不显示版本号。\n" "\n" -#: src/cmdline/cmdline_prompt.cc:1127 +#: src/cmdline/cmdline_prompt.cc:1125 #, c-format msgid "" "\n" @@ -1448,7 +1448,7 @@ "尺寸变化将被显示。\n" "\n" -#: src/cmdline/cmdline_prompt.cc:1129 +#: src/cmdline/cmdline_prompt.cc:1127 #, c-format msgid "" "\n" @@ -1459,184 +1459,184 @@ "尺寸变化将不被显示。\n" "\n" -#: src/cmdline/cmdline_resolver.cc:149 src/cmdline/cmdline_resolver.cc:1002 -#: src/generic/apt/apt.cc:289 +#: src/cmdline/cmdline_resolver.cc:144 src/cmdline/cmdline_resolver.cc:997 +#: src/generic/apt/apt.cc:269 #, c-format msgid "Unable to open %s for writing" msgstr "无法打开 %s 以写入" -#: src/cmdline/cmdline_resolver.cc:155 src/cmdline/cmdline_resolver.cc:1007 +#: src/cmdline/cmdline_resolver.cc:150 src/cmdline/cmdline_resolver.cc:1002 #, c-format msgid "Error writing resolver state to %s" msgstr "将依赖关系解决状态写入文件 %s 时发生错误" -#: src/cmdline/cmdline_resolver.cc:157 src/cmdline/cmdline_resolver.cc:1009 +#: src/cmdline/cmdline_resolver.cc:152 src/cmdline/cmdline_resolver.cc:1004 msgid "Resolver state successfully written!" msgstr "成功写入依赖关系解决状态！" -#: src/cmdline/cmdline_resolver.cc:222 +#: src/cmdline/cmdline_resolver.cc:217 #, c-format msgid "" "y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n: %F%n pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" -#: src/cmdline/cmdline_resolver.cc:243 +#: src/cmdline/cmdline_resolver.cc:238 msgid "accept the proposed changes" msgstr "接受所建议的变动" -#: src/cmdline/cmdline_resolver.cc:245 +#: src/cmdline/cmdline_resolver.cc:240 msgid "reject the proposed changes and search for another solution" msgstr "拒绝所建议的变动并寻找另一个解决方案" -#: src/cmdline/cmdline_resolver.cc:247 +#: src/cmdline/cmdline_resolver.cc:242 msgid "give up and quit the program" msgstr "放弃并退出此程序" -#: src/cmdline/cmdline_resolver.cc:249 +#: src/cmdline/cmdline_resolver.cc:244 msgid "move to the next solution" msgstr "到下一个解决方案" -#: src/cmdline/cmdline_resolver.cc:251 +#: src/cmdline/cmdline_resolver.cc:246 msgid "move to the previous solution" msgstr "到上一个解决方案" -#: src/cmdline/cmdline_resolver.cc:253 +#: src/cmdline/cmdline_resolver.cc:248 msgid "" "toggle between the contents of the solution and an explanation of the " "solution" msgstr "在解决方案内容和解决方案解释之间切换" -#: src/cmdline/cmdline_resolver.cc:255 +#: src/cmdline/cmdline_resolver.cc:250 msgid "examine the solution in the visual user interface" msgstr "检查可视用户界面中的设置方案" -#: src/cmdline/cmdline_resolver.cc:257 +#: src/cmdline/cmdline_resolver.cc:252 msgid "" "abort automatic dependency resolution; resolve dependencies by hand instead" msgstr "终止自动依赖解决关系；请手动解决依赖关系。" -#: src/cmdline/cmdline_resolver.cc:259 +#: src/cmdline/cmdline_resolver.cc:254 msgid "" "reject the given package versions; don't display any solutions in which they " "occur. Enter UNINST instead of a version to reject removing the package. " "ID is the integer printed to the left of the action." msgstr "拒绝给定的软件包版本；不显示任何包括它们的解决方案。请输入 UNINST 而不是版本以拒绝移除此软件包。ID 是在动作左边显示的整数。" -#: src/cmdline/cmdline_resolver.cc:261 +#: src/cmdline/cmdline_resolver.cc:256 msgid "" "accept the given package versions; display only solutions in which they " "occur. Enter UNINST instead of a version to accept removing the package. " "ID is the integer printed to the left of the action." msgstr "接受给定的软件包版本;仅显示包括它们的解决方案。请输入 UNINST 而不是版本以接受移除软件包。ID 是在动作左边显示的整数。" -#: src/cmdline/cmdline_resolver.cc:263 +#: src/cmdline/cmdline_resolver.cc:258 msgid "" "display information about the action labeled ID from the solution. The " "label is the integer printed to the left of the action." msgstr "显示关于带有从解决方案中标签 ID 的动作的信息。此标签是显示在动作左侧的整数。" -#: src/cmdline/cmdline_resolver.cc:265 +#: src/cmdline/cmdline_resolver.cc:260 msgid "adjust the state of the listed packages, where ACTION is one of:" msgstr "修改所列软件包的状态，这里“动作”为下列项之一：" -#: src/cmdline/cmdline_resolver.cc:283 +#: src/cmdline/cmdline_resolver.cc:278 msgid "" "Adjustments will cause the current solution to be discarded and recalculated " "as necessary." msgstr "修改将导致当前解决方案被放弃或者必须重新计算。" -#: src/cmdline/cmdline_resolver.cc:298 +#: src/cmdline/cmdline_resolver.cc:293 #, c-format msgid "The version %s is available in the following archives:" msgstr "在下列存档中版本 %s 已经可用了:" -#: src/cmdline/cmdline_resolver.cc:306 +#: src/cmdline/cmdline_resolver.cc:301 #, c-format msgid "Select the version of %s that should be used: " msgstr "选择要被使用的 %s 的版本号： " -#: src/cmdline/cmdline_resolver.cc:313 +#: src/cmdline/cmdline_resolver.cc:308 #, c-format msgid "Invalid response. Please enter an integer between 1 and %d." msgstr "无效响应。请输入 1 到 %d 之间的一个整数。" -#: src/cmdline/cmdline_resolver.cc:329 +#: src/cmdline/cmdline_resolver.cc:324 #, c-format msgid "Expected at least one package/version pair following '%c'" msgstr "在“%c”后需要至少一个软件包/版本对" -#: src/cmdline/cmdline_resolver.cc:351 +#: src/cmdline/cmdline_resolver.cc:346 #, c-format msgid "Expected a version or \"%s\" after \"%s\"" msgstr "预期在“%2$s”之后得到版本或“%1$s”" -#: src/cmdline/cmdline_resolver.cc:377 +#: src/cmdline/cmdline_resolver.cc:372 #, c-format msgid "%s has no version named \"%s\"" msgstr "%s 没有名字叫“%s”的版本" -#: src/cmdline/cmdline_resolver.cc:403 +#: src/cmdline/cmdline_resolver.cc:398 #, c-format msgid "Allowing the removal of %s" msgstr "同意删除 %s" -#: src/cmdline/cmdline_resolver.cc:406 +#: src/cmdline/cmdline_resolver.cc:401 #, c-format msgid "Allowing the installation of %s version %s (%s)" msgstr "同意安装 %s 的 %s 版本(%s)" -#: src/cmdline/cmdline_resolver.cc:416 +#: src/cmdline/cmdline_resolver.cc:411 #, c-format msgid "Rejecting the removal of %s" msgstr "放弃删除 %s" -#: src/cmdline/cmdline_resolver.cc:419 +#: src/cmdline/cmdline_resolver.cc:414 #, c-format msgid "Rejecting the installation of %s version %s (%s)" msgstr "放弃安装 %s 的 %s 版本(%s)" -#: src/cmdline/cmdline_resolver.cc:432 +#: src/cmdline/cmdline_resolver.cc:427 #, c-format msgid "No longer requiring the removal of %s" msgstr "不再要求删除 %s" -#: src/cmdline/cmdline_resolver.cc:435 +#: src/cmdline/cmdline_resolver.cc:430 #, c-format msgid "No longer requiring the installation of %s version %s (%s)" msgstr "不再要求安装 %s 的 %s 版本(%s)" -#: src/cmdline/cmdline_resolver.cc:444 +#: src/cmdline/cmdline_resolver.cc:439 #, c-format msgid "Requiring the removal of %s" msgstr "要求删除 %s" -#: src/cmdline/cmdline_resolver.cc:447 +#: src/cmdline/cmdline_resolver.cc:442 #, c-format msgid "Requiring the installation of %s version %s (%s)" msgstr "要求安装 %s 的 %s 版本(%s)" -#: src/cmdline/cmdline_resolver.cc:496 +#: src/cmdline/cmdline_resolver.cc:491 #, c-format msgid "Allowing this recommendation to be ignored: %s" msgstr "允许忽略这些推荐的软件包：%s" -#: src/cmdline/cmdline_resolver.cc:502 +#: src/cmdline/cmdline_resolver.cc:497 #, c-format msgid "Always obeying this recommendation: %s" msgstr "总是遵守此推荐：%s" -#: src/cmdline/cmdline_resolver.cc:511 +#: src/cmdline/cmdline_resolver.cc:506 #, c-format msgid "No longer ignoring this recommendation: %s" msgstr "不再忽略这些推荐：%s" -#: src/cmdline/cmdline_resolver.cc:517 +#: src/cmdline/cmdline_resolver.cc:512 #, c-format msgid "Ignoring this recommendation: %s" msgstr "忽略这些推荐结果：%s" -#: src/cmdline/cmdline_resolver.cc:576 +#: src/cmdline/cmdline_resolver.cc:571 #, c-format msgid "Action \"%s\"" msgstr "动作“%s”" @@ -1644,17 +1644,17 @@ #. TRANSLATORS: the substitution is #. replaced in English with something #. like "Pkg1 depends upon Pkg2". -#: src/cmdline/cmdline_resolver.cc:589 +#: src/cmdline/cmdline_resolver.cc:584 #, c-format msgid "This action was selected because %ls." msgstr "选中了此动作，因为%ls。" -#: src/cmdline/cmdline_resolver.cc:591 +#: src/cmdline/cmdline_resolver.cc:586 msgid "" "This action is currently rejected; it will not appear in new solutions." msgstr "此动作当前已被拒绝；其不会出现在新解决方案中。" -#: src/cmdline/cmdline_resolver.cc:592 +#: src/cmdline/cmdline_resolver.cc:587 msgid "" "This action is currently approved; it will be selected whenever possible." msgstr "此动作当前被认可；只要可能其就会被选择。" @@ -1664,7 +1664,7 @@ #. translated since the commands in #. aptitude's internal command-line #. aren't translated. -#: src/cmdline/cmdline_resolver.cc:599 +#: src/cmdline/cmdline_resolver.cc:594 #, c-format msgid "Enter \"r %s\" to allow this action to appear in new solutions." msgstr "输入 \"r %s\" 以让此动作出现在新解决方案中。" @@ -1674,7 +1674,7 @@ #. translated since the commands in #. aptitude's internal command-line #. aren't translated. -#: src/cmdline/cmdline_resolver.cc:605 +#: src/cmdline/cmdline_resolver.cc:600 #, c-format msgid "" "Enter \"r %s\" to prevent this action from appearing in new solutions." @@ -1685,7 +1685,7 @@ #. translated since the commands in #. aptitude's internal command-line #. aren't translated. -#: src/cmdline/cmdline_resolver.cc:611 +#: src/cmdline/cmdline_resolver.cc:606 #, c-format msgid "" "Enter \"a %s\" to cease requiring that new solutions include this action if " @@ -1697,18 +1697,18 @@ #. translated since the commands in #. aptitude's internal command-line #. aren't translated. -#: src/cmdline/cmdline_resolver.cc:617 +#: src/cmdline/cmdline_resolver.cc:612 #, c-format msgid "" "Enter \"a %s\" to require that new solutions include this action if possible." msgstr "输入 \"a %s\" 要求新解决方案可能时包含此动作。" -#: src/cmdline/cmdline_resolver.cc:790 +#: src/cmdline/cmdline_resolver.cc:785 #, c-format msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd" msgstr "打开：%zd；关闭；%zd；defer: %zd; 冲突；%zd" -#: src/cmdline/cmdline_resolver.cc:814 +#: src/cmdline/cmdline_resolver.cc:809 #, c-format msgid "" "Would resolve dependencies, but dependency resolution is disabled.\n" @@ -1717,64 +1717,64 @@ "需要解决依赖关系，但依赖关系解决被禁用。\n" " (%s::ProblemResolver::StepLimit = 0)\n" -#: src/cmdline/cmdline_resolver.cc:823 +#: src/cmdline/cmdline_resolver.cc:818 msgid "" "I want to resolve dependencies, but no dependency resolver was created." msgstr "我想解决依赖关系，但没有创建依赖关系解决器" -#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 +#: src/cmdline/cmdline_resolver.cc:832 src/cmdline/cmdline_resolver.cc:1175 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "依赖关系分析中..." -#: src/cmdline/cmdline_resolver.cc:897 +#: src/cmdline/cmdline_resolver.cc:892 msgid "The following actions will resolve these dependencies:" msgstr "下列动作将解决这些依赖关系：" -#: src/cmdline/cmdline_resolver.cc:915 +#: src/cmdline/cmdline_resolver.cc:910 msgid "Accept this solution? [Y/n/q/?] " msgstr "是否接受该解决方案？[Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:942 src/cmdline/cmdline_resolver.cc:1077 +#: src/cmdline/cmdline_resolver.cc:937 src/cmdline/cmdline_resolver.cc:1072 msgid "Abandoning all efforts to resolve these dependencies." msgstr "放弃解决这些依赖关系的全部努力。" -#: src/cmdline/cmdline_resolver.cc:945 +#: src/cmdline/cmdline_resolver.cc:940 msgid "" "Abandoning automatic dependency resolution and reverting to manual " "resolution." msgstr "放弃自动依赖解决方案并恢复到手动解决方案。" -#: src/cmdline/cmdline_resolver.cc:978 +#: src/cmdline/cmdline_resolver.cc:973 msgid "The following commands are available:" msgstr "下列命令可选：" -#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2317 +#: src/cmdline/cmdline_resolver.cc:994 src/ui.cc:2340 msgid "File to write resolver state to: " msgstr "将依赖关系解决状态写入文件： " -#: src/cmdline/cmdline_resolver.cc:1031 +#: src/cmdline/cmdline_resolver.cc:1026 msgid "Invalid response; please enter one of the following commands:" msgstr "无效响应；请输入下列命令之一：" -#: src/cmdline/cmdline_resolver.cc:1051 +#: src/cmdline/cmdline_resolver.cc:1046 msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "在限定的时间内没能找到解决方案。加把劲再试试？[Y/n] " -#: src/cmdline/cmdline_resolver.cc:1080 +#: src/cmdline/cmdline_resolver.cc:1075 msgid "Invalid response; please enter 'y' or 'n'." msgstr "非法响应；请输入“y”或者“n”。" -#: src/cmdline/cmdline_resolver.cc:1089 +#: src/cmdline/cmdline_resolver.cc:1084 msgid "Unable to resolve dependencies! Giving up..." msgstr "未能解决依赖关系！放弃..." -#: src/cmdline/cmdline_resolver.cc:1095 +#: src/cmdline/cmdline_resolver.cc:1090 msgid "*** No more solutions available ***" msgstr "*** 没有更多的解决方案了 ***" -#: src/cmdline/cmdline_resolver.cc:1114 +#: src/cmdline/cmdline_resolver.cc:1109 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -1782,7 +1782,7 @@ "*** 错误：搜索因致命异常被中止。您可以继续搜索，\n" " 但无法找到某些解决方案。" -#: src/cmdline/cmdline_resolver.cc:1191 +#: src/cmdline/cmdline_resolver.cc:1186 #, c-format msgid "" "Unable to resolve dependencies for the upgrade because the resolver timed " @@ -1794,46 +1794,46 @@ " 你可能通过提高以下参数的值来解决此问题：\n" " Aptitude::ProblemResolver::StepLimit (当前为 %d)。" -#: src/cmdline/cmdline_resolver.cc:1201 +#: src/cmdline/cmdline_resolver.cc:1196 msgid "Unable to resolve dependencies for the upgrade: no solution found." msgstr "未能解决此升级的依赖关系：未找到解决方案。" -#: src/cmdline/cmdline_resolver.cc:1207 +#: src/cmdline/cmdline_resolver.cc:1202 #, c-format msgid "Unable to resolve dependencies for the upgrade: %s" msgstr "无法解决此更新的依赖关系：%s" -#: src/cmdline/cmdline_search.cc:199 src/cmdline/cmdline_versions.cc:567 +#: src/cmdline/cmdline_search.cc:204 src/cmdline/cmdline_versions.cc:590 #, c-format msgid "iconv of %s failed.\n" msgstr "用 iconv 转换 %s 失败。\n" -#: src/cmdline/cmdline_search.cc:216 +#: src/cmdline/cmdline_search.cc:221 #, c-format msgid "search: You must provide at least one search term\n" msgstr "查找：您必须提供至少一个查找项\n" -#: src/cmdline/cmdline_show_broken.cc:81 +#: src/cmdline/cmdline_show_broken.cc:36 #, c-format msgid "but %s is to be installed." msgstr "但是 %s 将被安装。" -#: src/cmdline/cmdline_show_broken.cc:84 +#: src/cmdline/cmdline_show_broken.cc:39 #, c-format msgid "but %s is installed and it is kept back." msgstr "但是 %s 已被安装并且被保持不升级。" -#: src/cmdline/cmdline_show_broken.cc:87 +#: src/cmdline/cmdline_show_broken.cc:42 #, c-format msgid "but %s is installed." msgstr "但是 %s 已安装。" -#: src/cmdline/cmdline_show_broken.cc:94 +#: src/cmdline/cmdline_show_broken.cc:49 #, c-format msgid "but it is not installable." msgstr "但它是不可安装的" -#: src/cmdline/cmdline_show_broken.cc:96 +#: src/cmdline/cmdline_show_broken.cc:51 #, c-format msgid "but it is not going to be installed." msgstr "但它将不会被安装。" @@ -1843,54 +1843,54 @@ msgid " which is a virtual package." msgstr " 这是一个虚拟软件包。" -#: src/cmdline/cmdline_show_broken.cc:104 +#: src/cmdline/cmdline_show_broken.cc:138 #, c-format msgid " or" msgstr " 或者" -#: src/cmdline/cmdline_show_broken.cc:127 +#: src/cmdline/cmdline_show_broken.cc:160 #, c-format msgid "The following packages have unmet dependencies:\n" msgstr "下列软件包存在未满足的依赖关系：\n" -#: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448 -#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192 -#: src/solution_fragment.cc:68 +#: src/cmdline/cmdline_show.cc:196 src/cmdline/cmdline_show.cc:448 +#: src/cmdline/cmdline_versions.cc:225 src/gtk/resolver.cc:1192 +#: src/solution_fragment.cc:64 msgid "" msgstr "" -#: src/cmdline/cmdline_show.cc:215 src/cmdline/cmdline_show.cc:220 +#: src/cmdline/cmdline_show.cc:217 src/cmdline/cmdline_show.cc:222 #: src/qt/widgets/packages_tab.cc:73 msgid "not installed" msgstr "未安装" -#: src/cmdline/cmdline_show.cc:222 src/pkg_columnizer.cc:250 -#: src/pkg_ver_item.cc:227 +#: src/cmdline/cmdline_show.cc:224 src/pkg_columnizer.cc:249 +#: src/pkg_ver_item.cc:228 msgid "unpacked" msgstr "未解包的" -#: src/cmdline/cmdline_show.cc:224 +#: src/cmdline/cmdline_show.cc:226 msgid "partially configured" msgstr "部分配置" -#: src/cmdline/cmdline_show.cc:226 +#: src/cmdline/cmdline_show.cc:228 msgid "partially installed" msgstr "部分安装" -#: src/cmdline/cmdline_show.cc:228 +#: src/cmdline/cmdline_show.cc:230 msgid "not installed (configuration files remain)" msgstr "未安装(配置文件保留)" -#: src/cmdline/cmdline_show.cc:231 +#: src/cmdline/cmdline_show.cc:232 msgid "awaiting trigger processing by other package(s)" msgstr "等待其他软件包触发处理" -#: src/cmdline/cmdline_show.cc:233 +#: src/cmdline/cmdline_show.cc:234 msgid "awaiting trigger processing" msgstr "等待触发处理" -#: src/cmdline/cmdline_show.cc:236 src/pkg_columnizer.cc:258 -#: src/pkg_ver_item.cc:235 src/qt/widgets/packages_tab.cc:72 +#: src/cmdline/cmdline_show.cc:236 src/pkg_columnizer.cc:257 +#: src/pkg_ver_item.cc:236 src/qt/widgets/packages_tab.cc:72 msgid "installed" msgstr "已安装" @@ -1957,7 +1957,7 @@ msgstr "软件包： " #: src/cmdline/cmdline_show.cc:378 src/cmdline/cmdline_show.cc:408 -#: src/pkg_columnizer.cc:92 +#: src/pkg_columnizer.cc:93 msgid "State" msgstr "状态" @@ -1965,12 +1965,12 @@ msgid "Provided by" msgstr "提供者：" -#: src/cmdline/cmdline_show.cc:402 src/pkg_info_screen.cc:120 +#: src/cmdline/cmdline_show.cc:402 src/pkg_info_screen.cc:118 msgid "Essential: " msgstr "基本的： " #: src/cmdline/cmdline_show.cc:402 src/cmdline/cmdline_show.cc:406 -#: src/cmdline/cmdline_show.cc:417 src/pkg_info_screen.cc:120 +#: src/cmdline/cmdline_show.cc:417 src/pkg_info_screen.cc:118 msgid "yes" msgstr "是" @@ -1990,7 +1990,7 @@ msgid "no" msgstr "否" -#: src/cmdline/cmdline_show.cc:421 src/pkg_info_screen.cc:125 +#: src/cmdline/cmdline_show.cc:421 src/pkg_info_screen.cc:123 msgid "Multi-Arch: " msgstr "" @@ -1999,7 +1999,7 @@ msgid "Version: " msgstr "版本号： " -#: src/cmdline/cmdline_show.cc:424 src/pkg_info_screen.cc:134 +#: src/cmdline/cmdline_show.cc:424 src/pkg_info_screen.cc:144 msgid "Priority: " msgstr "优先级： " @@ -2007,23 +2007,23 @@ msgid "N/A" msgstr "不可用" -#: src/cmdline/cmdline_show.cc:426 src/pkg_info_screen.cc:135 +#: src/cmdline/cmdline_show.cc:426 src/pkg_info_screen.cc:145 msgid "Section: " msgstr "部分： " -#: src/cmdline/cmdline_show.cc:428 src/pkg_info_screen.cc:136 +#: src/cmdline/cmdline_show.cc:428 src/pkg_info_screen.cc:146 msgid "Maintainer: " msgstr "维护者： " -#: src/cmdline/cmdline_show.cc:430 src/pkg_info_screen.cc:137 +#: src/cmdline/cmdline_show.cc:430 src/pkg_info_screen.cc:147 msgid "Architecture: " msgstr "体系： " -#: src/cmdline/cmdline_show.cc:433 src/pkg_info_screen.cc:139 +#: src/cmdline/cmdline_show.cc:433 src/pkg_info_screen.cc:149 msgid "Uncompressed Size: " msgstr "未压缩尺寸： " -#: src/cmdline/cmdline_show.cc:437 src/pkg_info_screen.cc:138 +#: src/cmdline/cmdline_show.cc:437 src/pkg_info_screen.cc:148 msgid "Compressed Size: " msgstr "压缩后尺寸： " @@ -2048,11 +2048,11 @@ msgid "PreDepends" msgstr "预依赖于" -#: src/cmdline/cmdline_show.cc:457 src/cmdline/cmdline_why.cc:299 +#: src/cmdline/cmdline_show.cc:457 src/cmdline/cmdline_why.cc:290 msgid "Recommends" msgstr "推荐" -#: src/cmdline/cmdline_show.cc:459 src/cmdline/cmdline_why.cc:302 +#: src/cmdline/cmdline_show.cc:459 src/cmdline/cmdline_why.cc:293 msgid "Suggests" msgstr "建议" @@ -2076,337 +2076,337 @@ msgid "Enhances" msgstr "" -#: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230 -#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205 +#: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:221 +#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:207 msgid "Provides" msgstr "提供" #: src/cmdline/cmdline_show.cc:475 src/gtk/entitysummary.cc:369 -#: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 +#: src/gtk/info.cc:714 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "描述： " -#: src/cmdline/cmdline_show.cc:481 src/pkg_info_screen.cc:107 -#: src/pkg_view.cc:259 +#: src/cmdline/cmdline_show.cc:480 src/pkg_info_screen.cc:106 +#: src/pkg_view.cc:257 msgid "Homepage: " msgstr "主页： " -#: src/cmdline/cmdline_show.cc:575 +#: src/cmdline/cmdline_show.cc:573 #, c-format msgid "Unable to locate package %s" msgstr "无法定位软件包 %s" -#: src/cmdline/cmdline_show.cc:596 +#: src/cmdline/cmdline_show.cc:594 #, c-format msgid "Unable to parse pattern %s" msgstr "无法分析模式 %s" -#: src/cmdline/cmdline_simulate.cc:66 +#: src/cmdline/cmdline_simulate.cc:65 #, c-format msgid "Would download/install/remove packages.\n" msgstr "将要下载/安装/卸载软件包。\n" -#: src/cmdline/cmdline_simulate.cc:77 +#: src/cmdline/cmdline_simulate.cc:76 msgid "Internal Error, Ordering didn't finish" msgstr "内部错误，排序未完成" -#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1712 src/ui.cc:1881 +#: src/cmdline/cmdline_update.cc:43 src/ui.cc:1735 src/ui.cc:1904 msgid "Deleting obsolete downloaded files" msgstr "删除过期的下载文件" -#: src/cmdline/cmdline_update.cc:55 +#: src/cmdline/cmdline_update.cc:54 #, c-format msgid "E: The update command takes no arguments\n" msgstr "E: update 命令不接受任何参数\n" -#: src/cmdline/cmdline_user_tag.cc:65 +#: src/cmdline/cmdline_user_tag.cc:66 #, c-format msgid "Adding user tag \"%s\" to the package \"%s\".\n" msgstr "添加用户标签“%s”到软件包“%s”。\n" -#: src/cmdline/cmdline_user_tag.cc:72 +#: src/cmdline/cmdline_user_tag.cc:73 #, c-format msgid "Removing user tag \"%s\" from the package \"%s\".\n" msgstr "将用户标签“%s”移除出软件包“%s”。\n" -#: src/cmdline/cmdline_user_tag.cc:104 +#: src/cmdline/cmdline_user_tag.cc:105 #, c-format msgid "%s: too few arguments; expected at least a tag name and a package.\n" msgstr "%s: 参数太少；期待至少一个标签名称和一个软件包名称。\n" -#: src/cmdline/cmdline_util.cc:167 +#: src/cmdline/cmdline_util.cc:166 #, c-format msgid "No candidate version found for %s\n" msgstr "未发现 %s 的候选版本\n" -#: src/cmdline/cmdline_util.cc:169 +#: src/cmdline/cmdline_util.cc:168 #, c-format msgid "No current or candidate version found for %s\n" msgstr "未发现 %s 的已安装或候选版本\n" -#: src/cmdline/cmdline_util.cc:193 +#: src/cmdline/cmdline_util.cc:192 #, c-format msgid "Unable to find an archive \"%s\" for the package \"%s\"\n" msgstr "无法找到存档“%s”，该存档用于软件包“%s”\n" -#: src/cmdline/cmdline_util.cc:203 +#: src/cmdline/cmdline_util.cc:202 #, c-format msgid "Unable to find a version \"%s\" for the package \"%s\"\n" msgstr "无法找到“%s”版本的软件包“%s”\n" -#: src/cmdline/cmdline_util.cc:209 +#: src/cmdline/cmdline_util.cc:208 #, c-format msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n" msgstr "内部错误：非法的数值 %i 被传递给 cmdline_find_ver！\n" -#: src/cmdline/cmdline_util.cc:239 +#: src/cmdline/cmdline_util.cc:238 #, c-format msgid "You cannot specify both an archive and a version for a package\n" msgstr "您不能为一个软件包同时指定存档和版本号\n" -#: src/cmdline/cmdline_util.cc:273 +#: src/cmdline/cmdline_util.cc:272 #, c-format msgid "Couldn't find task '%s'" msgstr "" -#: src/cmdline/cmdline_util.cc:361 +#: src/cmdline/cmdline_util.cc:360 #, c-format msgid "%d broken [%+d]" msgid_plural "%d broken [%+d]" msgstr[0] "%d 个被破坏 [%+d]" -#: src/cmdline/cmdline_util.cc:375 +#: src/cmdline/cmdline_util.cc:374 #, c-format msgid "%d update [%+d]" msgid_plural "%d updates [%+d]" msgstr[0] "%d 个被更新 [%+d]" -#: src/cmdline/cmdline_util.cc:389 +#: src/cmdline/cmdline_util.cc:388 #, c-format msgid "%d new [%+d]" msgid_plural "%d new [%+d]" msgstr[0] "%d 个新软件包 [%+d]" -#: src/cmdline/cmdline_util.cc:400 +#: src/cmdline/cmdline_util.cc:399 #, c-format msgid "Current status: %F." msgstr "当前状态：%F。" -#: src/cmdline/cmdline_util.cc:411 +#: src/cmdline/cmdline_util.cc:410 #, c-format msgid "There is %d newly obsolete package." msgid_plural "There are %d newly obsolete packages." msgstr[0] "有 %d 个新被废弃的软件包。" -#: src/cmdline/cmdline_util.cc:423 +#: src/cmdline/cmdline_util.cc:422 #, c-format msgid "There is %d newly obsolete package: " msgid_plural "There are %d newly obsolete packages: " msgstr[0] "有 %d 个新被废弃的软件包： " -#: src/cmdline/cmdline_versions.cc:125 +#: src/cmdline/cmdline_versions.cc:122 #, c-format msgid "Package %s:" msgstr "软件包 %s：" -#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191 +#: src/cmdline/cmdline_versions.cc:159 src/cmdline/cmdline_versions.cc:208 #, c-format msgid "Source package %s:" msgstr "源码包 %s：" -#: src/cmdline/cmdline_versions.cc:213 +#: src/cmdline/cmdline_versions.cc:230 #, c-format msgid "Archive %s:" msgstr "存档 %s：" -#: src/cmdline/cmdline_versions.cc:502 +#: src/cmdline/cmdline_versions.cc:519 msgid "--group-by|archive" msgstr "--group-by|archive" -#: src/cmdline/cmdline_versions.cc:506 +#: src/cmdline/cmdline_versions.cc:523 msgid "--group-by|auto" msgstr "--group-by|auto" -#: src/cmdline/cmdline_versions.cc:510 +#: src/cmdline/cmdline_versions.cc:527 msgid "--group-by|none" msgstr "--group-by|none" -#: src/cmdline/cmdline_versions.cc:514 +#: src/cmdline/cmdline_versions.cc:531 msgid "--group-by|package" msgstr "--group-by|package" -#: src/cmdline/cmdline_versions.cc:518 +#: src/cmdline/cmdline_versions.cc:535 msgid "--group-by|source-package" msgstr "--group-by|source-package" -#: src/cmdline/cmdline_versions.cc:522 +#: src/cmdline/cmdline_versions.cc:539 msgid "--group-by|source-version" msgstr "--group-by|source-version" #. TRANSLATORS: --group-by is the argument name and shouldn't #. be translated. -#: src/cmdline/cmdline_versions.cc:528 +#: src/cmdline/cmdline_versions.cc:545 #, c-format msgid "" "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", " "\"package\", or \"source-package\")" msgstr "无效的软件包分组模式 %s (应为 auto、none、pacakge 或 source-package 之一)" -#: src/cmdline/cmdline_versions.cc:584 +#: src/cmdline/cmdline_versions.cc:607 #, c-format msgid "versions: You must provide at least one package selector\n" msgstr "版本：您必须提供至少一个查找项\n" -#: src/cmdline/cmdline_why.cc:290 +#: src/cmdline/cmdline_why.cc:281 msgid "dep_level" msgstr "依赖级" -#: src/cmdline/cmdline_why.cc:296 +#: src/cmdline/cmdline_why.cc:287 msgid "DependsOnly" msgstr "仅依赖" -#: src/cmdline/cmdline_why.cc:310 +#: src/cmdline/cmdline_why.cc:301 msgid "version_selection" msgstr "版本选择" -#: src/cmdline/cmdline_why.cc:315 +#: src/cmdline/cmdline_why.cc:306 msgid "Current" msgstr "当前" -#: src/cmdline/cmdline_why.cc:318 +#: src/cmdline/cmdline_why.cc:309 msgid "Candidate" msgstr "候选" -#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417 +#: src/cmdline/cmdline_why.cc:312 src/gtk/gui.cc:91 src/gtk/gui.cc:1417 msgid "Install" msgstr "安装" -#: src/cmdline/cmdline_why.cc:324 +#: src/cmdline/cmdline_why.cc:315 msgid "InstallNotCurrent" msgstr "已安装但不是最新版本" -#: src/cmdline/cmdline_why.cc:332 +#: src/cmdline/cmdline_why.cc:323 msgid "allow_choices" msgstr "允许的选择" -#: src/cmdline/cmdline_why.cc:335 +#: src/cmdline/cmdline_why.cc:326 msgid "true" msgstr "真" -#: src/cmdline/cmdline_why.cc:337 +#: src/cmdline/cmdline_why.cc:328 msgid "false" msgstr "假" -#: src/cmdline/cmdline_why.cc:381 +#: src/cmdline/cmdline_why.cc:372 #, c-format msgid "Install(%s)" msgstr "安装(%s)" -#: src/cmdline/cmdline_why.cc:383 +#: src/cmdline/cmdline_why.cc:374 #, c-format msgid "Remove(%s)" msgstr "移除(%s)" -#: src/cmdline/cmdline_why.cc:385 +#: src/cmdline/cmdline_why.cc:376 #, c-format msgid "Install(%s provides %s)" msgstr "安装(%s 提供了 %s)" -#: src/cmdline/cmdline_why.cc:389 +#: src/cmdline/cmdline_why.cc:380 #, c-format msgid "Remove(%s provides %s)" msgstr "移除(%s 提供了 %s)" -#: src/cmdline/cmdline_why.cc:1074 +#: src/cmdline/cmdline_why.cc:1065 #, c-format msgid " ++ Examining %F\n" msgstr " ++ 正在检查 %F\n" -#: src/cmdline/cmdline_why.cc:1082 +#: src/cmdline/cmdline_why.cc:1073 msgid " ++ --> skipping, not a conflict\n" msgstr " ++ --> 跳过，不是冲突\n" -#: src/cmdline/cmdline_why.cc:1088 +#: src/cmdline/cmdline_why.cc:1079 msgid " ++ --> skipping conflict\n" msgstr " ++ --> 跳过冲突\n" -#: src/cmdline/cmdline_why.cc:1094 +#: src/cmdline/cmdline_why.cc:1085 msgid " ++ --> skipping, not relevant according to params\n" msgstr " ++ --> 跳过，根据参数它不相关\n" -#: src/cmdline/cmdline_why.cc:1100 +#: src/cmdline/cmdline_why.cc:1091 msgid " ++ --> skipping, parent is not the selected version\n" msgstr " ++ --> 跳过，父节点不是选定的版本\n" -#: src/cmdline/cmdline_why.cc:1106 +#: src/cmdline/cmdline_why.cc:1097 msgid " ++ --> skipping, the dep is satisfied by the current version\n" msgstr " ++ --> 跳过，当前版本已满足依赖\n" -#: src/cmdline/cmdline_why.cc:1112 +#: src/cmdline/cmdline_why.cc:1103 msgid "Skipping this solution, I've already seen it.\n" msgstr "跳过这个解决方案，我已经看过了。\n" -#: src/cmdline/cmdline_why.cc:1118 +#: src/cmdline/cmdline_why.cc:1109 msgid " ++ --> skipping, version check failed\n" msgstr " ++ --> 跳过，版本检查失败\n" -#: src/cmdline/cmdline_why.cc:1124 +#: src/cmdline/cmdline_why.cc:1115 msgid " ++ --> ENQUEUING\n" msgstr " ++ --> 加入队列\n" -#: src/cmdline/cmdline_why.cc:1130 +#: src/cmdline/cmdline_why.cc:1121 #, c-format msgid " ++ --> ENQUEUING %s Provides %s\n" msgstr " ++ --> 加入队列 %s 提供了 %s\n" -#: src/cmdline/cmdline_why.cc:1138 +#: src/cmdline/cmdline_why.cc:1129 #, c-format msgid "Starting search with parameters %ls\n" msgstr "开始搜索参数 %ls\n" -#: src/cmdline/cmdline_why.cc:1194 +#: src/cmdline/cmdline_why.cc:1185 #, c-format msgid "Unable to find a reason to remove %s.\n" msgstr "未能找到理由以移除 %s。\n" -#: src/cmdline/cmdline_why.cc:1196 +#: src/cmdline/cmdline_why.cc:1187 #, c-format msgid "Unable to find a reason to install %s.\n" msgstr "未能找到理由以安装 %s。\n" -#: src/cmdline/cmdline_why.cc:1235 +#: src/cmdline/cmdline_why.cc:1226 #, c-format msgid "Packages requiring %s:" msgstr "要求 %s 的软件包：" -#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327 -#: src/cmdline/cmdline_why.cc:1391 +#: src/cmdline/cmdline_why.cc:1290 src/cmdline/cmdline_why.cc:1318 +#: src/cmdline/cmdline_why.cc:1382 #, c-format msgid "No package named \"%s\" exists." msgstr "名称为“%s”的软件包的软件包不存在。" -#: src/cmdline/cmdline_why.cc:1331 +#: src/cmdline/cmdline_why.cc:1322 msgid "Unable to parse some match patterns." msgstr "无法分析某些匹配模式" -#: src/cmdline/cmdline_why.cc:1366 +#: src/cmdline/cmdline_why.cc:1357 #, c-format msgid "" "%s: this command requires at least one argument (the package to query).\n" msgstr "%s：这个命令要求至少一个参数(要查询的软件包)。\n" -#: src/cmdline/cmdline_why.h:212 +#: src/cmdline/cmdline_why.h:213 msgid "Unknown version selection, something is very wrong." msgstr "未知的版本选择，有一些严重错误。" -#: src/cmdline/terminal.cc:46 +#: src/cmdline/terminal.cc:44 msgid "Unexpected end-of-file on standard input" msgstr "标准输入中遇到意料之外的文件结束标志" #. TRANSLATORS: the text between [] should be #. exactly 4 character cells wide; "ERR" is short #. for "ERROR". -#: src/cmdline/text_progress.cc:96 +#: src/cmdline/text_progress.cc:93 #, c-format msgid "[ ERR] %s" msgstr "[ 错误] %s" @@ -2415,7 +2415,7 @@ msgid "UNSATISFIED" msgstr "未满足" -#: src/dep_item.cc:151 src/reason_fragment.cc:234 +#: src/dep_item.cc:151 src/reason_fragment.cc:241 msgid "UNAVAILABLE" msgstr "不可用" @@ -2453,7 +2453,7 @@ msgid "Continue" msgstr "继续" -#: src/download_list.cc:100 src/mine/cmine.cc:301 src/mine/cmine.cc:366 +#: src/download_list.cc:100 src/mine/cmine.cc:296 src/mine/cmine.cc:361 msgid "Cancel" msgstr "取消" @@ -2514,77 +2514,77 @@ msgid "Unable to look up your home directory!" msgstr "无法查阅您的主目录！" -#: src/generic/apt/aptcache.cc:271 +#: src/generic/apt/aptcache.cc:273 #, c-format msgid "" "Error parsing a user-tag for the package %s: unexpected end-of-line " "following %s." msgstr "解析软件包 %s 的用户标签时出错：%s 后有意外的行结束符。" -#: src/generic/apt/aptcache.cc:288 +#: src/generic/apt/aptcache.cc:290 #, c-format msgid "Unterminated '\"' in the user-tags list of the package %s." msgstr "软件包 %s 的用户标签列表有未结束的'\"'。" -#: src/generic/apt/aptcache.cc:392 +#: src/generic/apt/aptcache.cc:395 msgid "Can't open Aptitude extended state file" msgstr "无法打开 Aptitude 扩展状态文件" -#: src/generic/apt/aptcache.cc:406 src/generic/apt/aptcache.cc:501 -#: src/generic/apt/aptcache.cc:503 +#: src/generic/apt/aptcache.cc:409 src/generic/apt/aptcache.cc:527 +#: src/generic/apt/aptcache.cc:529 msgid "Reading extended state information" msgstr "正在读取扩展状态文件" -#: src/generic/apt/aptcache.cc:509 src/generic/apt/aptcache.cc:591 -#: src/generic/apt/aptcache.cc:594 +#: src/generic/apt/aptcache.cc:535 src/generic/apt/aptcache.cc:619 +#: src/generic/apt/aptcache.cc:622 msgid "Initializing package states" msgstr "正在初始化软件包状态" -#: src/generic/apt/aptcache.cc:752 +#: src/generic/apt/aptcache.cc:783 msgid "Cannot open Aptitude state file" msgstr "无法打开 Aptitude 扩展状态文件" -#: src/generic/apt/aptcache.cc:756 src/generic/apt/aptcache.cc:863 -#: src/generic/apt/aptcache.cc:866 +#: src/generic/apt/aptcache.cc:787 src/generic/apt/aptcache.cc:920 +#: src/generic/apt/aptcache.cc:923 msgid "Writing extended state information" msgstr "正在编辑扩展状态信息" -#: src/generic/apt/aptcache.cc:854 +#: src/generic/apt/aptcache.cc:911 msgid "Couldn't write state file" msgstr "不能写入状态文件" -#: src/generic/apt/aptcache.cc:871 +#: src/generic/apt/aptcache.cc:928 msgid "Error writing state file" msgstr "写入状态文件时发生错误" -#: src/generic/apt/aptcache.cc:889 +#: src/generic/apt/aptcache.cc:946 #, c-format msgid "failed to remove %s" msgstr "无法删除 %s" -#: src/generic/apt/aptcache.cc:896 +#: src/generic/apt/aptcache.cc:953 #, c-format msgid "failed to rename %s to %s" msgstr "无法将 %s 改名为 %s" -#: src/generic/apt/aptcache.cc:904 +#: src/generic/apt/aptcache.cc:961 #, c-format msgid "couldn't replace %s with %s" msgstr "无法用 %s 代替 %s" -#: src/generic/apt/aptcache.cc:1525 +#: src/generic/apt/aptcache.cc:1714 msgid "Unable to correct dependencies, some packages cannot be installed" msgstr "无法修正依赖关系，一些包无法安装" -#: src/generic/apt/aptcache.cc:2172 +#: src/generic/apt/aptcache.cc:2386 msgid "The list of sources could not be read." msgstr "无法读取软件源列表。" -#: src/generic/apt/aptcache.cc:2179 +#: src/generic/apt/aptcache.cc:2393 msgid "The package lists or status file could not be parsed or opened." msgstr "无法解析或打开软件包列表文件或状态文件。" -#: src/generic/apt/aptcache.cc:2182 +#: src/generic/apt/aptcache.cc:2396 msgid "" "You may want to update the package lists to correct these missing files" msgstr "您可能需要更新软件包列表来解决缺少这些文件的问题" @@ -2599,21 +2599,21 @@ #. indicated by translating "Localized defaults|" below to #. "aptitude-defaults.ww". If you use this mechanism, you should #. also add your defaults file to pkgdata_DATA in Makefile.am. -#: src/generic/apt/apt.cc:188 +#: src/generic/apt/apt.cc:168 msgid "Localized defaults|" msgstr "aptitude-defaults.zh_CN" -#: src/generic/apt/apt.cc:261 +#: src/generic/apt/apt.cc:241 #, c-format msgid "%s is readable but not writable; unable to write configuration file." msgstr "%s 可读但不可写；无法写入配置文件。" -#: src/generic/apt/apt.cc:306 +#: src/generic/apt/apt.cc:286 #, c-format msgid "Unable to replace %s with new configuration file" msgstr "无法用新的配置文件代替 %s" -#: src/generic/apt/apt.cc:457 +#: src/generic/apt/apt.cc:437 msgid "" "Could not lock the cache file; this usually means that dpkg or another apt " "tool is already installing packages. Opening in read-only mode; any changes " @@ -2621,31 +2621,31 @@ msgstr "" "无法锁定缓存文件；这通常意味着 dpkg 或另一个 apt 工具已经在安装软件包。正在以只读方式打开；您对软件包状态所作的任何改变都“不会”被保存！" -#: src/generic/apt/apt.cc:1269 +#: src/generic/apt/apt.cc:1253 msgid "foreign" msgstr "" -#: src/generic/apt/apt.cc:1271 +#: src/generic/apt/apt.cc:1255 msgid "same" msgstr "" -#: src/generic/apt/apt.cc:1274 +#: src/generic/apt/apt.cc:1258 msgid "allowed" msgstr "" -#: src/generic/apt/apt.cc:1363 +#: src/generic/apt/apt.cc:1347 msgid "main" msgstr "主要" -#: src/generic/apt/apt.cc:1363 +#: src/generic/apt/apt.cc:1347 msgid "contrib" msgstr "" -#: src/generic/apt/apt.cc:1363 +#: src/generic/apt/apt.cc:1347 msgid "non-free" msgstr "" -#: src/generic/apt/apt.cc:1363 +#: src/generic/apt/apt.cc:1347 msgid "non-US" msgstr "" @@ -2700,7 +2700,7 @@ "a number." msgstr "无效的线索 %s：动作 \"%s\" 应该为 \"approve\"、\"reject\" 或一个数字。" -#: src/generic/apt/aptitude_resolver_cost_settings.cc:130 +#: src/generic/apt/aptitude_resolver_cost_settings.cc:129 #, c-format msgid "Conflicting types for the cost component %s." msgstr "" @@ -2739,6 +2739,7 @@ msgid "A package failed to install. Trying to recover:" msgstr "软件包安装失败。正在试图恢复：" +#: src/generic/apt/aptcache.cc:979 #: src/generic/apt/download_install_manager.cc:219 msgid "" "Could not regain the system lock! (Perhaps another apt or dpkg is running?)" @@ -2783,22 +2784,22 @@ msgid "Unable to create truncated cache: %s." msgstr "无法创建截断的缓存 %s" -#: src/generic/apt/log.cc:55 +#: src/generic/apt/log.cc:56 #, c-format msgid "Unable to open %s to log actions" msgstr "无法打开 %s 来记录动作" #. TRANSLATORS: This is a date and time format. See strftime(3). -#: src/generic/apt/log.cc:66 +#: src/generic/apt/log.cc:67 msgid "%a, %b %e %Y %T %z" msgstr "" -#: src/generic/apt/log.cc:68 +#: src/generic/apt/log.cc:69 #, c-format msgid "Error generating local time (%s)" msgstr "生成本地时间(%s)时错误" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 msgid "log report" msgstr "日志报告" @@ -2812,17 +2813,17 @@ "重要：该日志只记录预期动作；由于 dpkg 问题而出错的动作可能尚未完成。\n" "\n" -#: src/generic/apt/log.cc:74 +#: src/generic/apt/log.cc:75 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "将要安装 %li 个软件包，卸载 %li 个软件包。\n" -#: src/generic/apt/log.cc:78 +#: src/generic/apt/log.cc:79 #, c-format msgid "%sB of disk space will be used\n" msgstr "将要占用 %sB 的磁盘空间\n" -#: src/generic/apt/log.cc:81 +#: src/generic/apt/log.cc:82 #, c-format msgid "%sB of disk space will be freed\n" msgstr "将要释放 %sB 的磁盘空间\n" @@ -2837,51 +2838,51 @@ msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[降级] %s %s -> %s\n" -#: src/generic/apt/log.cc:105 +#: src/generic/apt/log.cc:94 msgid "REMOVE" msgstr "卸载" -#: src/generic/apt/log.cc:111 +#: src/generic/apt/log.cc:93 msgid "INSTALL" msgstr "安装" -#: src/generic/apt/log.cc:114 +#: src/generic/apt/log.cc:97 msgid "REINSTALL" msgstr "重新安装" -#: src/generic/apt/log.cc:117 +#: src/generic/apt/log.cc:98 msgid "HOLD" msgstr "保持" -#: src/generic/apt/log.cc:120 +#: src/generic/apt/log.cc:99 msgid "BROKEN" msgstr "破坏" -#: src/generic/apt/log.cc:123 +#: src/generic/apt/log.cc:100 msgid "REMOVE, NOT USED" msgstr "卸载，未用" -#: src/generic/apt/log.cc:126 +#: src/generic/apt/log.cc:101 msgid "REMOVE, DEPENDENCIES" msgstr "卸载，依赖关系" -#: src/generic/apt/log.cc:129 +#: src/generic/apt/log.cc:102 msgid "INSTALL, DEPENDENCIES" msgstr "安装，依赖关系" -#: src/generic/apt/log.cc:132 +#: src/generic/apt/log.cc:103 msgid "HOLD, DEPENDENCIES" msgstr "保持，依赖关系" -#: src/generic/apt/log.cc:135 +#: src/generic/apt/log.cc:104 msgid "UNCONFIGURED" msgstr "未配置的" -#: src/generic/apt/log.cc:138 +#: src/generic/apt/log.cc:105 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:142 +#: src/generic/apt/log.cc:155 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" @@ -2899,13 +2900,13 @@ "\n" "日志完成。\n" -#: src/generic/apt/matching/match.cc:3054 -#: src/generic/apt/matching/match.cc:3171 +#: src/generic/apt/matching/match.cc:3083 +#: src/generic/apt/matching/match.cc:3200 msgid "Accessing index" msgstr "正在访问索引" -#: src/generic/apt/matching/match.cc:3064 -#: src/generic/apt/matching/match.cc:3178 +#: src/generic/apt/matching/match.cc:3093 +#: src/generic/apt/matching/match.cc:3207 msgid "Filtering packages" msgstr "分类软件包" @@ -2939,8 +2940,7 @@ msgid "Expected '%c', got '%c'." msgstr "预期得到“%c”，却得到“%c”。" -#: src/generic/apt/matching/parse.cc:861 -#: src/generic/apt/matching/parse.cc:1306 +#: src/generic/apt/matching/parse.cc:861 src/generic/apt/matching/parse.cc:1306 #: src/generic/apt/matching/parse.cc:1346 #, c-format msgid "Unknown dependency type: %s" @@ -3011,18 +3011,18 @@ "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包索引文件被损坏。软件包 %s 无 Filename：域。" -#: src/cmdline/cmdline_changelog.cc:198 src/generic/apt/pkg_changelog.cc:442 -#: src/generic/apt/pkg_changelog.cc:596 src/view_changelog.cc:272 +#: src/cmdline/cmdline_changelog.cc:195 src/generic/apt/pkg_changelog.cc:450 +#: src/generic/apt/pkg_changelog.cc:615 src/view_changelog.cc:272 #, c-format msgid "Changelog of %s" msgstr "%s 的变更日志" -#: src/generic/apt/pkg_changelog.cc:572 src/generic/apt/pkg_changelog.cc:577 +#: src/generic/apt/pkg_changelog.cc:591 src/generic/apt/pkg_changelog.cc:596 #, c-format msgid "Failed to download changelogs: %s" msgstr "下载变更日志失败：%s" -#: src/generic/apt/pkg_changelog.cc:582 +#: src/generic/apt/pkg_changelog.cc:601 msgid "Failed to download changelogs: unexpected exception." msgstr "下载变更日志失败：预期之外的异常。" @@ -3054,18 +3054,18 @@ msgid "Multiple descriptions found for group %s, ignoring one" msgstr "发现组 %s 的多个描述，忽略其中一个" -#: src/generic/apt/resolver_manager.cc:489 +#: src/generic/apt/resolver_manager.cc:488 #, c-format msgid "Unable to create the output file: child killed by signal %d." msgstr "无法创建输出文件：子进程被信号 %d 杀死。" -#: src/generic/apt/resolver_manager.cc:491 +#: src/generic/apt/resolver_manager.cc:490 #, c-format msgid "Unable to create the output file: child exited with status %d." msgstr "无法创建输出文件：子进程以状态 %d 退出。" -#: src/generic/apt/resolver_manager.cc:910 -#: src/generic/apt/resolver_manager.cc:912 +#: src/generic/apt/resolver_manager.cc:909 +#: src/generic/apt/resolver_manager.cc:911 #, c-format msgid "Failed to parse the cost settings string: %s" msgstr "" @@ -3099,7 +3099,7 @@ msgid "Reading task descriptions" msgstr "正在读取软件集说明档" -#: src/generic/controllers/search_input.cc:110 src/gtk/packagestab.cc:60 +#: src/generic/controllers/search_input.cc:109 src/gtk/packagestab.cc:60 msgid "Parse error" msgstr "解析错误" @@ -3115,75 +3115,75 @@ msgid "A single cost level was both added and lower-bounded." msgstr "" -#: src/generic/util/parsers.h:735 +#: src/generic/util/parsers.h:734 #, c-format msgid "Expected '%s', but got EOF." msgstr "预期得到“%s”，却得到 EOF。" -#: src/generic/util/parsers.h:737 +#: src/generic/util/parsers.h:736 #, c-format msgid "Expected '%s', but got '%s'." msgstr "预期得到“%s”，却得到“%s”。" -#: src/generic/util/parsers.h:778 +#: src/generic/util/parsers.h:777 msgid "Expected any character, but got EOF." msgstr "预期得到一个任意字符，却得到 EOF。" -#: src/generic/util/parsers.h:791 +#: src/generic/util/parsers.h:790 msgid "any character" msgstr "任意字符" -#: src/generic/util/parsers.h:832 +#: src/generic/util/parsers.h:831 #, c-format msgid "Expected %s, but got EOF." msgstr "预期得到“%s”，却得到 EOF。" -#: src/generic/util/parsers.h:843 +#: src/generic/util/parsers.h:842 #, c-format msgid "Expected %s, but got '%c'." msgstr "预期得到“%s，却得到“%c”。" -#: src/generic/util/parsers.h:1017 +#: src/generic/util/parsers.h:1016 msgid "Expected an integer, got EOF." msgstr "预期得到一个整数，却得到 EOF。" -#: src/generic/util/parsers.h:1026 +#: src/generic/util/parsers.h:1025 msgid "Expected an integer following '-', got EOF." msgstr "预期得到一个后面带有“-”的整数，却得到 EOF。" -#: src/generic/util/parsers.h:1032 +#: src/generic/util/parsers.h:1031 #, c-format msgid "Expected an integer, got '%c'." msgstr "预期得到一个整数，却得到“%c”。" -#: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054 +#: src/generic/util/parsers.h:1045 src/generic/util/parsers.h:1053 #, c-format msgid "Invalid integer: \"%s\"." msgstr "无效的整数：%s。" -#: src/generic/util/parsers.h:1077 +#: src/generic/util/parsers.h:1076 #, c-format msgid "Expected EOF, got '%c'." msgstr "预期得到 EOF，却得到“%c”。" -#: src/generic/util/parsers.h:1191 +#: src/generic/util/parsers.h:1190 msgid "anything" msgstr "任意" #. TRANSLATORS: this is used to generate an error #. message; a brief description of what we expected to see #. is inserted into it. -#: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034 -#: src/generic/util/parsers.h:2085 +#: src/generic/util/parsers.h:1940 src/generic/util/parsers.h:2033 +#: src/generic/util/parsers.h:2084 #, c-format msgid "Expected %s" msgstr "预期得到 %s" -#: src/generic/util/parsers.h:2007 +#: src/generic/util/parsers.h:2006 msgid " or " msgstr " 或者 " -#: src/generic/util/parsers.h:2770 +#: src/generic/util/parsers.h:2769 #, c-format msgid "Unexpected %s" msgstr "未预期的 %s" @@ -3193,32 +3193,32 @@ msgid "Unable to create temporary directory from template \"%s\": %s" msgstr "无法从模板“%s”创建临时目录：%s" -#: src/generic/util/temp.cc:342 +#: src/generic/util/temp.cc:319 #, c-format msgid "Unable to create temporary filename from prefix \"%s\"" msgstr "无法从前缀“%s”创建临时文件名" -#: src/generic/util/util.cc:377 +#: src/generic/util/util.cc:372 #, c-format msgid "Unable to stat \"%s\"" msgstr "无法获得“%s”的信息" -#: src/generic/util/util.cc:383 +#: src/generic/util/util.cc:378 #, c-format msgid "Unable to remove \"%s\"" msgstr "无法删除“%s”" -#: src/generic/util/util.cc:393 +#: src/generic/util/util.cc:388 #, c-format msgid "Unable to list files in \"%s\"" msgstr "无法列出“%s”中的文件" -#: src/generic/util/util.cc:410 +#: src/generic/util/util.cc:405 #, c-format msgid "Failure closing directory \"%s\"" msgstr "无法关闭文件夹“%s”" -#: src/generic/util/util.cc:416 +#: src/generic/util/util.cc:411 #, c-format msgid "Unable to remove directory \"%s\"" msgstr "无法删除目录“%s”" @@ -3232,43 +3232,43 @@ msgid "_File" msgstr "文件(_F)" -#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2348 +#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2371 msgid "Perform all pending installs and removals" msgstr "执行所有等待执行的安装和卸载任务" -#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2351 +#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2374 msgid "Check for new versions of packages" msgstr "正在检查新版本的软件包" -#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2356 +#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2379 msgid "Mark all upgradable packages which are not held for upgrade" msgstr "为所有未被保持现状的软件包加上升级标记" -#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2361 +#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2384 msgid "Forget which packages are \"new\"" msgstr "忘记哪些软件包是“新”的" -#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2365 +#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2388 msgid "Cancel all pending installations, removals, holds, and upgrades." msgstr "执行所有等待执行的安装、卸载、保持和升级任务" -#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2369 +#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2392 msgid "Delete package files which were previously downloaded" msgstr "删除以前下载的软件包文件" -#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2373 +#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2396 msgid "Delete package files which can no longer be downloaded" msgstr "删除无法再下载的软件包文件" -#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2380 +#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2403 msgid "Reload the package cache" msgstr "重新载入软件包缓存" -#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2390 +#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2413 msgid "Restart the program as root; your settings will be preserved" msgstr "作为管理员重新启动程序，您的设置将被保留" -#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2393 +#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2416 msgid "Exit the program" msgstr "退出此程序" @@ -3276,7 +3276,7 @@ msgid "E_dit" msgstr "退出(_D)" -#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2400 +#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2423 msgid "Undo the last package operation or group of operations" msgstr "撤销最近一次或者一组软件包操作" @@ -3307,7 +3307,7 @@ msgstr "帮助(_H)" #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576 -#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801 +#: src/gtk/dashboardtab.cc:739 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801 msgid "Dashboard" msgstr "状态显示器" @@ -3316,18 +3316,17 @@ msgstr "更新" #: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323 -#: src/qt/tabs_manager.cc:241 src/ui.cc:855 src/ui.cc:857 src/ui.cc:902 -#: src/ui.cc:904 src/ui.cc:930 src/ui.cc:932 src/ui.cc:953 src/ui.cc:955 +#: src/qt/tabs_manager.cc:241 src/ui.cc:884 src/ui.cc:886 msgid "Packages" msgstr "软件包" #: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033 -#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1396 +#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1419 msgid "Preview" msgstr "预览" #: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028 -#: src/qt/tabs_manager.cc:263 src/ui.cc:2788 +#: src/qt/tabs_manager.cc:263 src/ui.cc:2813 msgid "Resolver" msgstr "解决手段" @@ -3406,7 +3405,7 @@ msgid "Fixing upgrade manually:" msgstr "手动修复升级：" -#: src/gtk/aptitude.glade:1138 src/gtk/dashboardtab.cc:526 +#: src/gtk/aptitude.glade:1138 src/gtk/dashboardtab.cc:525 msgid "Calculating upgrade..." msgstr "估算升级" @@ -3496,7 +3495,7 @@ msgid "Fix Manually" msgstr "手动修复" -#: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93 +#: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:67 src/gtk/gui.cc:93 #: src/gtk/gui.cc:1408 msgid "Upgrade" msgstr "升级" @@ -3538,39 +3537,39 @@ "要应用这些更改吗？\n" "也可以手动修改这些文件，如果这样，请点击 \"否\"。" -#: src/gtk/areas.cc:73 +#: src/gtk/areas.cc:68 msgid "Keep your computer up-to-date." msgstr "保持您的系统最新。" -#: src/gtk/areas.cc:75 +#: src/gtk/areas.cc:70 msgid "Browse" msgstr "浏览" -#: src/gtk/areas.cc:76 +#: src/gtk/areas.cc:71 msgid "Explore the available packages." msgstr "探索可用的软件包。" -#: src/gtk/areas.cc:78 +#: src/gtk/areas.cc:73 msgid "Find" msgstr "查找" -#: src/gtk/areas.cc:79 +#: src/gtk/areas.cc:74 msgid "Search for packages." msgstr "搜索软件包。" -#: src/gtk/areas.cc:81 +#: src/gtk/areas.cc:76 msgid "Go" msgstr "搜索" -#: src/gtk/areas.cc:82 +#: src/gtk/areas.cc:77 msgid "Finalize and apply your changes to the system." msgstr "最终决定并应用变更到系统。" -#: src/gtk/areas.cc:84 src/ui.cc:714 src/ui.cc:716 +#: src/gtk/areas.cc:79 src/ui.cc:712 src/ui.cc:714 msgid "Preferences" msgstr "首选项" -#: src/gtk/areas.cc:85 +#: src/gtk/areas.cc:80 msgid "Configure aptitude." msgstr "配置 aptitude。" @@ -3623,33 +3622,33 @@ msgid "Preparing to download the changelog of %s version %s." msgstr "正在准备下载 %2$s 版的 %1$s 的变更日志..." -#: src/gtk/dashboardtab.cc:215 +#: src/gtk/dashboardtab.cc:214 msgid "Resolve Upgrade Manually" msgstr "手动解决升级" -#: src/gtk/dashboardtab.cc:298 +#: src/gtk/dashboardtab.cc:297 msgid "Preparing to download changelogs" msgstr "正在准备下载变更日志" -#: src/gtk/dashboardtab.cc:383 +#: src/gtk/dashboardtab.cc:382 msgid "Available upgrades:" msgstr "可用的升级：" -#: src/gtk/dashboardtab.cc:400 +#: src/gtk/dashboardtab.cc:399 #, c-format msgid "%d available upgrade:" msgid_plural "%d available upgrades:" msgstr[0] "%d 个可用的升级：" -#: src/gtk/dashboardtab.cc:619 +#: src/gtk/dashboardtab.cc:618 msgid "No upgrades are available." msgstr "无可用更新" -#: src/gtk/dashboardtab.cc:631 +#: src/gtk/dashboardtab.cc:630 msgid "Unable to calculate an upgrade." msgstr "无法估算更新" -#: src/gtk/dashboardtab.cc:640 +#: src/gtk/dashboardtab.cc:639 #, c-format msgid "" "Press \"%s\" to install %d upgrade out of %d 个更新，总共有 %d 个。" -#: src/gtk/dashboardtab.cc:652 +#: src/gtk/dashboardtab.cc:651 #, c-format msgid "" "Press \"%s\" to manually attempt to install the remaining %d upgrades." msgstr[0] "按 \"%s\" 手动尝试安装剩余的 %d 升级" -#: src/gtk/dashboardtab.cc:677 +#: src/gtk/dashboardtab.cc:676 #, c-format msgid "" "Unable to calculate an upgrade. Press \"%s\" to manually search for a " "solution." msgstr "无法估算升级。请按 \"%s\" 手动搜索解决方案。" -#: src/gtk/dashboardtab.cc:694 +#: src/gtk/dashboardtab.cc:693 #, c-format msgid "Internal error encountered while calculating an upgrade: %s" msgstr "估算更新时发生内部错误：%s" -#: src/gtk/dependency_chains_tab.cc:78 +#: src/gtk/dependency_chains_tab.cc:80 msgid "Find dependency chains: start" msgstr "查找依赖关系链：开始" -#: src/gtk/dependency_chains_tab.cc:82 +#: src/gtk/dependency_chains_tab.cc:84 msgid "Find dependency chains: end" msgstr "查找依赖关系链：结束" -#: src/gtk/dependency_chains_tab.cc:86 +#: src/gtk/dependency_chains_tab.cc:88 msgid "Find dependency chains: results" msgstr "查找依赖关系链：结果" -#: src/gtk/dependency_chains_tab.cc:226 +#: src/gtk/dependency_chains_tab.cc:228 msgid "Select one or more starting packages and an ending package to search." msgstr "选择一个或多个起始软件包和一个终止软件包以搜索。" -#: src/gtk/dependency_chains_tab.cc:282 +#: src/gtk/dependency_chains_tab.cc:284 msgid "No dependency chain found." msgstr "没有发现依赖关系链。" @@ -3715,8 +3714,8 @@ msgid "Already downloaded" msgstr "已经下载" -#: src/gtk/download.cc:248 src/gtk/entityview.cc:397 src/pkg_columnizer.cc:94 -#: src/pkg_view.cc:675 +#: src/gtk/download.cc:248 src/gtk/entityview.cc:397 src/pkg_columnizer.cc:95 +#: src/pkg_view.cc:643 msgid "Description" msgstr "描述" @@ -3930,7 +3929,7 @@ msgid "Icons showing the current and future status of this package." msgstr "显示此包当前和将来状态的图标。" -#: src/gtk/entityview.cc:564 src/pkg_columnizer.cc:103 +#: src/gtk/entityview.cc:564 src/pkg_columnizer.cc:104 msgid "Auto" msgstr "自动" @@ -4041,7 +4040,7 @@ msgid "Download already running." msgstr "下载已经在进行。" -#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1527 src/ui.cc:1766 +#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1550 src/ui.cc:1789 msgid "A package-list update or install run is already taking place." msgstr "已经开始了一个软件包列表更新或者安装的动作。" @@ -4103,7 +4102,7 @@ msgid "Asking whether to replace the configuration file %s" msgstr "询问是否替换配置文件 %s" -#: src/gtk/gui.cc:962 src/ui.cc:1267 +#: src/gtk/gui.cc:962 src/ui.cc:1290 msgid "Downloading packages" msgstr "正在下载软件包" @@ -4197,45 +4196,45 @@ msgid "Toggle automatic status" msgstr "切换自动状态" -#: src/gtk/gui.cc:1780 src/gtk/init.cc:144 +#: src/gtk/gui.cc:1780 src/gtk/init.cc:145 #, c-format msgid "Unable to load the user interface definition file %s/aptitude.glade." msgstr "无法加载用户界面定义文件 %s/aptitude.glade。" -#: src/gtk/info.cc:161 src/gtk/pkgview.cc:169 +#: src/gtk/info.cc:159 src/gtk/pkgview.cc:167 msgid "Current status" msgstr "当前状态" -#: src/gtk/info.cc:163 src/gtk/pkgview.cc:171 +#: src/gtk/info.cc:161 src/gtk/pkgview.cc:169 msgid "Selected status" msgstr "选中的状态" -#: src/gtk/info.cc:496 +#: src/gtk/info.cc:494 msgid "Not available" msgstr "不可用" -#: src/gtk/info.cc:545 +#: src/gtk/info.cc:543 msgid "Package information: version list" msgstr "软件包信息：版本列表" -#: src/gtk/info.cc:555 +#: src/gtk/info.cc:553 msgid "Package information: dependency list" msgstr "软件包信息：依赖关系列表" -#: src/gtk/info.cc:597 +#: src/gtk/info.cc:595 msgid "Please wait; reloading cache..." msgstr "请稍候；重新加载缓存..." -#: src/gtk/info.cc:779 +#: src/gtk/info.cc:777 msgid "Info" msgstr "信息" #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106 -#: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375 -#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:269 -#: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135 -#: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224 -#: src/qt/version.cc:114 +#: src/pkg_columnizer.cc:351 src/pkg_columnizer.cc:372 +#: src/pkg_columnizer.cc:379 src/pkg_grouppolicy.cc:269 +#: src/pkg_info_screen.cc:144 src/pkg_info_screen.cc:145 +#: src/pkg_ver_item.cc:350 src/pkg_ver_item.cc:384 src/qt/package.cc:226 +#: src/qt/version.cc:117 msgid "Unknown" msgstr "未知" @@ -4252,44 +4251,44 @@ msgid "Packages: " msgstr "软件包： " -#: src/gtk/pkgview.cc:224 +#: src/gtk/pkgview.cc:222 #, c-format msgid "%s was installed automatically." msgstr "%s 已被自动安装" -#: src/gtk/pkgview.cc:227 +#: src/gtk/pkgview.cc:225 #, c-format msgid "%s is being installed automatically." msgstr "%s 将被自动安装" -#: src/gtk/pkgview.cc:235 +#: src/gtk/pkgview.cc:233 #, c-format msgid "%s was installed manually." msgstr "%s 已手动安装" -#: src/gtk/pkgview.cc:238 +#: src/gtk/pkgview.cc:236 #, c-format msgid "%s is being installed manually." msgstr "%s 将被手动安装" -#: src/gtk/pkgview.cc:401 +#: src/gtk/pkgview.cc:399 msgid "Cache reloading, please wait..." msgstr "正在重新加载缓存，请稍候..." -#: src/gtk/pkgview.cc:607 +#: src/gtk/pkgview.cc:605 msgid "Searching..." msgstr "搜索..." -#: src/gtk/pkgview.cc:718 +#: src/gtk/pkgview.cc:716 msgid "Finalizing view" msgstr "最终视图" -#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215 +#: src/gtk/pkgview.cc:716 src/pkg_tree.cc:204 src/pkg_tree.cc:215 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238 msgid "Building view" msgstr "编译视图" -#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:677 +#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:710 msgid "" "Packages with unsatisfied dependencies\n" " The dependency requirements of these packages will be unmet after the " @@ -4303,7 +4302,7 @@ " .\n" " 该树的存在表示您的系统上或者 Debian 归档中的某些东西被破坏。" -#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:678 +#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:711 msgid "" "Packages being removed because they are no longer used\n" " These packages are being deleted because they were automatically installed " @@ -4313,7 +4312,7 @@ "因不再使用而删除的软件包\n" " 这些软件包被删除，因为它们曾被自动安装以满足依赖关系，同时计划中的操作将导致没有任何软件包声明与它们有“重要”依赖关系。\n" -#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:679 +#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:712 msgid "" "Packages being automatically held in their current state\n" " These packages could be upgraded, but they have been kept in their current " @@ -4322,7 +4321,7 @@ "被自动保持在当前状态的软件包\n" " 这些软件包可以被升级，但是它们被保持在其当前状态以避免破坏依赖关系。" -#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:680 +#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:713 msgid "" "Packages being automatically installed to satisfy dependencies\n" " These packages are being installed because they are required by another " @@ -4331,7 +4330,7 @@ "被自动安装以满足依赖关系的软件包\n" " 这些软件包被安装的原因是您选择安装的另一个软件包要求它们。" -#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:681 +#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:714 msgid "" "Packages being deleted due to unsatisfied dependencies\n" " These packages are being deleted because one or more of their dependencies " @@ -4340,7 +4339,7 @@ "由于未满足依赖关系而卸载的软件包\n" " 这些软件包被卸载，因为它们的一个或者多个依赖关系无法满足，或者另一个软件包和它们相冲突。" -#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:682 +#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:715 msgid "" "Packages to be downgraded\n" " An older version of these packages than is currently installed will be " @@ -4349,7 +4348,7 @@ "将被降级的软件包\n" " 这些软件包的一个比目前安装版本老的版本将被安装。" -#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:683 +#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:716 msgid "" "Packages being held back\n" " These packages could be upgraded, but you have asked for them to be held at " @@ -4358,7 +4357,7 @@ "被保持的软件包\n" " 这些软件包可以升级，但是您已经要求将它们保持在当前版本。" -#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:684 +#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:717 msgid "" "Packages to be reinstalled\n" " These packages will be reinstalled." @@ -4366,7 +4365,7 @@ "重新安装的软件包\n" " 这些软件包将被重新安装。" -#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:685 +#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:718 msgid "" "Packages to be installed\n" " These packages have been manually selected for installation on your " @@ -4375,7 +4374,7 @@ "将要安装的软件包\n" " 这些软件包已经被手动选择安装在您的机器上。" -#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:686 +#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:719 msgid "" "Packages to be removed\n" " These packages have been manually selected for removal." @@ -4383,7 +4382,7 @@ "将被卸载的软件包\n" " 这些软件包已经被手动选择卸载。" -#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:687 +#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:720 msgid "" "Packages to be upgraded\n" " These packages will be upgraded to a newer version." @@ -4391,7 +4390,7 @@ "将要升级的软件包\n" " 这些软件包将被升级到一个新版本。" -#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:688 +#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:721 msgid "" "Packages that are partially installed\n" " These packages are not fully installed and configured; an attempt will be " @@ -4425,7 +4424,7 @@ msgid "Virtual package" msgstr "虚报" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:457 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:453 msgid "Not Installed" msgstr "未安装的" @@ -4543,59 +4542,57 @@ "Always prefer these actions over alternatives that have not been accepted." msgstr[0] "总是比尚未接受的候选方案优先选择这些动作。" -#: src/gtk/resolver.cc:1240 src/solution_fragment.cc:131 +#: src/gtk/resolver.cc:1240 src/solution_fragment.cc:127 #, c-format msgid "%s depends upon %s" msgstr "%s 依赖于 %s" -#: src/gtk/resolver.cc:1243 src/solution_fragment.cc:134 +#: src/gtk/resolver.cc:1243 src/solution_fragment.cc:130 #, c-format msgid "%s pre-depends upon %s" msgstr "%s 预依赖于 %s" -#: src/gtk/resolver.cc:1246 src/solution_fragment.cc:137 +#: src/gtk/resolver.cc:1246 src/solution_fragment.cc:133 #, c-format msgid "%s suggests %s" msgstr "%s 建议 %s" -#: src/gtk/resolver.cc:1249 src/solution_fragment.cc:140 -#: src/solution_item.cc:599 +#: src/gtk/resolver.cc:1249 src/solution_fragment.cc:136 +#: src/solution_item.cc:602 #, c-format msgid "%s recommends %s" msgstr "%s 推荐 %s" -#: src/gtk/resolver.cc:1252 src/solution_fragment.cc:143 +#: src/gtk/resolver.cc:1252 src/solution_fragment.cc:139 #, c-format msgid "%s conflicts with %s" msgstr "%s 冲突 %s" -#: src/gtk/resolver.cc:1255 src/solution_fragment.cc:146 +#: src/gtk/resolver.cc:1255 src/solution_fragment.cc:142 #, c-format msgid "%s breaks %s" msgstr "%s 破坏 %s" -#: src/gtk/resolver.cc:1258 src/solution_fragment.cc:149 +#: src/gtk/resolver.cc:1258 src/solution_fragment.cc:145 #, c-format msgid "%s replaces %s" msgstr "%s 替代 %s" -#: src/gtk/resolver.cc:1261 src/solution_fragment.cc:152 +#: src/gtk/resolver.cc:1261 src/solution_fragment.cc:148 #, c-format msgid "%s obsoletes %s" msgstr "%s 过期 %s" -#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:155 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:151 #, c-format msgid "%s enhances %s" msgstr "" -#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 -#: src/solution_screen.cc:272 +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "删除下列软件包：" -#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 -#: src/solution_screen.cc:296 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "安装下列软件包：" @@ -4603,18 +4600,16 @@ msgid "Keep the following packages:" msgstr "保持下列软件包：" -#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 -#: src/solution_screen.cc:308 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "升级下列软件包：" -#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 -#: src/solution_screen.cc:320 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "降级下列软件包：" #: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 -#: src/solution_fragment.cc:513 +#: src/solution_fragment.cc:509 msgid "Leave the following dependencies unresolved:" msgstr "保留下列未解决的依赖关系：" @@ -4828,95 +4823,95 @@ msgid "Ignoring invalid keybinding \"%s\" -> \"%s\"" msgstr "忽略无效快捷键绑定“%s”->“%s”" -#: src/load_grouppolicy.cc:289 +#: src/load_grouppolicy.cc:290 #, c-format msgid "Expected policy identifier, got '%c'" msgstr "需要策略标识符，却得到“%c”" -#: src/load_grouppolicy.cc:305 +#: src/load_grouppolicy.cc:306 #, c-format msgid "Expected ',', '%c', or '('; got '%c'" msgstr "需要“,”，'%c' 或 “(”，却得到“%c”" -#: src/load_grouppolicy.cc:309 +#: src/load_grouppolicy.cc:310 #, c-format msgid "Expected ',' or '(', got '%c'" msgstr "需要“,”或“(”，却得到“%c”" -#: src/load_grouppolicy.cc:317 +#: src/load_grouppolicy.cc:318 #, c-format msgid "Unknown grouping policy \"%s\"" msgstr "未知的分组策略“%s”" -#: src/load_grouppolicy.cc:324 +#: src/load_grouppolicy.cc:325 #, c-format msgid "Terminal policy '%s' should be the last policy in the list" msgstr "终极策略“%s”应该是列表中的最后一个策略" -#: src/load_grouppolicy.cc:385 +#: src/load_grouppolicy.cc:386 msgid "Unmatched '(' in grouping policy" msgstr "" -#: src/load_grouppolicy.cc:413 +#: src/load_grouppolicy.cc:414 #, c-format msgid "Bad section name '%s' (use 'none', 'topdir', 'subdir', or 'subdirs')" msgstr "坏的区段名称“%s”(使用“none”，“topdir”，“subdir”，或者“subdirs”)" -#: src/load_grouppolicy.cc:423 +#: src/load_grouppolicy.cc:424 #, c-format msgid "Bad passthrough setting '%s' (use 'passthrough' or 'nopassthrough')" msgstr "坏的 passthrough 设置“%s”(使用“passthrough”或者“nopassthrough”)" -#: src/load_grouppolicy.cc:428 src/load_grouppolicy.cc:544 -#: src/load_grouppolicy.cc:621 +#: src/load_grouppolicy.cc:429 src/load_grouppolicy.cc:557 +#: src/load_grouppolicy.cc:627 #, c-format msgid "Too many arguments to '%s' grouping policy" msgstr "" -#: src/load_grouppolicy.cc:441 src/load_grouppolicy.cc:521 -#: src/load_grouppolicy.cc:532 src/load_grouppolicy.cc:555 -#: src/load_grouppolicy.cc:566 src/load_grouppolicy.cc:577 -#: src/load_grouppolicy.cc:608 src/load_grouppolicy.cc:766 +#: src/load_grouppolicy.cc:442 src/load_grouppolicy.cc:522 +#: src/load_grouppolicy.cc:570 src/load_grouppolicy.cc:581 +#: src/load_grouppolicy.cc:592 src/load_grouppolicy.cc:603 +#: src/load_grouppolicy.cc:614 src/load_grouppolicy.cc:772 #, c-format msgid "Grouping policy '%s' takes no arguments" msgstr "" -#: src/load_grouppolicy.cc:460 src/load_grouppolicy.cc:636 +#: src/load_grouppolicy.cc:461 src/load_grouppolicy.cc:642 #, c-format msgid "Expected '(' after '%s'" msgstr "" -#: src/load_grouppolicy.cc:497 +#: src/load_grouppolicy.cc:498 #, c-format msgid "Unable to parse pattern at '%s'" msgstr "无法在“%s”中分析模式" -#: src/load_grouppolicy.cc:502 +#: src/load_grouppolicy.cc:503 msgid "" "Exactly one filter must be provided as an argument to a 'filter' policy" msgstr "" -#: src/load_grouppolicy.cc:644 +#: src/load_grouppolicy.cc:650 #, c-format msgid "Missing arguments to '%s' grouping policy" msgstr "" -#: src/load_grouppolicy.cc:667 +#: src/load_grouppolicy.cc:673 #, c-format msgid "Unable to parse pattern after \"%s\"" msgstr "无法在“%s”后分析模式" -#: src/load_grouppolicy.cc:705 +#: src/load_grouppolicy.cc:684 #, c-format msgid "Unexpectedly empty tree title after \"%s\"" msgstr "“%s”之后出现意外的空白的树型标题" -#: src/load_grouppolicy.cc:724 +#: src/load_grouppolicy.cc:730 #, c-format msgid "Expected '{', ')', or ',' following '||', got '%s'" msgstr "在“||”之后应该是“{”，“)”或“,”，却得到“%s”" -#: src/load_grouppolicy.cc:750 +#: src/load_grouppolicy.cc:756 #, c-format msgid "Unmatched '(' in '%s' grouping policy" msgstr "" @@ -5453,73 +5448,73 @@ msgid "Invalid logger name \"%s\"." msgstr "无效日志记录名 %s。" -#: src/main.cc:763 +#: src/main.cc:807 #, c-format msgid "Expected a number after -q=\n" msgstr "在 -q= 之后需要一个数字\n" -#: src/main.cc:772 +#: src/main.cc:816 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "在 -q= 之后需要一个数字，但却得到 %s\n" -#: src/main.cc:796 +#: src/main.cc:840 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o 要求参数格式为 key=val，却接受到 %s\n" -#: src/main.cc:886 +#: src/main.cc:930 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "标签名“%s”后没有逗号。\n" -#: src/main.cc:978 src/main.cc:988 +#: src/main.cc:1022 src/main.cc:1032 msgid "WEIRDNESS: unknown option code received\n" msgstr "“诡异”：收到未知的选项代码\n" -#: src/main.cc:1006 +#: src/main.cc:1050 msgid "--show-package-names|never" msgstr "--show-package-names|never" -#: src/main.cc:1009 +#: src/main.cc:1053 msgid "--show-package-names|auto" msgstr "--show-package-names|auto" -#: src/main.cc:1012 +#: src/main.cc:1056 msgid "--show-package-names|always" msgstr "--show-package-names|always" -#: src/main.cc:1017 +#: src/main.cc:1061 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "无效的软件包名称显示模式 %s (应为 never、auto 或 always 之一)。" -#: src/main.cc:1023 +#: src/main.cc:1067 msgid "no-summary" msgstr "无摘要" -#: src/main.cc:1025 +#: src/main.cc:1069 msgid "first-package" msgstr "首个软件包" -#: src/main.cc:1027 +#: src/main.cc:1071 msgid "first-package-and-type" msgstr "首个软件包及类型" -#: src/main.cc:1029 +#: src/main.cc:1073 msgid "all-packages" msgstr "全部包" -#: src/main.cc:1031 +#: src/main.cc:1075 msgid "all-packages-with-dep-versions" msgstr "全部软件包及依赖版本" #. TRANSLATORS: "why" here is the aptitude command name and should not #. be translated. Both the translated and the untranslated log level #. names are accepted here. -#: src/main.cc:1038 +#: src/main.cc:1082 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-" @@ -5529,33 +5524,33 @@ "无效的 \"why\" 总结模式 \"%s\"：期望 \"no-summary\"，\"first-package\"，\"first-package-" "and-type\"，\"all-packages\" 或 \"all-packages-with-dep-versions\"。" -#: src/main.cc:1079 +#: src/main.cc:1123 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" msgstr "选项 --auto-clean-on-startup，--clean-on-startup，-i 和 -u 只能指定一个\n" -#: src/main.cc:1088 +#: src/main.cc:1132 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" msgstr "选项 -u，-i 和 --clean-on-startup 不能在命令行模式中指定 (例如，和“install”一起)" -#: src/main.cc:1105 +#: src/main.cc:1149 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "选项 -u，-i 和 --clean-on-startup 不能在和一个命令一起指定" -#: src/main.cc:1216 +#: src/main.cc:1260 #, c-format msgid "Unknown command \"%s\"\n" msgstr "未知的命令“%s”\n" -#: src/main.cc:1228 src/main.cc:1313 +#: src/main.cc:1272 src/main.cc:1357 #, c-format msgid "Uncaught exception: %s\n" msgstr "未知的例外：%s\n" -#: src/main.cc:1232 src/main.cc:1317 +#: src/main.cc:1276 src/main.cc:1361 #, c-format msgid "" "Backtrace:\n" @@ -5564,7 +5559,7 @@ "回溯：\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:232 src/ui.cc:260 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:232 src/ui.cc:258 #: src/view_changelog.cc:168 msgid "Search for: " msgstr "搜索： " @@ -5573,7 +5568,7 @@ msgid "Search backwards for: " msgstr "向前搜索： " -#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1771 +#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1794 msgid "Minesweeper" msgstr "扫雷" @@ -5613,63 +5608,63 @@ msgid "Could not load game from %s" msgstr "无法从 %s 中载入游戏" -#: src/mine/cmine.cc:247 +#: src/mine/cmine.cc:242 msgid "The board height must be a positive integer" msgstr "棋盘高度必须是正整数" -#: src/mine/cmine.cc:258 +#: src/mine/cmine.cc:253 msgid "The board width must be a positive integer" msgstr "棋盘宽度必须是正整数" -#: src/mine/cmine.cc:269 +#: src/mine/cmine.cc:264 msgid "Invalid mine count; please enter a positive integer" msgstr "不合法的地雷数；请输入一个正整数" -#: src/mine/cmine.cc:289 +#: src/mine/cmine.cc:284 msgid "Setup custom game" msgstr "设置自定义游戏" -#: src/mine/cmine.cc:291 +#: src/mine/cmine.cc:286 msgid "Height of board: " msgstr "棋盘高度： " -#: src/mine/cmine.cc:294 +#: src/mine/cmine.cc:289 msgid "Width of board: " msgstr "棋盘宽度： " -#: src/mine/cmine.cc:297 +#: src/mine/cmine.cc:292 msgid "Number of mines: " msgstr "地雷数量： " -#: src/mine/cmine.cc:300 src/mine/cmine.cc:365 src/ui.cc:293 src/ui.cc:365 +#: src/mine/cmine.cc:295 src/mine/cmine.cc:360 src/ui.cc:291 src/ui.cc:363 msgid "Ok" msgstr "确定" -#: src/mine/cmine.cc:358 +#: src/mine/cmine.cc:353 msgid "Choose difficulty level" msgstr "选择难度级别" -#: src/mine/cmine.cc:360 +#: src/mine/cmine.cc:355 msgid "Easy" msgstr "容易" -#: src/mine/cmine.cc:361 +#: src/mine/cmine.cc:356 msgid "Medium" msgstr "中等" -#: src/mine/cmine.cc:362 +#: src/mine/cmine.cc:357 msgid "Hard" msgstr "困难" -#: src/mine/cmine.cc:363 +#: src/mine/cmine.cc:358 msgid "Custom" msgstr "自定义" -#: src/mine/cmine.cc:461 +#: src/mine/cmine.cc:456 msgid "You have won." msgstr "您赢了。" -#: src/mine/cmine.cc:464 +#: src/mine/cmine.cc:459 msgid "You lose!" msgstr "您输了！" @@ -5761,243 +5756,243 @@ msgid "You are jolted by a surge of electricity! --More--" msgstr "您被一股强电流击中了！ --更多--" -#: src/mine/cmine.cc:655 +#: src/mine/cmine.cc:657 msgid "Enter the filename to load: " msgstr "请输入要载入的文件名： " -#: src/mine/cmine.cc:662 +#: src/mine/cmine.cc:664 msgid "Enter the filename to save: " msgstr "输入要保存的文件名： " -#: src/mine/cmine.cc:670 +#: src/mine/cmine.cc:672 msgid "mine-help.txt" msgstr "mine-help.txt" -#: src/mine/cmine.cc:672 +#: src/mine/cmine.cc:674 msgid "Encoding of mine-help.txt|UTF-8" msgstr "mine-help.txt 的编码|UTF-8" -#: src/pkg_columnizer.cc:86 +#: src/pkg_columnizer.cc:87 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15" msgstr "" -#: src/pkg_columnizer.cc:89 src/ui.cc:2787 +#: src/pkg_columnizer.cc:90 src/ui.cc:2812 msgid "Package" msgstr "软件包" -#: src/pkg_columnizer.cc:90 +#: src/pkg_columnizer.cc:91 msgid "InstSz" msgstr "安装空间大小" -#: src/pkg_columnizer.cc:91 +#: src/pkg_columnizer.cc:92 msgid "DebSz" msgstr "Deb包大小" -#: src/pkg_columnizer.cc:93 +#: src/pkg_columnizer.cc:94 msgid "Action" msgstr "动作" -#: src/pkg_columnizer.cc:95 +#: src/pkg_columnizer.cc:96 msgid "InstVer" msgstr "安装版本" -#: src/pkg_columnizer.cc:96 +#: src/pkg_columnizer.cc:97 msgid "CandVer" msgstr "候选版本" -#: src/pkg_columnizer.cc:97 +#: src/pkg_columnizer.cc:98 msgid "LongState" msgstr "长格式状态" -#: src/pkg_columnizer.cc:98 +#: src/pkg_columnizer.cc:99 msgid "LongAction" msgstr "长格式动作" -#: src/pkg_columnizer.cc:99 src/qt/widgets/packages_tab.cc:105 +#: src/pkg_columnizer.cc:100 src/qt/widgets/packages_tab.cc:105 msgid "Maintainer" msgstr "维护者" -#: src/pkg_columnizer.cc:100 +#: src/pkg_columnizer.cc:101 msgid "Priority" msgstr "优先级" -#: src/pkg_columnizer.cc:101 +#: src/pkg_columnizer.cc:102 msgid "Section" msgstr "部分" -#: src/pkg_columnizer.cc:102 +#: src/pkg_columnizer.cc:103 msgid "RC" msgstr "RC" -#: src/pkg_columnizer.cc:104 +#: src/pkg_columnizer.cc:105 msgid "Tag" msgstr "标签" -#: src/pkg_columnizer.cc:107 +#: src/pkg_columnizer.cc:108 msgid "ProgName" msgstr "程序名" -#: src/pkg_columnizer.cc:108 +#: src/pkg_columnizer.cc:109 msgid "ProgVer" msgstr "程序版本" -#: src/pkg_columnizer.cc:109 +#: src/pkg_columnizer.cc:110 msgid "#Broken" msgstr "#损坏" -#: src/pkg_columnizer.cc:110 +#: src/pkg_columnizer.cc:111 msgid "DiskUsage" msgstr "占用磁盘空间" -#: src/pkg_columnizer.cc:111 +#: src/pkg_columnizer.cc:112 msgid "DownloadSize" msgstr "下载文件大小" -#: src/pkg_columnizer.cc:139 src/pkg_columnizer.cc:151 src/pkg_ver_item.cc:99 -#: src/pkg_ver_item.cc:164 +#: src/pkg_columnizer.cc:140 src/pkg_columnizer.cc:152 src/pkg_ver_item.cc:98 +#: src/pkg_ver_item.cc:163 msgid "" msgstr "<不可用>" -#: src/pkg_columnizer.cc:181 src/pkg_columnizer.cc:192 +#: src/pkg_columnizer.cc:182 src/pkg_columnizer.cc:193 msgid "" msgstr "<无>" -#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264 -#: src/pkg_grouppolicy.cc:1747 src/qt/package.cc:234 +#: src/pkg_columnizer.cc:237 src/pkg_grouppolicy.cc:264 +#: src/pkg_grouppolicy.cc:1673 src/qt/package.cc:236 #: src/qt/widgets/packages_tab.cc:73 msgid "virtual" msgstr "虚拟" -#: src/pkg_columnizer.cc:245 src/pkg_ver_item.cc:214 src/pkg_ver_item.cc:222 +#: src/pkg_columnizer.cc:244 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:223 msgid "purged" msgstr "清除" -#: src/pkg_columnizer.cc:252 src/pkg_ver_item.cc:229 +#: src/pkg_columnizer.cc:251 src/pkg_ver_item.cc:230 msgid "half-config" msgstr "配置完成一半" -#: src/pkg_columnizer.cc:254 src/pkg_ver_item.cc:231 +#: src/pkg_columnizer.cc:253 src/pkg_ver_item.cc:232 msgid "half-install" msgstr "安装完成一半" -#: src/pkg_columnizer.cc:256 src/pkg_ver_item.cc:233 +#: src/pkg_columnizer.cc:255 src/pkg_ver_item.cc:234 msgid "config-files" msgstr "配置文件" -#: src/pkg_columnizer.cc:261 +#: src/pkg_columnizer.cc:259 src/pkg_ver_item.cc:238 msgid "triggers-awaited" msgstr "等待触发" -#: src/pkg_columnizer.cc:263 +#: src/pkg_columnizer.cc:261 src/pkg_ver_item.cc:240 msgid "triggers-pending" msgstr "即将触发" -#: src/pkg_columnizer.cc:266 src/pkg_columnizer.cc:551 src/pkg_ver_item.cc:237 +#: src/pkg_columnizer.cc:263 src/pkg_columnizer.cc:548 src/pkg_ver_item.cc:242 msgid "ERROR" msgstr "错误" -#: src/pkg_columnizer.cc:313 src/pkg_ver_item.cc:295 +#: src/pkg_columnizer.cc:310 src/pkg_ver_item.cc:300 msgid "hold" msgstr "保持" -#: src/pkg_columnizer.cc:316 +#: src/pkg_columnizer.cc:313 msgid "forbidden upgrade" msgstr "被禁止的升级" -#: src/pkg_columnizer.cc:318 +#: src/pkg_columnizer.cc:315 msgid "purge" msgstr "清除" -#: src/pkg_columnizer.cc:318 src/pkg_ver_item.cc:319 +#: src/pkg_columnizer.cc:315 src/pkg_ver_item.cc:324 msgid "delete" msgstr "删除" -#: src/pkg_columnizer.cc:320 src/pkg_ver_item.cc:217 src/pkg_ver_item.cc:301 +#: src/pkg_columnizer.cc:317 src/pkg_ver_item.cc:218 src/pkg_ver_item.cc:306 msgid "broken" msgstr "损坏" -#: src/pkg_columnizer.cc:322 src/pkg_ver_item.cc:305 src/pkg_ver_item.cc:312 -#: src/pkg_ver_item.cc:321 +#: src/pkg_columnizer.cc:319 src/pkg_ver_item.cc:310 src/pkg_ver_item.cc:317 +#: src/pkg_ver_item.cc:326 msgid "install" msgstr "安装" -#: src/pkg_columnizer.cc:324 +#: src/pkg_columnizer.cc:321 msgid "reinstall" msgstr "重新安装" -#: src/pkg_columnizer.cc:326 +#: src/pkg_columnizer.cc:323 msgid "upgrade" msgstr "升级" -#: src/pkg_columnizer.cc:328 src/pkg_columnizer.cc:330 src/pkg_ver_item.cc:307 -#: src/pkg_ver_item.cc:314 src/pkg_ver_item.cc:323 src/pkg_ver_item.cc:326 +#: src/pkg_columnizer.cc:325 src/pkg_columnizer.cc:327 src/pkg_ver_item.cc:312 +#: src/pkg_ver_item.cc:319 src/pkg_ver_item.cc:328 src/pkg_ver_item.cc:331 msgid "none" msgstr "无" #. TRANSLATORS: Imp = Important -#: src/pkg_columnizer.cc:362 src/pkg_ver_item.cc:354 +#: src/pkg_columnizer.cc:359 src/pkg_ver_item.cc:359 msgid "Imp" msgstr "导入" #. TRANSLATORS: Req = Required -#: src/pkg_columnizer.cc:364 src/pkg_ver_item.cc:357 +#: src/pkg_columnizer.cc:361 src/pkg_ver_item.cc:362 msgid "Req" msgstr "要求" #. TRANSLATORS: Std = Standard -#: src/pkg_columnizer.cc:366 src/pkg_ver_item.cc:360 +#: src/pkg_columnizer.cc:363 src/pkg_ver_item.cc:365 msgid "Std" msgstr "标准" #. TRANSLATORS: Opt = Optional -#: src/pkg_columnizer.cc:368 src/pkg_ver_item.cc:363 +#: src/pkg_columnizer.cc:365 src/pkg_ver_item.cc:368 msgid "Opt" msgstr "可选" #. TRANSLATORS: Xtr = Extra -#: src/pkg_columnizer.cc:370 src/pkg_ver_item.cc:366 +#: src/pkg_columnizer.cc:367 src/pkg_ver_item.cc:371 msgid "Xtr" msgstr "额外" -#: src/pkg_columnizer.cc:372 src/pkg_ver_item.cc:368 +#: src/pkg_columnizer.cc:369 src/pkg_ver_item.cc:373 msgid "ERR" msgstr "错误" -#: src/pkg_columnizer.cc:394 +#: src/pkg_columnizer.cc:391 #, c-format msgid "#Broken: %ld" msgstr "#损坏：%ld" -#: src/pkg_columnizer.cc:409 +#: src/pkg_columnizer.cc:406 #, c-format msgid "Will use %sB of disk space" msgstr "将使用 %sB 磁盘空间" -#: src/pkg_columnizer.cc:417 +#: src/pkg_columnizer.cc:414 #, c-format msgid "Will free %sB of disk space" msgstr "将释放 %sB 磁盘空间" -#: src/pkg_columnizer.cc:431 +#: src/pkg_columnizer.cc:428 #, c-format msgid "DL Size: %sB" msgstr "需下载：%sB" #. TRANSLATORS: Hostname -#: src/pkg_columnizer.cc:499 +#: src/pkg_columnizer.cc:496 msgid "HN too long" msgstr "HN 太长" -#: src/pkg_columnizer.cc:676 src/pkg_columnizer.cc:685 +#: src/pkg_columnizer.cc:679 src/pkg_columnizer.cc:691 #, c-format msgid "Unable to transcode package display format after \"%ls\"" msgstr "在“%ls”之后无法转码软件包显示格式" -#: src/pkg_columnizer.cc:692 +#: src/pkg_columnizer.cc:698 msgid "Internal error: Default column string is unparsable" msgstr "内部错误：默认栏字符串无法解析" -#: src/pkg_grouppolicy.cc:274 src/pkg_grouppolicy.cc:1124 +#: src/pkg_grouppolicy.cc:274 src/pkg_grouppolicy.cc:1036 msgid "Tasks" msgstr "软件集" @@ -6062,7 +6057,7 @@ "虚拟软件包\n" " 这些软件包不存在；它们是一些其它软件包用于要求或者提供某种功能的名称。" -#: src/pkg_grouppolicy.cc:628 +#: src/pkg_grouppolicy.cc:653 msgid "" "Packages which are recommended by other packages\n" " These packages are not strictly required, but they may be necessary to " @@ -6072,7 +6067,7 @@ "由其它软件包推荐安装的软件包\n" " 这些软件包不是必需的，但是您可能需要安装它们以为您现在安装或者升级的某些其它程序提供全部功能。" -#: src/pkg_grouppolicy.cc:649 +#: src/pkg_grouppolicy.cc:678 msgid "" "Packages which are suggested by other packages\n" " These packages are not required in order to make your system function " @@ -6082,11 +6077,11 @@ "由其它软件包建议安装的软件包\n" "没有这些软件包您的系统依然能够正常工作，但是它们能为您现在安装的某些程序提供增强功能。" -#: src/pkg_grouppolicy.cc:806 +#: src/pkg_grouppolicy.cc:876 msgid "unknown" msgstr "未知" -#: src/pkg_grouppolicy.cc:817 +#: src/pkg_grouppolicy.cc:887 #, c-format msgid "Priority %s" msgstr "优先级：%s" @@ -6095,31 +6090,31 @@ msgid "UNCATEGORIZED" msgstr "未分类" -#: src/pkg_grouppolicy.cc:1058 +#: src/pkg_grouppolicy.cc:970 msgid "End-user" msgstr "最终用户" -#: src/pkg_grouppolicy.cc:1059 +#: src/pkg_grouppolicy.cc:971 msgid "Servers" msgstr "服务器" -#: src/pkg_grouppolicy.cc:1060 +#: src/pkg_grouppolicy.cc:972 msgid "Development" msgstr "开发" -#: src/pkg_grouppolicy.cc:1061 +#: src/pkg_grouppolicy.cc:973 msgid "Localization" msgstr "本地化" -#: src/pkg_grouppolicy.cc:1062 +#: src/pkg_grouppolicy.cc:974 msgid "Hardware Support" msgstr "硬件支持" -#: src/pkg_grouppolicy.cc:1064 +#: src/pkg_grouppolicy.cc:976 msgid "Unrecognized tasks" msgstr "无法识别的软件集" -#: src/pkg_grouppolicy.cc:1125 +#: src/pkg_grouppolicy.cc:1037 msgid "" "\n" " Tasks are groups of packages which provide an easy way to select a " @@ -6128,26 +6123,26 @@ "\n" " 软件集是一组软件包，它们提供了一种简单的方法来选择一组预定义的完成特定任务的软件包。" -#: src/pkg_grouppolicy.cc:1254 +#: src/pkg_grouppolicy.cc:1166 #, c-format msgid "Bad number in format string: %ls" msgstr "格式字符串里有错误的号码：%ls" -#: src/pkg_grouppolicy.cc:1263 +#: src/pkg_grouppolicy.cc:1175 #, c-format msgid "Match indices must be 1 or greater, not \"%s\"" msgstr "匹配索引必须大于等于 1，而不是“%s”" -#: src/pkg_grouppolicy.cc:1281 +#: src/pkg_grouppolicy.cc:1193 #, c-format msgid "Match index %ls is too large; available groups are (%s)" msgstr "匹配索引 %ls 太大了；可用的组为 (%s)" -#: src/pkg_grouppolicy.cc:1520 +#: src/pkg_grouppolicy.cc:1432 msgid "TAGLESS PACKAGES" msgstr "没有标签的软件包" -#: src/pkg_grouppolicy.cc:1521 +#: src/pkg_grouppolicy.cc:1433 msgid "" "\n" " These packages have not yet been classified in debtags, or the debtags " @@ -6160,38 +6155,38 @@ msgid "MISSING TAG" msgstr "标签缺失" -#: src/pkg_info_screen.cc:140 +#: src/pkg_info_screen.cc:150 msgid "Source Package: " msgstr "源码软件包： " -#: src/pkg_info_screen.cc:150 +#: src/pkg_info_screen.cc:160 #, c-format msgid "Package names provided by %s" msgstr "软件包名称由 %s 提供" -#: src/pkg_info_screen.cc:163 +#: src/pkg_info_screen.cc:173 #, c-format msgid "Packages which depend on %s" msgstr "依赖于 %s 的软件包" -#: src/pkg_info_screen.cc:169 +#: src/pkg_info_screen.cc:179 #, c-format msgid "Versions of %s" msgstr "%s 的版本号" -#: src/pkg_item.cc:88 +#: src/pkg_item.cc:86 #, c-format msgid "" "%s is an essential package!%n%nAre you sure you want to remove it?%nType " "'%s' if you are." msgstr "%s 是一个基本软件包！%n%n 您确定您要卸载它吗？%n 如果您确定的话输入“%s”。" -#: src/pkg_item.cc:373 src/pkg_ver_item.cc:748 +#: src/pkg_item.cc:369 src/pkg_ver_item.cc:749 #, c-format msgid "Reporting a bug in %s:\n" msgstr "报告 %s 中的错误\n" -#: src/pkg_item.cc:393 +#: src/pkg_item.cc:389 msgid "" "You are not root and I cannot find any way to become root. To reconfigure " "this package, install the menu package, the login package, or run aptitude " @@ -6200,7 +6195,7 @@ "您不是 root，而且我没有发现任何方法来变成 root。要重新配置这个软件包，请安装 menu 软件包，login 软件包，或者以 root 身份运行 " "aptitude 。" -#: src/pkg_item.cc:401 +#: src/pkg_item.cc:397 #, c-format msgid "Reconfiguring %s\n" msgstr "重新配置 %s\n" @@ -6209,7 +6204,7 @@ msgid "Hierarchy Editor" msgstr "层次编辑器" -#: src/pkg_subtree.cc:159 +#: src/pkg_subtree.cc:163 #, c-format msgid "This group contains %d package." msgid_plural "This group contains %d packages." @@ -6236,42 +6231,42 @@ msgid "Enter the new package sorting mechanism for this display: " msgstr "为此显示输入新的软件包排序机制： " -#: src/pkg_view.cc:165 +#: src/pkg_view.cc:164 msgid "Couldn't cw::util::transcode column definition" msgstr "无法 cw::util::transcode 列定义" -#: src/pkg_view.cc:172 +#: src/pkg_view.cc:171 msgid "Couldn't parse column definition" msgstr "无法解析列定义" -#: src/pkg_view.cc:223 +#: src/pkg_view.cc:222 msgid "" "If you select a package, an explanation of why it should be installed or " "removed will appear in this space." msgstr "如果您选择了一个软件包，那么为什么它需要被安装或移除的解释将会出现在这片空间。" -#: src/pkg_view.cc:575 +#: src/pkg_view.cc:565 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: 参数错误 -- 两个主要部件？" -#: src/pkg_view.cc:581 +#: src/pkg_view.cc:571 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "make_package_view: 参数错误 -- 静态项目的栏列表错误" -#: src/pkg_view.cc:678 +#: src/pkg_view.cc:646 msgid "Related Dependencies" msgstr "相关依赖关系" -#: src/pkg_view.cc:681 +#: src/pkg_view.cc:649 msgid "Why Installed" msgstr "为什么已安装" -#: src/pkg_view.cc:700 +#: src/pkg_view.cc:668 msgid "make_package_view: bad argument!" msgstr "make_package_view: 参数错误！" -#: src/pkg_view.cc:752 +#: src/pkg_view.cc:720 msgid "make_package_view: no main widget found" msgstr "make_package_view: 未发现主要部件" @@ -6364,143 +6359,143 @@ msgid " (provided by %F)" msgstr " (由 %F 提供)" -#: src/reason_fragment.cc:265 +#: src/reason_fragment.cc:272 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:314 +#: src/reason_fragment.cc:321 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "如果您选择了一个软件包，其当前状态的描述将会出现在这片空间。" -#: src/reason_fragment.cc:348 +#: src/reason_fragment.cc:355 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" msgstr "%B%s%b 被自动安装；现在它将被删除，因为所有依赖于它的软件包都将被删除：" -#: src/reason_fragment.cc:352 +#: src/reason_fragment.cc:359 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "由于依赖关系出错，%B%s%b 将被自动删除：" -#: src/reason_fragment.cc:356 +#: src/reason_fragment.cc:363 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "%B%s%b 将被自动安装以满足下列依赖关系：" -#: src/reason_fragment.cc:362 src/reason_fragment.cc:374 +#: src/reason_fragment.cc:369 src/reason_fragment.cc:381 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." msgstr "%B%s%b 现在无法升级，但是如果可以升级的话，它仍将被保持在版本 %B%s%b。" -#: src/reason_fragment.cc:365 +#: src/reason_fragment.cc:372 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" msgstr "%B%s%b 将不会被升级到版本 %B%s%b，以避免破坏下列依赖关系：" -#: src/reason_fragment.cc:377 +#: src/reason_fragment.cc:384 msgid "%B%s%b is currently installed." msgstr "%B%s%b 目前已安装。" -#: src/reason_fragment.cc:383 +#: src/reason_fragment.cc:390 msgid "%B%s%b is not currently installed." msgstr "%B%s%b 目前未被安装。" -#: src/reason_fragment.cc:391 +#: src/reason_fragment.cc:398 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "%B%s%b 的某些依赖关系未被满足：" -#: src/reason_fragment.cc:395 +#: src/reason_fragment.cc:402 msgid "%B%s%b will be downgraded." msgstr "%B%s%b 将被降级。" -#: src/reason_fragment.cc:402 +#: src/reason_fragment.cc:409 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b 将从不会升级到禁止的版本 %B%s%b。" -#: src/reason_fragment.cc:406 +#: src/reason_fragment.cc:413 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "%B%s%b 可以升级到版本 %B%s%b，但是它将被保持在版本%B%s%b。" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:420 msgid "%B%s%b will be re-installed." msgstr "%B%s%b 将被重新安装。" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:424 msgid "%B%s%b will be installed." msgstr "%B%s%b 将被安装。" -#: src/reason_fragment.cc:421 +#: src/reason_fragment.cc:428 msgid "%B%s%b will be removed." msgstr "%B%s%b 将被删除。" -#: src/reason_fragment.cc:426 +#: src/reason_fragment.cc:433 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b 将从版本 %B%s%b升级到版本%B%s%b。" -#: src/reason_fragment.cc:433 +#: src/reason_fragment.cc:440 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b 仅被部分安装；它的安装将会完成。" -#: src/reason_fragment.cc:465 +#: src/reason_fragment.cc:472 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "下列软件包依赖于 %B%s%b，删除该软件包将使它们破损：" -#: src/reason_fragment.cc:468 +#: src/reason_fragment.cc:475 msgid "The following packages depend on %B%s%b and are broken:" msgstr "下列软件包依赖于 %B%s%b，它们目前是破损的：" -#: src/reason_fragment.cc:475 +#: src/reason_fragment.cc:482 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "下列软件包与 %B%s%b 相冲突，安装该软件包将使它们破损：" -#: src/reason_fragment.cc:508 +#: src/reason_fragment.cc:515 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " "installed version:" msgstr "下列软件包依赖于某一版本的 %B%s%b，该版本当前安装的版本 %B%s%b 不同，或者它们与当前安装的版本冲突：" -#: src/reason_fragment.cc:512 +#: src/reason_fragment.cc:519 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "下列软件包与 %B%s%b 冲突，或者依赖于它的某一版本，该版本将不被安装。" -#: src/reason_fragment.cc:516 +#: src/reason_fragment.cc:523 msgid "The following packages conflict with %B%s%b:" msgstr "下列软件包与 %B%s%b 相冲突：" -#: src/reason_fragment.cc:521 +#: src/reason_fragment.cc:528 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "下列软件包依赖于某一版本的 %B%s%b，该版本当前安装的版本 %B%s%b 不同：" -#: src/reason_fragment.cc:525 +#: src/reason_fragment.cc:532 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "下列软件包依赖于 %B%s%b 的某一版本，该版本将不被安装。" -#: src/reason_fragment.cc:531 +#: src/reason_fragment.cc:538 msgid "upgraded" msgstr "已升级" -#: src/reason_fragment.cc:531 +#: src/reason_fragment.cc:538 msgid "downgraded" msgstr "已下载" -#: src/reason_fragment.cc:537 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -6508,13 +6503,13 @@ msgstr "" "下列软件包依赖于当前安装版本的 %B%s%b ( %B%s%b )，或者与它将被 %s 至的版本 (%B%s%b)冲突，并且将会破损如果它是 %s。" -#: src/reason_fragment.cc:544 +#: src/reason_fragment.cc:551 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "下列软件包与版本 %B%s%b 的 %B%s%b 冲突，并且将会破损如果它是 %s。" -#: src/reason_fragment.cc:549 +#: src/reason_fragment.cc:556 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -6548,43 +6543,43 @@ msgid "Close" msgstr "关闭" -#: src/solution_fragment.cc:168 +#: src/solution_fragment.cc:164 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s 和 %s 冲突 [由 %s %s 提供]" -#: src/solution_fragment.cc:181 +#: src/solution_fragment.cc:177 #, c-format msgid "Removing %s" msgstr "%s 删除中" -#: src/solution_fragment.cc:183 +#: src/solution_fragment.cc:179 #, c-format msgid "Installing %s %s (%s)" msgstr "正在安装 %s %s (%s)" -#: src/solution_fragment.cc:189 +#: src/solution_fragment.cc:185 #, c-format msgid "Leave %ls unresolved." msgstr "遗留 %ls 未解决。" -#: src/solution_fragment.cc:415 +#: src/solution_fragment.cc:411 msgid "%BRemove%b the following packages:%n" msgstr "%B删除%b 下列软件包：%n" -#: src/solution_fragment.cc:430 +#: src/solution_fragment.cc:426 msgid "%BInstall%b the following packages:%n" msgstr "%B安装%b 下列软件包：%n" -#: src/solution_fragment.cc:448 +#: src/solution_fragment.cc:444 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%B保持%b 下列软件包于其当前版本：%n" -#: src/solution_fragment.cc:472 +#: src/solution_fragment.cc:468 msgid "%BUpgrade%b the following packages:%n" msgstr "%B升级%b 下列软件包：%n" -#: src/solution_fragment.cc:492 +#: src/solution_fragment.cc:488 msgid "%BDowngrade%b the following packages:%n" msgstr "%B降级%b 下列软件包：%n" @@ -6623,7 +6618,7 @@ msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgstr "降级 %F [%s (%s) -> %s (%s)]" -#: src/solution_item.cc:603 +#: src/solution_item.cc:606 #, c-format msgid "-> Leave the dependency \"%s recommends %s\" unresolved." msgstr "-> 不处理“%s 推荐 %s”中的依赖关系。" @@ -6663,23 +6658,23 @@ #. TRANSLATORS: This string is a confirmation message, which users #. (especially CJK users) should be able to input without input #. methods. Please include nothing but ASCII characters. -#: src/ui.cc:211 +#: src/ui.cc:209 msgid "Yes, I am aware this is a very bad idea" msgstr "Yes, I am aware this is a very bad idea" -#: src/ui.cc:238 +#: src/ui.cc:236 msgid "Er, there aren't any errors, this shouldn't have happened.." msgstr "嗯，没有任何错误，这不应该发生.." -#: src/ui.cc:244 +#: src/ui.cc:242 msgid "E:" msgstr "E:" -#: src/ui.cc:246 +#: src/ui.cc:244 msgid "W:" msgstr "W:" -#: src/ui.cc:342 +#: src/ui.cc:340 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " "subsequent changes will not be saved unless you stop all other running apt-" @@ -6687,111 +6682,111 @@ msgstr "" "注意：软件包缓存是用只读模式打开！本次更改和其他更改将不会被保留，除非您暂停其他给予 apt 的程序，并且在动作菜单中选择 \"变为 root\"。" -#: src/ui.cc:348 +#: src/ui.cc:346 msgid "Never display this message again." msgstr "不要再显示此信息。" -#: src/ui.cc:394 +#: src/ui.cc:392 msgid "" "You may not modify the state of any package while a download is underway." msgstr "在下载还在继续的时候，您不能修改任何软件包的状态。" -#: src/ui.cc:425 +#: src/ui.cc:423 msgid "You already are root!" msgstr "您已经是 root 了！" -#: src/ui.cc:440 +#: src/ui.cc:438 msgid "Invalid Get-Root-Command; it should start with su: or sudo:" msgstr "无效的获取 root 权限命令：应该以 su: 或 sudo: 开始" -#: src/ui.cc:447 +#: src/ui.cc:445 #, c-format msgid "Invalid Get-Root-Command; it should start with su: or sudo:, not %s:" msgstr "无效的获取 root 权限命令：应该以 su: 或 sudo: 开始，而不是 %s:" -#: src/ui.cc:476 +#: src/ui.cc:474 #, c-format msgid "Unable to fork: %s" msgstr "无法产生子进程：%s" -#: src/ui.cc:580 +#: src/ui.cc:578 msgid "" "Subprocess exited with an error -- did you type your password correctly?" msgstr "子进程返回一个错误 -- 您输入的密码正确吗？" -#: src/ui.cc:619 +#: src/ui.cc:617 msgid "Loading cache" msgstr "载入缓存" -#: src/ui.cc:661 +#: src/ui.cc:659 msgid "Really quit Aptitude?" msgstr "真的要退出 Aptitude 吗？" -#: src/ui.cc:715 src/ui.cc:2550 +#: src/ui.cc:713 src/ui.cc:2573 msgid "Change the behavior of aptitude" msgstr "修改 aptitude 的行为" -#: src/ui.cc:751 +#: src/ui.cc:749 msgid "Really discard your personal settings and reload the defaults?" msgstr "真的要放弃您的个人设置并载入默认值吗？" -#: src/ui.cc:856 src/ui.cc:903 src/ui.cc:931 src/ui.cc:954 +#: src/ui.cc:885 msgid "View available packages and choose actions to perform" msgstr "查看可选软件包以及选择要执行的动作" -#: src/ui.cc:885 +#: src/ui.cc:914 msgid "Recommended Packages" msgstr "推荐的软件包" -#: src/ui.cc:886 +#: src/ui.cc:915 msgid "View packages that it is recommended that you install" msgstr "查看推荐您安装的软件包" -#: src/ui.cc:887 +#: src/ui.cc:916 msgid "Recommendations" msgstr "推荐" -#: src/ui.cc:982 +#: src/ui.cc:1002 #, c-format msgid "Information about %s" msgstr "关于 %s 的信息" -#: src/ui.cc:984 +#: src/ui.cc:1004 #, c-format msgid "%s info" msgstr "%s 信息" -#: src/ui.cc:1005 +#: src/ui.cc:1025 #, c-format msgid "Packages depending on %s" msgstr "依赖于 %s 的软件包" -#: src/ui.cc:1006 +#: src/ui.cc:1026 #, c-format msgid "Dependencies of %s" msgstr "%s 的依赖关系" -#: src/ui.cc:1009 +#: src/ui.cc:1029 #, c-format msgid "%s reverse deps" msgstr "%s 反向依赖" -#: src/ui.cc:1010 +#: src/ui.cc:1030 #, c-format msgid "%s deps" msgstr "%s 依赖" -#: src/ui.cc:1028 +#: src/ui.cc:1048 #, c-format msgid "Available versions of %s" msgstr "%s 的可用版本" -#: src/ui.cc:1030 +#: src/ui.cc:1050 #, c-format msgid "%s versions" msgstr "%s 版本号" -#: src/ui.cc:1036 +#: src/ui.cc:1056 msgid "" "Aptitude %s%n%nCopyright 2000-2008 Daniel Burrows.%n%naptitude comes with " "%BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu. " @@ -6801,88 +6796,88 @@ "Aptitude %s%n%n版权所有 2000-2008 Daniel Burrows。%n%n使用 Aptitude " "软件%B无任何担保%b；细节请查阅帮助菜单的“license”项。该软件是自由软件，欢迎您遵照某些条款分发该软件；细节请查阅“license”文件。" -#: src/ui.cc:1086 src/ui.cc:1088 +#: src/ui.cc:1106 src/ui.cc:1108 msgid "License" msgstr "许可证" -#: src/ui.cc:1087 src/ui.cc:2642 +#: src/ui.cc:1107 src/ui.cc:2665 msgid "View the terms under which you may copy and distribute aptitude" msgstr "查看您可以在何种条款下拷贝和分发 aptitude" #. TRANSLATORS: You can translate help.txt and set the filename here. -#: src/ui.cc:1102 +#: src/ui.cc:1122 msgid "Localized file|help.txt" msgstr "help-zh_CN.txt" -#: src/ui.cc:1104 +#: src/ui.cc:1124 msgid "Encoding of help.txt|UTF-8" msgstr "UTF-8" -#: src/ui.cc:1115 +#: src/ui.cc:1135 msgid "Online Help" msgstr "在线帮助" -#: src/ui.cc:1116 +#: src/ui.cc:1136 msgid "View a brief introduction to aptitude" msgstr "观看 aptitude 的简要介绍" -#: src/ui.cc:1117 src/ui.cc:2792 +#: src/ui.cc:1137 src/ui.cc:2817 msgid "Help" msgstr "帮助" #. TRANSLATORS: You can translate README and set the filename here. -#: src/ui.cc:1126 +#: src/ui.cc:1146 msgid "Localized file|README" msgstr "README" # I think we don't have a Chinese README file yet, so leave this alone -#: src/ui.cc:1127 +#: src/ui.cc:1147 msgid "Encoding of README|ISO_8859-1" msgstr "ISO_8859-1" -#: src/ui.cc:1138 +#: src/ui.cc:1158 msgid "User's Manual" msgstr "用户手册" -#: src/ui.cc:1139 +#: src/ui.cc:1159 msgid "Read the full user's manual of aptitude" msgstr "阅读 aptitude 的完整的用户手册" -#: src/ui.cc:1140 +#: src/ui.cc:1160 msgid "Manual" msgstr "手册" -#: src/ui.cc:1147 src/ui.cc:1149 +#: src/ui.cc:1167 src/ui.cc:1169 msgid "FAQ" msgstr "常见问题回答" -#: src/ui.cc:1148 src/ui.cc:2634 +#: src/ui.cc:1168 src/ui.cc:2657 msgid "View a list of frequently asked questions" msgstr "查看常见问题列表" -#: src/ui.cc:1157 src/ui.cc:1159 +#: src/ui.cc:1177 src/ui.cc:1179 msgid "News" msgstr "新闻" -#: src/ui.cc:1158 +#: src/ui.cc:1178 #, c-format msgid "View the important changes made in each version of %s" msgstr "查看 %s 每一版本中所做的重大修改" -#: src/ui.cc:1165 +#: src/ui.cc:1185 #, c-format msgid "" "Unable to remove the old temporary directory; you should remove %s by hand." msgstr "无法删除旧的临时文件夹；您需要手动删除 %s。" -#: src/ui.cc:1170 +#: src/ui.cc:1190 #, c-format msgid "" "Will not remove %s; you should examine the files in it and remove them by " "hand." msgstr "不会删除 %s；您需要坚持该文件夹内的文件，然后手动删除。" -#: src/ui.cc:1196 +#: src/ui.cc:1216 #, c-format msgid "" "It appears that a previous version of aptitude left files behind in %s. " @@ -6893,15 +6888,15 @@ "好像上一个版本的 aptitude 在 %s " "中留了一些文件。这些文件基本上没什么用处了，可以安装的删除。%n%n您要删除这些目录和里面的内容吗？如果您选择“不”，您将不会再看到这条信息。" -#: src/ui.cc:1268 +#: src/ui.cc:1291 msgid "View the progress of the package download" msgstr "查看软件包下载的进程" -#: src/ui.cc:1269 +#: src/ui.cc:1292 msgid "Package Download" msgstr "软件包下载" -#: src/ui.cc:1316 +#: src/ui.cc:1339 msgid "" "%BWARNING%b: untrusted versions of the following packages will be " "installed!%n%nUntrusted packages could %Bcompromise your system's " @@ -6911,531 +6906,531 @@ "%B警告%b：以下软件包的不可信版本将被安装！%n%n不可信的软件包可能会%B危害您的系统安全%b。只有当您非常清楚地了解这就是您所要执行的操作时，才应该" "进行安装操作。%n%n" -#: src/ui.cc:1322 +#: src/ui.cc:1345 msgid " %S*%N %s [version %s]%n" msgstr " %S*%N %s [版本号 %s]%n" -#: src/ui.cc:1328 +#: src/ui.cc:1351 msgid "Really Continue" msgstr "真的继续" -#: src/ui.cc:1330 +#: src/ui.cc:1353 msgid "Abort Installation" msgstr "中止安装" -#: src/ui.cc:1394 +#: src/ui.cc:1417 msgid "Preview of package installation" msgstr "预览软件包安装" -#: src/ui.cc:1395 +#: src/ui.cc:1418 msgid "View and/or adjust the actions that will be performed" msgstr "查看以及/或者调整将要被执行的动作" -#: src/ui.cc:1457 +#: src/ui.cc:1480 msgid "Some packages were broken and have been fixed:" msgstr "某些破损的包已经被修补:" -#: src/ui.cc:1465 +#: src/ui.cc:1488 msgid "No solution to these dependency problems exists!" msgstr "这些依赖关系没有解决方案！" -#: src/ui.cc:1471 +#: src/ui.cc:1494 #, c-format msgid "" "Ran out of time while trying to resolve dependencies (press \"%s\" to try " "harder)" msgstr "试图搜寻解决方案时用时已尽 (按“%s”加把劲儿再试试)" -#: src/ui.cc:1517 +#: src/ui.cc:1540 msgid "" "Installing/removing packages requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "安装/删除软件包需要管理员权限，而您现在没有这种权限。您想要进入 root 帐号吗？" -#: src/ui.cc:1520 src/ui.cc:1759 src/ui.cc:1820 src/ui.cc:1915 +#: src/ui.cc:1543 src/ui.cc:1782 src/ui.cc:1843 src/ui.cc:1938 msgid "Become root" msgstr "变成 root" -#: src/ui.cc:1522 src/ui.cc:1761 src/ui.cc:1822 src/ui.cc:1917 +#: src/ui.cc:1545 src/ui.cc:1784 src/ui.cc:1845 src/ui.cc:1940 msgid "Don't become root" msgstr "不变成 root" -#: src/ui.cc:1643 +#: src/ui.cc:1666 msgid "No packages are scheduled to be installed, removed, or upgraded." msgstr "没有任何软件包被设定为安装，删除或者升级。" -#: src/ui.cc:1649 +#: src/ui.cc:1672 msgid "" "No packages will be installed, removed or upgraded. Some packages could be " "upgraded, but you have not chosen to upgrade them. Type \"U\" to prepare an " "upgrade." msgstr "没有任何软件包将被安装，删除或者升级。某些软件包可以升级，但是您没有选择将它们升级。输入“U”以准备升级。" -#: src/ui.cc:1729 +#: src/ui.cc:1752 msgid "Updating package lists" msgstr "正在更新软件包列表" -#: src/ui.cc:1730 +#: src/ui.cc:1753 msgid "View the progress of the package list update" msgstr "查看软件包列表更新的进程" -#: src/ui.cc:1731 +#: src/ui.cc:1754 msgid "List Update" msgstr "列表更新" -#: src/ui.cc:1756 +#: src/ui.cc:1779 msgid "" "Updating the package lists requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "更新软件包列表需要管理员权限，而您现在没有这种权限。您想要进入 root 帐号吗？" -#: src/ui.cc:1771 src/ui.cc:2385 +#: src/ui.cc:1794 src/ui.cc:2408 msgid "Waste time trying to find mines" msgstr "通过扫雷来消磨时间" -#: src/ui.cc:1778 src/ui.cc:1866 +#: src/ui.cc:1801 src/ui.cc:1889 msgid "Cleaning while a download is in progress is not allowed" msgstr "在下载进行过程中不允许执行清除" -#: src/ui.cc:1793 +#: src/ui.cc:1816 msgid "Deleting downloaded files" msgstr "删除下载的文件" -#: src/ui.cc:1807 +#: src/ui.cc:1830 msgid "Downloaded package files have been deleted" msgstr "下载的文件已经被删除" -#: src/ui.cc:1817 +#: src/ui.cc:1840 msgid "" "Cleaning the package cache requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "清理软件包缓存需要管理员权限，而您现在没有这种权限。您想要进入 root 帐号吗？" -#: src/ui.cc:1863 +#: src/ui.cc:1886 msgid "The apt cache file is not available; cannot auto-clean." msgstr "软件包缓存不可用：无法 auto-clean 。" -#: src/ui.cc:1901 +#: src/ui.cc:1924 #, c-format msgid "" "Obsolete downloaded package files have been deleted, freeing %sB of disk " "space." msgstr "过期的下载文件已经被删除，正在释放 %sB 的磁盘空间。" -#: src/ui.cc:1912 +#: src/ui.cc:1935 msgid "" "Deleting obsolete files requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "删除废弃文件需要管理员权限，而您现在没有这种权限。您想要进入 root 帐号吗？" -#: src/ui.cc:2014 +#: src/ui.cc:2037 msgid "No more solutions." msgstr "没有更多的解决方案了。" -#: src/ui.cc:2222 +#: src/ui.cc:2245 msgid "Unable to find a solution to apply." msgstr "未能找到解决方案以实施。" -#: src/ui.cc:2228 +#: src/ui.cc:2251 msgid "Ran out of time while trying to find a solution." msgstr "寻求解决方案时耗尽了时限。" -#: src/ui.cc:2288 src/ui.cc:2290 +#: src/ui.cc:2311 src/ui.cc:2313 msgid "Resolve Dependencies" msgstr "解决依赖关系" -#: src/ui.cc:2289 +#: src/ui.cc:2312 msgid "Search for solutions to unsatisfied dependencies" msgstr "为未满足的依赖关系寻找解决方案" -#: src/ui.cc:2301 +#: src/ui.cc:2324 #, c-format msgid "Unable to open %ls" msgstr "无法打开 %ls" -#: src/ui.cc:2307 +#: src/ui.cc:2330 msgid "Error while dumping resolver state" msgstr "存储依赖关系解决状态时出错" -#: src/ui.cc:2347 +#: src/ui.cc:2370 msgid "^Install/remove packages" msgstr "安装/卸载软件包(^I)" -#: src/ui.cc:2350 +#: src/ui.cc:2373 msgid "^Update package list" msgstr "更新软件包列表(^U)" -#: src/ui.cc:2355 +#: src/ui.cc:2378 msgid "Mark Up^gradable" msgstr "标记可升级的(^g)" -#: src/ui.cc:2360 +#: src/ui.cc:2383 msgid "^Forget new packages" msgstr "忘记新软件包(^F)" -#: src/ui.cc:2364 +#: src/ui.cc:2387 msgid "Canc^el pending actions" msgstr "取消待执行的动作(^E)" -#: src/ui.cc:2368 +#: src/ui.cc:2391 msgid "^Clean package cache" msgstr "清除软件包缓存(^C)" -#: src/ui.cc:2372 +#: src/ui.cc:2395 msgid "Clean ^obsolete files" msgstr "关闭过期文件(^O)" -#: src/ui.cc:2379 +#: src/ui.cc:2402 msgid "^Reload package cache" msgstr "重新载入软件包缓存(^R)" -#: src/ui.cc:2384 +#: src/ui.cc:2407 msgid "^Play Minesweeper" msgstr "玩扫雷游戏(^P)" -#: src/ui.cc:2389 +#: src/ui.cc:2412 msgid "^Become root" msgstr "变成 root (^B)" -#: src/ui.cc:2392 +#: src/ui.cc:2415 msgid "^Quit" msgstr "退出(^Q)" -#: src/ui.cc:2399 src/ui.cc:2786 +#: src/ui.cc:2422 src/ui.cc:2811 msgid "Undo" msgstr "撤消" -#: src/ui.cc:2408 +#: src/ui.cc:2431 msgid "^Install" msgstr "安装(^I)" -#: src/ui.cc:2409 +#: src/ui.cc:2432 msgid "Flag the currently selected package for installation or upgrade" msgstr "标记当前选择的软件包以安装或者升级" -#: src/ui.cc:2416 +#: src/ui.cc:2439 msgid "^Remove" msgstr "删除(^R)" -#: src/ui.cc:2417 +#: src/ui.cc:2440 msgid "Flag the currently selected package for removal" msgstr "标记当前选择的软件包以删除" -#: src/ui.cc:2420 +#: src/ui.cc:2443 msgid "^Purge" msgstr "清除(^P)" -#: src/ui.cc:2421 +#: src/ui.cc:2444 msgid "" "Flag the currently selected package and its configuration files for removal" msgstr "标记当前选择的软件包和它的配置文件以删除" -#: src/ui.cc:2424 +#: src/ui.cc:2447 msgid "^Keep" msgstr "保持(^K)" -#: src/ui.cc:2425 +#: src/ui.cc:2448 msgid "Cancel any action on the selected package" msgstr "取消选定软件包上的任何动作" -#: src/ui.cc:2428 +#: src/ui.cc:2451 msgid "^Hold" msgstr "保持(^H)" -#: src/ui.cc:2429 +#: src/ui.cc:2452 msgid "" "Cancel any action on the selected package, and protect it from future " "upgrades" msgstr "取消选定软件包上的任何动作，并且保护它免于以后被升级" -#: src/ui.cc:2432 +#: src/ui.cc:2455 msgid "Mark ^Auto" msgstr "标记为自动安装(^A)" -#: src/ui.cc:2433 +#: src/ui.cc:2456 msgid "" "Mark the selected package as having been automatically installed; it will " "automatically be removed if no other packages depend on it" msgstr "将所选定的软件包标记为自动安装；如果没有其它软件包依赖于它，它将会被自动删除" -#: src/ui.cc:2436 +#: src/ui.cc:2459 msgid "Mark ^Manual" msgstr "标记为手动安装(^M)" -#: src/ui.cc:2437 +#: src/ui.cc:2460 msgid "" "Mark the selected package as having been manually installed; it will not be " "removed unless you manually remove it" msgstr "将所选定的软件包标记为手动安装；除非您手动删除该软件包，否则它将不会被删除" -#: src/ui.cc:2440 +#: src/ui.cc:2463 msgid "^Forbid Version" msgstr "禁止版本(^F)" -#: src/ui.cc:2441 +#: src/ui.cc:2464 msgid "" "Forbid the candidate version of the selected package from being installed; " "newer versions of the package will be installed as usual" msgstr "禁止安装选定软件包的候选版本；该软件包的新版本将可以正常安装" -#: src/ui.cc:2445 +#: src/ui.cc:2468 msgid "I^nformation" msgstr "信息(^N)" -#: src/ui.cc:2446 +#: src/ui.cc:2469 msgid "Display more information about the selected package" msgstr "显示关于选定软件包上的更多信息" -#: src/ui.cc:2449 +#: src/ui.cc:2472 msgid "C^ycle Package Information" msgstr "循环软件包信息" -#: src/ui.cc:2450 +#: src/ui.cc:2473 msgid "" "Cycle through the modes of the package information area: it can show the " "package's long description, a summary of its dependency status, or an " "analysis of why the package is required." msgstr "在软件包信息区域模式中循环：它可以显示软件包的长篇说明，依赖状态的概要，或者分析为什么该软件包是必须的。" -#: src/ui.cc:2453 +#: src/ui.cc:2476 msgid "^Changelog" msgstr "变更日志(^C)" -#: src/ui.cc:2454 +#: src/ui.cc:2477 msgid "Display the Debian changelog of the selected package" msgstr "显示选定软件包上的变更日志" -#: src/ui.cc:2461 +#: src/ui.cc:2484 msgid "^Examine Solution" msgstr "检查解决方案(^E)" -#: src/ui.cc:2462 +#: src/ui.cc:2485 msgid "Examine the currently selected solution to the dependency problems." msgstr "检查当前选择的处理依赖问题的解决方案" -#: src/ui.cc:2465 +#: src/ui.cc:2488 msgid "Apply ^Solution" msgstr "应用解决方案(^S)" -#: src/ui.cc:2466 +#: src/ui.cc:2489 msgid "Perform the actions contained in the currently selected solution." msgstr "确认当前选择的解决方案中包含的动作。" -#: src/ui.cc:2469 +#: src/ui.cc:2492 msgid "^Next Solution" msgstr "下一个解决方案(^N)" -#: src/ui.cc:2470 +#: src/ui.cc:2493 msgid "Select the next solution to the dependency problems." msgstr "选择解决此依赖问题的下一个方案。" -#: src/ui.cc:2473 +#: src/ui.cc:2496 msgid "^Previous Solution" msgstr "前一个解决方案(^P)" -#: src/ui.cc:2474 +#: src/ui.cc:2497 msgid "Select the previous solution to the dependency problems." msgstr "选择解决此依赖问题的前一个方案。" -#: src/ui.cc:2477 +#: src/ui.cc:2500 msgid "^First Solution" msgstr "第一个解决方案(^F)" -#: src/ui.cc:2478 +#: src/ui.cc:2501 msgid "Select the first solution to the dependency problems." msgstr "选择解决此依赖问题的第一个方案。" -#: src/ui.cc:2481 +#: src/ui.cc:2504 msgid "^Last Solution" msgstr "最后一个解决方案(^L)" -#: src/ui.cc:2482 +#: src/ui.cc:2505 msgid "" "Select the last solution to the dependency problems that has been generated " "so far." msgstr "选择当前已经生成的解决此依赖问题的最后一个方案。" -#: src/ui.cc:2488 +#: src/ui.cc:2511 msgid "Toggle ^Rejected" msgstr "放弃(^R)" -#: src/ui.cc:2489 +#: src/ui.cc:2512 msgid "Toggle whether the currently selected action is rejected." msgstr "切换是否放弃当前选择的动作。" -#: src/ui.cc:2493 +#: src/ui.cc:2516 msgid "Toggle ^Approved" msgstr "确认(^A)" -#: src/ui.cc:2494 +#: src/ui.cc:2517 msgid "Toggle whether the currently selected action is approved." msgstr "切换当前选择的动作是否被允许。" -#: src/ui.cc:2498 +#: src/ui.cc:2521 msgid "^View Target" msgstr "查看目标(^V)" -#: src/ui.cc:2499 +#: src/ui.cc:2522 msgid "View the package which will be affected by the selected action" msgstr "查看会被所选的动作影响的软件包" -#: src/ui.cc:2505 +#: src/ui.cc:2528 msgid "Reject Breaking ^Holds" msgstr "拒绝破坏 ^Holds" -#: src/ui.cc:2507 +#: src/ui.cc:2530 msgid "" "Reject all actions that would change the state of held packages or install " "forbidden versions" msgstr "拒绝所有会改变保持软件包或安装禁止版本的动作。" -#: src/ui.cc:2515 +#: src/ui.cc:2538 msgid "^Find" msgstr "查找(^F)" -#: src/ui.cc:2516 +#: src/ui.cc:2539 msgid "Search forwards" msgstr "向前搜索" -#: src/ui.cc:2519 +#: src/ui.cc:2542 msgid "^Find Backwards" msgstr "向后查找(^F)" -#: src/ui.cc:2520 +#: src/ui.cc:2543 msgid "Search backwards" msgstr "向后搜索" -#: src/ui.cc:2523 +#: src/ui.cc:2546 msgid "Find ^Again" msgstr "继续查找(^A)" -#: src/ui.cc:2524 +#: src/ui.cc:2547 msgid "Repeat the last search" msgstr "重复上一次查找" -#: src/ui.cc:2527 +#: src/ui.cc:2550 msgid "Find Again ^Backwards" msgstr "向后继续查找(^B)" -#: src/ui.cc:2528 +#: src/ui.cc:2551 msgid "Repeat the last search in the opposite direction" msgstr "反向重复上一次查找" -#: src/ui.cc:2532 +#: src/ui.cc:2555 msgid "^Limit Display" msgstr "限制显示(^L)" -#: src/ui.cc:2533 +#: src/ui.cc:2556 msgid "Apply a filter to the package list" msgstr "使用过滤器过滤软件包列表" -#: src/ui.cc:2536 +#: src/ui.cc:2559 msgid "^Un-Limit Display" msgstr "取消显示限制(^U)" -#: src/ui.cc:2537 +#: src/ui.cc:2560 msgid "Remove the filter from the package list" msgstr "取消软件包列表中过滤器的效果" -#: src/ui.cc:2541 +#: src/ui.cc:2564 msgid "Find ^Broken" msgstr "搜寻损坏(^F)" -#: src/ui.cc:2542 +#: src/ui.cc:2565 msgid "Find the next package with unsatisfied dependencies" msgstr "下列软件包存在未满足的依赖关系：" -#: src/ui.cc:2549 +#: src/ui.cc:2572 msgid "^Preferences" msgstr "首选项(^P)" -#: src/ui.cc:2554 +#: src/ui.cc:2577 msgid "^UI options" msgstr "用户界面选项(^U)" -#: src/ui.cc:2555 +#: src/ui.cc:2578 msgid "Change the settings which affect the user interface" msgstr "修改影响用户界面的设置" -#: src/ui.cc:2558 +#: src/ui.cc:2581 msgid "^Dependency handling" msgstr "处理依赖关系(^D)" -#: src/ui.cc:2559 +#: src/ui.cc:2582 msgid "Change the settings which affect how package dependencies are handled" msgstr "改变影响处理依赖关系的设置" -#: src/ui.cc:2562 +#: src/ui.cc:2585 msgid "^Miscellaneous" msgstr "杂项(^M)" -#: src/ui.cc:2563 +#: src/ui.cc:2586 msgid "Change miscellaneous program settings" msgstr "改变程序的杂项设置" -#: src/ui.cc:2569 +#: src/ui.cc:2592 msgid "^Revert options" msgstr "还原选项(^R)" -#: src/ui.cc:2570 +#: src/ui.cc:2593 msgid "Reset all settings to the system defaults" msgstr "把所有项目重设为它们的默认值" -#: src/ui.cc:2581 +#: src/ui.cc:2604 msgid "^Next" msgstr "下一个(^N)" -#: src/ui.cc:2582 +#: src/ui.cc:2605 msgid "View next display" msgstr "查看下一个画面" -#: src/ui.cc:2585 +#: src/ui.cc:2608 msgid "^Prev" msgstr "上一个(^P)" -#: src/ui.cc:2586 +#: src/ui.cc:2609 msgid "View previous display" msgstr "查看上一画面" -#: src/ui.cc:2589 +#: src/ui.cc:2612 msgid "^Close" msgstr "关闭(^C)" -#: src/ui.cc:2590 +#: src/ui.cc:2613 msgid "Close this display" msgstr "关闭此画面" -#: src/ui.cc:2595 +#: src/ui.cc:2618 msgid "New Package ^View" msgstr "新建软件包视图(^V)" -#: src/ui.cc:2596 +#: src/ui.cc:2619 msgid "Create a new default package view" msgstr "创建新的默认软件包视图" -#: src/ui.cc:2599 +#: src/ui.cc:2622 msgid "Audit ^Recommendations" msgstr "检查推荐结果(^R)" -#: src/ui.cc:2600 +#: src/ui.cc:2623 msgid "" "View packages which it is recommended that you install, but which are not " "currently installed." msgstr "查看推荐您安装，但是现在尚未安装的软件包。" -#: src/ui.cc:2603 +#: src/ui.cc:2626 msgid "New ^Flat Package List" msgstr "新建平面软件包列表(^F)" -#: src/ui.cc:2604 +#: src/ui.cc:2627 msgid "View all the packages on the system in a single uncategorized list" msgstr "在一个未分类的列表中查看系统中的所有的软件包" -#: src/ui.cc:2607 +#: src/ui.cc:2630 msgid "New ^Debtags Browser" msgstr "新建 Debtags 浏览器(^D)" -#: src/ui.cc:2609 +#: src/ui.cc:2632 msgid "Browse packages using Debtags data" msgstr "用 Debtags 的信息来浏览软件包" @@ -7447,74 +7442,74 @@ msgid "Browse packages by category" msgstr "分类浏览软件包" -#: src/ui.cc:2622 +#: src/ui.cc:2645 msgid "^About" msgstr "关于(^A)" -#: src/ui.cc:2623 +#: src/ui.cc:2646 msgid "View information about this program" msgstr "查看关于此程序的信息" -#: src/ui.cc:2626 +#: src/ui.cc:2649 msgid "^Help" msgstr "帮助(^H)" -#: src/ui.cc:2627 +#: src/ui.cc:2650 msgid "View the on-line help" msgstr "查看在线帮助" -#: src/ui.cc:2629 +#: src/ui.cc:2652 msgid "User's ^Manual" msgstr "用户手册(^M)" -#: src/ui.cc:2630 +#: src/ui.cc:2653 msgid "View the detailed program manual" msgstr "查看详细的程序使用手册" -#: src/ui.cc:2633 +#: src/ui.cc:2656 msgid "^FAQ" msgstr "常见问题回答(^F)" -#: src/ui.cc:2637 +#: src/ui.cc:2660 msgid "^News" msgstr "新闻(^N)" -#: src/ui.cc:2638 +#: src/ui.cc:2661 msgid "View the important changes made in each version of " msgstr "查看其每一版本中所做的重大修改： " -#: src/ui.cc:2641 +#: src/ui.cc:2664 msgid "^License" msgstr "许可证(^L)" -#: src/ui.cc:2785 +#: src/ui.cc:2810 msgid "Actions" msgstr "动作" -#: src/ui.cc:2789 +#: src/ui.cc:2814 msgid "Search" msgstr "搜索" -#: src/ui.cc:2790 +#: src/ui.cc:2815 msgid "Options" msgstr "选项" -#: src/ui.cc:2791 +#: src/ui.cc:2816 msgid "Views" msgstr "视图" -#: src/ui.cc:2857 +#: src/ui.cc:2823 #, c-format msgid "" "%ls: Menu %ls: Help %ls: Quit %ls: Update %ls: Download/Install/Remove " "Pkgs" msgstr "%ls：菜单 %ls：帮助 %ls：退出 %ls：更新 %ls：下载/安装/删除软件包" -#: src/ui.cc:3216 +#: src/ui.cc:3252 msgid "yes_key" msgstr "" -#: src/ui.cc:3217 +#: src/ui.cc:3253 msgid "no_key" msgstr "n" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apt-listchanges.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apt-listchanges.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2015-02-19 15:26:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2016-07-20 16:51:45.000000000 +0000 @@ -13,63 +13,71 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:31+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:33+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Generated-By: pygettext.py 1.4\n" -#: ../apt-listchanges.py:85 +#: ../apt-listchanges.py:89 +#, python-format msgid "database %s failed to load.\n" msgstr "数据库 %s 加载失败。\n" -#: ../apt-listchanges.py:103 +#: ../apt-listchanges.py:107 +#, python-format msgid "Unknown frontend: %s\n" msgstr "未知前端：%s\n" -#: ../apt-listchanges.py:128 +#: ../apt-listchanges.py:132 +#, python-format msgid "%s: will be newly installed" msgstr "%s：将被全新安装" -#: ../apt-listchanges.py:144 +#: ../apt-listchanges.py:148 +#, python-format msgid "%s: Version %s has already been seen" msgstr "%s：版本 %s 已经被看过了" -#: ../apt-listchanges.py:184 +#: ../apt-listchanges.py:188 +#, python-format msgid "News for %s" msgstr "%s 的新消息" -#: ../apt-listchanges.py:195 +#: ../apt-listchanges.py:199 +#, python-format msgid "Changes for %s" msgstr "%s 的变更" -#: ../apt-listchanges.py:205 +#: ../apt-listchanges.py:209 msgid "Informational notes" msgstr "信息备忘" -#: ../apt-listchanges.py:208 +#: ../apt-listchanges.py:212 msgid "apt-listchanges: News" msgstr "apt-listchanges: 新内容" -#: ../apt-listchanges.py:212 +#: ../apt-listchanges.py:216 msgid "apt-listchanges: Changelogs" msgstr "apt-listchanges: 变更日志" -#: ../apt-listchanges.py:219 +#: ../apt-listchanges.py:223 msgid "Aborting" msgstr "正在终止" -#: ../apt-listchanges.py:222 +#: ../apt-listchanges.py:226 msgid "Confirmation failed, don't save seen state" msgstr "确认失败，未保存所见状态" -#: ../apt-listchanges.py:229 +#: ../apt-listchanges.py:233 +#, python-format msgid "apt-listchanges: changelogs for %s" msgstr "apt-listchanges: %s 的变更日志" -#: ../apt-listchanges.py:233 +#: ../apt-listchanges.py:237 +#, python-format msgid "apt-listchanges: news for %s" msgstr "apt-listchanges: %s 的新内容" -#: ../apt-listchanges.py:245 +#: ../apt-listchanges.py:249 msgid "didn't find any valid .deb archives" msgstr "没有找到任何有效的 .deb 档案" @@ -78,6 +86,7 @@ msgstr "用法: apt-listchanges [选项] {--apt | filename.deb ...}\n" #: ../apt-listchanges/ALCConfig.py:133 +#, python-format msgid "Unknown option %s for --which. Allowed are: %s." msgstr "未知选项 %s 用于 --which。允许的有：%s。" @@ -94,11 +103,13 @@ msgstr "如果您选择“no”您可以中止安装。" #: ../apt-listchanges/DebianFiles.py:188 +#, python-format msgid "" "Could not run apt-changelog (%s), unable to retrieve changelog for package %s" msgstr "" #: ../apt-listchanges/DebianFiles.py:219 +#, python-format msgid "Ignoring `%s' (seems to be a directory!)" msgstr "忽略“%s” (似乎是个目录！)" @@ -111,10 +122,12 @@ "(Dpkg::Tools::Options::/usr/bin/apt-listchanges::Version 设为 2 了吗？)\n" #: ../apt-listchanges/apt_listchanges.py:110 +#, python-format msgid "Mailing %s: %s" msgstr "正在邮寄给 %s: %s" #: ../apt-listchanges/apt_listchanges.py:137 +#, python-format msgid "The %s frontend is deprecated, using pager" msgstr "%s 前端已被废除，改用分页器" @@ -123,6 +136,7 @@ msgstr "邮件前端需要一个已安装的“sendmail”，改用分页器" #: ../apt-listchanges/apt_listchanges.py:153 +#, python-format msgid "" "The gtk frontend needs a working python-gtk2 and python-glade2.\n" "Those imports can not be found. Falling back to pager.\n" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apt.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apt.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apt.po 2015-02-19 15:26:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apt.po 2016-07-20 16:51:49.000000000 +0000 @@ -10,75 +10,75 @@ "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2012-03-15 19:05+0000\n" -"PO-Revision-Date: 2014-11-07 13:57+0000\n" +"PO-Revision-Date: 2016-05-18 21:15+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-02-19 10:31+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:32+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: \n" -#: cmdline/apt-cache.cc:141 +#: apt-private/private-unmet.cc #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n" -#: cmdline/apt-cache.cc:245 +#: cmdline/apt-cache.cc msgid "Total package names: " msgstr "软件包名称总数： " -#: cmdline/apt-cache.cc:286 +#: cmdline/apt-cache.cc msgid "Total package structures: " msgstr "全部软件包结构： " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc msgid " Normal packages: " msgstr " 普通软件包： " -#: cmdline/apt-cache.cc:286 +#: cmdline/apt-cache.cc msgid " Pure virtual packages: " msgstr " 完全虚拟软件包： " -#: cmdline/apt-cache.cc:287 +#: cmdline/apt-cache.cc msgid " Single virtual packages: " msgstr " 单虚拟软件包： " -#: cmdline/apt-cache.cc:288 +#: cmdline/apt-cache.cc msgid " Mixed virtual packages: " msgstr " 混合虚拟软件包： " -#: cmdline/apt-cache.cc:289 +#: cmdline/apt-cache.cc msgid " Missing: " msgstr " 缺失： " -#: cmdline/apt-cache.cc:291 +#: cmdline/apt-cache.cc msgid "Total distinct versions: " -msgstr "按版本共计： " +msgstr "按不同的版本共计： " -#: cmdline/apt-cache.cc:293 +#: cmdline/apt-cache.cc msgid "Total distinct descriptions: " msgstr "按不同的说明共计： " -#: cmdline/apt-cache.cc:295 +#: cmdline/apt-cache.cc msgid "Total dependencies: " msgstr "按依赖关系共计： " -#: cmdline/apt-cache.cc:298 +#: cmdline/apt-cache.cc msgid "Total ver/file relations: " msgstr "按版本/文件关系共计： " -#: cmdline/apt-cache.cc:300 +#: cmdline/apt-cache.cc msgid "Total Desc/File relations: " msgstr "按说明/文件关系共计： " -#: cmdline/apt-cache.cc:302 +#: cmdline/apt-cache.cc msgid "Total Provides mappings: " msgstr "提供映射共计： " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc msgid "Total globbed strings: " msgstr "Glob 字串共计： " @@ -86,75 +86,72 @@ msgid "Total dependency version space: " msgstr "依赖关系版本名所占空间共计： " -#: cmdline/apt-cache.cc:333 +#: cmdline/apt-cache.cc msgid "Total slack space: " msgstr "空闲空间共计: " -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc msgid "Total space accounted for: " msgstr "总占用空间： " -#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221 +#: apt-private/private-show.cc cmdline/apt-cache.cc #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步。" -#: cmdline/apt-cache.cc:1453 +#: apt-private/private-depends.cc apt-private/private-show.cc +#: cmdline/apt-mark.cc msgid "No packages found" msgstr "没有发现匹配的软件包" -#: cmdline/apt-cache.cc:1221 +#: apt-private/private-search.cc msgid "You must give at least one search pattern" msgstr "您必须明确地给出至少一个表达式" -#: cmdline/apt-cache.cc:1353 +#: cmdline/apt-cache.cc msgid "This command is deprecated. Please use 'apt-mark showauto' instead." -msgstr "" +msgstr "该命令已废弃。请使用‘apt-mark showauto’。" -#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644 -#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021 -#: cmdline/apt-cache.cc:1425 cmdline/apt-cache.cc:1577 +#: apt-private/private-show.cc #, c-format msgid "Unable to locate package %s" -msgstr "未发现软件包 %s" +msgstr "无法定位软件包 %s" -#: cmdline/apt-cache.cc:1530 +#: apt-private/private-show.cc msgid "Package files:" msgstr "软件包文件：" -#: cmdline/apt-cache.cc:1537 cmdline/apt-cache.cc:1624 +#: apt-private/private-show.cc msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1551 +#: apt-private/private-show.cc msgid "Pinned packages:" msgstr "被锁定的软件包：" -#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1604 +#: apt-private/private-show.cc msgid "(not found)" msgstr "(未找到)" -#. Installed version -#: cmdline/apt-cache.cc:1584 +#: apt-private/private-show.cc msgid " Installed: " msgstr " 已安装： " -#. Candidate Version -#: cmdline/apt-cache.cc:1591 +#: apt-private/private-show.cc msgid " Candidate: " -msgstr " 候选软件包： " +msgstr " 候选： " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: apt-private/private-show.cc msgid "(none)" msgstr "(无)" -#: cmdline/apt-cache.cc:1601 +#: apt-private/private-show.cc msgid " Package pin: " msgstr " 软件包锁： " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: apt-private/private-show.cc msgid " Version table:" msgstr " 版本列表：" @@ -163,7 +160,7 @@ #: cmdline/apt-get.cc:2739 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" +msgstr "%s %s，用于 %s 体系结构，编译于 %s %s\n" #: cmdline/apt-cache.cc:1682 msgid "" @@ -201,8 +198,41 @@ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" +"用法： apt-cache [选项] 命令\n" +"　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n" +"　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n" +"\n" +"apt-cache 是一个底层的工具，它可以在 APT 的\n" +"二进制缓存文件中查询信息\n" +"\n" +"命令：\n" +" gencaches - 同时生成软件包和源代码包的缓存\n" +" showpkg - 显示某个软件包的全面信息\n" +" showsrc - 显示源文件的各项记录\n" +" stats - 显示基本的统计信息\n" +" dump - 简要显示整个缓存文件的内容\n" +" dumpavail - 把所有有效的包文件列表打印到标准输出\n" +" unmet - 显示所有未满足的依赖关系\n" +" search - 根据正则表达式搜索软件包列表\n" +" show - 以便于阅读的格式介绍该软件包\n" +" depends - 显示该软件包的依赖关系信息\n" +" rdepends - 显示所有依赖于该软件包的软件包名字\n" +" pkgnames - 列出所有软件包的名字\n" +" dotty - 生成可用 GraphViz 处理的软件包关系图\n" +" xvcg - 生成可用 xvcg 处理的软件包的关系图\n" +" policy - 显示软件包的安装设置状态\n" +"\n" +"选项：\n" +" -h 本帮助文档。\n" +" -p=? 软件包的缓存。\n" +" -s=? 源代码包的缓存。\n" +" -q 关闭进度显示。\n" +" -i 仅为 unmet 命令显示重要的依赖关系。\n" +" -c=? 读取指定配置文件\n" +" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" +"若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n" -#: cmdline/apt-cdrom.cc:77 +#: cmdline/apt-cdrom.cc msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”" @@ -210,18 +240,18 @@ msgid "Please insert a Disc in the drive and press enter" msgstr "请把盘片插入驱动器再按回车键" -#: cmdline/apt-cdrom.cc:127 +#: cmdline/apt-cdrom.cc #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "无法将 %s 挂载到 %s" -#: cmdline/apt-cdrom.cc:162 +#: cmdline/apt-cdrom.cc msgid "Repeat this process for the rest of the CDs in your set." msgstr "请对您的盘片套件中的其它盘片重复相同的操作。" -#: cmdline/apt-config.cc:41 +#: cmdline/apt-config.cc msgid "Arguments not in pairs" -msgstr "参数没有成对" +msgstr "参数不成对" #: cmdline/apt-config.cc:76 msgid "" @@ -247,7 +277,7 @@ " dump - 显示配置文件\n" "\n" "选项：\n" -" -h 本帮助文本。\n" +" -h 显示本帮助文本。\n" " -c=? 读取指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n" @@ -423,7 +453,7 @@ msgid "Unable to open DB file %s: %s" msgstr "无法打开数据库文件 %s：%s" -#: ftparchive/cachedb.cc:123 +#: methods/rred.cc #, c-format msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" @@ -533,17 +563,17 @@ #: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" -msgstr "" +msgstr "override 文件 %s 第 %llu 行的格式有误 #1" #: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" -msgstr "" +msgstr "override 文件 %s 第 %llu 行的格式有误 #2" #: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" -msgstr "" +msgstr "override 文件 %s 第 %llu 行的格式有误 #3" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format @@ -560,7 +590,7 @@ msgid "Compressed output %s needs a compression set" msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: ftparchive/multicompress.cc:170 +#: methods/rsh.cc msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" @@ -599,74 +629,76 @@ msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" -#: cmdline/apt-get.cc:127 +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: apt-private/private-output.cc msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: apt-private/private-output.cc msgid "N" -msgstr "" +msgstr "N" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1763 +#: apt-private/private-output.cc #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" -#: cmdline/apt-get.cc:244 +#: apt-private/private-output.cc msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: cmdline/apt-get.cc:334 +#: apt-private/private-output.cc #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: cmdline/apt-get.cc:336 +#: apt-private/private-output.cc #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:343 +#: apt-private/private-output.cc msgid "but it is not installable" msgstr "但无法安装它" -#: cmdline/apt-get.cc:345 +#: apt-private/private-output.cc msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: cmdline/apt-get.cc:348 +#: apt-private/private-output.cc msgid "but it is not installed" msgstr "但是它还没有被安装" -#: cmdline/apt-get.cc:348 +#: apt-private/private-output.cc msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: cmdline/apt-get.cc:353 +#: apt-private/private-output.cc msgid " or" msgstr " 或" -#: cmdline/apt-get.cc:382 +#: apt-private/private-output.cc msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: cmdline/apt-get.cc:408 +#: apt-private/private-output.cc msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【删除】：" -#: cmdline/apt-get.cc:430 +#: apt-private/private-output.cc msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: cmdline/apt-get.cc:451 +#: apt-private/private-output.cc msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: cmdline/apt-get.cc:472 +#: apt-private/private-output.cc msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: cmdline/apt-get.cc:492 +#: apt-private/private-output.cc msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" @@ -675,7 +707,7 @@ msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: cmdline/apt-get.cc:553 +#: apt-private/private-output.cc msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -683,59 +715,59 @@ "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: cmdline/apt-get.cc:584 +#: apt-private/private-output.cc #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包， " -#: cmdline/apt-get.cc:588 +#: apt-private/private-output.cc #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包， " -#: cmdline/apt-get.cc:590 +#: apt-private/private-output.cc #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包， " -#: cmdline/apt-get.cc:592 +#: apt-private/private-output.cc #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: cmdline/apt-get.cc:596 +#: apt-private/private-output.cc #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:628 +#: apt-private/private-cacheset.cc #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "注意，为任务 %2$s 选中了 %1$s\n" -#: cmdline/apt-get.cc:634 +#: apt-private/private-cacheset.cc #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n" -#: cmdline/apt-get.cc:1133 +#: apt-private/private-cacheset.cc #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是由下面的软件包提供的虚拟软件包：\n" -#: cmdline/apt-get.cc:1145 +#: apt-private/private-cacheset.cc msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:671 +#: apt-private/private-cacheset.cc msgid " [Not candidate version]" msgstr " [无候选版本]" -#: cmdline/apt-get.cc:1150 +#: apt-private/private-cacheset.cc msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:1155 +#: apt-private/private-cacheset.cc #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -746,36 +778,36 @@ "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:1174 +#: apt-private/private-cacheset.cc msgid "However the following packages replace it:" msgstr "可是下列软件包取代了它：" -#: cmdline/apt-get.cc:706 +#: apt-private/private-cacheset.cc #, c-format msgid "Package '%s' has no installation candidate" msgstr "软件包 %s 没有可供安装的候选者" -#: cmdline/apt-get.cc:717 +#: apt-private/private-cacheset.cc #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "类似 %s 的虚拟软件包可以卸载\n" -#: cmdline/apt-get.cc:748 +#: apt-private/private-cacheset.cc #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "注意，选取 %s 而非 %s\n" -#: cmdline/apt-get.cc:1104 +#: apt-private/private-install.cc #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" -#: cmdline/apt-get.cc:782 +#: apt-private/private-install.cc #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n" -#: cmdline/apt-get.cc:1197 +#: apt-private/private-install.cc #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" @@ -783,61 +815,61 @@ #: cmdline/apt-get.cc:1205 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s 已经是最新的版本了。\n" +msgstr "%s 已经是最新的版本。\n" -#: cmdline/apt-get.cc:1805 +#: apt-private/private-install.cc cmdline/apt-get.cc cmdline/apt-mark.cc #, c-format msgid "%s set to manually installed.\n" -msgstr "%s 被设置为手动安装。\n" +msgstr "%s 已设置为手动安装。\n" -#: cmdline/apt-get.cc:844 +#: apt-private/private-install.cc #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" -#: cmdline/apt-get.cc:849 +#: apt-private/private-install.cc #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -msgstr "" +msgstr "由于 %4$s，为 %3$s 选定了版本 %1$s (%2$s)\n" #: cmdline/apt-get.cc:1122 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:669 +#: apt-private/private-cachefile.cc msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:672 +#: apt-private/private-cachefile.cc msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:675 +#: apt-private/private-cachefile.cc msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:678 +#: apt-private/private-cachefile.cc msgid "Unable to minimize the upgrade set" -msgstr "无法最小化要升级的软件包集合" +msgstr "无法最小化待升级软件集合" -#: cmdline/apt-get.cc:680 +#: apt-private/private-cachefile.cc msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:986 +#: apt-private/private-cachefile.cc msgid "You might want to run 'apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。" -#: cmdline/apt-get.cc:687 +#: apt-private/private-cachefile.cc msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。请试用 -f 选项。" -#: cmdline/apt-get.cc:695 +#: apt-private/private-download.cc msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：下列软件包不能通过验证！" -#: cmdline/apt-get.cc:699 +#: apt-private/private-download.cc msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" @@ -845,7 +877,7 @@ msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包吗？[y/N] " -#: cmdline/apt-get.cc:704 cmdline/apt-get.cc:711 +#: apt-private/private-download.cc msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" @@ -853,15 +885,15 @@ msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" -#: cmdline/apt-get.cc:782 +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" -#: cmdline/apt-get.cc:791 +#: apt-private/private-install.cc msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:802 +#: apt-private/private-install.cc msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" @@ -869,46 +901,55 @@ msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧" -#: cmdline/apt-get.cc:848 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" -#: cmdline/apt-get.cc:851 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" -#: cmdline/apt-get.cc:856 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" -#: cmdline/apt-get.cc:859 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:877 cmdline/apt-get.cc:2319 -#: cmdline/apt-get.cc:2322 +#: apt-private/private-download.cc #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:887 +#: apt-private/private-download.cc #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 上没有足够的可用空间。" -#: cmdline/apt-get.cc:903 cmdline/apt-get.cc:923 +#: apt-private/private-install.cc msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。" -#: cmdline/apt-get.cc:905 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: apt-private/private-install.cc msgid "Yes, do as I say!" msgstr "是，按我说的做！" -#: cmdline/apt-get.cc:907 +#: apt-private/private-install.cc #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -919,7 +960,7 @@ "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:913 cmdline/apt-get.cc:932 +#: apt-private/private-install.cc msgid "Abort." msgstr "中止执行。" @@ -927,38 +968,38 @@ msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n] " -#: cmdline/apt-get.cc:1000 cmdline/apt-get.cc:2375 +#: apt-private/private-download.cc #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: cmdline/apt-get.cc:1018 +#: apt-private/private-install.cc msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: cmdline/apt-get.cc:1019 cmdline/apt-get.cc:2384 +#: apt-private/private-install.cc apt-private/private-source.cc msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:1025 +#: apt-private/private-install.cc msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项再试试？" -#: cmdline/apt-get.cc:1029 +#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换" -#: cmdline/apt-get.cc:1034 +#: apt-private/private-install.cc msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:1035 +#: apt-private/private-install.cc msgid "Aborting install." msgstr "中止安装。" -#: cmdline/apt-get.cc:1363 +#: apt-private/private-install.cc msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -976,7 +1017,7 @@ msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s" -#: cmdline/apt-get.cc:1374 +#: apt-private/private-source.cc #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "选择 %s 作为源代码包而非 %s\n" @@ -987,15 +1028,15 @@ msgid "Ignore unavailable version '%s' of package '%s'" msgstr "忽略不可用的 %2$s 软件包的 %1$s 版" -#: cmdline/apt-get.cc:1428 +#: apt-private/private-update.cc msgid "The update command takes no arguments" msgstr "update 命令不需要参数" -#: cmdline/apt-get.cc:1497 +#: apt-private/private-install.cc msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: cmdline/apt-get.cc:1554 +#: apt-private/private-install.cc msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1004,22 +1045,22 @@ #. #. if (Packages == 1) #. { -#. c1out << endl; +#. c1out << std::endl; #. c1out << #. _("Since you only requested a single operation it is extremely likely that\n" #. "the package is simply not installable and a bug report against\n" -#. "that package should be filed.") << endl; +#. "that package should be filed.") << std::endl; #. } #. -#: cmdline/apt-get.cc:1557 cmdline/apt-get.cc:1848 +#: apt-private/private-install.cc msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1561 +#: apt-private/private-install.cc msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动卸载工具坏事了" -#: cmdline/apt-get.cc:1754 +#: apt-private/private-install.cc msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1027,7 +1068,7 @@ "required:" msgstr[0] "下列软件包是自动安装的并且现在不需要了：" -#: cmdline/apt-get.cc:1758 +#: apt-private/private-install.cc #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1042,17 +1083,17 @@ msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，全部升级工具坏事了" -#: cmdline/apt-get.cc:1878 +#: apt-private/private-install.cc msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1821 +#: apt-private/private-install.cc msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可以指定一个解决办法)。" -#: cmdline/apt-get.cc:1833 +#: apt-private/private-install.cc msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1063,7 +1104,7 @@ "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: cmdline/apt-get.cc:1851 +#: apt-private/private-install.cc msgid "Broken packages" msgstr "破损的软件包" @@ -1071,35 +1112,35 @@ msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:1969 +#: apt-private/private-install.cc msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1970 +#: apt-private/private-install.cc msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1750 cmdline/apt-get.cc:1786 +#: cmdline/apt-get.cc #, c-format msgid "Couldn't find package %s" -msgstr "无法找到软件包 %s" +msgstr "找不到软件包 %s" -#: cmdline/apt-get.cc:2082 +#: cmdline/apt-get.cc cmdline/apt-mark.cc #, c-format msgid "%s set to automatically installed.\n" -msgstr "%s 被设置为手动安装。\n" +msgstr "%s 已设置为自动安装。\n" -#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:105 +#: cmdline/apt-get.cc cmdline/apt-mark.cc msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." -msgstr "" +msgstr "该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’。" #: cmdline/apt-get.cc:1999 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:2002 +#: methods/connect.cc methods/ftp.cc methods/rsh.cc msgid "Failed" msgstr "失败" @@ -1107,29 +1148,29 @@ msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2074 cmdline/apt-get.cc:2082 +#: cmdline/apt-get.cc msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决工具坏事了" -#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2106 cmdline/apt-get.cc:2139 +#: apt-private/private-download.cc msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" #: cmdline/apt-get.cc:2294 #, c-format msgid "Downloading %s %s" -msgstr "" +msgstr "正在下载 %s %s" -#: cmdline/apt-get.cc:2182 +#: apt-private/private-source.cc msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2213 cmdline/apt-get.cc:2498 +#: apt-private/private-source.cc #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2232 +#: apt-private/private-source.cc #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -1145,52 +1186,59 @@ "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" +"请使用：\n" +"bzr branch %s\n" +"获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:2292 +#: apt-private/private-source.cc #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "忽略已下载过的文件“%s”\n" +msgstr "忽略已下载的文件“%s”\n" #: cmdline/apt-get.cc:2332 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" -#: cmdline/apt-get.cc:2338 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-source.cc #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:2341 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-source.cc #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2347 +#: apt-private/private-source.cc #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2380 +#: apt-private/private-source.cc msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2409 +#: apt-private/private-source.cc #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:2421 +#: apt-private/private-source.cc #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2422 +#: apt-private/private-source.cc #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2439 +#: apt-private/private-source.cc #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" @@ -1199,23 +1247,23 @@ msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2475 +#: apt-private/private-source.cc msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2721 +#: apt-private/private-source.cc #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) " "APT::Architectures for setup" -msgstr "" +msgstr "找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for setup" -#: cmdline/apt-get.cc:2503 +#: apt-private/private-source.cc #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:2523 +#: apt-private/private-source.cc #, c-format msgid "%s has no build depends.\n" msgstr "%s 没有构建依赖关系信息。\n" @@ -1225,7 +1273,7 @@ msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" -msgstr "" +msgstr "由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系" #: cmdline/apt-get.cc:2575 #, c-format @@ -1245,14 +1293,14 @@ msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" -msgstr "" +msgstr "软件包 %3$s 的候选版本不能满足版本要求，因此 %2$s 软件包的 %1$s 依赖无法满足" #: cmdline/apt-get.cc:2977 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" -msgstr "" +msgstr "软件包 %3$s 没有可用的候选版本，因此 %2$s 的 %1$s 依赖无法满足" #: cmdline/apt-get.cc:2691 #, c-format @@ -1264,16 +1312,16 @@ msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2712 +#: apt-private/private-source.cc msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" #: cmdline/apt-get.cc:2977 cmdline/apt-get.cc:2989 #, c-format msgid "Changelog for %s (%s)" -msgstr "" +msgstr "%s (%s) 的 Changelog" -#: cmdline/apt-get.cc:2744 +#: cmdline/apt-get.cc msgid "Supported modules:" msgstr "支持的模块：" @@ -1322,8 +1370,49 @@ "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" +"用法： apt-get [选项] 命令\n" +"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n" +"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n" +"\n" +"apt-get 是一个用于下载和安装软件包的简易命令行界面。\n" +"最常用命令是 update 和 install。\n" +"\n" +"命令：\n" +" update - 取回更新的软件包列表信息\n" +" upgrade - 进行一次升级\n" +" install - 安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)\n" +" remove - 卸载软件包\n" +" autoremove - 卸载所有自动安装且不再使用的软件包\n" +" purge - 卸载并清除软件包的配置\n" +" source - 下载源码包文件\n" +" build-dep - 为源码包配置所需的编译依赖关系\n" +" dist-upgrade - 发布版升级，见 apt-get(8)\n" +" dselect-upgrade - 根据 dselect 的选择来进行升级\n" +" clean - 删除所有已下载的包文件\n" +" autoclean - 删除已下载的旧包文件\n" +" check - 核对以确认系统的依赖关系的完整性\n" +" changelog - 下载指定软件包，并显示其changelog\n" +" download - 下载指定的二进制包到当前目录\n" +"\n" +"选项：\n" +" -h 本帮助文档。\n" +" -q 让输出可作为日志 - 不显示进度\n" +" -qq 除了错误外，什么都不输出\n" +" -d 仅仅下载 - 【不】安装或解开包文件\n" +" -s 不作实际操作。只是依次模拟执行命令\n" +" -y 对所有询问都回答是(Yes)，同时不作任何提示\n" +" -f 当出现破损的依赖关系时，程序将尝试修正系统\n" +" -m 当有包文件无法找到时，程序仍尝试继续执行\n" +" -u 显示已升级的软件包列表\n" +" -b 在下载完源码包后，编译生成相应的软件包\n" +" -V 显示详尽的版本号\n" +" -c=? 读取指定配置文件\n" +" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" +"请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n" +"以获取更多信息和选项。\n" +" 本 APT 具有超级牛力。\n" -#: cmdline/apt-get.cc:2952 +#: apt-private/private-main.cc msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1350,13 +1439,12 @@ msgid "Err " msgstr "错误 " -#: cmdline/acqprogress.cc:135 +#: apt-private/acqprogress.cc #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "下载 %sB，耗时 %s (%sB/s)\n" -#: cmdline/acqprogress.cc:225 -#, c-format +#: apt-private/acqprogress.cc msgid " [Working]" msgstr " [执行中]" @@ -1386,45 +1474,60 @@ "apt.conf(5) manual pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" +"用法：apt-internal-resolver\n" +"\n" +"apt-internal-resolver 是内部接口，用于像外部解析器一样使用内部解析器，\n" +"用于 APT 家族的调试或类似用途\n" +"\n" +"选项​​：\n" +"-h 本帮助文档。\n" +"-q 可记录输出 - 不显示进度\n" +"-c=? 读取这个配置文件\n" +"-o=? 设置任意指定的配置选项，如 -o dir::cache=/tmp\n" +"参见 apt.conf(5) 手册页获取更多信息。\n" +"APT 功能非常强大。\n" +"\n" +" " +" 本 APT 具有超级牛力\n" -#: cmdline/apt-mark.cc:46 +#: cmdline/apt-mark.cc #, c-format msgid "%s can not be marked as it is not installed.\n" -msgstr "" +msgstr "%s 还没有安装，因此无法标记。\n" -#: cmdline/apt-mark.cc:52 +#: cmdline/apt-mark.cc #, c-format msgid "%s was already set to manually installed.\n" -msgstr "" +msgstr "%s 已经被设置为手动安装。\n" -#: cmdline/apt-mark.cc:54 +#: cmdline/apt-mark.cc #, c-format msgid "%s was already set to automatically installed.\n" -msgstr "" +msgstr "%s 已经被设置为自动安装。\n" -#: cmdline/apt-mark.cc:169 +#: cmdline/apt-mark.cc #, c-format msgid "%s was already set on hold.\n" -msgstr "" +msgstr "%s 已经设置为保留。\n" -#: cmdline/apt-mark.cc:171 +#: cmdline/apt-mark.cc #, c-format msgid "%s was already not hold.\n" -msgstr "" +msgstr "%s 已经设置为不保留。\n" -#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 +#: cmdline/apt-mark.cc #, c-format msgid "%s set on hold.\n" -msgstr "" +msgstr "%s 设置为保留。\n" -#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 +#: cmdline/apt-mark.cc #, c-format msgid "Canceled hold on %s.\n" -msgstr "" +msgstr "取消保留 %s 的设置。\n" -#: cmdline/apt-mark.cc:220 +#: cmdline/apt-mark.cc msgid "Executing dpkg failed. Are you root?" -msgstr "" +msgstr "执行 dpkg 失败。您是 root 吗？" #: cmdline/apt-mark.cc:268 msgid "" @@ -1447,6 +1550,23 @@ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" +"用法： apt-mark [选项] {auto|manual} 包1 [包2 ...]\n" +"\n" +"apt-mark 是一个简单的命令行接口，用于标记包手动或自动安装的软件包。它也可以列出标记。\n" +"\n" +"命令：\n" +" auto - 将指定的软件包标记为自动安装\n" +" manual - 将指定的软件包标记为手动安装\n" +"\n" +"选项：\n" +" -h 本帮助文档。\n" +" -q 可记录输出 - 不显示进度\n" +" -qq 除了错误，什么都不输出\n" +" -s 无行为。只是打印会做什么。\n" +" -f 读/写、自动/手动标记给定的文件\n" +" -c=？读取配置文件\n" +" -o=? 设定任意一个配置选项，例如 -o dir::cache=/tmp\n" +"参见 apt-mark(8) 和 apt.conf(5)手册获得更多的信息。" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1476,7 +1596,7 @@ " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: dselect/install:32 +#: dselect/install:33 msgid "Bad default setting!" msgstr "错误的默认设置！" @@ -1485,23 +1605,23 @@ msgid "Press enter to continue." msgstr "按回车键继续。" -#: dselect/install:91 +#: dselect/install:92 msgid "Do you want to erase any previously downloaded .deb files?" msgstr "您想要删除之前下载的所有 .deb 文件吗？" -#: dselect/install:101 +#: dselect/install:102 msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "在解包时发生了一些错误。已经安装的软件包" -#: dselect/install:102 +#: dselect/install:103 msgid "will be configured. This may result in duplicate errors" msgstr "将被配置。这个操作可能会导致出现重复的错误" -#: dselect/install:103 +#: dselect/install:104 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "或一些由于依赖关系不能满足所产生的错误。这个问题不大，只有" -#: dselect/install:104 +#: dselect/install:105 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apturl.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apturl.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apturl.po 2015-02-19 15:26:20.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/apturl.po 2016-07-20 16:51:47.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 12:39+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 13:35+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." @@ -125,11 +125,11 @@ msgid "Enable additional components" msgstr "使用附加组件" -#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:85 ../AptUrl/kde/KdeUI.py:80 +#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:100 ../AptUrl/kde/KdeUI.py:80 msgid "Enable additional software channel" msgstr "启用附加软件频道" -#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:86 ../AptUrl/kde/KdeUI.py:81 +#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:101 ../AptUrl/kde/KdeUI.py:81 #, python-format msgid "Do you want to enable the following software channel: '%s'?" msgstr "您想启用“%s”软件频道吗？" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/aspell.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/aspell.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/aspell.po 2015-02-19 15:26:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/aspell.po 2016-07-20 16:51:45.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:32+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:35+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" #: common/info.cpp:232 diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/attr.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/attr.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/attr.po 2015-02-19 15:26:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/attr.po 2016-07-20 16:51:45.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:33+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:35+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: ../attr/attr.c:46 #, c-format diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/avahi.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/avahi.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/avahi.po 2015-02-19 15:26:15.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/avahi.po 2016-07-20 16:51:54.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: zh_CN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-17 12:20+0000\n" +"POT-Creation-Date: 2016-07-01 09:35+0000\n" "PO-Revision-Date: 2014-02-18 03:47+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: 简体中文 \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 11:58+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 12:41+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: \n" #: ../avahi-common/error.c:30 @@ -311,7 +311,7 @@ msgid "The service type of the selected service" msgstr "选定服务的服务类型" -#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1031 +#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1023 msgid "Service Name" msgstr "服务名称" @@ -444,27 +444,27 @@ msgid "Change domain" msgstr "更改域" -#: ../avahi-ui/avahi-ui.c:1039 ../avahi-ui/avahi-ui.c:1178 +#: ../avahi-ui/avahi-ui.c:1031 ../avahi-ui/avahi-ui.c:1162 msgid "Browsing..." msgstr "正在浏览..." -#: ../avahi-ui/avahi-ui.c:1132 +#: ../avahi-ui/avahi-ui.c:1120 msgid "Initializing..." msgstr "正在初始化..." -#: ../avahi-ui/avahi-ui.c:1160 +#: ../avahi-ui/avahi-ui.c:1144 msgid "Location" msgstr "位置" -#: ../avahi-ui/avahi-ui.c:1165 ../avahi-utils/avahi-browse.c:553 +#: ../avahi-ui/avahi-ui.c:1149 ../avahi-utils/avahi-browse.c:553 msgid "Name" msgstr "名称" -#: ../avahi-ui/avahi-ui.c:1170 ../avahi-utils/avahi-browse.c:553 +#: ../avahi-ui/avahi-ui.c:1154 ../avahi-utils/avahi-browse.c:553 msgid "Type" msgstr "类型" -#: ../avahi-ui/avahi-ui.c:1182 +#: ../avahi-ui/avahi-ui.c:1166 msgid "_Domain..." msgstr "_域..." diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bacula.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/bacula.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bacula.po 2015-02-19 15:26:12.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/bacula.po 2016-07-20 16:51:57.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 11:46+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 12:26+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: src/dird/jobq.c:74 #, c-format @@ -268,8 +268,7 @@ msgid "Defined Pools:\n" msgstr "已定义的链接池：\n" -#: src/dird/ua_select.c:542 src/dird/ua_select.c:562 src/dird/ua_update.c:364 -#: src/baconfig.h:80 +#: src/baconfig.h:76 msgid "*None*" msgstr "" @@ -744,7 +743,8 @@ msgid "Inappropriate term code: %c\n" msgstr "不适当的终止代码： %c\n" -#: src/dird/admin.c:118 +#: src/lib/status.h:171 src/lib/status.h:182 src/lib/status.h:196 +#: src/lib/status.h:200 src/lib/status.h:204 msgid "Bacula " msgstr "" @@ -770,14 +770,11 @@ "\n" msgstr "" -#: src/dird/dird.c:258 src/stored/stored.c:227 src/console/console.c:1109 -#: src/filed/filed.c:218 src/qt-console/main.cpp:165 +#: src/qt-console/main.cpp:154 msgid "Cryptography library initialization failed.\n" msgstr "" -#: src/dird/dird.c:262 src/dird/dird.c:292 src/dird/dird.c:538 -#: src/dird/dird.c:541 src/stored/stored.c:231 src/console/console.c:1113 -#: src/filed/filed.c:223 src/qt-console/main.cpp:169 +#: src/qt-console/main.cpp:158 #, c-format msgid "Please correct configuration file: %s\n" msgstr "" @@ -811,11 +808,7 @@ msgid "Only one Director resource permitted in %s\n" msgstr "" -#: src/dird/dird.c:628 src/dird/dird.c:834 src/dird/dird.c:889 -#: src/dird/dird.c:1056 src/stored/stored.c:354 src/console/console.c:1296 -#: src/console/console.c:1326 src/filed/filed.c:357 src/filed/filed.c:516 -#: src/wx-console/console_thread.cpp:118 src/wx-console/console_thread.cpp:144 -#: src/qt-console/main.cpp:224 src/qt-console/main.cpp:254 +#: src/qt-console/main.cpp:213 src/qt-console/main.cpp:243 msgid "TLS required but not configured in Bacula.\n" msgstr "" @@ -2281,8 +2274,7 @@ msgid "%d directories unmarked.\n" msgstr "" -#: src/dird/dird_conf.c:559 src/tray-monitor/tray_conf.c:168 -#: src/qt-console/tray-monitor/tray_conf.cpp:168 +#: src/qt-console/tray-monitor/tray_conf.cpp:156 #, c-format msgid "No %s resource defined\n" msgstr "" @@ -2606,29 +2598,23 @@ msgid " opcmd=%s\n" msgstr "" -#: src/dird/dird_conf.c:1012 src/tray-monitor/tray_conf.c:199 -#: src/qt-console/tray-monitor/tray_conf.cpp:199 +#: src/qt-console/tray-monitor/tray_conf.cpp:187 #, c-format msgid "Unknown resource type %d in dump_resource.\n" msgstr "" -#: src/dird/dird_conf.c:1343 src/tray-monitor/tray_conf.c:257 -#: src/qt-console/tray-monitor/tray_conf.cpp:257 +#: src/qt-console/tray-monitor/tray_conf.cpp:245 #, c-format msgid "Unknown resource type %d in free_resource.\n" msgstr "" -#: src/dird/dird_conf.c:1375 src/dird/dird_conf.c:1390 -#: src/tray-monitor/tray_conf.c:288 src/wx-console/console_conf.c:265 -#: src/console/console_conf.c:259 src/filed/filed_conf.c:361 -#: src/qt-console/tray-monitor/tray_conf.cpp:288 -#: src/qt-console/bat_conf.cpp:265 +#: src/qt-console/bat_conf.cpp:257 +#: src/qt-console/tray-monitor/tray_conf.cpp:276 #, c-format msgid "%s item is required in %s resource, but not found.\n" msgstr "" -#: src/dird/dird_conf.c:1381 src/tray-monitor/tray_conf.c:294 -#: src/lib/parse_conf.c:225 src/qt-console/tray-monitor/tray_conf.cpp:294 +#: src/qt-console/tray-monitor/tray_conf.cpp:282 #, c-format msgid "Too many items in %s resource\n" msgstr "" @@ -2674,10 +2660,8 @@ msgid "Cannot find Schedule resource %s\n" msgstr "" -#: src/dird/dird_conf.c:1530 src/dird/dird_conf.c:1590 -#: src/tray-monitor/tray_conf.c:314 src/tray-monitor/tray_conf.c:352 -#: src/qt-console/tray-monitor/tray_conf.cpp:314 -#: src/qt-console/tray-monitor/tray_conf.cpp:352 +#: src/qt-console/tray-monitor/tray_conf.cpp:302 +#: src/qt-console/tray-monitor/tray_conf.cpp:340 #, c-format msgid "Unknown resource type %d in save_resource.\n" msgstr "" @@ -2687,10 +2671,8 @@ msgid "Name item is required in %s resource, but not found.\n" msgstr "" -#: src/dird/dird_conf.c:1613 src/tray-monitor/tray_conf.c:372 -#: src/wx-console/console_conf.c:328 src/console/console_conf.c:322 -#: src/filed/filed_conf.c:446 src/qt-console/tray-monitor/tray_conf.cpp:372 -#: src/qt-console/bat_conf.cpp:334 +#: src/qt-console/bat_conf.cpp:326 +#: src/qt-console/tray-monitor/tray_conf.cpp:360 #, c-format msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n" msgstr "" @@ -2859,8 +2841,7 @@ msgid "Select full restore to a specified Job date" msgstr "" -#: src/dird/ua_restore.c:446 src/dird/ua_status.c:863 src/stored/status.c:546 -#: src/filed/status.c:373 src/wx-console/wxbconfigpanel.cpp:220 +#: src/lib/status.h:112 msgid "Cancel" msgstr "" @@ -5336,13 +5317,13 @@ msgid "No Terminated Jobs.\n" msgstr "" -#: src/dird/ua_status.c:819 src/stored/status.c:507 src/filed/status.c:330 +#: src/lib/status.h:73 msgid "" "\n" "Terminated Jobs:\n" msgstr "" -#: src/dird/ua_status.c:820 src/stored/status.c:514 src/filed/status.c:340 +#: src/lib/status.h:80 msgid " JobId Level Files Bytes Status Finished Name \n" msgstr "" @@ -5351,41 +5332,36 @@ "====================================================================\n" msgstr "" -#: src/dird/ua_status.c:853 src/stored/status.c:536 src/lib/util.c:180 -#: src/filed/status.c:363 +#: src/lib/status.h:102 msgid "Created" msgstr "" -#: src/dird/ua_status.c:857 src/stored/status.c:540 src/lib/util.c:196 -#: src/lib/util.c:331 src/lib/util.c:478 src/filed/status.c:367 +#: src/lib/status.h:106 msgid "Error" msgstr "" -#: src/dird/ua_status.c:860 src/stored/status.c:543 src/filed/status.c:370 +#: src/lib/status.h:109 msgid "Diffs" msgstr "" -#: src/dird/ua_status.c:866 src/stored/status.c:549 src/stored/btape.c:1521 -#: src/lib/util.c:189 src/lib/util.c:324 src/filed/status.c:376 -#: src/wx-console/wxbconfigpanel.cpp:209 +#: src/lib/status.h:115 msgid "OK" msgstr "" -#: src/dird/ua_status.c:869 src/stored/status.c:552 src/lib/util.c:202 -#: src/lib/util.c:327 +#: src/lib/status.h:118 msgid "OK -- with warnings" msgstr "" -#: src/dird/ua_status.c:872 src/stored/status.c:555 src/filed/status.c:379 +#: src/lib/status.h:122 msgid "Other" msgstr "" -#: src/dird/ua_status.c:876 src/stored/status.c:567 src/filed/status.c:391 +#: src/lib/status.h:134 #, c-format msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n" msgstr "" -#: src/dird/ua_status.c:884 src/stored/status.c:575 src/filed/status.c:399 +#: src/lib/status.h:142 #, c-format msgid "%6d %-6s %8s %10s %-7s %-8s %s\n" msgstr "" @@ -5591,9 +5567,7 @@ msgid "Clone JobId %d started.\n" msgstr "" -#: src/dird/authenticate.c:83 src/dird/authenticate.c:84 -#: src/tray-monitor/authenticate.c:132 -#: src/qt-console/tray-monitor/authenticate.cpp:131 +#: src/qt-console/tray-monitor/authenticate.cpp:119 #, c-format msgid "Error sending Hello to Storage daemon. ERR=%s\n" msgstr "" @@ -5637,8 +5611,7 @@ msgid "bdird\n" msgstr "" -#: src/tray-monitor/tray-monitor.c:1046 -#: src/qt-console/tray-monitor/tray-monitor.cpp:457 +#: src/qt-console/tray-monitor/tray-monitor.cpp:454 msgid "Error : BNET_HARDEOF or BNET_ERROR" msgstr "" @@ -6293,52 +6242,43 @@ msgid "\n" msgstr "" -#: src/tray-monitor/tray-monitor.c:1056 -#: src/qt-console/tray-monitor/tray-monitor.cpp:466 +#: src/qt-console/tray-monitor/tray-monitor.cpp:463 msgid "Error : Connection closed." msgstr "" -#: src/tray-monitor/authenticate.c:88 -#: src/qt-console/tray-monitor/authenticate.cpp:87 +#: src/qt-console/tray-monitor/authenticate.cpp:75 msgid "" "Director authorization problem.\n" "Most likely the passwords do not agree.\n" "Please see " msgstr "" -#: src/tray-monitor/authenticate.c:97 src/console/authenticate.c:152 -#: src/qt-console/tray-monitor/authenticate.cpp:96 +#: src/qt-console/tray-monitor/authenticate.cpp:84 #, c-format msgid "Bad response to Hello command: ERR=%s\n" msgstr "" -#: src/tray-monitor/authenticate.c:104 src/wx-console/authenticate.c:157 -#: src/console/authenticate.c:159 -#: src/qt-console/tray-monitor/authenticate.cpp:103 +#: src/qt-console/tray-monitor/authenticate.cpp:91 msgid "Director rejected Hello command\n" msgstr "" -#: src/tray-monitor/authenticate.c:138 -#: src/qt-console/tray-monitor/authenticate.cpp:137 +#: src/qt-console/tray-monitor/authenticate.cpp:125 msgid "" "Director and Storage daemon passwords or names not the same.\n" "Please see " msgstr "" -#: src/tray-monitor/authenticate.c:145 -#: src/qt-console/tray-monitor/authenticate.cpp:144 +#: src/qt-console/tray-monitor/authenticate.cpp:132 #, c-format msgid "bdird\n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:34+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:37+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: aout-adobe.c:127 msgid "%B: Unknown section type in a.out.adobe file: %x\n" @@ -5498,11 +5498,11 @@ #: vms-alpha.c:7363 msgid "MISC " -msgstr "" +msgstr "杂项 " #: vms-alpha.c:7366 msgid "CPU " -msgstr "" +msgstr "CPU " #: vms-alpha.c:7369 msgid "VOLATILE " @@ -5510,11 +5510,11 @@ #: vms-alpha.c:7372 msgid "SHELL " -msgstr "" +msgstr "SHELL " #: vms-alpha.c:7375 msgid "POSIX " -msgstr "" +msgstr "POSIX " #: vms-alpha.c:7378 msgid "MULTI_PROCESSING " diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/binutils.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/binutils.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/binutils.po 2015-02-19 15:26:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/binutils.po 2016-07-20 16:51:56.000000000 +0000 @@ -7,14 +7,14 @@ "Project-Id-Version: binutils 2.12.91\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-10-25 11:20+0100\n" -"PO-Revision-Date: 2014-04-16 15:06+0000\n" +"PO-Revision-Date: 2016-05-17 13:22+0000\n" "Last-Translator: Wang Li \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:34+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:39+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: addr2line.c:81 #, c-format @@ -51,6 +51,19 @@ " -v --version Display the program's version\n" "\n" msgstr "" +" 选项是：\n" +" @ 读取选项从 \n" +" -a --addresses 显示地址\n" +" -b --target= 设置二进位文件格式\n" +" -e --exe= 设置输入文件名称（默认为 a.out）\n" +" -i --inlines 解开内联函数\n" +" -j --section= 读取相对于段的偏移而非地址\n" +" -p --pretty-print 让输出对人类更可读\n" +" -s --basenames 去除目录名\n" +" -f --functions 显示函数名\n" +" -C --demangle[=style] 解码函数名\n" +" -h --help 显示本帮助\n" +"\n" #: addr2line.c:101 ar.c:332 ar.c:369 coffdump.c:471 dlltool.c:3969 #: dllwrap.c:518 elfedit.c:651 nlmconv.c:1113 objcopy.c:606 objcopy.c:656 @@ -68,7 +81,7 @@ #: addr2line.c:297 #, c-format msgid " at " -msgstr "" +msgstr " 于 " #. Note for translators: This printf is used to join the #. line number/file name pair that has just been printed with @@ -79,17 +92,17 @@ #: addr2line.c:338 #, c-format msgid " (inlined by) " -msgstr "" +msgstr " (已内连入) " #: addr2line.c:371 #, c-format msgid "%s: cannot get addresses from archive" -msgstr "%s：无法从存档中获取地址" +msgstr "%s：无法从归档中得到地址" #: addr2line.c:388 #, c-format msgid "%s: cannot find section %s" -msgstr "%s: 无法找到章节 %s" +msgstr "%s：无法找到节：%s" #: addr2line.c:457 nm.c:1572 objdump.c:3479 #, c-format @@ -107,13 +120,15 @@ "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin " "] [member-name] [count] archive-file file...\n" msgstr "" +"用法：%s [仿真选项] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <名称>] [成员名] [计数] 归档 " +"文件…\n" #: ar.c:273 #, c-format msgid "" "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [member-name] " "[count] archive-file file...\n" -msgstr "" +msgstr "用法：%s [仿真选项] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [成员名] [计数] 归档 文件…\n" #: ar.c:281 #, c-format @@ -154,7 +169,7 @@ #: ar.c:288 #, c-format msgid " s - act as ranlib\n" -msgstr "" +msgstr " s - 作为 ranlib 工作\n" #: ar.c:289 #, c-format @@ -184,17 +199,17 @@ #: ar.c:303 #, c-format msgid " [D] - use zero for timestamps and uids/gids\n" -msgstr "" +msgstr " [D] - 将 0 用于时间戳和 uid/gid\n" #: ar.c:308 #, c-format msgid " [N] - use instance [count] of name\n" -msgstr " [N] - 使用文件名编号\n" +msgstr " [N] - 使用名称的实例 [数量]\n" #: ar.c:309 #, c-format msgid " [f] - truncate inserted file names\n" -msgstr " [f] - 截短插入的文件名\n" +msgstr " [f] - 截去插入的文件名称\n" #: ar.c:310 #, c-format @@ -236,7 +251,7 @@ #: ar.c:317 #, c-format msgid " [T] - make a thin archive\n" -msgstr "" +msgstr " [T] - 产生一个简单归档\n" #: ar.c:318 #, c-format @@ -251,22 +266,22 @@ #: ar.c:320 #, c-format msgid " @ - read options from \n" -msgstr " @ - 从 中读取选项\n" +msgstr " @ - 从 读取选项\n" #: ar.c:321 #, c-format msgid " --target=BFDNAME - specify the target object format as BFDNAME\n" -msgstr "" +msgstr " --target=BFDNAME - 指定目标对象格式为 BFDNAME\n" #: ar.c:323 #, c-format msgid " optional:\n" -msgstr "" +msgstr " 可选项：\n" #: ar.c:324 #, c-format msgid " --plugin

- load the specified plugin\n" -msgstr "" +msgstr " --plugin

- 加载指定的插件程序\n" #: ar.c:345 #, c-format @@ -284,11 +299,13 @@ " The options are:\n" " @ Read options from \n" msgstr "" +" 选项是：\n" +" @ 从 读取选项\n" #: ar.c:350 #, c-format msgid " --plugin Load the specified plugin\n" -msgstr "" +msgstr " --plugin 加载指定的插件程序\n" #: ar.c:361 #, c-format @@ -297,6 +314,9 @@ " -h --help Print this help message\n" " -v --version Print version information\n" msgstr "" +" -t 更新归档的符号映射时间戳记\n" +" -h --help 打印本帮助消息\n" +" -v --version 打印版本信息\n" #: ar.c:485 msgid "two different operation options specified" @@ -305,7 +325,7 @@ #: ar.c:577 ar.c:638 nm.c:1654 #, c-format msgid "sorry - this program has been built without plugin support\n" -msgstr "" +msgstr "抱歉 - 此程序构建时未启用插件支持\n" #: ar.c:761 msgid "no operation specified" @@ -317,7 +337,7 @@ #: ar.c:767 msgid "`u' is not meaningful with the `D' option." -msgstr "" +msgstr "“u” 在使用 “D” 选项的时候没有意义。" #: ar.c:781 msgid "`N' is only meaningful with the `x' and `d' options." @@ -329,7 +349,7 @@ #: ar.c:798 msgid "`x' cannot be used on thin archives." -msgstr "" +msgstr "`x' 不能被用于归档上。" #: ar.c:845 #, c-format @@ -344,7 +364,7 @@ #: ar.c:983 ar.c:1037 ar.c:1366 objcopy.c:2294 #, c-format msgid "internal stat error on %s" -msgstr "%s 出现内部状态错误" +msgstr "在 %s 内部状态错误" #: ar.c:1002 ar.c:1070 #, c-format @@ -468,15 +488,15 @@ #: bucomm.c:229 msgid "big endian" -msgstr "" +msgstr "大端序" #: bucomm.c:230 msgid "little endian" -msgstr "" +msgstr "小端序" #: bucomm.c:231 msgid "endianness unknown" -msgstr "" +msgstr "未知的端序" #: bucomm.c:252 #, c-format @@ -498,17 +518,17 @@ #: bucomm.c:579 strings.c:408 #, c-format msgid "'%s': No such file" -msgstr "'%s': 没有这个文件" +msgstr "%s：无此文件" #: bucomm.c:581 strings.c:410 #, c-format msgid "Warning: could not locate '%s'. reason: %s" -msgstr "警告:不能定位 '%s'。 原因: %s" +msgstr "警告：无法找到 %s。原因：%s" #: bucomm.c:585 #, c-format msgid "Warning: '%s' is not an ordinary file" -msgstr "警告: '%s' 不是一个普通的文件" +msgstr "警告：'%s' 不是一般文件" #: bucomm.c:587 #, c-format @@ -523,17 +543,17 @@ #: coffdump.c:130 #, c-format msgid "size %d " -msgstr "" +msgstr "大小 %d " #: coffdump.c:135 #, c-format msgid "section definition at %x size %x\n" -msgstr "" +msgstr "节定义于 %x 大小 %x\n" #: coffdump.c:141 #, c-format msgid "pointer to" -msgstr "" +msgstr "指针到" #: coffdump.c:146 #, c-format @@ -543,22 +563,22 @@ #: coffdump.c:151 #, c-format msgid "function returning" -msgstr "" +msgstr "函数返回" #: coffdump.c:155 #, c-format msgid "arguments" -msgstr "" +msgstr "参数" #: coffdump.c:159 #, c-format msgid "code" -msgstr "" +msgstr "编码" #: coffdump.c:165 #, c-format msgid "structure definition" -msgstr "" +msgstr "结构体定义" #: coffdump.c:171 #, c-format @@ -578,7 +598,7 @@ #: coffdump.c:179 #, c-format msgid "enum definition" -msgstr "" +msgstr "枚举定义" #: coffdump.c:252 #, c-format @@ -588,12 +608,12 @@ #: coffdump.c:255 #, c-format msgid "Memory section %s+%x" -msgstr "" +msgstr "内存节 %s+%x" #: coffdump.c:258 #, c-format msgid "Register %d" -msgstr "" +msgstr "寄存器 %d" #: coffdump.c:261 #, c-format @@ -608,12 +628,12 @@ #: coffdump.c:267 #, c-format msgid "Undefined symbol" -msgstr "" +msgstr "未定义符号" #: coffdump.c:334 #, c-format msgid "List of symbols" -msgstr "" +msgstr "符号清单" #: coffdump.c:341 #, c-format @@ -623,21 +643,21 @@ #: coffdump.c:345 readelf.c:13103 readelf.c:13177 #, c-format msgid "Type" -msgstr "" +msgstr "类型" #: coffdump.c:350 #, c-format msgid "Where" -msgstr "" +msgstr "来自" #: coffdump.c:354 #, c-format msgid "Visible" -msgstr "" +msgstr "可见" #: coffdump.c:370 msgid "List of blocks " -msgstr "" +msgstr "区块清单 " #: coffdump.c:383 #, c-format @@ -647,17 +667,17 @@ #: coffdump.c:386 #, c-format msgid "blocks" -msgstr "" +msgstr "块" #: coffdump.c:404 #, c-format msgid "List of source files" -msgstr "" +msgstr "来源文件清单" #: coffdump.c:410 #, c-format msgid "Source file %s" -msgstr "" +msgstr "来源文件：%s" #: coffdump.c:424 #, c-format @@ -667,7 +687,7 @@ #: coffdump.c:449 #, c-format msgid "#sources %d" -msgstr "" +msgstr "#源 %d" #: coffdump.c:462 sysdump.c:646 #, c-format @@ -677,7 +697,7 @@ #: coffdump.c:463 #, c-format msgid " Print a human readable interpretation of a COFF object file\n" -msgstr "" +msgstr " 打印人类可读的对 COFF 目标文件的解释\n" #: coffdump.c:464 #, c-format @@ -688,10 +708,10 @@ " -v --version Display the program's version\n" "\n" msgstr "" -" 选项为:\n" -" @ 从中读取配置\n" -" -h --help 显示此帮助信息\n" -" -v --version 显示程序版本\n" +" 选项为：\n" +" @ 从 读取选项\n" +" -h --help 显示本帮助信息\n" +" -v --version 显示程序的版本号\n" "\n" #: coffdump.c:533 srconv.c:1834 sysdump.c:710 @@ -823,31 +843,31 @@ #: dlltool.c:1086 #, c-format msgid "%s: Path components stripped from image name, '%s'." -msgstr "%s: 从镜像文件名中剪除路径, '%s'." +msgstr "%s：从映像名 '%s' 中截去路径成分。" #: dlltool.c:1104 #, c-format msgid "NAME: %s base: %x" -msgstr "NAME: %s 基: %x" +msgstr "名称：%s 基址：%x" #: dlltool.c:1107 dlltool.c:1128 msgid "Can't have LIBRARY and NAME" -msgstr "无法找到 LIBRARY 和 NAME" +msgstr "不能同时具有 LIBRARY 和 NAME" #: dlltool.c:1125 #, c-format msgid "LIBRARY: %s base: %x" -msgstr "LIBRARY: %s 基: %x" +msgstr "库：%s 基址：%x" #: dlltool.c:1282 #, c-format msgid "VERSION %d.%d\n" -msgstr "" +msgstr "版本 %d.%d\n" #: dlltool.c:1330 #, c-format msgid "run: %s %s" -msgstr "" +msgstr "运行：%s %s" #: dlltool.c:1370 resrc.c:288 #, c-format @@ -872,7 +892,7 @@ #: dlltool.c:1552 #, c-format msgid "Excluding symbol: %s" -msgstr "排除符号: %s" +msgstr "排除符号：%s" #: dlltool.c:1641 dlltool.c:1652 nm.c:1006 nm.c:1016 nm.c:1025 #, c-format @@ -883,12 +903,12 @@ #: dlltool.c:1678 #, c-format msgid "Done reading %s" -msgstr "读入 %s 完成" +msgstr "读取 %s 完成" #: dlltool.c:1688 #, c-format msgid "Unable to open object file: %s: %s" -msgstr "" +msgstr "无法打开目标文件：%s: %s" #: dlltool.c:1691 #, c-format @@ -902,11 +922,11 @@ #: dlltool.c:1810 msgid "Adding exports to output file" -msgstr "正在将输出结果添加到输出文件" +msgstr "正在加入导出至输出文件" #: dlltool.c:1862 msgid "Added exports to output file" -msgstr "已将输出结果添加到输出文件" +msgstr "已加入导出至输出文件" #: dlltool.c:2004 #, c-format @@ -925,7 +945,7 @@ #: dlltool.c:2189 msgid "failed to read the number of entries from base file" -msgstr "" +msgstr "从基底文件读取条目数量时失败" #: dlltool.c:2237 msgid "Generated exports file" @@ -934,17 +954,17 @@ #: dlltool.c:2447 #, c-format msgid "bfd_open failed open stub file: %s: %s" -msgstr "" +msgstr "无法打开输出文件：%s: %s" #: dlltool.c:2451 #, c-format msgid "Creating stub file: %s" -msgstr "建立存根文件: %s" +msgstr "正在创建占位文件：%s" #: dlltool.c:2922 #, c-format msgid "bfd_open failed reopen stub file: %s: %s" -msgstr "" +msgstr "无法打开输出文件：%s: %s" #: dlltool.c:2936 dlltool.c:3012 #, c-format @@ -954,7 +974,7 @@ #: dlltool.c:2998 dlltool.c:3081 #, c-format msgid "failed to open temporary head file: %s: %s" -msgstr "" +msgstr "打开临时标头文件失败：%s: %s" #: dlltool.c:3095 #, c-format @@ -964,12 +984,12 @@ #: dlltool.c:3152 #, c-format msgid "failed to open temporary tail file: %s: %s" -msgstr "" +msgstr "打开临时标尾文件失败：%s: %s" #: dlltool.c:3174 #, c-format msgid "Can't create .lib file: %s: %s" -msgstr "" +msgstr "无法创建 .lib 文件：%s: %s" #: dlltool.c:3178 #, c-format @@ -988,12 +1008,12 @@ #: dlltool.c:3493 #, c-format msgid "Can't open .lib file: %s: %s" -msgstr "" +msgstr "无法打开 .lib 文件：%s: %s" #: dlltool.c:3501 dlltool.c:3523 #, c-format msgid "%s is not a library" -msgstr "" +msgstr "%s 不是一个函数库" #: dlltool.c:3541 #, c-format @@ -1003,17 +1023,17 @@ #: dlltool.c:3552 #, c-format msgid "Unable to determine dll name for `%s' (not an import library?)" -msgstr "" +msgstr "无法确定 ‘%s’ 的 dll 名称（不是导入库？）" #: dlltool.c:3776 #, c-format msgid "Warning, ignoring duplicate EXPORT %s %d,%d" -msgstr "警告, 忽略重复的EXPORT %s %d,%d" +msgstr "警告，正在忽略重复的 EXPORT %s %d,%d" #: dlltool.c:3782 #, c-format msgid "Error, duplicate EXPORT with ordinals: %s" -msgstr "" +msgstr "错误，重复的 EXPORT 以及原始出处: %s" #: dlltool.c:3887 msgid "Processing definitions" @@ -1057,7 +1077,7 @@ #: dlltool.c:3932 #, c-format msgid " -y --output-delaylib Create a delay-import library.\n" -msgstr "" +msgstr " -y --output-delaylib 生成延迟导入库。\n" #: dlltool.c:3933 #, c-format @@ -1068,12 +1088,12 @@ #, c-format msgid "" " -D --dllname Name of input dll to put into interface lib.\n" -msgstr " -D --dllname 放入接口库中的输入 dll 文件的名称.\n" +msgstr " -D --dllname <名称> 要置入接口函数库的输入 dll 名称。\n" #: dlltool.c:3935 #, c-format msgid " -d --input-def Name of .def file to be read in.\n" -msgstr " -d --input-def 需读入的 .def 文件名。\n" +msgstr " -d --input-def 需读取的 .def 文件名。\n" #: dlltool.c:3936 #, c-format @@ -1098,12 +1118,13 @@ #: dlltool.c:3940 #, c-format msgid " --no-default-excludes Clear default exclude symbols\n" -msgstr " --no-default-excludes 清除默认的导出符号。\n" +msgstr " --no-default-excludes 清空缺省排除的符号\n" +# Need texinfo page #: dlltool.c:3941 #, c-format msgid " -b --base-file Read linker generated base file.\n" -msgstr " -b --base-file 读取连结器生成的基文件.\n" +msgstr " -b --base-file 读取链接器所产生的 base 文件。\n" #: dlltool.c:3942 #, c-format @@ -1127,14 +1148,14 @@ msgid "" " -U --add-underscore Add underscores to all symbols in interface " "library.\n" -msgstr "" +msgstr " -U --add-underscore 于接口中所有符号添加下划线。\n" #: dlltool.c:3946 #, c-format msgid "" " --add-stdcall-underscore Add underscores to stdcall symbols in " "interface library.\n" -msgstr "" +msgstr " --add-stdcall-underscore 向接口中的 stdcall 符号添加下划线。\n" #: dlltool.c:3947 #, c-format @@ -1153,7 +1174,7 @@ #: dlltool.c:3949 #, c-format msgid " -k --kill-at Kill @ from exported names.\n" -msgstr " -k --kill-at 从导出文件名中 Kill @.\n" +msgstr " -k --kill-at 删去导出名称中的 @。\n" #: dlltool.c:3950 #, c-format @@ -1163,7 +1184,7 @@ #: dlltool.c:3951 #, c-format msgid " -p --ext-prefix-alias Add aliases with .\n" -msgstr " -p --ext-prefix-alias 添加 的别名.\n" +msgstr " -p --ext-prefix-alias <前缀> 添加附带 <前缀> 的别名。\n" #: dlltool.c:3952 #, c-format @@ -1186,7 +1207,7 @@ msgid "" " -n --no-delete Keep temp files (repeat for extra " "preservation).\n" -msgstr "" +msgstr " -n --no-delete 保留临时文件 (重复以保留更多)。\n" #: dlltool.c:3956 #, c-format @@ -1226,13 +1247,13 @@ #: dlltool.c:3962 #, c-format msgid " @ Read options from .\n" -msgstr " @ 从中读取选项.\n" +msgstr " @ 从 读取选项。\n" #: dlltool.c:3964 #, c-format msgid "" " -M --mcore-elf Process mcore-elf object files into .\n" -msgstr "" +msgstr " -M --mcore-elf <输出名称> 将 mcore-elf 对象文件处理成 <输出名称>。\n" #: dlltool.c:3965 #, c-format @@ -1247,12 +1268,12 @@ #: dlltool.c:4113 #, c-format msgid "Path components stripped from dllname, '%s'." -msgstr "从dll名称中剪除路径, '%s'." +msgstr "已从 dll 名称 '%s' 中截去路径部分。" #: dlltool.c:4161 #, c-format msgid "Unable to open base-file: %s" -msgstr "无法打开基文件:%s" +msgstr "无法打开 base 文件：%s" #: dlltool.c:4196 #, c-format @@ -1267,32 +1288,32 @@ #: dlltool.c:4344 dllwrap.c:207 #, c-format msgid "Tried file: %s" -msgstr "尝试了文件:%s" +msgstr "已尝试文件：%s" #: dlltool.c:4351 dllwrap.c:214 #, c-format msgid "Using file: %s" -msgstr "正在使用文件: %s" +msgstr "正处理文件：%s" #: dllwrap.c:297 #, c-format msgid "Keeping temporary base file %s" -msgstr "" +msgstr "保留临时 base 文件 %s" #: dllwrap.c:299 #, c-format msgid "Deleting temporary base file %s" -msgstr "" +msgstr "删除临时 base 文件 %s" #: dllwrap.c:313 #, c-format msgid "Keeping temporary exp file %s" -msgstr "" +msgstr "保留临时 exp 文件 %s" #: dllwrap.c:315 #, c-format msgid "Deleting temporary exp file %s" -msgstr "" +msgstr "删除临时 exp 文件 %s" #: dllwrap.c:328 #, c-format @@ -1307,7 +1328,7 @@ #: dllwrap.c:411 #, c-format msgid "pwait returns: %s" -msgstr "" +msgstr "pwait 返回：%s" #: dllwrap.c:478 #, c-format @@ -1317,7 +1338,7 @@ #: dllwrap.c:479 #, c-format msgid " @ Read options from \n" -msgstr " @ 从 中读取选项\n" +msgstr " @ 从 读取选项\n" #: dllwrap.c:480 #, c-format @@ -1362,12 +1383,12 @@ #: dllwrap.c:488 #, c-format msgid " --entry Specify alternate DLL entry point\n" -msgstr "" +msgstr " --entry <入口> 指定额外的 DLL 入口点\n" #: dllwrap.c:489 #, c-format msgid " --image-base Specify image base address\n" -msgstr "" +msgstr " --image-base <基址> 指定映像的基本地址\n" #: dllwrap.c:490 #, c-format @@ -1412,7 +1433,7 @@ #: dllwrap.c:498 #, c-format msgid " --dllname Name of input dll to put into output lib.\n" -msgstr "" +msgstr " --dllname <名称> 要置入输出函数库的输入 dll 名称。\n" #: dllwrap.c:499 #, c-format @@ -1447,7 +1468,7 @@ #: dllwrap.c:505 #, c-format msgid " --base-file Read linker generated base file\n" -msgstr "" +msgstr " --base-file 读取链接器所产生的 base 文件。\n" #: dllwrap.c:506 #, c-format @@ -1542,7 +1563,7 @@ #: dwarf.c:413 #, c-format msgid " Extended opcode %d: " -msgstr "" +msgstr " 扩充操作码 %d： " #: dwarf.c:418 #, c-format @@ -1556,7 +1577,7 @@ #: dwarf.c:424 #, c-format msgid "set Address to 0x%s\n" -msgstr "" +msgstr "设置地址为 0x%s\n" #: dwarf.c:280 #, c-format @@ -1585,17 +1606,17 @@ #: dwarf.c:541 #, c-format msgid "user defined: " -msgstr "" +msgstr "用户定义： " #: dwarf.c:543 #, c-format msgid "UNKNOWN: " -msgstr "" +msgstr "未知： " #: dwarf.c:544 #, c-format msgid "length %d [" -msgstr "" +msgstr "长度 %d [" #: dwarf.c:561 dwarf.c:599 msgid "" @@ -1623,7 +1644,7 @@ #: dwarf.c:836 #, c-format msgid " %s byte block: " -msgstr "" +msgstr " %s 字节区块： " #: dwarf.c:1188 #, c-format @@ -1633,12 +1654,12 @@ #: dwarf.c:1210 #, c-format msgid "size: %s " -msgstr "" +msgstr "大小：%s " #: dwarf.c:1213 #, c-format msgid "offset: %s " -msgstr "" +msgstr "偏移量：%s " #: dwarf.c:1233 #, c-format @@ -1653,30 +1674,30 @@ #: dwarf.c:1377 #, c-format msgid "(User defined location op)" -msgstr "" +msgstr "(用户定义的定位操作码)" #: dwarf.c:1379 #, c-format msgid "(Unknown location op)" -msgstr "" +msgstr "(未知的定位操作码)" #: dwarf.c:1488 msgid "Internal error: DWARF version is not 2, 3 or 4.\n" -msgstr "" +msgstr "内部错误：DWARF 版本号码并非 2, 3 或 4。\n" #: dwarf.c:1614 msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n" -msgstr "" +msgstr "当 sizeof (dwarf_vma) != 8 时，不支持 DW_FORM_data8\n" #: dwarf.c:1665 #, c-format msgid " (indirect string, offset: 0x%s): %s" -msgstr "" +msgstr " (间接字串，偏移量：0x%s)： %s" #: dwarf.c:1713 #, c-format msgid "Unrecognized form: %lu\n" -msgstr "无法识别的表格: %lu\n" +msgstr "无法识别的形式：%lu\n" #: dwarf.c:1815 #, c-format @@ -1701,7 +1722,7 @@ #: dwarf.c:1827 #, c-format msgid " (Unknown inline attribute value: %s)" -msgstr "" +msgstr " (未知的内嵌属性值：%s)" #: dwarf.c:1869 #, c-format @@ -1711,54 +1732,54 @@ #: dwarf.c:1872 #, c-format msgid "(Unknown: %s)" -msgstr "" +msgstr "<未知：%s>" #: dwarf.c:1911 #, c-format msgid "(user defined type)" -msgstr "" +msgstr "(用户定义的类型)" #: dwarf.c:1913 #, c-format msgid "(unknown type)" -msgstr "" +msgstr "(未知的类型)" #: dwarf.c:1926 #, c-format msgid "(unknown accessibility)" -msgstr "" +msgstr "(未知的可访问性)" #: dwarf.c:1938 #, c-format msgid "(unknown visibility)" -msgstr "" +msgstr "(未知的可见性)" #: dwarf.c:1949 #, c-format msgid "(unknown virtuality)" -msgstr "" +msgstr "(未知的)" #: dwarf.c:1961 #, c-format msgid "(unknown case)" -msgstr "" +msgstr "(未知的案例)" #: dwarf.c:1975 #, c-format msgid "(user defined)" -msgstr "" +msgstr "(用户定义的)" #: dwarf.c:1977 #, c-format msgid "(unknown convention)" -msgstr "" +msgstr "未知的节" #: dwarf.c:1985 #, c-format msgid "(undefined)" -msgstr "" +msgstr "(未定义的)" -#: dwarf.c:1740 +#: dwarf.c:1735 #, c-format msgid "(location list)" msgstr "(位置列表)" @@ -1766,7 +1787,7 @@ #: dwarf.c:2029 dwarf.c:4209 dwarf.c:4335 #, c-format msgid " [without DW_AT_frame_base]" -msgstr "" +msgstr " [不含 DW_AT_frame_base]" #: dwarf.c:2046 #, c-format @@ -1803,7 +1824,7 @@ #: dwarf.c:2200 #, c-format msgid "Not enough memory for a debug info array of %u entries" -msgstr "" +msgstr "内存不足以容纳 %u 个条目的调试信息数组" #: dwarf.c:2209 dwarf.c:3544 dwarf.c:3669 dwarf.c:3833 dwarf.c:4086 #: dwarf.c:4444 dwarf.c:4528 dwarf.c:4597 dwarf.c:4738 dwarf.c:4884 @@ -1813,28 +1834,30 @@ "Contents of the %s section:\n" "\n" msgstr "" +"%s 节的内容:\n" +"\n" #: dwarf.c:2221 #, c-format msgid "Unable to locate %s section!\n" -msgstr "" +msgstr "无法找到 %s 节的位置！\n" #: dwarf.c:2309 #, c-format msgid " Compilation Unit @ offset 0x%s:\n" -msgstr "" +msgstr " 编译单元 @ 偏移 0x%s:\n" #: dwarf.c:2311 #, c-format msgid " Length: 0x%s (%s)\n" -msgstr "" +msgstr " 长度： 0x%s (%s)\n" #: dwarf.c:2314 #, c-format msgid " Version: %d\n" msgstr " 版本： %d\n" -#: dwarf.c:2182 +#: dwarf.c:2175 #, c-format msgid " Abbrev Offset: %s\n" msgstr "" @@ -1844,7 +1867,7 @@ msgid " Pointer Size: %d\n" msgstr " 指针大小： %d\n" -#: dwarf.c:2188 +#: dwarf.c:2181 #, c-format msgid " Signature: " msgstr "" @@ -1852,7 +1875,7 @@ #: dwarf.c:2325 #, c-format msgid " Type Offset: 0x%s\n" -msgstr "" +msgstr " 类型偏移量： 0x%s\n" #: dwarf.c:2352 #, c-format @@ -1873,7 +1896,7 @@ "size (%lx)\n" msgstr "" -#: dwarf.c:2274 +#: dwarf.c:2267 #, c-format msgid "" "Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n" @@ -1886,7 +1909,7 @@ #: dwarf.c:2454 #, c-format msgid " <%d><%lx>: Abbrev Number: %lu" -msgstr "" +msgstr " <%d><%lx>：缩写编号：%lu" #: dwarf.c:2458 #, c-format @@ -1905,8 +1928,10 @@ "Raw dump of debug contents of section %s:\n" "\n" msgstr "" +"%s 节的调试内容转储：\n" +"\n" -#: dwarf.c:2460 +#: dwarf.c:2453 #, c-format msgid "" "The information in section %s appears to be corrupt - the section is too " @@ -1915,7 +1940,7 @@ #: dwarf.c:2647 msgid "Only DWARF version 2, 3 and 4 line info is currently supported.\n" -msgstr "" +msgstr "目前只支持第二、三与第四版的 DWARF 行信息。\n" #: dwarf.c:2660 msgid "Invalid maximum operations per insn.\n" @@ -1924,7 +1949,7 @@ #: dwarf.c:2727 dwarf.c:3854 #, c-format msgid " Offset: 0x%lx\n" -msgstr "" +msgstr " 偏移： 0x%lx\n" #: dwarf.c:2728 #, c-format @@ -1939,7 +1964,7 @@ #: dwarf.c:2730 #, c-format msgid " Prologue Length: %d\n" -msgstr "" +msgstr " 导言长度： %d\n" #: dwarf.c:2731 #, c-format @@ -1949,7 +1974,7 @@ #: dwarf.c:2733 #, c-format msgid " Maximum Ops per Instruction: %d\n" -msgstr "" +msgstr " 每个指令中最大操作码数： %d\n" #: dwarf.c:2734 #, c-format @@ -1959,17 +1984,17 @@ #: dwarf.c:2735 #, c-format msgid " Line Base: %d\n" -msgstr "" +msgstr " 行基数： %d\n" #: dwarf.c:2736 #, c-format msgid " Line Range: %d\n" -msgstr "" +msgstr " 行范围： %d\n" #: dwarf.c:2737 #, c-format msgid " Opcode Base: %d\n" -msgstr "" +msgstr " 操作码基数： %d\n" #: dwarf.c:2744 #, c-format @@ -1977,11 +2002,13 @@ "\n" " Opcodes:\n" msgstr "" +"\n" +" 操作码:\n" #: dwarf.c:2747 #, c-format msgid " Opcode %d has %d args\n" -msgstr "" +msgstr " 操作码 %d 具有 %d 个参数\n" #: dwarf.c:2753 #, c-format @@ -1992,7 +2019,7 @@ "\n" " 目录表为空。\n" -#: dwarf.c:2536 +#: dwarf.c:2529 #, c-format msgid "" "\n" @@ -2010,7 +2037,7 @@ "\n" " 文件名表为空。\n" -#: dwarf.c:2554 +#: dwarf.c:2547 #, c-format msgid "" "\n" @@ -2020,7 +2047,7 @@ " 文件名表：\n" #. Now display the statements. -#: dwarf.c:2584 +#: dwarf.c:2577 #, c-format msgid "" "\n" @@ -2072,12 +2099,12 @@ #: dwarf.c:2921 #, c-format msgid " Set column to %s\n" -msgstr "" +msgstr " 将列设定为 %s\n" #: dwarf.c:2929 #, c-format msgid " Set is_stmt to %s\n" -msgstr "" +msgstr " 将 is_stmt 设定为 %s\n" #: dwarf.c:2934 #, c-format @@ -2102,17 +2129,17 @@ #: dwarf.c:2974 #, c-format msgid " Set prologue_end to true\n" -msgstr " 设置 prologue_end 为 true\n" +msgstr " 将 prologue_end 设置为真\n" #: dwarf.c:2978 #, c-format msgid " Set epilogue_begin to true\n" -msgstr "" +msgstr " 将 epilogue_begin 设置为真\n" #: dwarf.c:2984 #, c-format msgid " Set ISA to %s\n" -msgstr "" +msgstr " 将 ISA 设定为 %s\n" #: dwarf.c:2988 dwarf.c:3377 #, c-format @@ -2125,6 +2152,8 @@ "Decoded dump of debug contents of section %s:\n" "\n" msgstr "" +"解码后的 %s 节的调试内容转储：\n" +"\n" #: dwarf.c:2634 msgid "The line info appears to be corrupt - the section is too small\n" @@ -2139,14 +2168,14 @@ #, c-format msgid "" "File name Line number Starting address\n" -msgstr "" +msgstr "文件名 行号 起始地址\n" #: dwarf.c:3152 #, c-format msgid "CU: %s/%s:\n" msgstr "" -#: dwarf.c:3059 +#: dwarf.c:3051 #, c-format msgid "UNKNOWN: length %d\n" msgstr "未知：长度 %d\n" @@ -2164,7 +2193,7 @@ #: dwarf.c:3586 msgid "Only DWARF 2 and 3 pubnames are currently supported\n" -msgstr "" +msgstr "目前只支持第二与第三版 DWARF 的 pubname\n" #: dwarf.c:3593 #, c-format @@ -2228,17 +2257,17 @@ #: dwarf.c:3856 #, c-format msgid " Version: %d\n" -msgstr "" +msgstr " 版本： %d\n" #: dwarf.c:3857 #, c-format msgid " Offset size: %d\n" -msgstr "" +msgstr " 偏移量长度： %d\n" #: dwarf.c:3861 #, c-format msgid " Offset into .debug_line: 0x%lx\n" -msgstr "" +msgstr " .debug_info 节中的偏移量: 0x%lx\n" #: dwarf.c:3875 #, c-format @@ -2271,37 +2300,37 @@ #: dwarf.c:3956 #, c-format msgid " DW_MACRO_GNU_start_file - lineno: %d filenum: %d\n" -msgstr "" +msgstr " DW_MACINFO_start_file - 行号：%d 文件编号：%d\n" #: dwarf.c:3959 #, c-format msgid " DW_MACRO_GNU_start_file - lineno: %d filenum: %d filename: %s%s%s\n" -msgstr "" +msgstr " DW_MACRO_GNU_start_file - 行号：%d 文件编号：%d 文件名：%s%s%s\n" #: dwarf.c:3967 #, c-format msgid " DW_MACRO_GNU_end_file\n" -msgstr "" +msgstr " DW_MACINFO_end_file\n" #: dwarf.c:3975 #, c-format msgid " DW_MACRO_GNU_define - lineno : %d macro : %s\n" -msgstr "" +msgstr " DW_MACINFO_define - 行号：%d 宏：%s\n" #: dwarf.c:3984 #, c-format msgid " DW_MACRO_GNU_undef - lineno : %d macro : %s\n" -msgstr "" +msgstr " DW_MACINFO_undef - 行号：%d 宏：%s\n" #: dwarf.c:3993 #, c-format msgid " DW_MACRO_GNU_define_indirect - lineno : %d macro : %s\n" -msgstr "" +msgstr " DW_MACINFO_define - 行号：%d 宏：%s\n" #: dwarf.c:4002 #, c-format msgid " DW_MACRO_GNU_undef_indirect - lineno : %d macro : %s\n" -msgstr "" +msgstr " DW_MACINFO_define - 行号：%d 宏：%s\n" #: dwarf.c:4008 #, c-format @@ -2323,7 +2352,7 @@ msgid " DW_MACRO_GNU_%02x -" msgstr "" -#: dwarf.c:3790 +#: dwarf.c:3467 #, c-format msgid " Number TAG\n" msgstr " 数字标签\n" @@ -2342,17 +2371,19 @@ "\n" "The %s section is empty.\n" msgstr "" +"\n" +"%s 段空。\n" #: dwarf.c:4390 dwarf.c:4733 dwarf.c:4843 #, c-format msgid "" "Unable to load/parse the .debug_info section, so cannot interpret the %s " "section.\n" -msgstr "" +msgstr "无法加载/解析 .debug_info 段，因此不能解释 %s 段。\n" #: dwarf.c:4434 msgid "No location lists in .debug_info section!\n" -msgstr "" +msgstr ".debug_info 节中没有定位列表！\n" #: dwarf.c:4438 #, c-format @@ -2362,22 +2393,22 @@ #: dwarf.c:4445 #, c-format msgid " Offset Begin End Expression\n" -msgstr "" +msgstr " 偏移量 起始 结束 表达式\n" #: dwarf.c:4481 #, c-format msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n" -msgstr "" +msgstr "在 .debug_loc 节中有一处空洞 [0x%lx - 0x%lx]。\n" #: dwarf.c:4485 #, c-format msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n" -msgstr "" +msgstr "在 .debug_loc 节中有一处重叠 [0x%lx - 0x%lx]。\n" #: dwarf.c:4493 #, c-format msgid "Offset 0x%lx is bigger than .debug_loc section size.\n" -msgstr "" +msgstr "偏移量 0x%lx 大于 .debug_loc 节大小。\n" #: dwarf.c:4150 dwarf.c:4182 dwarf.c:4191 dwarf.c:4264 dwarf.c:4312 #: dwarf.c:4320 @@ -2388,20 +2419,20 @@ #: dwarf.c:4166 dwarf.c:4274 dwarf.c:4939 #, c-format msgid "\n" -msgstr "" +msgstr "<列表末尾>\n" #: dwarf.c:4176 #, c-format msgid "(base address)\n" -msgstr "" +msgstr "(基址)\n" #: dwarf.c:4212 msgid " (start == end)" -msgstr " (初始值 == 终止值)" +msgstr " (开始 == 结束)" #: dwarf.c:4214 msgid " (start > end)" -msgstr " (初始值 > 终止值)" +msgstr " (开始 > 结束)" #: dwarf.c:4507 #, c-format @@ -2410,32 +2441,32 @@ #: dwarf.c:4644 msgid "Only DWARF 2 and 3 aranges are currently supported.\n" -msgstr "" +msgstr "目前只支持第二与第三版 DWARF 的 arange。\n" #: dwarf.c:4648 #, c-format msgid " Length: %ld\n" -msgstr " 宽度: %ld\n" +msgstr " 长度： %ld\n" #: dwarf.c:4650 #, c-format msgid " Version: %d\n" -msgstr " 版本: %d\n" +msgstr " 版本： %d\n" #: dwarf.c:4651 #, c-format msgid " Offset into .debug_info: 0x%lx\n" -msgstr "" +msgstr " .debug_info 节中的偏移量: 0x%lx\n" #: dwarf.c:4653 #, c-format msgid " Pointer Size: %d\n" -msgstr "" +msgstr " 指针大小: %d\n" #: dwarf.c:4654 #, c-format msgid " Segment Size: %d\n" -msgstr "" +msgstr " 节区大小: %d\n" #: dwarf.c:4660 #, c-format @@ -2453,7 +2484,7 @@ " Address Length\n" msgstr "" "\n" -" 地址 长度\n" +" 地址 长度\n" #: dwarf.c:4677 #, c-format @@ -2464,7 +2495,7 @@ "\n" " 地址 长度\n" -#: dwarf.c:4327 +#: dwarf.c:3997 msgid "No range lists in .debug_info section!\n" msgstr "" @@ -2524,15 +2555,15 @@ #: dwarf.c:6081 #, c-format msgid "Version %ld\n" -msgstr "" +msgstr "版本 %ld\n" #: dwarf.c:6091 msgid "The address table data in version 3 may be wrong.\n" -msgstr "" +msgstr "地址表数据在第三版中也许是错误的。\n" #: dwarf.c:6093 msgid "Version 4 does not support case insensitive lookups.\n" -msgstr "" +msgstr "版本 4 不支持大小写不敏感的查找。\n" #: dwarf.c:6087 #, c-format @@ -2550,11 +2581,13 @@ "\n" "CU table:\n" msgstr "" +"\n" +"CU 表：\n" #: dwarf.c:6136 #, c-format msgid "[%3u] 0x%lx - 0x%lx\n" -msgstr "" +msgstr "[%3u] 0x%lx - 0x%lx\n" #: dwarf.c:6141 #, c-format @@ -2562,11 +2595,13 @@ "\n" "TU table:\n" msgstr "" +"\n" +"TU 表：\n" #: dwarf.c:6148 #, c-format msgid "[%3u] 0x%lx 0x%lx " -msgstr "" +msgstr "[%3u] 0x%lx 0x%lx " #: dwarf.c:6155 #, c-format @@ -2574,11 +2609,13 @@ "\n" "Address table:\n" msgstr "" +"\n" +"地址表：\n" #: dwarf.c:6164 #, c-format msgid "%lu\n" -msgstr "" +msgstr "%lu\n" #: dwarf.c:6167 #, c-format @@ -2623,22 +2660,22 @@ #: elfcomm.c:594 #, c-format msgid "%s: failed to seek to first archive header\n" -msgstr "" +msgstr "%s：搜索至下一个归档标头失败\n" #: elfcomm.c:603 elfcomm.c:791 elfedit.c:338 readelf.c:14477 #, c-format msgid "%s: failed to read archive header\n" -msgstr "" +msgstr "%s：读取归档标头失败\n" #: elfcomm.c:475 #, c-format msgid "%s: the archive index is empty\n" -msgstr "" +msgstr "%s: 归档索引空\n" #: elfcomm.c:483 elfcomm.c:510 #, c-format msgid "%s: failed to read archive index\n" -msgstr "" +msgstr "%s: 读取归档索引失败\n" #: elfcomm.c:365 #, c-format @@ -2658,7 +2695,7 @@ #: elfcomm.c:535 #, c-format msgid "%s: the archive has an index but no symbols\n" -msgstr "" +msgstr "%s: 归档有索引但无符号\n" #: elfcomm.c:543 msgid "Out of memory whilst trying to read archive index symbol table\n" @@ -2667,22 +2704,22 @@ #: elfcomm.c:551 #, c-format msgid "%s: failed to read archive index symbol table\n" -msgstr "" +msgstr "%s: 读取归档索引符号表失败\n" #: elfcomm.c:456 #, c-format msgid "%s: failed to skip archive symbol table\n" -msgstr "" +msgstr "%s：跳过归档符号表失败\n" #: elfcomm.c:561 #, c-format msgid "%s: failed to read archive header following archive index\n" -msgstr "" +msgstr "%s: 读取归档索引后的标头失败\n" #: elfcomm.c:620 #, c-format msgid "%s has no archive index\n" -msgstr "" +msgstr "%s 没有归档索引\n" #: elfcomm.c:631 msgid "Out of memory reading long symbol names in archive\n" @@ -2752,7 +2789,7 @@ #: elfedit.c:268 #, c-format msgid "%s: Failed to read ELF header\n" -msgstr "" +msgstr "%s：读取 ELF 标头失败\n" #: elfedit.c:275 #, c-format @@ -2762,12 +2799,12 @@ #: elfedit.c:329 readelf.c:14469 #, c-format msgid "%s: failed to seek to next archive header\n" -msgstr "" +msgstr "%s：搜索至下一个归档标头失败\n" #: elfedit.c:360 elfedit.c:369 readelf.c:14497 readelf.c:14506 #, c-format msgid "%s: bad archive file name\n" -msgstr "" +msgstr "%s：不当的归档文件名称\n" #: elfedit.c:389 elfedit.c:481 #, c-format @@ -2827,7 +2864,7 @@ #: elfedit.c:637 #, c-format msgid " Update the ELF header of ELF files\n" -msgstr "" +msgstr " 更新 ELF 文件的 ELF 头\n" #: elfedit.c:638 objcopy.c:489 objcopy.c:615 #, c-format @@ -2976,15 +3013,15 @@ #: ieee.c:2410 msgid "unexpected string in C++ misc" -msgstr "" +msgstr "意外的 C++ 杂项字串" #: ieee.c:2423 msgid "bad misc record" -msgstr "" +msgstr "不当的杂项记录" #: ieee.c:2464 msgid "unrecognized C++ misc record" -msgstr "" +msgstr "无法识别的 C++ 杂项纪录" #: ieee.c:2579 msgid "undefined C++ object" @@ -2992,7 +3029,7 @@ #: ieee.c:2613 msgid "unrecognized C++ object spec" -msgstr "" +msgstr "无法识别的 C++ 对象规范" #: ieee.c:2649 msgid "unsupported C++ object type" @@ -3008,23 +3045,23 @@ #: ieee.c:2690 msgid "C++ base class not found in container" -msgstr "" +msgstr "容器中找不到 C++ 基类" #: ieee.c:2797 msgid "C++ data member not found in container" -msgstr "" +msgstr "容器中找不到 C++ 数据成员" #: ieee.c:2838 ieee.c:2988 msgid "unknown C++ visibility" -msgstr "" +msgstr "未知的 C++ 可见性" #: ieee.c:2872 msgid "bad C++ field bit pos or size" -msgstr "" +msgstr "不当的 C++ 字段位位置或大小" #: ieee.c:2964 msgid "bad type for C++ method function" -msgstr "" +msgstr "不当的 C++ 方法函数类型" #: ieee.c:2974 msgid "no type information for C++ method function" @@ -3068,15 +3105,15 @@ #: ieee.c:3486 ieee.c:3494 msgid "missing required ASN" -msgstr "遗失必须的 ASN" +msgstr "缺失必须的 ASN" #: ieee.c:3521 ieee.c:3529 msgid "missing required ATN65" -msgstr "遗失必须的 ATN65" +msgstr "缺失必须的 ATN65" #: ieee.c:3543 msgid "bad ATN65 record" -msgstr "错误的 ATN65 记录" +msgstr "不当的 ATN65 记录" #: ieee.c:4171 #, c-format @@ -3680,7 +3717,7 @@ #: objcopy.c:869 #, c-format msgid "cannot open '%s': %s" -msgstr "" +msgstr "无法打开 '%s'：%s" #: objcopy.c:872 objcopy.c:3701 #, c-format @@ -3690,7 +3727,7 @@ #: objcopy.c:945 #, c-format msgid "%s:%d: Ignoring rubbish found on this line" -msgstr "" +msgstr "%s:%d: 忽略本行所含无用数据" #: objcopy.c:1292 #, c-format @@ -3710,12 +3747,12 @@ #: objcopy.c:1407 #, c-format msgid "couldn't open symbol redefinition file %s (error: %s)" -msgstr "" +msgstr "无法打开符号重定义文件 %s (错误: %s)" #: objcopy.c:1485 #, c-format msgid "%s:%d: garbage found at end of line" -msgstr "" +msgstr "%s:%d: 行尾出现无用字符" #: objcopy.c:1488 #, c-format @@ -3909,7 +3946,7 @@ msgid "interleave width must be positive" msgstr "" -#: objcopy.c:3280 objcopy.c:3288 +#: objcopy.c:3255 objcopy.c:3263 #, c-format msgid "%s both copied and removed" msgstr "即要复制 %s 又要删除它" @@ -4108,6 +4145,24 @@ " --prefix=PREFIX Add PREFIX to absolute paths for -S\n" " --prefix-strip=LEVEL Strip initial directory names for -S\n" msgstr "" +" -b, --target=BFDNAME 将标的目标文件格式指定为 BFDNAME\n" +" -m, --architecture=MACHINE 将标的体系结构指定为 MACHINE\n" +" -j, --section=NAME 只显示 NAME 节的信息\n" +" -M, --disassembler-options=OPT 将文本传递到 OPT 反汇编程序\n" +" -EB --endian=big 反汇编时假定高位字节在前\n" +" -EL --endian=little 反汇编时假定低位字节在前\n" +" --file-start-context 从文件的起点引入上下文 (带有 -S)\n" +" -l, --line-numbers 在输出中给出行号和文件名\n" +" -C, --demangle[=STYLE] 对修饰过的 (mangled) 符号名进行解码\n" +" 如果给出了 STYLE，STYLE 可能为“auto”、“gnu”、\n" +" “lucid”、“arm”、“hp”、“edg”或“gnu-new-abi”\n" +" -w, --wide 以多于 80 列的宽度对输出进行格式化\n" +" -z, --disassemble-zeroes 反汇编时不要跳过为零的块\n" +" --start-address=ADDR 只有进程数据的地址 >= ADDR\n" +" --stop-address=ADDR 只有进程数据的地址 <= ADDR\n" +" --prefix-addresses 同反汇编代码并列显示完整的地址\n" +" --[no-]show-raw-insn 同符号反汇编并列显示十六进制值\n" +" --adjust-vma=OFFSET 为所有显示的节地址增加 OFFSET\n" #: objdump.c:263 #, c-format @@ -4261,7 +4316,7 @@ #: objdump.c:2858 #, c-format msgid "no symbols\n" -msgstr "" +msgstr "无符号\n" #: objdump.c:2865 #, c-format @@ -4577,7 +4632,7 @@ #: od-xcoff.c:1090 #, c-format msgid "Dynamic symbols:\n" -msgstr "" +msgstr "动态符号：\n" #: od-xcoff.c:1097 #, c-format @@ -4667,7 +4722,7 @@ #: od-xcoff.c:1516 #, c-format msgid "TOC:\n" -msgstr "" +msgstr "目录：\n" #: od-xcoff.c:1559 #, c-format @@ -4681,7 +4736,7 @@ #: od-xcoff.c:1651 #, c-format msgid "File header:\n" -msgstr "" +msgstr "文件标头：\n" #: od-xcoff.c:1652 #, c-format @@ -4706,12 +4761,12 @@ #: od-xcoff.c:1665 #, c-format msgid "unknown magic" -msgstr "" +msgstr "不明魔数" #: od-xcoff.c:1673 od-xcoff.c:1813 #, c-format msgid " Unhandled magic\n" -msgstr "" +msgstr " 未经处理的魔数\n" #: rclex.c:197 msgid "invalid value specified for pragma code_page.\n" @@ -4764,7 +4819,7 @@ #: readelf.c:8890 readelf.c:9895 readelf.c:9989 readelf.c:10050 #: readelf.c:13313 readelf.c:13316 msgid "" -msgstr "" +msgstr "<已损坏>" #: readelf.c:318 #, c-format @@ -4801,22 +4856,22 @@ #, c-format msgid "" " Offset Info Type Sym. Value Symbol's Name + Addend\n" -msgstr "" +msgstr " 偏移量 信息 类型 符号值 符号名称 + 加数\n" #: readelf.c:955 #, c-format msgid " Offset Info Type Sym.Value Sym. Name + Addend\n" -msgstr "" +msgstr " 偏移量 信息 类型 符号值 符号名称 + 加数\n" #: readelf.c:960 #, c-format msgid " Offset Info Type Sym. Value Symbol's Name\n" -msgstr "" +msgstr " 偏移量 信息 类型 符号值 符号名称\n" #: readelf.c:962 #, c-format msgid " Offset Info Type Sym.Value Sym. Name\n" -msgstr "" +msgstr " 偏移量 信息 类型 符号值 符号名称\n" #: readelf.c:970 #, c-format @@ -4824,13 +4879,14 @@ " Offset Info Type Symbol's Value " "Symbol's Name + Addend\n" msgstr "" +" 偏移量 信息 类型 符号值 符号名称 + 加数\n" #: readelf.c:972 #, c-format msgid "" " Offset Info Type Sym. Value Sym. Name + " "Addend\n" -msgstr "" +msgstr " 偏移量 信息 类型 符号值 符号名称 + 加数\n" #: readelf.c:977 #, c-format @@ -4838,12 +4894,13 @@ " Offset Info Type Symbol's Value " "Symbol's Name\n" msgstr "" +" 偏移量 信息 类型 符号值 符号名称\n" #: readelf.c:979 #, c-format msgid "" " Offset Info Type Sym. Value Sym. Name\n" -msgstr "" +msgstr " 偏移量 信息 类型 符号值 符号名称\n" #: readelf.c:1327 readelf.c:1491 readelf.c:1499 #, c-format @@ -4858,17 +4915,17 @@ #: readelf.c:1359 #, c-format msgid " bad symbol index: %08lx" -msgstr "" +msgstr " 不当的符号索引：%08lx" #: readelf.c:1445 #, c-format msgid "" -msgstr "" +msgstr "<字串表索引：%3ld>" #: readelf.c:1447 #, c-format msgid "" -msgstr "" +msgstr "<毁损的字串表索引：%3ld>" #: readelf.c:1858 #, c-format @@ -4935,7 +4992,7 @@ #: readelf.c:2600 readelf.c:8067 msgid "unknown" -msgstr "" +msgstr "未知" #: readelf.c:2601 msgid "unknown mac" @@ -4955,15 +5012,15 @@ #: readelf.c:2818 msgid ", unknown CPU" -msgstr "" +msgstr ", 未知 CPU" #: readelf.c:2833 msgid ", unknown ABI" -msgstr "" +msgstr ", 未知 ABI" #: readelf.c:2856 readelf.c:2888 msgid ", unknown ISA" -msgstr "" +msgstr ", 未知 ISA" #: readelf.c:3103 msgid "Standalone App" @@ -4983,7 +5040,7 @@ #: readelf.c:3596 #, c-format msgid "%08x: " -msgstr "" +msgstr "%08x: <未知>" #: readelf.c:3653 #, c-format @@ -4995,7 +5052,7 @@ msgid " Display information about the contents of ELF format files\n" msgstr " 显示关于 ELF 格式文件内容的信息\n" -#: readelf.c:3165 +#: readelf.c:3125 #, c-format msgid "" " Options are:\n" @@ -5082,11 +5139,11 @@ #: readelf.c:3978 msgid "2's complement, little endian" -msgstr "" +msgstr "2 补码，小端序 (little endian)" #: readelf.c:3979 msgid "2's complement, big endian" -msgstr "" +msgstr "2 补码，大端序 (big endian)" #: readelf.c:3997 msgid "Not an ELF file - it has the wrong magic bytes at the start\n" @@ -5105,47 +5162,47 @@ #: readelf.c:4012 #, c-format msgid " Class: %s\n" -msgstr "" +msgstr " 类别: %s\n" #: readelf.c:4014 #, c-format msgid " Data: %s\n" -msgstr "" +msgstr " 数据: %s\n" #: readelf.c:4016 #, c-format msgid " Version: %d %s\n" -msgstr "" +msgstr " 版本: %d %s\n" #: readelf.c:4021 #, c-format msgid "" -msgstr "" +msgstr "<未知: %lx>" #: readelf.c:4023 #, c-format msgid " OS/ABI: %s\n" -msgstr "" +msgstr " OS/ABI: %s\n" #: readelf.c:4025 #, c-format msgid " ABI Version: %d\n" -msgstr "" +msgstr " ABI 版本: %d\n" #: readelf.c:4027 #, c-format msgid " Type: %s\n" -msgstr "" +msgstr " 类型: %s\n" #: readelf.c:4029 #, c-format msgid " Machine: %s\n" -msgstr "" +msgstr " 系统架构: %s\n" #: readelf.c:4031 #, c-format msgid " Version: 0x%lx\n" -msgstr "" +msgstr " 版本: 0x%lx\n" #: readelf.c:4034 #, c-format @@ -5399,7 +5456,7 @@ msgid "string table" msgstr "字符串表" -#: readelf.c:4558 +#: readelf.c:4511 #, c-format msgid "Section %d has invalid sh_entsize %lx (expected %lx)\n" msgstr "" @@ -5441,7 +5498,7 @@ #: readelf.c:5186 readelf.c:5197 readelf.c:5208 #, c-format msgid " [Nr] Name\n" -msgstr "" +msgstr " [号] 名称\n" #: readelf.c:5187 #, c-format @@ -5471,27 +5528,27 @@ #: readelf.c:5209 #, c-format msgid " Type Address Offset Link\n" -msgstr "" +msgstr " 类型 地址 偏移量 链接\n" #: readelf.c:5210 #, c-format msgid " Size EntSize Info Align\n" -msgstr "" +msgstr " 大小 全体大小 信息 对齐\n" #: readelf.c:5214 #, c-format msgid " [Nr] Name Type Address Offset\n" -msgstr "" +msgstr " [号] 名称 类型 地址 偏移量\n" #: readelf.c:5215 #, c-format msgid " Size EntSize Flags Link Info Align\n" -msgstr "" +msgstr " 大小 全体大小 旗标 链接 信息 对齐\n" #: readelf.c:5220 #, c-format msgid " Flags\n" -msgstr "" +msgstr " 旗标\n" #: readelf.c:5298 #, c-format @@ -5601,7 +5658,7 @@ #, c-format msgid "" "Seg Offset Type SymVec DataType\n" -msgstr "" +msgstr "段 偏移 类型 SymVec 数据类型\n" #: readelf.c:5755 msgid "dynamic section image relocations" @@ -5613,6 +5670,8 @@ "\n" "Image relocs\n" msgstr "" +"\n" +"映像重定位\n" #: readelf.c:5761 #, c-format @@ -5666,7 +5725,7 @@ #: readelf.c:6153 #, c-format msgid "\tUnknown version.\n" -msgstr "" +msgstr "\t未知版本。\n" #: readelf.c:6206 readelf.c:6577 msgid "unwind table" @@ -5698,7 +5757,7 @@ #: readelf.c:6385 msgid "unwind info" -msgstr "" +msgstr "展开信息" #: readelf.c:6388 readelf.c:6727 #, c-format @@ -5706,10 +5765,12 @@ "\n" "Unwind section " msgstr "" +"\n" +"展开节 " #: readelf.c:6849 msgid "unwind data" -msgstr "" +msgstr "展开数据" #: readelf.c:6908 #, c-format @@ -5724,7 +5785,7 @@ #: readelf.c:7067 readelf.c:7267 #, c-format msgid "Refuse to unwind" -msgstr "" +msgstr "拒绝展开" #: readelf.c:7090 #, c-format @@ -5770,7 +5831,7 @@ msgid " [Truncated data]\n" msgstr "" -#: readelf.c:6911 +#: readelf.c:6854 #, c-format msgid " Compact model %d\n" msgstr "" @@ -5807,22 +5868,22 @@ "Unwind table index '%s' at offset 0x%lx contains %lu entries:\n" msgstr "" -#: readelf.c:7159 +#: readelf.c:7102 #, c-format msgid "NONE\n" msgstr "" -#: readelf.c:7185 +#: readelf.c:7128 #, c-format msgid "Interface Version: %s\n" msgstr "" -#: readelf.c:7187 +#: readelf.c:7130 #, c-format msgid "\n" msgstr "" -#: readelf.c:7200 +#: readelf.c:7143 #, c-format msgid "Time Stamp: %s\n" msgstr "" @@ -5844,7 +5905,7 @@ #: readelf.c:8134 msgid "Unable to determine the number of symbols to load\n" -msgstr "无法确定要读入的符号数量\n" +msgstr "无法确定要读取的符号数量\n" #: readelf.c:8167 msgid "Unable to seek to end of file\n" @@ -5946,7 +6007,7 @@ #: readelf.c:8732 msgid "| " -msgstr "" +msgstr "| <未知>" #: readelf.c:8765 #, c-format @@ -5992,12 +6053,12 @@ #: readelf.c:8852 #, c-format msgid " %#06x: Parent %d: %s\n" -msgstr "" +msgstr " %#06x: 前一版 %d: %s\n" #: readelf.c:8855 #, c-format msgid " %#06x: Parent %d, name index: %ld\n" -msgstr "" +msgstr " %#06x: 前一版 %d, 名称索引: %ld\n" #: readelf.c:8860 #, c-format @@ -6028,7 +6089,7 @@ #: readelf.c:8923 #, c-format msgid " %#06x: Version: %d" -msgstr "" +msgstr " %#06x: 版本: %d" #: readelf.c:8926 #, c-format @@ -6048,12 +6109,12 @@ #: readelf.c:8954 #, c-format msgid " %#06x: Name: %s" -msgstr "" +msgstr " %#06x：名称：%s" #: readelf.c:8957 #, c-format msgid " %#06x: Name index: %lx" -msgstr "" +msgstr " %#06x：名称索引：%lx" #: readelf.c:8960 #, c-format @@ -6104,7 +6165,7 @@ #: readelf.c:9114 readelf.c:9941 msgid "version need" -msgstr "" +msgstr "版本需要" #: readelf.c:9125 msgid "version need aux (2)" @@ -6112,15 +6173,15 @@ #: readelf.c:9146 readelf.c:9208 msgid "*invalid*" -msgstr "" +msgstr "*无效*" #: readelf.c:9176 readelf.c:10019 msgid "version def" -msgstr "" +msgstr "版本定义" #: readelf.c:9202 readelf.c:10041 msgid "version def aux" -msgstr "" +msgstr "版本定义附加数据" #: readelf.c:9237 #, c-format @@ -6136,7 +6197,7 @@ #: readelf.c:9531 msgid "Unable to read in dynamic data\n" -msgstr "无法读入动态数据\n" +msgstr "无法读取动态数据\n" #: readelf.c:9581 #, c-format @@ -6217,7 +6278,7 @@ #: readelf.c:9994 msgid "bad dynamic symbol\n" -msgstr "" +msgstr "不当的动态符号\n" #: readelf.c:10066 #, c-format @@ -6362,6 +6423,8 @@ "\n" "Section '%s' has no debugging data.\n" msgstr "" +"\n" +"“%s” 节不含正在调试的数据。\n" #. There is no point in dumping the contents of a debugging section #. which has the NOBITS type - the bits in the file will be random. @@ -6391,7 +6454,7 @@ #: readelf.c:12333 readelf.c:12346 readelf.c:12359 #, c-format msgid "None\n" -msgstr "" +msgstr "无\n" #: readelf.c:11689 #, c-format @@ -6442,77 +6505,77 @@ #: readelf.c:11744 #, c-format msgid "True\n" -msgstr "" +msgstr "真\n" #: readelf.c:11844 readelf.c:12001 #, c-format msgid "Hard or soft float\n" -msgstr "" +msgstr "硬或软浮点数\n" #: readelf.c:11847 #, c-format msgid "Hard float\n" -msgstr "" +msgstr "硬浮点数\n" #: readelf.c:11850 readelf.c:12010 #, c-format msgid "Soft float\n" -msgstr "" +msgstr "软浮点数\n" #: readelf.c:11853 #, c-format msgid "Single-precision hard float\n" -msgstr "" +msgstr "单精度硬浮点数\n" #: readelf.c:11870 readelf.c:11902 #, c-format msgid "Any\n" -msgstr "" +msgstr "任何\n" #: readelf.c:11873 #, c-format msgid "Generic\n" -msgstr "" +msgstr "通用\n" #: readelf.c:11908 #, c-format msgid "Memory\n" -msgstr "" +msgstr "内存\n" #: readelf.c:12004 #, c-format msgid "Hard float (double precision)\n" -msgstr "" +msgstr "硬浮点 (单精度)\n" #: readelf.c:12007 #, c-format msgid "Hard float (single precision)\n" -msgstr "" +msgstr "硬浮点 (双精度)\n" #: readelf.c:12013 #, c-format msgid "Hard float (MIPS32r2 64-bit FPU)\n" -msgstr "" +msgstr "硬浮点（MIPS32r2 64-bit FPU)\n" #: readelf.c:12103 #, c-format msgid "Not used\n" -msgstr "" +msgstr "未使用\n" #: readelf.c:12106 #, c-format msgid "2 bytes\n" -msgstr "" +msgstr "2 字节\n" #: readelf.c:12109 #, c-format msgid "4 bytes\n" -msgstr "" +msgstr "4 字节\n" #: readelf.c:12127 readelf.c:12145 readelf.c:12223 readelf.c:12244 #, c-format msgid "16-byte\n" -msgstr "" +msgstr "16 字节\n" #: readelf.c:12160 #, c-format @@ -6600,7 +6663,7 @@ #: readelf.c:12581 readelf.c:12603 msgid "" -msgstr "" +msgstr "<未知>" #: readelf.c:12698 readelf.c:13266 msgid "liblist section data" @@ -6693,7 +6756,7 @@ #: readelf.c:13066 readelf.c:13083 readelf.c:13099 readelf.c:13166 #: readelf.c:13175 msgid "Address" -msgstr "" +msgstr "住址" #: readelf.c:13066 readelf.c:13083 readelf.c:13100 msgid "Access" @@ -6735,7 +6798,7 @@ #: readelf.c:13105 readelf.c:13177 msgid "Name" -msgstr "" +msgstr "名字" #: readelf.c:13159 msgid "Procedure Linkage Table data" @@ -6867,11 +6930,11 @@ #: readelf.c:13408 msgid "NT_VERSION (version)" -msgstr "" +msgstr "NT_VERSION (版本)" #: readelf.c:13410 msgid "NT_ARCH (architecture)" -msgstr "" +msgstr "NT_ARCH (系统架构)" #: readelf.c:13415 readelf.c:13524 readelf.c:13614 readelf.c:13672 #: readelf.c:13749 @@ -7088,7 +7151,7 @@ msgid "notes" msgstr "注释" -#: readelf.c:12859 +#: readelf.c:12615 #, c-format msgid "" "\n" @@ -7110,12 +7173,12 @@ msgid "Data size" msgstr "" -#: readelf.c:12899 readelf.c:12912 +#: readelf.c:12655 readelf.c:12668 #, c-format msgid "corrupt note found at offset %lx into core notes\n" msgstr "" -#: readelf.c:12901 readelf.c:12914 +#: readelf.c:12657 readelf.c:12670 #, c-format msgid " type: %lx, namesize: %08lx, descsize: %08lx\n" msgstr "" @@ -7131,12 +7194,12 @@ "64 bit data type and so it cannot read 64 bit ELF files.\n" msgstr "" "本 readelf 实例编译时未加入 64 位数据类型支持，\n" -"因而无法读入 64 位 ELF 文件。\n" +"因而无法读取 64 位 ELF 文件。\n" #: readelf.c:14203 #, c-format msgid "%s: Failed to read file header\n" -msgstr "%s：读入文件头失败\n" +msgstr "%s：读取文件头失败\n" #: readelf.c:14217 #, c-format @@ -7157,7 +7220,7 @@ msgid "Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n" msgstr "" -#: readelf.c:13359 +#: readelf.c:13110 #, c-format msgid "Binary %s contains:\n" msgstr "" @@ -7167,7 +7230,7 @@ msgid "%s: end of the symbol table reached before the end of the index\n" msgstr "" -#: readelf.c:13378 +#: readelf.c:13129 #, c-format msgid "" "%s: symbols remain in the index symbol table, but without corresponding " @@ -7506,7 +7569,7 @@ #: resrc.c:333 #, c-format msgid "Using temporary file `%s' to read preprocessor output\n" -msgstr "使用临时文件“%s”以读入预处理器输出\n" +msgstr "使用临时文件“%s”以读取预处理器输出\n" #: resrc.c:340 #, c-format @@ -7516,7 +7579,7 @@ #: resrc.c:342 #, c-format msgid "Using popen to read preprocessor output\n" -msgstr "使用 popen 读入预处理器输出\n" +msgstr "使用 popen 读取预处理器输出\n" #: resrc.c:408 #, c-format @@ -7651,7 +7714,7 @@ #: stabs.c:338 #, c-format msgid "Bad stab: %s\n" -msgstr "" +msgstr "不当的 stab: %s\n" #: stabs.c:346 #, c-format @@ -7682,19 +7745,19 @@ #. about dealing with it rather than just calling error_type? #: stabs.c:1809 msgid "missing index type" -msgstr "遗漏的索引类型" +msgstr "缺失索引类型" #: stabs.c:2129 msgid "unknown virtual character for baseclass" -msgstr "" +msgstr "未知的基类虚类字符" #: stabs.c:2147 msgid "unknown visibility character for baseclass" -msgstr "" +msgstr "未知的基类可见性字符" #: stabs.c:2337 msgid "unnamed $vb type" -msgstr "" +msgstr "未命名的 $vb 类型" #: stabs.c:2343 msgid "unrecognized C++ abbreviation" @@ -7702,7 +7765,7 @@ #: stabs.c:2419 msgid "unknown visibility character for field" -msgstr "" +msgstr "未知的字段可见性字符" #: stabs.c:2679 msgid "const/volatile indicator missing" @@ -7711,7 +7774,7 @@ #: stabs.c:2921 #, c-format msgid "No mangling for \"%s\"\n" -msgstr "" +msgstr "\"%s\" 未被修饰\n" #: stabs.c:3221 msgid "Undefined N_EXCL" @@ -7735,42 +7798,42 @@ #: stabs.c:3677 #, c-format msgid "bad mangled name `%s'\n" -msgstr "" +msgstr "不当的修饰名称 \"%s\"\n" #: stabs.c:3772 #, c-format msgid "no argument types in mangled string\n" -msgstr "" +msgstr "已修饰字串中没有参数类型\n" #: stabs.c:5122 #, c-format msgid "Demangled name is not a function\n" -msgstr "" +msgstr "解码出的名称不是函数\n" #: stabs.c:5164 #, c-format msgid "Unexpected type in v3 arglist demangling\n" -msgstr "" +msgstr "v3 参数表解码时遇到意外的类型\n" #: stabs.c:5236 #, c-format msgid "Unrecognized demangle component %d\n" -msgstr "" +msgstr "无法识别的解码组件 %d\n" #: stabs.c:5288 #, c-format msgid "Failed to print demangled template\n" -msgstr "" +msgstr "打印解码后的模板失败\n" #: stabs.c:5368 #, c-format msgid "Couldn't get demangled builtin type\n" -msgstr "" +msgstr "无法取得解码后的内置类型\n" #: stabs.c:5417 #, c-format msgid "Unexpected demangled varargs\n" -msgstr "" +msgstr "意外的解码后可变参数\n" #: stabs.c:5424 #, c-format @@ -7785,7 +7848,7 @@ #: strings.c:247 #, c-format msgid "invalid minimum string length %d" -msgstr "" +msgstr "无效的最小字符串长度 %d" #: strings.c:637 #, c-format @@ -7815,34 +7878,35 @@ #: sysdump.c:66 msgid "*undefined*" -msgstr "" +msgstr "*未定义*" #: sysdump.c:137 #, c-format msgid "SUM IS %x\n" -msgstr "" +msgstr "总和 %x\n" #: sysdump.c:503 #, c-format msgid "GOT A %x\n" -msgstr "" +msgstr "得到 %x\n" +# Why are you shouting? #: sysdump.c:521 #, c-format msgid "WANTED %x!!\n" -msgstr "" +msgstr "想要 %x！！\n" #: sysdump.c:539 msgid "SYMBOL INFO" -msgstr "" +msgstr "符号信息" #: sysdump.c:557 msgid "DERIVED TYPE" -msgstr "" +msgstr "派生类型" #: sysdump.c:614 msgid "MODULE***\n" -msgstr "" +msgstr "模块***\n" #: sysdump.c:647 #, c-format @@ -7878,6 +7942,9 @@ "version.\n" "This program has absolutely no warranty.\n" msgstr "" +"这个程序是自由软件；您可以遵循 GNU 通用公共授权版本 3 或\n" +"(您自行选择的) 稍后版本再发布它。\n" +"这个程序不含任何担保。\n" #: windmc.c:190 #, c-format @@ -7924,6 +7991,9 @@ " -v --verbose Verbose - tells you what it's doing\n" " -V --version Print version information\n" msgstr "" +" -H --help 打印这份帮助\n" +" -v --verbose 详细模式 - 告诉您它在做什么\n" +" -V --version 打印版本信息\n" #: windmc.c:261 windres.c:403 #, c-format @@ -7938,7 +8008,7 @@ #: windmc.c:263 #, c-format msgid "\tcodepage settings are ignored.\n" -msgstr "" +msgstr "\t代码页设置值被忽略。\n" #: windmc.c:307 msgid "try to add a ill language." @@ -7956,7 +8026,7 @@ #: windmc.c:1136 msgid "input file does not seems to be UFT16.\n" -msgstr "" +msgstr "输入文件似乎不为 UFT16。\n" #: windres.c:213 #, c-format @@ -7971,12 +8041,12 @@ #: windres.c:394 #, c-format msgid ": expected to be a leaf\n" -msgstr "" +msgstr "：应该是分支\n" #: windres.c:405 #, c-format msgid ": duplicate value\n" -msgstr "" +msgstr "：重复的值\n" #: windres.c:555 #, c-format @@ -8035,6 +8105,10 @@ " -h --help Print this help message\n" " -V --version Print version information\n" msgstr "" +" -r 为与 rc 的兼容性忽略\n" +" @ 读取选项从 \n" +" -h --help 打印这份说明消息\n" +" -V --version 打印版本信息\n" #: windres.c:679 #, c-format @@ -8049,22 +8123,22 @@ #: windres.c:842 msgid "invalid codepage specified.\n" -msgstr "" +msgstr "指定了无效的代码页。\n" #: windres.c:857 msgid "invalid option -f\n" -msgstr "无效选项 -f\n" +msgstr "无效的选项“-f”\n" #: windres.c:862 msgid "No filename following the -fo option.\n" -msgstr "" +msgstr "在选项 -fo 之后没有文件名。\n" #: windres.c:951 #, c-format msgid "" "Option -I is deprecated for setting the input format, please use -J " "instead.\n" -msgstr "" +msgstr "选项 -I 用做设置输入格式已过时，请转而使用 -J。\n" #: windres.c:1064 msgid "no resources" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bison.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/bison.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bison.po 2015-02-19 15:26:01.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/bison.po 2016-07-20 16:51:53.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-02-19 10:37+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:42+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" #: src/complain.c:322 @@ -46,7 +46,7 @@ msgid "only one %s allowed per rule" msgstr "" -#: src/complain.c:402 src/reader.c:140 src/symtab.c:217 src/symtab.c:229 +#: src/complain.c:402 src/reader.c:140 src/symtab.c:253 src/symtab.c:266 #, c-format msgid "previous declaration" msgstr "上次声明" @@ -343,7 +343,7 @@ "// 主页：<%s>。\n" "\n" -#: src/location.c:93 src/scan-gram.l:926 +#: src/location.c:93 src/scan-gram.l:932 #, c-format msgid "line number overflow" msgstr "行号溢出" @@ -387,7 +387,7 @@ msgid "accepted value: %s" msgstr "" -#: src/parse-gram.y:809 +#: src/parse-gram.y:811 #, c-format msgid "missing identifier in parameter declaration" msgstr "参数声明中缺少识别符" @@ -425,30 +425,30 @@ msgid "$default" msgstr "$default" -#: src/print.c:376 src/print_graph.c:61 +#: src/print.c:377 src/print_graph.c:61 #, c-format msgid "State %d" msgstr "" -#: src/print.c:412 +#: src/print.c:413 msgid "Terminals, with rules where they appear" msgstr "" -#: src/print.c:439 +#: src/print.c:440 msgid "Nonterminals, with rules where they appear" msgstr "" -#: src/print.c:468 +#: src/print.c:469 #, c-format msgid " on left:" msgstr " 左：" -#: src/print.c:485 +#: src/print.c:486 #, c-format msgid " on right:" msgstr " 右：" -#: src/print.c:513 +#: src/print.c:514 msgid "Rules useless in parser due to conflicts" msgstr "由于冲突，解析器中的规则不起作用" @@ -597,7 +597,7 @@ msgid ", cannot be accessed from mid-rule action at $%d" msgstr "" -#: src/scan-code.l:440 src/scan-gram.l:849 +#: src/scan-code.l:440 src/scan-gram.l:855 #, c-format msgid "integer out of range: %s" msgstr "整数超出范围：%s" @@ -647,79 +647,79 @@ msgid "$$ of %s has no declared type" msgstr "" -#: src/scan-code.l:704 +#: src/scan-code.l:703 #, c-format msgid "$%s of %s has no declared type" msgstr "" -#: src/scan-gram.l:180 +#: src/scan-gram.l:186 #, c-format msgid "stray ',' treated as white space" msgstr "" -#: src/scan-gram.l:270 +#: src/scan-gram.l:276 #, c-format msgid "invalid directive: %s" msgstr "" -#: src/scan-gram.l:296 +#: src/scan-gram.l:302 #, c-format msgid "invalid identifier: %s" msgstr "无效标识符：%s" -#: src/scan-gram.l:348 +#: src/scan-gram.l:354 msgid "invalid character" msgid_plural "invalid characters" msgstr[0] "" msgstr[1] "" -#: src/scan-gram.l:366 +#: src/scan-gram.l:372 #, c-format msgid "invalid null character" msgstr "无效的空字符" -#: src/scan-gram.l:419 +#: src/scan-gram.l:425 #, c-format msgid "unexpected identifier in bracketed name: %s" msgstr "" -#: src/scan-gram.l:441 +#: src/scan-gram.l:447 #, c-format msgid "an identifier expected" msgstr "应有一个标识符" -#: src/scan-gram.l:446 +#: src/scan-gram.l:452 msgid "invalid character in bracketed name" msgid_plural "invalid characters in bracketed name" msgstr[0] "" msgstr[1] "" -#: src/scan-gram.l:538 +#: src/scan-gram.l:544 #, c-format msgid "empty character literal" msgstr "" -#: src/scan-gram.l:544 +#: src/scan-gram.l:550 #, c-format msgid "extra characters in character literal" msgstr "" -#: src/scan-gram.l:590 src/scan-gram.l:600 src/scan-gram.l:620 +#: src/scan-gram.l:596 src/scan-gram.l:606 src/scan-gram.l:626 #, c-format msgid "invalid number after \\-escape: %s" msgstr "" -#: src/scan-gram.l:632 +#: src/scan-gram.l:638 #, c-format msgid "invalid character after \\-escape: %s" msgstr "" -#: src/scan-gram.l:978 +#: src/scan-gram.l:984 #, c-format msgid "missing %s at end of file" msgstr "" -#: src/scan-gram.l:989 +#: src/scan-gram.l:995 #, c-format msgid "missing %s at end of line" msgstr "" @@ -754,87 +754,87 @@ msgid "too many symbols in input grammar (limit is %d)" msgstr "输入语法中的符号过多(限制为 %d)" -#: src/symtab.c:214 +#: src/symtab.c:250 #, c-format msgid "%s redeclaration for %s" msgstr "" -#: src/symtab.c:226 +#: src/symtab.c:263 #, c-format msgid "%s redeclaration for <%s>" msgstr "" -#: src/symtab.c:355 +#: src/symtab.c:392 #, c-format msgid "symbol %s redefined" msgstr "符号 %s 重复定义" -#: src/symtab.c:370 +#: src/symtab.c:407 #, c-format msgid "symbol %s redeclared" msgstr "符号 %s 重复声明" -#: src/symtab.c:392 +#: src/symtab.c:429 #, c-format msgid "redefining user token number of %s" msgstr "" -#: src/symtab.c:422 +#: src/symtab.c:459 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" -#: src/symtab.c:460 +#: src/symtab.c:497 #, c-format msgid "useless %s for type <%s>" msgstr "" -#: src/symtab.c:465 +#: src/symtab.c:502 #, c-format msgid "type <%s> is used, but is not associated to any symbol" msgstr "" -#: src/symtab.c:490 +#: src/symtab.c:527 #, c-format msgid "symbol %s used more than once as a literal string" msgstr "" -#: src/symtab.c:493 +#: src/symtab.c:530 #, c-format msgid "symbol %s given more than one literal string" msgstr "" -#: src/symtab.c:602 +#: src/symtab.c:629 #, c-format msgid "user token number %d redeclaration for %s" msgstr "" -#: src/symtab.c:606 +#: src/symtab.c:633 #, c-format msgid "previous declaration for %s" msgstr "" -#: src/symtab.c:987 +#: src/symtab.c:1014 #, c-format msgid "the start symbol %s is undefined" msgstr "起始符号 %s 未定义" -#: src/symtab.c:991 +#: src/symtab.c:1018 #, c-format msgid "the start symbol %s is a token" msgstr "" -#: src/symtab.c:1166 +#: src/symtab.c:1193 #, c-format msgid "useless precedence and associativity for %s" msgstr "" -#: src/symtab.c:1169 +#: src/symtab.c:1196 #, c-format msgid "useless precedence for %s" msgstr "" -#: src/symtab.c:1173 +#: src/symtab.c:1200 #, c-format msgid "useless associativity for %s, use %%precedence" msgstr "" @@ -983,7 +983,7 @@ msgid "write error" msgstr "" -#: lib/error.c:188 +#: lib/error.c:191 msgid "Unknown system error" msgstr "未知系统错误" @@ -1042,17 +1042,17 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s：“-W %s”选项需要一个参数\n" -#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 msgid "memory exhausted" msgstr "内存耗尽" -#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264 -#: lib/spawn-pipe.c:267 +#: lib/spawn-pipe.c:135 lib/spawn-pipe.c:138 lib/spawn-pipe.c:259 +#: lib/spawn-pipe.c:262 #, c-format msgid "cannot create pipe" msgstr "无法创建管道" -#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282 +#: lib/spawn-pipe.c:229 lib/spawn-pipe.c:343 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bison-runtime.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/bison-runtime.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bison-runtime.po 2015-02-19 15:26:01.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/bison-runtime.po 2016-07-20 16:51:56.000000000 +0000 @@ -14,50 +14,50 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:37+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:42+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" -#: data/glr.c:770 data/yacc.c:643 +#: data/glr.c:803 data/yacc.c:643 msgid "syntax error: cannot back up" msgstr "语法错误：不能备份" -#: data/glr.c:1654 +#: data/glr.c:1687 msgid "syntax is ambiguous" msgstr "语法有歧义" -#: data/glr.c:1975 data/glr.c:2055 data/glr.c:2095 data/glr.c:2359 -#: data/lalr1.cc:1083 data/lalr1.cc:1103 data/yacc.c:1210 data/yacc.c:1710 +#: data/glr.c:2008 data/glr.c:2088 data/glr.c:2128 data/glr.c:2392 +#: data/lalr1.cc:1094 data/lalr1.cc:1115 data/yacc.c:1210 data/yacc.c:1710 #: data/yacc.c:1716 msgid "syntax error" msgstr "语法错误" -#: data/glr.c:2056 data/lalr1.cc:1084 data/yacc.c:1211 +#: data/glr.c:2089 data/lalr1.cc:1095 data/yacc.c:1211 #, c-format msgid "syntax error, unexpected %s" msgstr "语法错误，非预期的 %s" -#: data/glr.c:2057 data/lalr1.cc:1085 data/yacc.c:1212 +#: data/glr.c:2090 data/lalr1.cc:1096 data/yacc.c:1212 #, c-format msgid "syntax error, unexpected %s, expecting %s" msgstr "语法错误，非预期的 %s，需要 %s" -#: data/glr.c:2058 data/lalr1.cc:1086 data/yacc.c:1213 +#: data/glr.c:2091 data/lalr1.cc:1097 data/yacc.c:1213 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s" msgstr "语法错误，非预期的 %s，需要 %s 或 %s" -#: data/glr.c:2059 data/lalr1.cc:1087 data/yacc.c:1214 +#: data/glr.c:2092 data/lalr1.cc:1098 data/yacc.c:1214 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s" msgstr "语法错误，非预期的 %s，需要 %s，%s 或 %s" -#: data/glr.c:2060 data/lalr1.cc:1088 data/yacc.c:1215 +#: data/glr.c:2093 data/lalr1.cc:1099 data/yacc.c:1215 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s" msgstr "语法错误，非预期的 %s，需要 %s，%s，%s 或 %s" -#: data/glr.c:2419 data/yacc.c:1295 data/yacc.c:1297 data/yacc.c:1470 +#: data/glr.c:2452 data/yacc.c:1295 data/yacc.c:1297 data/yacc.c:1470 #: data/yacc.c:1867 msgid "memory exhausted" msgstr "内存耗尽" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bootloader.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/bootloader.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bootloader.po 2015-02-19 15:26:16.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/bootloader.po 2016-07-20 16:51:53.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 12:07+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 12:52+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" #. ok button label diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/byobu.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/byobu.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/byobu.po 2015-02-19 15:26:22.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/byobu.po 2016-07-20 16:51:44.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 12:54+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 13:54+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 msgid "Menu" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bzr.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/bzr.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bzr.po 2015-02-19 15:26:15.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/bzr.po 2016-07-20 16:51:55.000000000 +0000 @@ -9,14 +9,14 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-07-27 12:45+0200\n" "PO-Revision-Date: 2012-10-17 03:13+0000\n" -"Last-Translator: Jack Yu \n" +"Last-Translator: Jack Yu \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-02-19 11:59+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 12:42+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: bzrlib/add.py:93 msgid "skipping {0} (larger than {1} of {2} bytes)" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cinder.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cinder.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cinder.po 2015-02-19 15:26:27.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cinder.po 2016-07-20 16:51:56.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 13:40+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 14:50+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Generated-By: Babel 1.3\n" #: cinder/context.py:63 @@ -23,709 +23,710 @@ msgid "Arguments dropped when creating context: %s" msgstr "" -#: cinder/context.py:102 +#: cinder/context.py:114 #, python-format msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r" -msgstr "" +msgstr "read_deleted 只能是“no”、“yes”或“only”其中一项，而不能是 %r" -#: cinder/exception.py:67 cinder/brick/exception.py:31 +#: cinder/exception.py:68 msgid "An unknown exception occurred." msgstr "发生未知异常。" -#: cinder/exception.py:93 +#: cinder/exception.py:88 msgid "Exception in string format operation" msgstr "" -#: cinder/exception.py:118 +#: cinder/exception.py:120 #, python-format msgid "" "Bad or unexpected response from the storage volume backend API: %(data)s" -msgstr "" +msgstr "从存储卷后端 API 返回了不正确或意外的响应：%(data)s" -#: cinder/exception.py:123 +#: cinder/exception.py:125 #, python-format msgid "Volume driver reported an error: %(message)s" -msgstr "" +msgstr "卷驱动程序已报告错误：%(message)s" -#: cinder/exception.py:127 +#: cinder/exception.py:129 #, python-format msgid "Backup driver reported an error: %(message)s" -msgstr "" +msgstr "备份驱动程序已报告错误：%(message)s" -#: cinder/exception.py:131 +#: cinder/exception.py:133 #, python-format msgid "Connection to glance failed: %(reason)s" -msgstr "" +msgstr "连接glance失败: %(reason)s" -#: cinder/exception.py:135 +#: cinder/exception.py:137 msgid "Not authorized." msgstr "未授权。" -#: cinder/exception.py:140 +#: cinder/exception.py:142 msgid "User does not have admin privileges" msgstr "用户没有管理员权限" -#: cinder/exception.py:144 +#: cinder/exception.py:146 #, python-format msgid "Policy doesn't allow %(action)s to be performed." msgstr "政策不允许 %(action)s 被执行。" -#: cinder/exception.py:148 +#: cinder/exception.py:150 #, python-format msgid "Not authorized for image %(image_id)s." -msgstr "" +msgstr "未针对映像 %(image_id)s 授权。" -#: cinder/exception.py:152 +#: cinder/exception.py:154 msgid "Volume driver not ready." -msgstr "" +msgstr "卷驱动未准备好。" -#: cinder/exception.py:156 cinder/brick/exception.py:77 +#: cinder/exception.py:158 msgid "Unacceptable parameters." msgstr "无法接受的参数。" -#: cinder/exception.py:161 +#: cinder/exception.py:163 #, python-format msgid "Invalid snapshot: %(reason)s" -msgstr "" +msgstr "快照无效: %(reason)s" -#: cinder/exception.py:165 +#: cinder/exception.py:167 #, python-format msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s." -msgstr "" +msgstr "加载模式 '%(mode)s' 对于卷 %(volume_id)s 无效。" -#: cinder/exception.py:170 +#: cinder/exception.py:172 #, python-format msgid "Volume %(volume_id)s is still attached, detach volume first." -msgstr "" +msgstr "卷 %(volume_id)s 仍然处于连接状态，请先从卷断开连接。" -#: cinder/exception.py:174 +#: cinder/exception.py:175 msgid "Failed to load data into json format" msgstr "把数据加载为json格式失败" -#: cinder/exception.py:178 +#: cinder/exception.py:176 msgid "The results are invalid." -msgstr "" +msgstr "结果无效。" -#: cinder/exception.py:182 +#: cinder/exception.py:180 #, python-format msgid "Invalid input received: %(reason)s" -msgstr "" +msgstr "输入无效： %(reason)s" -#: cinder/exception.py:186 +#: cinder/exception.py:184 #, python-format msgid "Invalid volume type: %(reason)s" -msgstr "" +msgstr "卷类型无效：%(reason)s" -#: cinder/exception.py:190 +#: cinder/exception.py:188 #, python-format msgid "Invalid volume: %(reason)s" -msgstr "" +msgstr "卷无效： %(reason)s" -#: cinder/exception.py:194 +#: cinder/exception.py:192 #, python-format msgid "Invalid content type %(content_type)s." msgstr "无效的内容类型 %(content_type)s。" -#: cinder/exception.py:198 +#: cinder/exception.py:196 #, python-format msgid "Invalid host: %(reason)s" -msgstr "" +msgstr "主机无效：%(reason)s" -#: cinder/exception.py:204 cinder/brick/exception.py:84 +#: cinder/exception.py:202 #, python-format msgid "%(err)s" msgstr "%(err)s" -#: cinder/exception.py:208 +#: cinder/exception.py:206 #, python-format msgid "Invalid auth key: %(reason)s" -msgstr "" +msgstr "认证密钥无效：%(reason)s" -#: cinder/exception.py:212 +#: cinder/exception.py:210 #, python-format msgid "" "Value \"%(value)s\" is not valid for configuration option \"%(option)s\"" -msgstr "" +msgstr "值“%(value)s”对于配置选项“%(option)s”无效" -#: cinder/exception.py:217 +#: cinder/exception.py:215 msgid "Service is unavailable at this time." msgstr "该时刻服务无法使用。" -#: cinder/exception.py:221 +#: cinder/exception.py:219 #, python-format msgid "Image %(image_id)s is unacceptable: %(reason)s" -msgstr "镜像 %(image_id)s 无法接受，原因是： %(reason)s" +msgstr "映像 %(image_id)s 无法接受，原因是： %(reason)s" -#: cinder/exception.py:225 +#: cinder/exception.py:223 #, python-format msgid "The device in the path %(path)s is unavailable: %(reason)s" -msgstr "" +msgstr "路径%(path)s 指向的设备不可用：%(reason)s" -#: cinder/exception.py:229 +#: cinder/exception.py:227 #, python-format msgid "Expected a uuid but received %(uuid)s." -msgstr "" +msgstr "期望 uuid，但是接收到 %(uuid)s。" -#: cinder/exception.py:246 cinder/brick/exception.py:71 +#: cinder/exception.py:244 msgid "Resource could not be found." msgstr "资源没有找到。" -#: cinder/exception.py:252 +#: cinder/exception.py:250 #, python-format msgid "Volume %(volume_id)s could not be found." msgstr "卷 %(volume_id)s 没有找到。" -#: cinder/exception.py:256 +#: cinder/exception.py:259 #, python-format msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s." msgstr "卷 %(volume_id)s 没有含键 %(metadata_key)s 的元数据。" -#: cinder/exception.py:261 +#: cinder/exception.py:264 #, python-format msgid "" "Volume %(volume_id)s has no administration metadata with key " "%(metadata_key)s." -msgstr "" +msgstr "卷 %(volume_id)s 没有任何具有键 %(metadata_key)s 的元数据。" -#: cinder/exception.py:266 +#: cinder/exception.py:269 #, python-format msgid "Invalid metadata: %(reason)s" -msgstr "" +msgstr "元数据无效： %(reason)s" -#: cinder/exception.py:270 +#: cinder/exception.py:273 #, python-format msgid "Invalid metadata size: %(reason)s" -msgstr "" +msgstr "元数据大小无效： %(reason)s" -#: cinder/exception.py:274 +#: cinder/exception.py:277 #, python-format msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s." -msgstr "" +msgstr "快照 %(snapshot_id)s 没有任何具有键 %(metadata_key)s 的元数据。" -#: cinder/exception.py:279 +#: cinder/exception.py:282 #, python-format msgid "Volume type %(volume_type_id)s could not be found." msgstr "卷类型 %(volume_type_id)s 没有找到。" -#: cinder/exception.py:283 +#: cinder/exception.py:286 #, python-format msgid "Volume type with name %(volume_type_name)s could not be found." msgstr "名为 %(volume_type_name)s 的卷类型没有找到。" -#: cinder/exception.py:293 +#: cinder/exception.py:296 #, python-format msgid "" "Volume Type %(volume_type_id)s has no extra specs with key " "%(extra_specs_key)s." msgstr "卷类型 %(volume_type_id)s 没有额外说明键 %(extra_specs_key)s 。" -#: cinder/exception.py:298 +#: cinder/exception.py:301 #, python-format msgid "" "Volume Type %(volume_type_id)s deletion is not allowed with volumes present " "with the type." -msgstr "" +msgstr "当存在类型为 %(volume_type_id)s 的卷时，不允许删除该卷类型。" -#: cinder/exception.py:303 +#: cinder/exception.py:306 #, python-format msgid "Snapshot %(snapshot_id)s could not be found." msgstr "快照 %(snapshot_id)s 没有找到。" -#: cinder/exception.py:311 +#: cinder/exception.py:314 #, python-format msgid "deleting volume %(volume_name)s that has snapshot" msgstr "正在删除有快照的卷 %(volume_name)s" -#: cinder/exception.py:315 +#: cinder/exception.py:318 #, python-format msgid "deleting snapshot %(snapshot_name)s that has dependent volumes" -msgstr "" +msgstr "正在删除具有从属卷的快照 %(snapshot_name)s" -#: cinder/exception.py:320 +#: cinder/exception.py:323 #, python-format msgid "No target id found for volume %(volume_id)s." msgstr "没有为卷 %(volume_id)s 找到目标id。" -#: cinder/exception.py:324 +#: cinder/exception.py:327 #, python-format msgid "Invalid image href %(image_href)s." -msgstr "无效的镜像href %(image_href)s。" +msgstr "无效映像 href %(image_href)s。" -#: cinder/exception.py:328 +#: cinder/exception.py:331 #, python-format msgid "Image %(image_id)s could not be found." -msgstr "镜像 %(image_id)s 没有找到。" +msgstr "找不到映像 %(image_id)s。" -#: cinder/exception.py:332 +#: cinder/exception.py:335 #, python-format msgid "Service %(service_id)s could not be found." msgstr "服务 %(service_id)s 没有找到。" -#: cinder/exception.py:336 +#: cinder/exception.py:339 #, python-format msgid "Host %(host)s could not be found." msgstr "主机 %(host)s 没有找到。" -#: cinder/exception.py:340 +#: cinder/exception.py:343 #, python-format msgid "Scheduler Host Filter %(filter_name)s could not be found." msgstr "调度器主机过滤器 %(filter_name)s 没有找到。" -#: cinder/exception.py:344 +#: cinder/exception.py:347 #, python-format msgid "Scheduler Host Weigher %(weigher_name)s could not be found." -msgstr "" +msgstr "找不到调度程序主机衡量器 %(weigher_name)s。" -#: cinder/exception.py:348 +#: cinder/exception.py:351 #, python-format msgid "Could not find binary %(binary)s on host %(host)s." msgstr "没有找到二进制 %(binary)s 在主机 %(host)s 上。" -#: cinder/exception.py:352 +#: cinder/exception.py:355 #, python-format msgid "Invalid reservation expiration %(expire)s." -msgstr "" +msgstr "预留到期 %(expire)s 无效。" -#: cinder/exception.py:356 +#: cinder/exception.py:359 #, python-format msgid "" "Change would make usage less than 0 for the following resources: %(unders)s" -msgstr "" +msgstr "对于下列资源，更改将导致使用量小于 0：%(unders)s" -#: cinder/exception.py:361 +#: cinder/exception.py:364 msgid "Quota could not be found" msgstr "配额没有找到。" -#: cinder/exception.py:365 +#: cinder/exception.py:368 #, python-format msgid "Unknown quota resources %(unknown)s." -msgstr "" +msgstr "配额资源 %(unknown)s 未知。" -#: cinder/exception.py:369 +#: cinder/exception.py:372 #, python-format msgid "Quota for project %(project_id)s could not be found." msgstr "没有为项目 %(project_id)s 找到配额。" -#: cinder/exception.py:373 +#: cinder/exception.py:376 #, python-format msgid "Quota class %(class_name)s could not be found." -msgstr "" +msgstr "找不到配额类 %(class_name)s。" -#: cinder/exception.py:377 +#: cinder/exception.py:380 #, python-format msgid "Quota usage for project %(project_id)s could not be found." -msgstr "" +msgstr "找不到项目 %(project_id)s 的配额使用量。" -#: cinder/exception.py:381 +#: cinder/exception.py:384 #, python-format msgid "Quota reservation %(uuid)s could not be found." -msgstr "" +msgstr "找不到配额预留 %(uuid)s。" -#: cinder/exception.py:385 +#: cinder/exception.py:388 #, python-format msgid "Quota exceeded for resources: %(overs)s" -msgstr "" +msgstr "对于资源，已超过配额：%(overs)s" -#: cinder/exception.py:389 +#: cinder/exception.py:392 #, python-format msgid "File %(file_path)s could not be found." msgstr "找不到文件 %(file_path)s。" -#: cinder/exception.py:398 +#: cinder/exception.py:400 #, python-format msgid "Volume Type %(id)s already exists." -msgstr "" +msgstr "卷类型 %(id)s 已存在。" -#: cinder/exception.py:407 +#: cinder/exception.py:409 #, python-format msgid "Volume type encryption for type %(type_id)s already exists." -msgstr "" +msgstr "类型 %(type_id)s 的卷类型加密已存在。" -#: cinder/exception.py:411 +#: cinder/exception.py:413 #, python-format msgid "Volume type encryption for type %(type_id)s does not exist." -msgstr "" +msgstr "类型 %(type_id)s 的卷类型加密不存在。" -#: cinder/exception.py:415 +#: cinder/exception.py:417 #, python-format msgid "Malformed message body: %(reason)s" msgstr "错误格式的消息体： %(reason)s" -#: cinder/exception.py:419 +#: cinder/exception.py:421 #, python-format msgid "Could not find config at %(path)s" msgstr "在 %(path)s 找不到配置文件。" -#: cinder/exception.py:423 +#: cinder/exception.py:425 #, python-format msgid "Could not find parameter %(param)s" -msgstr "" +msgstr "找不到参数 %(param)s" -#: cinder/exception.py:427 +#: cinder/exception.py:429 #, python-format msgid "Could not load paste app '%(name)s' from %(path)s" msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'" -#: cinder/exception.py:431 +#: cinder/exception.py:433 #, python-format msgid "No valid host was found. %(reason)s" msgstr "找不到有效主机，原因是 %(reason)s。" -#: cinder/exception.py:440 +#: cinder/exception.py:442 #, python-format msgid "Quota exceeded: code=%(code)s" -msgstr "" +msgstr "配额用尽：code=%(code)s" -#: cinder/exception.py:447 +#: cinder/exception.py:409 #, python-format msgid "" "Requested volume or snapshot exceeds allowed Gigabytes quota. Requested " "%(requested)sG, quota is %(quota)sG and %(consumed)sG has been consumed." msgstr "" -#: cinder/exception.py:459 +#: cinder/exception.py:464 #, python-format msgid "Maximum number of volumes allowed (%(allowed)d) exceeded" msgstr "" -#: cinder/exception.py:463 +#: cinder/exception.py:480 #, python-format msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded" -msgstr "" +msgstr "已超过允许的最大快照数 (%(allowed)d)" -#: cinder/exception.py:471 +#: cinder/exception.py:488 #, python-format msgid "Detected more than one volume with name %(vol_name)s" -msgstr "" +msgstr "检测到多个具有名称 %(vol_name)s 的卷" -#: cinder/exception.py:475 +#: cinder/exception.py:492 #, python-format msgid "" "Cannot create volume_type with name %(name)s and specs %(extra_specs)s" msgstr "无法创建名称为 %(name)s 规格为 %(extra_specs)s 的卷类型。" -#: cinder/exception.py:484 +#: cinder/exception.py:501 #, python-format msgid "Unknown or unsupported command %(cmd)s" -msgstr "" +msgstr "命令 %(cmd)s 未知或不受支持" -#: cinder/exception.py:488 +#: cinder/exception.py:505 #, python-format msgid "Malformed response to command %(cmd)s: %(reason)s" -msgstr "" +msgstr "对命令 %(cmd)s 的响应的格式不正确：%(reason)s" -#: cinder/exception.py:492 +#: cinder/exception.py:509 #, python-format msgid "Operation failed with status=%(status)s. Full dump: %(data)s" -msgstr "" +msgstr "操作失败，并且 status=%(status)s。完全转储：%(data)s" -#: cinder/exception.py:500 +#: cinder/exception.py:517 #, python-format msgid "" "Glance metadata cannot be updated, key %(key)s exists for volume id " "%(volume_id)s" -msgstr "" +msgstr "无法更新 Glance 元数据，对于卷标识 %(volume_id)s，键 %(key)s 存在" -#: cinder/exception.py:505 +#: cinder/exception.py:522 #, python-format msgid "Glance metadata for volume/snapshot %(id)s cannot be found." -msgstr "" +msgstr "Glance中无法找到卷/镜像 %(id)s 的元数据" -#: cinder/exception.py:509 +#: cinder/exception.py:526 #, python-format msgid "Failed to export for volume: %(reason)s" -msgstr "" +msgstr "输出卷失败：%(reason)s" -#: cinder/exception.py:517 +#: cinder/exception.py:534 #, python-format msgid "Failed to create metadata for volume: %(reason)s" -msgstr "" +msgstr "未能为卷创建元数据：%(reason)s" -#: cinder/exception.py:521 +#: cinder/exception.py:538 #, python-format msgid "Failed to update metadata for volume: %(reason)s" -msgstr "" +msgstr "未能更新卷的元数据：%(reason)s" -#: cinder/exception.py:525 +#: cinder/exception.py:542 #, python-format msgid "Failed to copy metadata to volume: %(reason)s" -msgstr "" +msgstr "未能复制元数据到卷：%(reason)s" -#: cinder/exception.py:529 +#: cinder/exception.py:551 #, python-format msgid "Failed to copy image to volume: %(reason)s" -msgstr "" +msgstr "未能将映像复制到卷：%(reason)s" -#: cinder/exception.py:533 +#: cinder/exception.py:555 msgid "Invalid Ceph args provided for backup rbd operation" -msgstr "" +msgstr "为备份rbd操作提供的Ceph参数无效" -#: cinder/exception.py:537 +#: cinder/exception.py:559 msgid "An error has occurred during backup operation" -msgstr "" +msgstr "在备份过程中出现一个错误" -#: cinder/exception.py:541 +#: cinder/exception.py:563 msgid "Unsupported backup metadata version requested" -msgstr "" +msgstr "不支持请求的备份元数据版本" -#: cinder/exception.py:549 +#: cinder/exception.py:571 msgid "Metadata backup already exists for this volume" -msgstr "" +msgstr "对于此卷，已存在元数据备份" -#: cinder/exception.py:553 +#: cinder/exception.py:575 msgid "Backup RBD operation failed" -msgstr "" +msgstr "备份RBD操作失败" -#: cinder/exception.py:561 +#: cinder/exception.py:583 #, python-format msgid "Backup %(backup_id)s could not be found." -msgstr "" +msgstr "找不到备份 %(backup_id)s。" -#: cinder/exception.py:565 +#: cinder/exception.py:587 msgid "Failed to identify volume backend." -msgstr "" +msgstr "未能识别卷后端。" -#: cinder/exception.py:569 +#: cinder/exception.py:591 #, python-format msgid "Invalid backup: %(reason)s" -msgstr "" +msgstr "备份无效：%(reason)s" -#: cinder/exception.py:573 +#: cinder/exception.py:595 #, python-format msgid "Connection to swift failed: %(reason)s" -msgstr "" +msgstr "连接 Swift 失败：%(reason)s" -#: cinder/exception.py:577 +#: cinder/exception.py:599 #, python-format msgid "Transfer %(transfer_id)s could not be found." -msgstr "" +msgstr "无法找到转换器%(transfer_id)s" -#: cinder/exception.py:581 +#: cinder/exception.py:603 #, python-format msgid "Volume migration failed: %(reason)s" -msgstr "" +msgstr "卷迁移失败：%(reason)s" -#: cinder/exception.py:585 +#: cinder/exception.py:607 #, python-format msgid "SSH command injection detected: %(command)s" -msgstr "" +msgstr "检测到 SSH 命令注入：%(command)s" -#: cinder/exception.py:589 +#: cinder/exception.py:611 #, python-format msgid "QoS Specs %(specs_id)s already exists." -msgstr "" +msgstr "QoS 规范 %(specs_id)s 已存在。" -#: cinder/exception.py:593 +#: cinder/exception.py:615 #, python-format msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s." -msgstr "" +msgstr "未能通过规范 %(qos_specs)s 创建 qos_specs：%(name)s。" -#: cinder/exception.py:598 +#: cinder/exception.py:620 #, python-format msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s." -msgstr "" +msgstr "未能通过规范 %(qos_specs)s 更新 qos_specs：%(specs_id)s。" -#: cinder/exception.py:603 +#: cinder/exception.py:625 #, python-format msgid "No such QoS spec %(specs_id)s." -msgstr "" +msgstr "不存在任何此类 QoS 规范 %(specs_id)s。" -#: cinder/exception.py:607 +#: cinder/exception.py:629 #, python-format msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s." -msgstr "" +msgstr "未能使 qos_specs %(specs_id)s 与类型 %(type_id)s 关联。" -#: cinder/exception.py:612 +#: cinder/exception.py:634 #, python-format msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s." -msgstr "" +msgstr "未能使 qos_specs %(specs_id)s 与类型 %(type_id)s 取消关联。" -#: cinder/exception.py:617 +#: cinder/exception.py:639 #, python-format msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s." -msgstr "" +msgstr "QoS 规范 %(specs_id)s 没有任何具有键 %(specs_key)s 的规范。" -#: cinder/exception.py:622 +#: cinder/exception.py:644 #, python-format msgid "Invalid qos specs: %(reason)s" -msgstr "" +msgstr "qos 规范无效：%(reason)s" -#: cinder/exception.py:626 +#: cinder/exception.py:648 #, python-format msgid "QoS Specs %(specs_id)s is still associated with entities." -msgstr "" +msgstr "QoS 规范 %(specs_id)s 仍然与实体关联。" -#: cinder/exception.py:630 +#: cinder/exception.py:652 #, python-format msgid "key manager error: %(reason)s" -msgstr "" +msgstr "发生密钥管理器错误：%(reason)s" -#: cinder/exception.py:634 +#: cinder/exception.py:656 #, python-format msgid "" "Manage existing volume failed due to invalid backend reference " "%(existing_ref)s: %(reason)s" -msgstr "" +msgstr "由于后端引用 %(existing_ref)s 无效，管理现有卷失败：%(reason)s" -#: cinder/exception.py:649 +#: cinder/exception.py:676 #, python-format msgid "Manage existing volume failed due to volume type mismatch: %(reason)s" -msgstr "" +msgstr "由于卷类型不匹配，管理现有卷失败：%(reason)s" -#: cinder/exception.py:664 +#: cinder/exception.py:693 msgid "Coraid Cinder Driver exception." msgstr "" -#: cinder/exception.py:668 +#: cinder/exception.py:697 msgid "Failed to encode json data." msgstr "" -#: cinder/exception.py:672 +#: cinder/exception.py:701 msgid "Login on ESM failed." msgstr "" -#: cinder/exception.py:676 +#: cinder/exception.py:705 msgid "Relogin on ESM failed." msgstr "" -#: cinder/exception.py:680 +#: cinder/exception.py:709 #, python-format msgid "Group with name \"%(group_name)s\" not found." msgstr "" -#: cinder/exception.py:684 +#: cinder/exception.py:713 #, python-format msgid "ESM configure request failed: %(reason)s" msgstr "" -#: cinder/exception.py:688 +#: cinder/exception.py:717 #, python-format msgid "Coraid ESM not available with reason: %(reason)s" msgstr "" -#: cinder/exception.py:698 +#: cinder/exception.py:727 msgid "Zadara Cinder Driver exception." msgstr "" -#: cinder/exception.py:702 +#: cinder/exception.py:731 #, python-format msgid "Unable to create server object for initiator %(name)s" msgstr "" -#: cinder/exception.py:706 +#: cinder/exception.py:735 #, python-format msgid "Unable to find server object for initiator %(name)s" msgstr "" -#: cinder/exception.py:710 +#: cinder/exception.py:739 msgid "Unable to find any active VPSA controller" msgstr "" -#: cinder/exception.py:714 +#: cinder/exception.py:743 #, python-format msgid "Failed to retrieve attachments for volume %(name)s" msgstr "" -#: cinder/exception.py:718 +#: cinder/exception.py:747 #, python-format msgid "Invalid attachment info for volume %(name)s: %(reason)s" msgstr "" -#: cinder/exception.py:722 +#: cinder/exception.py:751 #, python-format msgid "Bad HTTP response status %(status)s" msgstr "" -#: cinder/exception.py:727 +#: cinder/exception.py:716 msgid "Bad response from SolidFire API" msgstr "来自SolidFire API的错误响应" -#: cinder/exception.py:731 +#: cinder/exception.py:720 msgid "SolidFire Cinder Driver exception" -msgstr "" +msgstr "发生“SolidFire Cinder 驱动程序”异常" -#: cinder/exception.py:735 +#: cinder/exception.py:724 #, python-format msgid "Error in SolidFire API response: data=%(data)s" msgstr "SolidFire API响应里发生错误：data=%(data)s" -#: cinder/exception.py:739 +#: cinder/exception.py:728 #, python-format msgid "Unable to locate account %(account_name)s on Solidfire device" -msgstr "" +msgstr "无法在 Solidfire 设备上找到帐户 %(account_name)s" -#: cinder/exception.py:749 +#: cinder/exception.py:738 #, python-format msgid "Invalid 3PAR Domain: %(err)s" -msgstr "" +msgstr "3PAR 域无效：%(err)s" -#: cinder/exception.py:767 +#: cinder/exception.py:756 msgid "Unknown NFS exception" -msgstr "" +msgstr "NFS 异常未知" -#: cinder/exception.py:771 +#: cinder/exception.py:760 msgid "No mounted NFS shares found" -msgstr "" +msgstr "找不到任何已安装的 NFS 共享项" -#: cinder/exception.py:762 cinder/exception.py:775 cinder/exception.py:801 +#: cinder/exception.py:751 cinder/exception.py:764 cinder/exception.py:790 +#: cinder/exception.py:804 #, python-format msgid "There is no share which can host %(volume_size)sG" -msgstr "" +msgstr "不存在任何可主管 %(volume_size)sG 的共享项" -#: cinder/exception.py:793 +#: cinder/exception.py:782 msgid "Unknown Gluster exception" -msgstr "" +msgstr "Gluster 异常未知" -#: cinder/exception.py:797 +#: cinder/exception.py:786 msgid "No mounted Gluster shares found" -msgstr "" +msgstr "找不到任何已安装的 Gluster 共享项" -#: cinder/exception.py:513 +#: cinder/exception.py:530 #, python-format msgid "Failed to remove export for volume %(volume)s: %(reason)s" -msgstr "" +msgstr "未能针对卷 %(volume)s 移除导出：%(reason)s" -#: cinder/exception.py:806 +#: cinder/exception.py:835 msgid "HP MSA Volume Driver exception" msgstr "" -#: cinder/exception.py:810 +#: cinder/exception.py:839 #, python-format msgid "VDisk doesn't exist (%(vdisk)s)" msgstr "" -#: cinder/exception.py:814 +#: cinder/exception.py:843 msgid "Unable to connect to MSA array" msgstr "" -#: cinder/exception.py:818 +#: cinder/exception.py:847 #, python-format msgid "Not enough space on VDisk (%(vdisk)s)" msgstr "" -#: cinder/exception.py:823 +#: cinder/exception.py:809 #, python-format msgid "Fibre Channel connection control failure: %(reason)s" -msgstr "" +msgstr "光纤通道连接控制失败：%(reason)s" -#: cinder/exception.py:827 +#: cinder/exception.py:813 #, python-format msgid "Fibre Channel Zone operation failed: %(reason)s" -msgstr "" +msgstr "“光纤通道区域”操作失败：%(reason)s" -#: cinder/exception.py:831 +#: cinder/exception.py:817 #, python-format msgid "Fibre Channel SAN Lookup failure: %(reason)s" -msgstr "" +msgstr "光纤通道 SAN 查找失败：%(reason)s" -#: cinder/exception.py:835 cinder/exception.py:839 +#: cinder/exception.py:821 cinder/exception.py:825 #, python-format msgid "Fibre Channel Zoning CLI error: %(reason)s" msgstr "" -#: cinder/exception.py:843 +#: cinder/exception.py:829 msgid "NetApp Cinder Driver exception." -msgstr "" +msgstr "发生“NetApp Cinder 驱动程序”异常。" #: cinder/manager.py:128 msgid "Notifying Schedulers of capabilities ..." @@ -752,40 +753,39 @@ msgid "Created reservations %s" msgstr "" -#: cinder/quota.py:783 +#: cinder/quota.py:770 #, python-format msgid "Failed to commit reservations %s" msgstr "" -#: cinder/quota.py:803 +#: cinder/quota.py:790 #, python-format msgid "Failed to roll back reservations %s" msgstr "" -#: cinder/quota.py:891 cinder/quota.py:915 +#: cinder/quota.py:940 cinder/quota.py:964 msgid "Cannot register resource" -msgstr "" +msgstr "无法注册资源" -#: cinder/quota.py:894 cinder/quota.py:918 +#: cinder/quota.py:943 cinder/quota.py:967 msgid "Cannot register resources" -msgstr "" +msgstr "无法注册多个资源" -#: cinder/quota_utils.py:47 +#: cinder/quota_utils.py:46 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume - " "(%(d_consumed)dG of %(d_quota)dG already consumed)" msgstr "" -#: cinder/quota_utils.py:57 cinder/transfer/api.py:174 -#: cinder/volume/flows/api/create_volume.py:586 +#: cinder/volume/flows/api/create_volume.py:608 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d volumes " "already consumed)" msgstr "" -#: cinder/service.py:139 +#: cinder/service.py:100 #, python-format msgid "Starting %(topic)s node (version %(version_string)s)" msgstr "" @@ -795,7 +795,7 @@ msgid "Creating RPC server for service %s" msgstr "" -#: cinder/service.py:185 +#: cinder/service.py:144 #, python-format msgid "" "Report interval must be less than service down time. Current config " @@ -804,7 +804,7 @@ "%(new_down_time)s" msgstr "" -#: cinder/service.py:253 +#: cinder/service.py:212 msgid "Service killed that has no database entry" msgstr "因无数据库记录，服务已被中止" @@ -812,11 +812,11 @@ msgid "The service database object disappeared, Recreating it." msgstr "服务数据库对象消失，正在重新创建。" -#: cinder/service.py:306 +#: cinder/service.py:265 msgid "Recovered model server connection!" msgstr "与模型服务器(model server)的连接已恢复！" -#: cinder/service.py:311 +#: cinder/service.py:271 msgid "model server went away" msgstr "失去与模型服务器的连接" @@ -827,9 +827,9 @@ "Input value ignored." msgstr "" -#: cinder/service.py:420 +#: cinder/service.py:452 msgid "serve() can only be called once" -msgstr "" +msgstr "serve() 只能调用一次" #: cinder/service.py:374 cinder/openstack/common/service.py:166 #: cinder/openstack/common/service.py:384 @@ -841,26 +841,26 @@ msgid "%s : FLAG SET " msgstr "" -#: cinder/utils.py:96 +#: cinder/utils.py:108 #, python-format msgid "Can not translate %s to integer." -msgstr "" +msgstr "无法把 %s 转换成整数" -#: cinder/utils.py:135 +#: cinder/utils.py:147 #, python-format msgid "May specify only one of %s" -msgstr "" +msgstr "只能指定 %s 中的一个" #: cinder/ssh_utils.py:135 msgid "Specify a password or private_key" -msgstr "" +msgstr "请指定密码或 private_key" #: cinder/ssh_utils.py:151 #, python-format msgid "Error connecting via ssh: %s" -msgstr "" +msgstr "通过 ssh 进行连接时出错：%s" -#: cinder/utils.py:292 +#: cinder/utils.py:413 #, python-format msgid "Invalid backend: %s" msgstr "无效的后台：%s" @@ -875,48 +875,48 @@ msgid "Could not remove tmpdir: %s" msgstr "" -#: cinder/utils.py:618 +#: cinder/utils.py:760 #, python-format msgid "Volume driver %s not initialized" msgstr "" -#: cinder/utils.py:687 +#: cinder/utils.py:714 #, python-format msgid "%s is not a string or unicode" -msgstr "" +msgstr "%s 不是字符串或 Unicode" -#: cinder/utils.py:691 +#: cinder/utils.py:718 #, python-format msgid "%(name)s has a minimum character requirement of %(min_length)s." -msgstr "" +msgstr "%(name)s 必须至少具有的字符数为 %(min_length)s。" -#: cinder/utils.py:696 +#: cinder/utils.py:723 #, python-format msgid "%(name)s has more than %(max_length)s characters." -msgstr "" +msgstr "%(name)s 包含的字符超过 %(max_length)s 个。" -#: cinder/wsgi.py:157 +#: cinder/wsgi/eventlet_server.py:147 #, python-format msgid "Unable to find cert_file : %s" msgstr "" -#: cinder/wsgi.py:161 +#: cinder/wsgi/eventlet_server.py:151 #, python-format msgid "Unable to find ca_file : %s" msgstr "" -#: cinder/wsgi.py:164 +#: cinder/wsgi/eventlet_server.py:154 #, python-format msgid "Unable to find key_file : %s" msgstr "" -#: cinder/openstack/common/sslutils.py:59 +#: cinder/wsgi.py:145 cinder/openstack/common/sslutils.py:59 msgid "" "When running server in SSL mode, you must specify both a cert_file and " "key_file option value in your configuration file" msgstr "" -#: cinder/wsgi.py:184 +#: cinder/wsgi/eventlet_server.py:174 #, python-format msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds" msgstr "" @@ -926,49 +926,49 @@ msgid "Started %(name)s on %(host)s:%(port)s" msgstr "" -#: cinder/wsgi.py:254 +#: cinder/wsgi.py:235 msgid "Stopping WSGI server." msgstr "关闭WSGI服务器" -#: cinder/wsgi.py:272 +#: cinder/wsgi.py:253 msgid "WSGI server has stopped." msgstr "WSGI服务器已经停止。" -#: cinder/wsgi.py:364 +#: cinder/wsgi/common.py:100 msgid "You must implement __call__" msgstr "你必须执行 __call__" -#: cinder/api/auth.py:27 +#: cinder/api/auth.py:26 msgid "" "cinder.api.auth:CinderKeystoneContext is deprecated. Please use " "cinder.api.middleware.auth:CinderKeystoneContext instead." msgstr "" -#: cinder/api/auth.py:35 +#: cinder/api/auth.py:34 msgid "" "cinder.api.auth:pipeline_factory is deprecated. Please use " "cinder.api.middleware.auth:pipeline_factory instead." msgstr "" -#: cinder/api/common.py:95 cinder/api/common.py:129 -#: cinder/consistencygroup/api.py:312 cinder/volume/api.py:392 +#: cinder/api/common.py:105 cinder/consistencygroup/api.py:699 +#: cinder/volume/api.py:472 msgid "limit param must be an integer" msgstr "limit 参数必须是整数" -#: cinder/api/common.py:98 cinder/api/common.py:133 -#: cinder/consistencygroup/api.py:309 cinder/volume/api.py:389 +#: cinder/api/common.py:108 cinder/consistencygroup/api.py:696 +#: cinder/volume/api.py:469 msgid "limit param must be positive" msgstr "limit参数必须是正数" -#: cinder/api/common.py:123 +#: cinder/api/common.py:124 msgid "offset param must be an integer" msgstr "offset 参数必须是整数" -#: cinder/api/common.py:137 +#: cinder/api/common.py:128 msgid "offset param must be positive" msgstr "offset 参数必须是正数" -#: cinder/api/common.py:165 +#: cinder/api/common.py:170 #, python-format msgid "marker [%s] not found" msgstr "没有找到标记 [%s]" @@ -978,11 +978,11 @@ msgid "href %s does not contain version" msgstr "href %s 不包含版本" -#: cinder/api/extensions.py:184 +#: cinder/api/extensions.py:183 msgid "Initializing extension manager." msgstr "正在初始化扩展管理员。" -#: cinder/api/extensions.py:199 +#: cinder/api/extensions.py:198 #, python-format msgid "Loaded extension: %s" msgstr "加载的扩展：%s" @@ -1012,7 +1012,7 @@ msgid "Ext updated: %s" msgstr "Ext updated: %s" -#: cinder/api/extensions.py:244 +#: cinder/api/extensions.py:243 #, python-format msgid "Exception loading extension: %s" msgstr "加载扩展发生异常：%s" @@ -1027,58 +1027,58 @@ msgid "Calling extension factory %s" msgstr "调用扩展工厂 %s" -#: cinder/api/extensions.py:278 +#: cinder/api/extensions.py:277 #, python-format msgid "osapi_volume_extension is set to deprecated path: %s" msgstr "" -#: cinder/api/extensions.py:280 +#: cinder/api/extensions.py:279 #, python-format msgid "" "Please set your flag or cinder.conf settings for osapi_volume_extension to: " "%s" msgstr "" -#: cinder/api/extensions.py:289 +#: cinder/api/extensions.py:288 #, python-format msgid "Failed to load extension %(ext_factory)s: %(exc)s" msgstr "加载扩展 %(ext_factory)s 失败：%(exc)s" -#: cinder/api/extensions.py:345 +#: cinder/api/extensions.py:357 #, python-format msgid "Failed to load extension %(classpath)s: %(exc)s" msgstr "加载扩展 %(classpath)s 失败：%(exc)s" -#: cinder/api/extensions.py:370 +#: cinder/api/extensions.py:382 #, python-format msgid "Failed to load extension %(ext_name)s: %(exc)s" msgstr "加载扩展 %(ext_name)s 失败：%(exc)s" -#: cinder/api/sizelimit.py:26 +#: cinder/api/sizelimit.py:25 msgid "" "cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " "cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" -#: cinder/api/xmlutil.py:271 +#: cinder/api/xmlutil.py:272 msgid "element is not a child" msgstr "元素不是子节点" -#: cinder/api/xmlutil.py:473 +#: cinder/api/xmlutil.py:474 msgid "root element selecting a list" msgstr "根元素选择列表" -#: cinder/api/xmlutil.py:796 +#: cinder/api/xmlutil.py:797 #, python-format msgid "" "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s" msgstr "模板数不匹配；把slave %(slavetag)s 添加到master %(mastertag)s" -#: cinder/api/xmlutil.py:917 +#: cinder/api/xmlutil.py:918 msgid "subclasses must implement construct()!" msgstr "subclasses必须执行construct()!" -#: cinder/api/contrib/admin_actions.py:84 +#: cinder/api/contrib/admin_actions.py:82 #, python-format msgid "Updating %(resource)s '%(id)s' with '%(update)r'" msgstr "" @@ -1093,7 +1093,7 @@ msgid "delete called for member %s" msgstr "" -#: cinder/api/contrib/backups.py:177 +#: cinder/api/contrib/backups.py:176 #, python-format msgid "Delete backup with id: %s" msgstr "" @@ -1103,15 +1103,12 @@ msgid "Creating new backup %s" msgstr "" -#: cinder/api/contrib/backups.py:246 cinder/api/contrib/backups.py:278 -#: cinder/api/contrib/cgsnapshots.py:168 -#: cinder/api/contrib/consistencygroups.py:173 -#: cinder/api/contrib/volume_transfer.py:158 -#: cinder/api/contrib/volume_transfer.py:194 +#: cinder/api/contrib/backups.py:258 cinder/api/contrib/volume_transfer.py:160 +#: cinder/api/contrib/volume_transfer.py:200 msgid "Incorrect request body format" msgstr "不正确的请求主体格式" -#: cinder/api/contrib/backups.py:250 +#: cinder/api/contrib/backups.py:234 #, python-format msgid "Creating backup of volume %(volume_id)s in container %(container)s" msgstr "" @@ -1121,7 +1118,7 @@ msgid "Restoring backup %(backup_id)s (%(body)s)" msgstr "" -#: cinder/api/contrib/backups.py:283 +#: cinder/api/contrib/backups.py:267 #, python-format msgid "Restoring backup %(backup_id)s to volume %(volume_id)s" msgstr "" @@ -1141,9 +1138,9 @@ msgid "Importing record from %s." msgstr "" -#: cinder/api/contrib/backups.py:340 cinder/api/contrib/backups.py:349 +#: cinder/api/contrib/backups.py:362 msgid "Incorrect request body format." -msgstr "" +msgstr "请求主体格式不正确。" #: cinder/api/contrib/backups.py:333 #, python-format @@ -1159,58 +1156,58 @@ msgid "Snapshot not found." msgstr "" -#: cinder/api/contrib/hosts.py:87 cinder/api/openstack/wsgi.py:320 +#: cinder/api/contrib/hosts.py:88 cinder/api/openstack/wsgi.py:325 msgid "cannot understand XML" msgstr "无法理解XML" -#: cinder/api/contrib/hosts.py:137 +#: cinder/api/contrib/hosts.py:142 #, python-format msgid "Host '%s' could not be found." -msgstr "" +msgstr "找不到主机“%s”。" -#: cinder/api/contrib/hosts.py:166 +#: cinder/api/contrib/hosts.py:171 #, python-format msgid "Invalid status: '%s'" msgstr "无效的状态：'%s'" -#: cinder/api/contrib/hosts.py:169 +#: cinder/api/contrib/hosts.py:174 #, python-format msgid "Invalid update setting: '%s'" msgstr "无效的更新设置：'%s'" -#: cinder/api/contrib/hosts.py:181 +#: cinder/api/contrib/hosts.py:180 #, python-format msgid "Setting host %(host)s to %(state)s." msgstr "把主机 %(host)s 设置为 %(state)s。" -#: cinder/api/contrib/hosts.py:207 +#: cinder/api/contrib/hosts.py:212 msgid "Describe-resource is admin only functionality" msgstr "Describe-resource是只有管理员才能执行的功能。" -#: cinder/api/contrib/hosts.py:215 +#: cinder/api/contrib/hosts.py:219 msgid "Host not found" msgstr "没有找到主机" -#: cinder/api/contrib/qos_specs_manage.py:132 +#: cinder/api/contrib/qos_specs_manage.py:131 msgid "Please specify a name for QoS specs." -msgstr "" +msgstr "请为 QoS 规范指定名称。" -#: cinder/api/contrib/qos_specs_manage.py:243 +#: cinder/api/contrib/qos_specs_manage.py:245 msgid "Failed to disassociate qos specs." -msgstr "" +msgstr "未能取消关联 Qos 规范。" -#: cinder/api/contrib/qos_specs_manage.py:245 +#: cinder/api/contrib/qos_specs_manage.py:247 msgid "Qos specs still in use." -msgstr "" +msgstr "Qos 规范仍在使用中。" -#: cinder/api/contrib/qos_specs_manage.py:322 -#: cinder/api/contrib/qos_specs_manage.py:376 +#: cinder/api/contrib/qos_specs_manage.py:324 +#: cinder/api/contrib/qos_specs_manage.py:378 msgid "Volume Type id must not be None." -msgstr "" +msgstr "卷类型不能为空。" -#: cinder/api/contrib/quota_classes.py:73 +#: cinder/api/contrib/quota_classes.py:76 msgid "Missing required element quota_class_set in request body." -msgstr "" +msgstr "在请求主体中缺少必需元素 quota_class_set。" #: cinder/api/contrib/quota_classes.py:82 msgid "Quota class limit must be specified as an integer value." @@ -1232,148 +1229,148 @@ msgid "Missing required element quota_set in request body." msgstr "" -#: cinder/api/contrib/quotas.py:116 +#: cinder/api/contrib/quotas.py:286 #, python-format msgid "Bad key(s) in quota set: %s" -msgstr "" +msgstr "配额集中的键不正确：%s" #: cinder/api/contrib/scheduler_hints.py:37 msgid "Malformed scheduler_hints attribute" -msgstr "" +msgstr "错误格式的 scheduler_hints 属性" -#: cinder/api/contrib/services.py:92 +#: cinder/api/contrib/services.py:93 msgid "" "Query by service parameter is deprecated. Please use binary parameter " "instead." -msgstr "" +msgstr "建议不要按 service 参数进行查询。请改为使用 binary 参数。" -#: cinder/api/contrib/services.py:162 +#: cinder/api/contrib/services.py:173 msgid "Disabled reason contains invalid characters or is too long" -msgstr "" +msgstr "禁用的原因包含无效字符或太长" #: cinder/api/contrib/snapshot_actions.py:52 msgid "'status' must be specified." -msgstr "" +msgstr "必须指定“status”。" #: cinder/api/contrib/snapshot_actions.py:62 #, python-format msgid "Snapshot status %(cur)s not allowed for update_snapshot_status" -msgstr "" +msgstr "对于 update_snapshot_status，不允许快照状态 %(cur)s" #: cinder/api/contrib/snapshot_actions.py:68 #, python-format msgid "" "Provided snapshot status %(provided)s not allowed for snapshot with status " "%(current)s." -msgstr "" +msgstr "对于状态为 %(current)s 的快照，不允许提供的快照状态 %(provided)s。" #: cinder/api/contrib/snapshot_actions.py:80 msgid "progress must be an integer percentage" -msgstr "" +msgstr "进度必须为整数百分比" -#: cinder/api/contrib/types_extra_specs.py:102 +#: cinder/api/contrib/types_extra_specs.py:114 msgid "Request body empty" -msgstr "" +msgstr "请求主体是空的" -#: cinder/api/contrib/types_extra_specs.py:106 +#: cinder/api/contrib/types_extra_specs.py:118 #: cinder/api/v1/snapshot_metadata.py:76 cinder/api/v1/volume_metadata.py:76 -#: cinder/api/v2/snapshot_metadata.py:76 cinder/api/v2/volume_metadata.py:75 +#: cinder/api/v2/snapshot_metadata.py:69 cinder/api/v2/volume_metadata.py:72 msgid "Request body and URI mismatch" msgstr "请求主体和URI不匹配" -#: cinder/api/contrib/types_extra_specs.py:109 +#: cinder/api/contrib/types_extra_specs.py:121 #: cinder/api/v1/snapshot_metadata.py:80 cinder/api/v1/volume_metadata.py:80 -#: cinder/api/v2/snapshot_metadata.py:80 cinder/api/v2/volume_metadata.py:79 +#: cinder/api/v2/snapshot_metadata.py:73 cinder/api/v2/volume_metadata.py:76 msgid "Request body contains too many items" msgstr "请求主体包含太多items" -#: cinder/api/contrib/types_extra_specs.py:153 +#: cinder/api/contrib/types_extra_specs.py:170 msgid "" "Key names can only contain alphanumeric characters, underscores, periods, " "colons and hyphens." -msgstr "" +msgstr "键名只能包含字母数字字符、下划线、句点、冒号和连字符。" -#: cinder/api/contrib/types_manage.py:148 +#: cinder/api/contrib/types_manage.py:179 msgid "Target volume type is still in use." -msgstr "" +msgstr "目标卷类型仍在使用中。" -#: cinder/api/contrib/volume_actions.py:101 +#: cinder/api/contrib/volume_actions.py:102 #, python-format msgid "" "Invalid request to attach volume to an instance %(instance_uuid)s and a host " "%(host_name)s simultaneously" msgstr "" -#: cinder/api/contrib/volume_actions.py:109 +#: cinder/api/contrib/volume_actions.py:110 msgid "Invalid request to attach volume to an invalid target" -msgstr "" +msgstr "关于将卷连接至无效目标的请求无效" -#: cinder/api/contrib/volume_actions.py:113 +#: cinder/api/contrib/volume_actions.py:114 msgid "" "Invalid request to attach volume with an invalid mode. Attaching mode should " "be 'rw' or 'ro'" -msgstr "" +msgstr "以无效方式连接卷的请求无效。连接方式应该为“rw”或“ro”" -#: cinder/api/contrib/volume_actions.py:202 +#: cinder/api/contrib/volume_actions.py:231 msgid "Unable to fetch connection information from backend." -msgstr "" +msgstr "无法从后端访存连接信息。" -#: cinder/api/contrib/volume_actions.py:223 +#: cinder/api/contrib/admin_actions.py:196 +#: cinder/api/contrib/volume_actions.py:252 msgid "Unable to terminate volume connection from backend." -msgstr "" +msgstr "无法从后端终止卷连接。" -#: cinder/api/contrib/volume_actions.py:236 +#: cinder/api/contrib/volume_actions.py:265 msgid "No image_name was specified in request." -msgstr "" +msgstr "未在请求中指定任何 image_name。" -#: cinder/api/contrib/volume_actions.py:244 +#: cinder/api/contrib/volume_actions.py:249 msgid "Bad value for 'force' parameter." msgstr "" -#: cinder/api/contrib/volume_actions.py:247 +#: cinder/api/contrib/volume_actions.py:252 msgid "'force' is not string or bool." msgstr "" -#: cinder/api/contrib/volume_actions.py:289 +#: cinder/api/contrib/volume_actions.py:314 msgid "New volume size must be specified as an integer." -msgstr "" +msgstr "新卷的大小必须指定为整数。" -#: cinder/api/contrib/volume_actions.py:308 +#: cinder/api/contrib/volume_actions.py:333 msgid "Must specify readonly in request." -msgstr "" +msgstr "必须在请求中指定 readonly。" -#: cinder/api/contrib/volume_actions.py:316 +#: cinder/api/contrib/volume_actions.py:321 msgid "Bad value for 'readonly'" msgstr "" -#: cinder/api/contrib/volume_actions.py:320 +#: cinder/api/contrib/volume_actions.py:325 msgid "'readonly' not string or bool" msgstr "" -#: cinder/api/contrib/volume_actions.py:334 +#: cinder/api/contrib/volume_actions.py:354 msgid "New volume type must be specified." -msgstr "" +msgstr "必须指定新的卷类型。" -#: cinder/api/contrib/volume_manage.py:100 cinder/api/v2/snapshots.py:176 -#: cinder/api/v2/snapshots.py:237 cinder/api/v2/volumes.py:303 -#: cinder/api/v2/volumes.py:443 +#: cinder/api/v2/snapshots.py:211 cinder/api/v2/volumes.py:450 #, python-format msgid "Missing required element '%s' in request body" -msgstr "" +msgstr "在请求主体中缺少必需元素“%s”" -#: cinder/api/contrib/volume_manage.py:111 +#: cinder/api/contrib/snapshot_manage.py:97 +#: cinder/api/contrib/volume_manage.py:110 #, python-format msgid "The following elements are required: %s" -msgstr "" +msgstr "需要下列元素：%s" #: cinder/api/contrib/volume_manage.py:129 -#: cinder/api/contrib/volume_type_access.py:96 cinder/api/v2/volumes.py:338 +#: cinder/api/contrib/volume_type_access.py:96 cinder/api/v2/volumes.py:344 msgid "Volume type not found." msgstr "" -#: cinder/api/contrib/volume_manage.py:145 +#: cinder/api/contrib/volume_manage.py:143 msgid "Service not found." -msgstr "" +msgstr "找不到服务。" #: cinder/api/contrib/volume_transfer.py:131 msgid "Listing volume transfers" @@ -1384,7 +1381,7 @@ msgid "Creating new volume transfer %s" msgstr "" -#: cinder/api/contrib/volume_transfer.py:163 +#: cinder/api/contrib/volume_transfer.py:162 #, python-format msgid "Creating transfer of volume %s" msgstr "" @@ -1394,12 +1391,12 @@ msgid "Accepting volume transfer %s" msgstr "" -#: cinder/api/contrib/volume_transfer.py:197 +#: cinder/api/contrib/volume_transfer.py:196 #, python-format msgid "Accepting transfer %s" msgstr "" -#: cinder/api/contrib/volume_transfer.py:218 +#: cinder/api/contrib/volume_transfer.py:217 #, python-format msgid "Delete transfer with id: %s" msgstr "" @@ -1412,22 +1409,22 @@ msgid "key_size must be an integer" msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:74 +#: cinder/api/contrib/volume_type_encryption.py:68 msgid "provider must be defined" -msgstr "" +msgstr "必须定义提供程序" -#: cinder/api/contrib/volume_type_encryption.py:76 +#: cinder/api/contrib/volume_type_encryption.py:70 msgid "control_location must be defined" -msgstr "" +msgstr "必须定义 control_location" -#: cinder/api/contrib/volume_type_encryption.py:84 +#: cinder/api/contrib/volume_type_encryption.py:78 #, python-format msgid "Valid control location are: %s" -msgstr "" +msgstr "以下是有效控制位置：%s" -#: cinder/api/contrib/volume_type_encryption.py:112 +#: cinder/api/contrib/volume_type_encryption.py:106 msgid "Cannot create encryption specs. Volume type in use." -msgstr "" +msgstr "无法创建加密规范。卷类型在使用中。" #: cinder/api/contrib/volume_type_encryption.py:116 msgid "Create body is not valid." @@ -1441,56 +1438,56 @@ msgid "Update body is not valid. It must contain \"encryption.\"" msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:148 +#: cinder/api/contrib/volume_type_encryption.py:136 msgid "Request body contains too many items." -msgstr "" +msgstr "请求主体包含太多项。" -#: cinder/api/contrib/volume_type_encryption.py:154 +#: cinder/api/contrib/volume_type_encryption.py:142 msgid "Cannot update encryption specs. Volume type in use." -msgstr "" +msgstr "无法更新加密规范。卷类型在使用中。" -#: cinder/api/contrib/volume_type_encryption.py:188 +#: cinder/api/contrib/volume_type_encryption.py:176 msgid "Cannot delete encryption specs. Volume type in use." -msgstr "" +msgstr "无法删除加密规范。卷类型在使用中。" -#: cinder/api/contrib/volume_unmanage.py:54 +#: cinder/api/contrib/volume_unmanage.py:53 #, python-format msgid "Unmanage volume with id: %s" msgstr "" -#: cinder/api/contrib/volume_replication.py:76 -#: cinder/api/contrib/volume_replication.py:94 -#: cinder/api/contrib/volume_unmanage.py:60 cinder/api/v2/snapshots.py:192 -#: cinder/api/v2/volumes.py:177 cinder/api/v2/volumes.py:194 -#: cinder/api/v2/volumes.py:477 +#: cinder/api/contrib/volume_replication.py:77 +#: cinder/api/contrib/volume_replication.py:95 +#: cinder/api/contrib/volume_unmanage.py:60 cinder/api/v2/snapshots.py:188 +#: cinder/api/v2/volumes.py:179 cinder/api/v2/volumes.py:196 +#: cinder/api/v2/volumes.py:485 msgid "Volume could not be found" msgstr "" -#: cinder/api/contrib/volume_unmanage.py:63 cinder/api/v2/volumes.py:197 +#: cinder/api/contrib/volume_unmanage.py:62 cinder/api/v2/volumes.py:210 msgid "Volume cannot be deleted while in attached state" msgstr "" #: cinder/api/middleware/auth.py:113 msgid "Invalid service catalog json." -msgstr "" +msgstr "服务目录 json 无效。" -#: cinder/api/middleware/fault.py:46 +#: cinder/api/middleware/fault.py:44 #, python-format msgid "Caught error: %s" msgstr "抓到错误：%s" -#: cinder/api/openstack/wsgi.py:1061 +#: cinder/api/middleware/fault.py:53 cinder/api/openstack/wsgi.py:978 #, python-format msgid "%(url)s returned with HTTP %(status)d" msgstr "%(url)s 随HTTP %(status)d返回" -#: cinder/api/middleware/fault.py:70 +#: cinder/api/middleware/fault.py:71 #, python-format msgid "%(exception)s: %(explanation)s" -msgstr "" +msgstr "发生异常 %(exception)s：原因 %(explanation)s" -#: cinder/api/middleware/sizelimit.py:56 cinder/api/middleware/sizelimit.py:65 -#: cinder/api/middleware/sizelimit.py:79 +#: cinder/api/middleware/sizelimit.py:55 cinder/api/middleware/sizelimit.py:64 +#: cinder/api/middleware/sizelimit.py:78 msgid "Request is too large." msgstr "" @@ -1503,7 +1500,7 @@ msgid "Extended resource: %s" msgstr "扩展资源：%s" -#: cinder/api/openstack/__init__.py:114 +#: cinder/api/openstack/__init__.py:104 #, python-format msgid "" "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such " @@ -1515,37 +1512,37 @@ msgid "Extension %(ext_name)s extending resource: %(collection)s" msgstr "扩展资源的扩展 %(ext_name)s：%(collection)s" -#: cinder/api/openstack/__init__.py:136 +#: cinder/api/openstack/__init__.py:126 msgid "" "cinder.api.openstack:FaultWrapper is deprecated. Please use " "cinder.api.middleware.fault:FaultWrapper instead." msgstr "" -#: cinder/api/openstack/urlmap.py:26 +#: cinder/api/openstack/urlmap.py:25 msgid "" "cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " "cinder.api.urlmap:urlmap_factory instead." msgstr "" -#: cinder/api/openstack/wsgi.py:295 cinder/api/openstack/wsgi.py:711 +#: cinder/api/openstack/wsgi.py:300 cinder/api/openstack/wsgi.py:704 msgid "cannot understand JSON" msgstr "无法理解JSON" -#: cinder/api/openstack/wsgi.py:716 +#: cinder/api/openstack/wsgi.py:709 msgid "too many body keys" msgstr "过多主体密钥" -#: cinder/api/openstack/wsgi.py:673 +#: cinder/api/openstack/wsgi.py:671 #, python-format msgid "Exception handling resource: %s" msgstr "" -#: cinder/api/openstack/wsgi.py:678 +#: cinder/api/openstack/wsgi.py:676 #, python-format msgid "Fault thrown: %s" msgstr "错误抛出: %s" -#: cinder/api/openstack/wsgi.py:681 +#: cinder/api/openstack/wsgi.py:679 #, python-format msgid "HTTP exception thrown: %s" msgstr "HTTP 异常抛出：%s" @@ -1562,43 +1559,40 @@ msgid "No Content-Type provided in request" msgstr "请求中没有提供 Content-Type" -#: cinder/api/openstack/wsgi.py:991 +#: cinder/api/openstack/wsgi.py:984 #, python-format msgid "There is no such action: %s" msgstr "没有该动作：%s" -#: cinder/api/openstack/wsgi.py:994 cinder/api/openstack/wsgi.py:1007 +#: cinder/api/openstack/wsgi.py:987 cinder/api/openstack/wsgi.py:1000 #: cinder/api/v1/snapshot_metadata.py:54 cinder/api/v1/snapshot_metadata.py:72 #: cinder/api/v1/snapshot_metadata.py:97 cinder/api/v1/snapshot_metadata.py:122 #: cinder/api/v1/volume_metadata.py:54 cinder/api/v1/volume_metadata.py:72 #: cinder/api/v1/volume_metadata.py:97 cinder/api/v1/volume_metadata.py:122 -#: cinder/api/v2/snapshot_metadata.py:54 cinder/api/v2/snapshot_metadata.py:72 -#: cinder/api/v2/snapshot_metadata.py:97 cinder/api/v2/snapshot_metadata.py:122 -#: cinder/api/v2/volume_metadata.py:53 cinder/api/v2/volume_metadata.py:71 -#: cinder/api/v2/volume_metadata.py:96 cinder/api/v2/volume_metadata.py:121 +#: cinder/api/v2/snapshot_metadata.py:112 cinder/api/v2/volume_metadata.py:116 msgid "Malformed request body" msgstr "错误格式的请求主体" -#: cinder/api/openstack/wsgi.py:1004 +#: cinder/api/openstack/wsgi.py:997 msgid "Unsupported Content-Type" msgstr "不支持的Content-Type" -#: cinder/api/openstack/wsgi.py:1016 +#: cinder/api/openstack/wsgi.py:1009 msgid "Malformed request url" msgstr "错误格式的请求url" -#: cinder/api/openstack/wsgi.py:1064 +#: cinder/api/openstack/wsgi.py:981 #, python-format msgid "%(url)s returned a fault: %(e)s" msgstr "%(url)s返回错误：%(e)s" -#: cinder/api/openstack/volume/__init__.py:26 +#: cinder/api/openstack/volume/__init__.py:25 msgid "" "cinder.api.openstack.volume:APIRouter is deprecated. Please use " "cinder.api.v1.router:APIRouter instead." msgstr "" -#: cinder/api/openstack/volume/versions.py:27 +#: cinder/api/openstack/volume/versions.py:26 msgid "" "cinder.api.openstack.volume.versions.Versions is deprecated. Please use " "cinder.api.versions.Versions instead." @@ -1611,76 +1605,75 @@ "%(unit_string)s." msgstr "只能有 %(value)s 个 %(verb)s 请求发送给 %(uri)s 限定是每一个 %(unit_string)s。" -#: cinder/api/v1/limits.py:264 cinder/api/v2/limits.py:262 +#: cinder/api/v1/limits.py:266 cinder/api/v2/limits.py:263 msgid "This request was rate-limited." msgstr "这个请求受到频率限制。" #: cinder/api/v1/snapshot_metadata.py:38 cinder/api/v1/snapshot_metadata.py:118 #: cinder/api/v1/snapshot_metadata.py:157 cinder/api/v2/snapshot_metadata.py:38 -#: cinder/api/v2/snapshot_metadata.py:118 -#: cinder/api/v2/snapshot_metadata.py:157 +#: cinder/api/v2/snapshot_metadata.py:108 +#: cinder/api/v2/snapshot_metadata.py:147 msgid "snapshot does not exist" -msgstr "" +msgstr "快照不存在" #: cinder/api/v1/snapshot_metadata.py:140 #: cinder/api/v1/snapshot_metadata.py:150 cinder/api/v1/volume_metadata.py:140 -#: cinder/api/v1/volume_metadata.py:150 cinder/api/v2/snapshot_metadata.py:140 -#: cinder/api/v2/snapshot_metadata.py:150 cinder/api/v2/volume_metadata.py:139 -#: cinder/api/v2/volume_metadata.py:149 +#: cinder/api/v1/volume_metadata.py:150 cinder/api/v2/snapshot_metadata.py:130 +#: cinder/api/v2/snapshot_metadata.py:140 cinder/api/v2/volume_metadata.py:134 +#: cinder/api/v2/volume_metadata.py:144 msgid "Metadata item was not found" msgstr "元数据项目未找到" -#: cinder/api/v1/snapshots.py:120 cinder/api/v2/snapshots.py:121 +#: cinder/api/v1/snapshots.py:119 cinder/api/v2/snapshots.py:120 #, python-format msgid "Delete snapshot with id: %s" msgstr "删除id为 %s 的快照" -#: cinder/api/v1/snapshots.py:175 cinder/api/v2/snapshots.py:186 +#: cinder/api/v1/snapshots.py:171 cinder/api/v2/snapshots.py:161 msgid "'volume_id' must be specified" -msgstr "" +msgstr "必须指定“volume_id”" -#: cinder/api/v1/snapshots.py:184 cinder/api/v2/snapshots.py:195 +#: cinder/api/v1/snapshots.py:182 cinder/api/v2/snapshots.py:193 #, python-format msgid "Create snapshot from volume %s" msgstr "为卷 %s 创建快照" -#: cinder/api/v1/snapshots.py:188 cinder/api/v2/snapshots.py:204 +#: cinder/api/v1/snapshots.py:184 #, python-format msgid "Invalid value '%s' for force. " -msgstr "" +msgstr "值“%s”对于 force 无效。 " #: cinder/api/v1/volume_metadata.py:38 cinder/api/v1/volume_metadata.py:118 -#: cinder/api/v1/volume_metadata.py:157 cinder/api/v2/volume_metadata.py:37 -#: cinder/api/v2/volume_metadata.py:117 cinder/api/v2/volume_metadata.py:156 +#: cinder/api/v1/volume_metadata.py:157 msgid "volume does not exist" -msgstr "" +msgstr "卷不存在" -#: cinder/api/v1/volumes.py:116 +#: cinder/api/v1/volumes.py:114 #, python-format msgid "vol=%s" msgstr "vol=%s" -#: cinder/api/v1/volumes.py:247 cinder/api/v2/volumes.py:186 +#: cinder/api/v1/volumes.py:293 cinder/api/v2/volumes.py:181 #, python-format msgid "Delete volume with id: %s" msgstr "删除id为 %s 的卷" -#: cinder/api/v1/volumes.py:306 cinder/api/v1/volumes.py:310 -#: cinder/api/v2/volumes.py:264 +#: cinder/api/v1/volumes.py:312 cinder/api/v1/volumes.py:316 +#: cinder/api/v2/volumes.py:279 msgid "Invalid imageRef provided." msgstr "提供了无效的imageRef。" -#: cinder/api/v1/volumes.py:350 cinder/api/v2/volumes.py:349 +#: cinder/api/v1/volumes.py:356 #, python-format msgid "snapshot id:%s not found" -msgstr "" +msgstr "找不到快照标识 %s" -#: cinder/api/v1/volumes.py:363 +#: cinder/api/v1/volumes.py:369 #, python-format msgid "source vol id:%s not found" -msgstr "" +msgstr "找不到源卷标识 %s" -#: cinder/api/v1/volumes.py:371 cinder/api/v2/volumes.py:370 +#: cinder/api/v1/volumes.py:415 cinder/api/v2/volumes.py:331 #, python-format msgid "Create volume of %s GB" msgstr "创建 %s GB的卷" @@ -1690,20 +1683,20 @@ msgid "Removing options '%(bad_options)s' from query" msgstr "" -#: cinder/api/v2/snapshots.py:112 cinder/api/v2/snapshots.py:127 -#: cinder/api/v2/snapshots.py:270 +#: cinder/api/v2/snapshots.py:108 cinder/api/v2/snapshots.py:123 +#: cinder/api/v2/snapshots.py:266 msgid "Snapshot could not be found" msgstr "" -#: cinder/api/v2/snapshots.py:233 cinder/api/v2/volumes.py:439 +#: cinder/api/v2/snapshots.py:207 cinder/api/v2/volumes.py:446 msgid "Missing request body" -msgstr "" +msgstr "缺少请求主体" #: cinder/api/v2/types.py:83 msgid "Volume type not found" msgstr "" -#: cinder/api/v2/volumes.py:361 +#: cinder/api/v2/volumes.py:367 #, python-format msgid "source volume id:%s not found" msgstr "" @@ -1713,48 +1706,48 @@ msgid "Removing options '%s' from query" msgstr "" -#: cinder/backup/api.py:69 +#: cinder/backup/api.py:83 msgid "Backup status must be available or error" -msgstr "" +msgstr "备份状态必须为“可用”或“错误”" -#: cinder/backup/api.py:120 +#: cinder/backup/api.py:130 msgid "Volume to be backed up must be available" msgstr "" -#: cinder/backup/api.py:198 +#: cinder/backup/api.py:265 msgid "Backup status must be available" -msgstr "" +msgstr "备份状态必须为“可用”" -#: cinder/backup/api.py:203 +#: cinder/backup/api.py:270 msgid "Backup to be restored has invalid size" -msgstr "" +msgstr "要复原的备份具有无效大小" -#: cinder/backup/api.py:212 +#: cinder/backup/api.py:164 #, python-format msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s" msgstr "" -#: cinder/backup/api.py:228 +#: cinder/backup/api.py:297 msgid "Volume to be restored to must be available" -msgstr "" +msgstr "要复原至的卷必须可用" -#: cinder/backup/api.py:234 +#: cinder/backup/api.py:303 #, python-format msgid "" "volume size %(volume_size)d is too small to restore backup of size %(size)d." -msgstr "" +msgstr "卷大小 %(volume_size)d 太小，无法复原大小为 %(size)d 的备份。" -#: cinder/backup/api.py:239 +#: cinder/backup/api.py:191 #, python-format msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s" msgstr "" -#: cinder/backup/api.py:290 +#: cinder/backup/api.py:359 #, python-format msgid "Backup status must be available and not %s." -msgstr "" +msgstr "备份状态必须为“可用”，不能是 %s。" -#: cinder/backup/driver.py:58 +#: cinder/backup/driver.py:53 #, python-format msgid "Value with type=%s is not serializable" msgstr "" @@ -1765,8 +1758,8 @@ msgid "Getting metadata type '%s'" msgstr "" -#: cinder/backup/driver.py:78 cinder/backup/driver.py:101 -#: cinder/backup/driver.py:125 +#: cinder/backup/driver.py:73 cinder/backup/driver.py:96 +#: cinder/backup/driver.py:120 #, python-format msgid "Unable to serialize field '%s' - excluding from backup" msgstr "" @@ -1803,14 +1796,14 @@ #: cinder/backup/driver.py:307 #, python-format msgid "Unsupported backup metadata version (%s)" -msgstr "" +msgstr "不支持备份元数据版本 (%s)" #: cinder/backup/driver.py:238 #, python-format msgid "No metadata of type '%s' to restore" msgstr "" -#: cinder/backup/manager.py:108 +#: cinder/backup/manager.py:113 msgid "NULL host not allowed for volume backend lookup." msgstr "" @@ -1819,7 +1812,7 @@ msgid "Checking hostname '%s' for backend info." msgstr "" -#: cinder/backup/manager.py:118 +#: cinder/backup/manager.py:112 #, python-format msgid "Backend not found in hostname (%s) so using default." msgstr "" @@ -1833,7 +1826,7 @@ msgid "Fetching default backend." msgstr "" -#: cinder/backup/manager.py:134 +#: cinder/backup/manager.py:139 #, python-format msgid "Volume manager for backend '%s' does not exist." msgstr "" @@ -1855,186 +1848,193 @@ msgid "Registering default backend %s." msgstr "" -#: cinder/backup/manager.py:169 +#: cinder/backup/manager.py:163 #, python-format msgid "Starting volume driver %(driver_name)s (%(version)s)." msgstr "" -#: cinder/backup/manager.py:176 +#: cinder/backup/manager.py:170 #, python-format msgid "Error encountered during initialization of driver: %(name)s." msgstr "" -#: cinder/backup/manager.py:195 +#: cinder/backup/manager.py:189 msgid "Cleaning up incomplete backup operations." msgstr "" -#: cinder/backup/manager.py:201 +#: cinder/backup/manager.py:194 #, python-format msgid "Resetting volume %s to available (was backing-up)." msgstr "" -#: cinder/backup/manager.py:206 +#: cinder/backup/manager.py:199 #, python-format msgid "Resetting volume %s to error_restoring (was restoring-backup)." msgstr "" -#: cinder/backup/manager.py:218 +#: cinder/backup/manager.py:211 #, python-format msgid "Resetting backup %s to error (was creating)." msgstr "" -#: cinder/backup/manager.py:224 +#: cinder/backup/manager.py:217 #, python-format msgid "Resetting backup %s to available (was restoring)." msgstr "" -#: cinder/backup/manager.py:229 +#: cinder/backup/manager.py:222 #, python-format msgid "Resuming delete on backup: %s." msgstr "" -#: cinder/backup/manager.py:237 +#: cinder/backup/manager.py:230 #, python-format msgid "Create backup started, backup: %(backup_id)s volume: %(volume_id)s." msgstr "" -#: cinder/backup/manager.py:253 +#: cinder/backup/manager.py:364 #, python-format msgid "" "Create backup aborted, expected volume status %(expected_status)s but got " "%(actual_status)s." -msgstr "" +msgstr "备份创建已异常中止，需要的卷状态为 %(expected_status)s，但实际为 %(actual_status)s。" -#: cinder/backup/manager.py:265 +#: cinder/backup/manager.py:375 #, python-format msgid "" "Create backup aborted, expected backup status %(expected_status)s but got " "%(actual_status)s." -msgstr "" +msgstr "备份创建已异常中止，需要的备份状态为 %(expected_status)s，但实际为 %(actual_status)s。" -#: cinder/backup/manager.py:295 +#: cinder/backup/manager.py:287 #, python-format msgid "Create backup finished. backup: %s." msgstr "" -#: cinder/backup/manager.py:299 +#: cinder/backup/manager.py:291 #, python-format msgid "Restore backup started, backup: %(backup_id)s volume: %(volume_id)s." msgstr "" -#: cinder/backup/manager.py:318 +#: cinder/backup/manager.py:436 #, python-format msgid "" "Restore backup aborted, expected volume status %(expected_status)s but got " "%(actual_status)s." -msgstr "" +msgstr "备份复原已异常中止，需要的卷状态为 %(expected_status)s，但获得的是 %(actual_status)s。" -#: cinder/backup/manager.py:328 +#: cinder/backup/manager.py:447 #, python-format msgid "" "Restore backup aborted: expected backup status %(expected_status)s but got " "%(actual_status)s." -msgstr "" +msgstr "备份复原已异常中止：需要的备份状态为 %(expected_status)s，但获得的是 %(actual_status)s。" -#: cinder/backup/manager.py:349 +#: cinder/backup/manager.py:467 #, python-format msgid "" "Restore backup aborted, the backup service currently configured " "[%(configured_service)s] is not the backup service that was used to create " "this backup [%(backup_service)s]." msgstr "" +"备份复原已异常中止，当前配置的备份服务 [%(configured_service)s] 不是已用来创建此备份的备份服务 " +"[%(backup_service)s]。" -#: cinder/backup/manager.py:375 +#: cinder/backup/manager.py:363 #, python-format msgid "" "Restore backup finished, backup %(backup_id)s restored to volume " "%(volume_id)s." msgstr "" -#: cinder/backup/manager.py:394 +#: cinder/backup/manager.py:382 #, python-format msgid "Delete backup started, backup: %s." msgstr "" -#: cinder/backup/manager.py:409 +#: cinder/backup/manager.py:526 #, python-format msgid "" "Delete_backup aborted, expected backup status %(expected_status)s but got " "%(actual_status)s." msgstr "" +"Delete_backup 已异常中止，需要的备份状态为 %(expected_status)s，但实际为 %(actual_status)s。" -#: cinder/backup/manager.py:421 +#: cinder/backup/manager.py:537 #, python-format msgid "" "Delete backup aborted, the backup service currently configured " "[%(configured_service)s] is not the backup service that was used to create " "this backup [%(backup_service)s]." msgstr "" +"备份删除已异常中止，当前配置的备份服务 [%(configured_service)s] 不是已用来创建此备份的备份服务 " +"[%(backup_service)s]。" -#: cinder/backup/manager.py:454 +#: cinder/backup/manager.py:425 #, python-format msgid "Delete backup finished, backup %s deleted." msgstr "" -#: cinder/backup/manager.py:469 +#: cinder/backup/manager.py:440 #, python-format msgid "Export record started, backup: %s." msgstr "" -#: cinder/backup/manager.py:495 +#: cinder/backup/manager.py:612 #, python-format msgid "" "Export backup aborted, expected backup status %(expected_status)s but got " "%(actual_status)s." -msgstr "" +msgstr "备份导出已异常中止，需要的备份状态为 %(expected_status)s，但实际为 %(actual_status)s。" -#: cinder/backup/manager.py:506 +#: cinder/backup/manager.py:623 #, python-format msgid "" "Export record aborted, the backup service currently configured " "[%(configured_service)s] is not the backup service that was used to create " "this backup [%(backup_service)s]." msgstr "" +"记录导出已异常中止，当前配置的备份服务 [%(configured_service)s] 不是已用来创建此备份的备份服务 " +"[%(backup_service)s]。" -#: cinder/backup/manager.py:505 +#: cinder/backup/manager.py:476 #, python-format msgid "Export record finished, backup %s exported." msgstr "" -#: cinder/backup/manager.py:524 +#: cinder/backup/manager.py:495 #, python-format msgid "Import record started, backup_url: %s." msgstr "" -#: cinder/backup/manager.py:559 +#: cinder/backup/manager.py:677 #, python-format msgid "" "Import record failed, cannot find backup service to perform the import. " "Request service %(service)s" -msgstr "" +msgstr "记录导入失败，找不到要执行导入的备份服务。请求服务 %(service)s" -#: cinder/backup/manager.py:594 +#: cinder/backup/manager.py:604 #, python-format msgid "Backup metadata received from driver for import is missing %s." msgstr "" -#: cinder/backup/manager.py:591 +#: cinder/backup/manager.py:561 #, python-format msgid "" "Backup service %(service)s does not support verify. Backup id %(id)s is not " "verified. Skipping verify." msgstr "" -#: cinder/backup/manager.py:603 +#: cinder/backup/manager.py:572 #, python-format msgid "Import record id %s metadata from driver finished." msgstr "" -#: cinder/backup/drivers/ceph.py:129 cinder/tests/test_backup_ceph.py:945 +#: cinder/backup/drivers/ceph.py:129 cinder/tests/unit/test_backup_ceph.py:1014 #, python-format msgid "Metadata backup object '%s' already exists" -msgstr "" +msgstr "元数据备份对象“%s”已存在" #: cinder/backup/drivers/ceph.py:139 #, python-format @@ -2046,19 +2046,19 @@ msgid "Metadata backup object '%s' not found - ignoring" msgstr "" -#: cinder/backup/drivers/ceph.py:180 +#: cinder/backup/drivers/ceph.py:178 msgid "" "RBD striping not supported - ignoring configuration settings for rbd striping" msgstr "" -#: cinder/backup/drivers/ceph.py:203 +#: cinder/backup/drivers/ceph.py:201 #, python-format msgid "invalid user '%s'" -msgstr "" +msgstr "用户 '%s' 无效" -#: cinder/backup/drivers/ceph.py:270 +#: cinder/backup/drivers/ceph.py:267 msgid "Backup id required" -msgstr "" +msgstr "需要备份标识" #: cinder/backup/drivers/ceph.py:279 #, python-format @@ -2080,7 +2080,7 @@ msgid "%(chunks)s chunks of %(bytes)s bytes to be transferred" msgstr "" -#: cinder/backup/drivers/ceph.py:327 +#: cinder/backup/drivers/ceph.py:324 #, python-format msgid "Transferred chunk %(chunk)s of %(chunks)s (%(rate)dK/s)" msgstr "" @@ -2109,10 +2109,10 @@ msgid "Trying diff format name format basename='%s'" msgstr "" -#: cinder/backup/drivers/ceph.py:428 +#: cinder/backup/drivers/ceph.py:426 #, python-format msgid "image %s not found" -msgstr "" +msgstr "找不到映像 %s" #: cinder/backup/drivers/ceph.py:432 #, python-format @@ -2148,10 +2148,10 @@ msgid "Performing differential transfer from '%(src)s' to '%(dest)s'" msgstr "" -#: cinder/backup/drivers/ceph.py:554 +#: cinder/backup/drivers/ceph.py:551 #, python-format msgid "RBD diff op failed - (ret=%(ret)s stderr=%(stderr)s)" -msgstr "" +msgstr "RBD 差集操作失败 - (ret=%(ret)s stderr=%(stderr)s)" #: cinder/backup/drivers/ceph.py:546 #, python-format @@ -2173,12 +2173,12 @@ msgid "Source snapshot '%s' is stale so deleting" msgstr "" -#: cinder/backup/drivers/ceph.py:634 +#: cinder/backup/drivers/ceph.py:629 #, python-format msgid "" "Snapshot='%(snap)s' does not exist in base image='%(base)s' - aborting " "incremental backup" -msgstr "" +msgstr "基本映像“%(base)s”中不存在快照“%(snap)s”- 正在异常中止增量备份" #: cinder/backup/drivers/ceph.py:624 #, python-format @@ -2218,24 +2218,24 @@ msgid "Backup '%s' has no snapshot" msgstr "" -#: cinder/backup/drivers/ceph.py:790 +#: cinder/backup/drivers/ceph.py:785 #, python-format msgid "Backup should only have one snapshot but instead has %s" -msgstr "" +msgstr "备份应该仅具有一个快照，但是具有 %s 个快照" #: cinder/backup/drivers/ceph.py:772 #, python-format msgid "Found snapshot '%s'" msgstr "" -#: cinder/backup/drivers/ceph.py:816 +#: cinder/backup/drivers/ceph.py:811 msgid "Need non-zero volume size" -msgstr "" +msgstr "需要非零卷大小" -#: cinder/backup/drivers/ceph.py:842 +#: cinder/backup/drivers/ceph.py:837 #, python-format msgid "Failed to backup volume metadata - %s" -msgstr "" +msgstr "未能备份卷元数据 - %s" #: cinder/backup/drivers/ceph.py:832 #, python-format @@ -2260,7 +2260,7 @@ msgid "Attempting incremental restore from base='%(base)s' snap='%(snap)s'" msgstr "" -#: cinder/backup/drivers/ceph.py:972 +#: cinder/backup/drivers/ceph.py:948 msgid "Differential restore failed, trying full restore" msgstr "" @@ -2296,10 +2296,10 @@ msgid "Volume has no backed up metadata" msgstr "" -#: cinder/backup/drivers/ceph.py:1145 cinder/backup/drivers/swift.py:564 -#: cinder/tests/test_backup_ceph.py:934 +#: cinder/backup/drivers/ceph.py:1143 +#: cinder/tests/unit/test_backup_ceph.py:1003 msgid "Metadata restore failed due to incompatible version" -msgstr "" +msgstr "由于版本不兼容，元数据复原失败" #: cinder/backup/drivers/ceph.py:1124 #, python-format @@ -2340,12 +2340,12 @@ msgid "Delete '%s' finished" msgstr "" -#: cinder/backup/drivers/swift.py:130 +#: cinder/backup/chunkeddriver.py:83 #, python-format msgid "unsupported compression algorithm: %s" -msgstr "" +msgstr "以下压缩算法不受支持：%s" -#: cinder/backup/drivers/swift.py:160 +#: cinder/backup/drivers/swift.py:122 #, python-format msgid "single_user auth mode enabled, but %(param)s not set" msgstr "" @@ -2373,7 +2373,7 @@ "%(filename)s" msgstr "" -#: cinder/backup/drivers/swift.py:249 +#: cinder/backup/drivers/swift.py:197 #, python-format msgid "" "error writing metadata file to swift, MD5 of metadata file in swift " @@ -2396,10 +2396,10 @@ msgid "_read_metadata finished (%s)" msgstr "" -#: cinder/backup/drivers/swift.py:274 +#: cinder/backup/chunkeddriver.py:266 #, python-format msgid "volume size %d is invalid." -msgstr "" +msgstr "卷大小 %d 无效。" #: cinder/backup/drivers/swift.py:236 #, python-format @@ -2438,12 +2438,13 @@ msgid "backup MD5 for %(object_name)s: %(md5)s" msgstr "" -#: cinder/backup/drivers/swift.py:345 +#: cinder/backup/drivers/swift.py:208 #, python-format msgid "" "error writing object to swift, MD5 of object in swift %(etag)s is not the " "same as MD5 of object sent to swift %(md5)s" msgstr "" +"将对象写入 swift 时出错，swift %(etag)s 中对象的 MD5 与发送至 swift %(md5)s 的对象的 MD5 不同" #: cinder/backup/drivers/swift.py:301 msgid "Calling eventlet.sleep(0)" @@ -2454,7 +2455,7 @@ msgid "backup %s finished." msgstr "" -#: cinder/backup/drivers/swift.py:395 +#: cinder/backup/drivers/swift.py:352 #, python-format msgid "Backup volume metadata to swift failed: %s" msgstr "" @@ -2469,7 +2470,7 @@ msgid "metadata_object_names = %s" msgstr "" -#: cinder/backup/drivers/swift.py:479 +#: cinder/backup/drivers/swift.py:373 msgid "" "restore_backup aborted, actual swift object list in swift does not match " "object list stored in metadata" @@ -2504,7 +2505,7 @@ msgid "Restoring swift backup version %s" msgstr "" -#: cinder/backup/drivers/swift.py:552 +#: cinder/backup/drivers/swift.py:445 #, python-format msgid "No support to restore swift backup version %s" msgstr "" @@ -2514,11 +2515,11 @@ msgid "restore %(backup_id)s to %(volume_id)s finished." msgstr "" -#: cinder/backup/drivers/swift.py:517 +#: cinder/backup/drivers/swift.py:475 msgid "swift error while listing objects, continuing with delete" msgstr "" -#: cinder/backup/drivers/swift.py:526 +#: cinder/backup/drivers/swift.py:484 #, python-format msgid "swift error while deleting object %s, continuing with delete" msgstr "" @@ -2541,6 +2542,8 @@ "unexpected mode. Image or file backups supported, actual mode is " "%(vol_mode)s." msgstr "" +"%(op)s：备份 %(bck_id)s（针对卷 %(vol_id)s）失败。备份对象具有意外方式。支持映像或文件备份，实际方式为 " +"%(vol_mode)s。" #: cinder/backup/drivers/tsm.py:114 #, python-format @@ -2550,26 +2553,29 @@ "stdout: %(out)s\n" " stderr: %(err)s" msgstr "" +"备份：%(vol_id)s 未能创建从 %(vpath)s 至 %(bpath)s 的设备硬链接。\n" +"标准输出：%(out)s\n" +"标准错误：%(err)s" #: cinder/backup/drivers/tsm.py:212 #, python-format msgid "" "backup: %(vol_id)s failed. %(path)s is unexpected file type. Block or " "regular files supported, actual file mode is %(vol_mode)s." -msgstr "" +msgstr "备份：%(vol_id)s 失败。%(path)s 是意外的文件类型。支持块文件或常规文件，实际文件方式为 %(vol_mode)s。" #: cinder/backup/drivers/tsm.py:222 #, python-format msgid "" "backup: %(vol_id)s failed. Cannot obtain real path to volume at %(path)s." -msgstr "" +msgstr "备份：%(vol_id)s 失败。无法获取 %(path)s 处卷的实际路径。" #: cinder/backup/drivers/tsm.py:229 #, python-format msgid "backup: %(vol_id)s failed. %(path)s is not a file." -msgstr "" +msgstr "备份：%(vol_id)s 失败。%(path)s 不是文件。" -#: cinder/backup/drivers/tsm.py:252 +#: cinder/backup/drivers/tsm.py:251 #, python-format msgid "" "backup: %(vol_id)s failed to remove backup hardlink from %(vpath)s to " @@ -2578,7 +2584,7 @@ " stderr: %(err)s." msgstr "" -#: cinder/backup/drivers/tsm.py:299 +#: cinder/backup/drivers/tsm.py:298 #, python-format msgid "" "backup: %(vol_id)s failed to obtain backup success notification from " @@ -2586,20 +2592,26 @@ "stdout: %(out)s\n" " stderr: %(err)s" msgstr "" +"备份：%(vol_id)s 未能从服务器获取“备份成功”通知。\n" +"标准输出：%(out)s\n" +"标准错误：%(err)s" -#: cinder/backup/drivers/tsm.py:340 +#: cinder/backup/drivers/tsm.py:339 #, python-format msgid "" "restore: %(vol_id)s failed.\n" "stdout: %(out)s\n" " stderr: %(err)s." msgstr "" +"复原：%(vol_id)s 失败。\n" +"标准输出：%(out)s\n" +"标准错误：%(err)s。" -#: cinder/backup/drivers/tsm.py:363 +#: cinder/backup/drivers/tsm.py:362 msgid "" "Volume metadata backup requested but this driver does not yet support this " "feature." -msgstr "" +msgstr "已请求卷元数据备份，但此驱动程序尚不支持此功能。" #: cinder/backup/drivers/tsm.py:370 #, python-format @@ -2608,15 +2620,18 @@ "%(volume_path)s, mode: %(mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:392 +#: cinder/backup/drivers/tsm.py:387 #, python-format msgid "" "backup: %(vol_id)s failed to run dsmc on %(bpath)s.\n" "stdout: %(out)s\n" " stderr: %(err)s" msgstr "" +"备份：%(vol_id)s 未能对 %(bpath)s 运行 dsmc。\n" +"标准输出：%(out)s\n" +"标准错误：%(err)s" -#: cinder/backup/drivers/tsm.py:402 +#: cinder/backup/drivers/tsm.py:397 #, python-format msgid "" "backup: %(vol_id)s failed to run dsmc due to invalid arguments on " @@ -2624,6 +2639,9 @@ "stdout: %(out)s\n" " stderr: %(err)s" msgstr "" +"备份：由于 %(bpath)s 上的自变量无效，使得 %(vol_id)s 未能运行 dsmc。\n" +"标准输出：%(out)s\n" +"标准错误：%(err)s" #: cinder/backup/drivers/tsm.py:415 #, python-format @@ -2637,15 +2655,18 @@ "%(backup_id)s, mode: %(mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:453 +#: cinder/backup/drivers/tsm.py:447 #, python-format msgid "" "restore: %(vol_id)s failed to run dsmc on %(bpath)s.\n" "stdout: %(out)s\n" " stderr: %(err)s" msgstr "" +"复原：%(vol_id)s 未能对 %(bpath)s 运行 dsmc。\n" +"标准输出：%(out)s\n" +"标准错误：%(err)s" -#: cinder/backup/drivers/tsm.py:463 +#: cinder/backup/drivers/tsm.py:457 #, python-format msgid "" "restore: %(vol_id)s failed to run dsmc due to invalid arguments on " @@ -2653,6 +2674,9 @@ "stdout: %(out)s\n" " stderr: %(err)s" msgstr "" +"复原：%(vol_id)s 由于 %(bpath)s 上的自变量无效而未能运行 dsmc。\n" +"标准输出：%(out)s\n" +"标准错误：%(err)s" #: cinder/backup/drivers/tsm.py:476 #, python-format @@ -2664,22 +2688,26 @@ msgid "Delete started for backup: %(backup)s, mode: %(mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:509 +#: cinder/backup/drivers/tsm.py:502 #, python-format msgid "" "delete: %(vol_id)s failed to run dsmc with stdout: %(out)s\n" " stderr: %(err)s" msgstr "" +"删除：%(vol_id)s 未能运行 dsmc，标准输出：%(out)s\n" +"标准错误：%(err)s" -#: cinder/backup/drivers/tsm.py:517 +#: cinder/backup/drivers/tsm.py:510 #, python-format msgid "" "delete: %(vol_id)s failed to run dsmc due to invalid arguments with stdout: " "%(out)s\n" " stderr: %(err)s" msgstr "" +"删除：%(vol_id)s 由于自变量无效而未能运行 dsmc，标准输出：%(out)s\n" +"标准错误：%(err)s" -#: cinder/backup/drivers/tsm.py:531 +#: cinder/backup/drivers/tsm.py:530 #, python-format msgid "" "delete: %(vol_id)s failed with stdout: %(out)s\n" @@ -2691,55 +2719,55 @@ msgid "Delete %s finished." msgstr "" -#: cinder/brick/exception.py:52 +#: cinder/brick/exception.py:54 #, python-format msgid "Exception in string format operation. msg='%s'" msgstr "" -#: cinder/brick/exception.py:88 +#: cinder/brick/exception.py:90 msgid "We are unable to locate any Fibre Channel devices." msgstr "" -#: cinder/brick/exception.py:92 +#: cinder/brick/exception.py:94 msgid "Unable to find a Fibre Channel volume device." msgstr "" -#: cinder/brick/exception.py:96 +#: cinder/exception.py:705 #, python-format msgid "Volume device not found at %(device)s." -msgstr "" +msgstr "在 %(device)s 上找不到卷设备。" -#: cinder/brick/exception.py:100 +#: cinder/exception.py:697 #, python-format msgid "Unable to find Volume Group: %(vg_name)s" -msgstr "" +msgstr "找不到卷组: %(vg_name)s" -#: cinder/brick/exception.py:104 +#: cinder/exception.py:701 #, python-format msgid "Failed to create Volume Group: %(vg_name)s" -msgstr "" +msgstr "未能创建卷组: %(vg_name)s" -#: cinder/exception.py:913 cinder/brick/exception.py:108 +#: cinder/exception.py:888 #, python-format msgid "Failed to create iscsi target for volume %(volume_id)s." -msgstr "" +msgstr "未能针对卷 %(volume_id)s 创建 iscsi 目标。" -#: cinder/exception.py:917 cinder/brick/exception.py:112 +#: cinder/exception.py:892 #, python-format msgid "Failed to remove iscsi target for volume %(volume_id)s." -msgstr "" +msgstr "未能针对卷 %(volume_id)s 除去 iscsi 目标。" -#: cinder/exception.py:921 cinder/brick/exception.py:116 +#: cinder/exception.py:896 #, python-format msgid "Failed to attach iSCSI target for volume %(volume_id)s." -msgstr "" +msgstr "未能针对卷 %(volume_id)s 连接 iSCSI 目标。" -#: cinder/brick/exception.py:120 +#: cinder/brick/exception.py:126 #, python-format msgid "Connect to volume via protocol %(protocol)s not supported." msgstr "" -#: cinder/brick/initiator/connector.py:135 +#: cinder/brick/initiator/connector.py:178 #, python-format msgid "Invalid InitiatorConnector protocol specified %(protocol)s" msgstr "" @@ -2761,12 +2789,12 @@ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)" msgstr "" -#: cinder/brick/initiator/connector.py:326 +#: cinder/brick/initiator/connector.py:440 #, python-format msgid "Could not find the iSCSI Initiator File %s" msgstr "" -#: cinder/brick/initiator/connector.py:620 +#: cinder/brick/initiator/connector.py:709 msgid "We are unable to locate any Fibre Channel devices" msgstr "" @@ -2775,11 +2803,11 @@ msgid "Looking for Fibre Channel dev %(device)s" msgstr "" -#: cinder/brick/initiator/connector.py:640 +#: cinder/brick/initiator/connector.py:729 msgid "Fibre Channel volume device not found." msgstr "" -#: cinder/brick/initiator/connector.py:636 +#: cinder/brick/initiator/connector.py:633 #, python-format msgid "" "Fibre volume not yet found. Will rescan & retry. Try number: %(tries)s" @@ -2795,7 +2823,7 @@ msgid "Multipath device discovered %(device)s" msgstr "" -#: cinder/brick/initiator/connector.py:780 +#: cinder/brick/initiator/connector.py:776 #, python-format msgid "AoE volume not yet found at: %(path)s. Try number: %(tries)s" msgstr "" @@ -2820,12 +2848,12 @@ msgid "aoe-flush %(dev)s: stdout=%(out)s stderr%(err)s" msgstr "" -#: cinder/brick/initiator/connector.py:862 +#: cinder/brick/initiator/connector.py:858 msgid "" "Connection details not present. RemoteFsClient may not initialize properly." msgstr "" -#: cinder/brick/initiator/connector.py:927 +#: cinder/brick/initiator/connector.py:1126 msgid "Invalid connection_properties specified no device_path attribute" msgstr "" @@ -2833,14 +2861,14 @@ msgid "systool is not installed" msgstr "" -#: cinder/brick/initiator/linuxscsi.py:114 -#: cinder/brick/initiator/linuxscsi.py:122 -#: cinder/brick/initiator/linuxscsi.py:139 +#: cinder/brick/initiator/linuxscsi.py:99 +#: cinder/brick/initiator/linuxscsi.py:107 +#: cinder/brick/initiator/linuxscsi.py:124 #, python-format msgid "multipath call failed exit (%(code)s)" msgstr "" -#: cinder/brick/initiator/linuxscsi.py:160 +#: cinder/brick/initiator/linuxscsi.py:145 #, python-format msgid "Couldn't find multipath device %(line)s" msgstr "" @@ -2850,18 +2878,18 @@ msgid "Found multipath device = %(mdev)s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:139 +#: cinder/brick/iscsi/iscsi.py:135 msgid "Attempting recreate of backing lun..." msgstr "" -#: cinder/brick/iscsi/iscsi.py:157 +#: cinder/brick/iscsi/iscsi.py:153 #, python-format msgid "" "Failed to recover attempt to create iscsi backing lun for volume " "id:%(vol_id)s: %(e)s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:178 +#: cinder/brick/iscsi/iscsi.py:172 #, python-format msgid "Creating iscsi_target for: %s" msgstr "" @@ -2873,114 +2901,114 @@ "content: %(vc)s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:217 cinder/brick/iscsi/iscsi.py:375 +#: cinder/brick/iscsi/iscsi.py:211 cinder/brick/iscsi/iscsi.py:367 #, python-format msgid "Failed to create iscsi target for volume id:%(vol_id)s: %(e)s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:228 +#: cinder/brick/iscsi/iscsi.py:222 #, python-format msgid "" "Failed to create iscsi target for volume id:%(vol_id)s. Please ensure your " "tgtd config file contains 'include %(volumes_dir)s/*'" msgstr "" -#: cinder/brick/iscsi/iscsi.py:258 +#: cinder/brick/iscsi/iscsi.py:252 #, python-format msgid "Removing iscsi_target for: %s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:262 +#: cinder/brick/iscsi/iscsi.py:256 #, python-format msgid "Volume path %s does not exist, nothing to remove." msgstr "" -#: cinder/brick/iscsi/iscsi.py:280 cinder/brick/iscsi/iscsi.py:304 +#: cinder/brick/iscsi/iscsi.py:274 #, python-format msgid "Failed to remove iscsi target for volume id:%(vol_id)s: %(e)s" msgstr "" -#: cinder/volume/targets/lio.py:149 cinder/volume/targets/tgt.py:420 +#: cinder/volume/targets/iscsi.py:323 cinder/volume/targets/scst.py:390 msgid "valid iqn needed for show_target" -msgstr "" +msgstr "show_target 需要有效 iqn" -#: cinder/brick/iscsi/iscsi.py:382 +#: cinder/brick/iscsi/iscsi.py:374 #, python-format msgid "Removing iscsi_target for volume: %s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:476 +#: cinder/brick/iscsi/iscsi.py:468 msgid "cinder-rtstool is not installed correctly" msgstr "" -#: cinder/brick/iscsi/iscsi.py:496 +#: cinder/brick/iscsi/iscsi.py:488 #, python-format msgid "Creating iscsi_target for volume: %s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:520 cinder/brick/iscsi/iscsi.py:529 +#: cinder/brick/iscsi/iscsi.py:512 cinder/brick/iscsi/iscsi.py:521 #, python-format msgid "Failed to create iscsi target for volume id:%s." msgstr "" -#: cinder/brick/iscsi/iscsi.py:536 +#: cinder/brick/iscsi/iscsi.py:528 #, python-format msgid "Removing iscsi_target: %s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:546 +#: cinder/brick/iscsi/iscsi.py:538 #, python-format msgid "Failed to remove iscsi target for volume id:%s." msgstr "" -#: cinder/brick/iscsi/iscsi.py:575 +#: cinder/brick/iscsi/iscsi.py:567 #, python-format msgid "Failed to add initiator iqn %s to target" msgstr "" -#: cinder/brick/local_dev/lvm.py:74 +#: cinder/brick/local_dev/lvm.py:75 msgid "Error creating Volume Group" msgstr "" -#: cinder/brick/local_dev/lvm.py:75 cinder/brick/local_dev/lvm.py:157 -#: cinder/brick/local_dev/lvm.py:477 cinder/brick/local_dev/lvm.py:507 -#: cinder/brick/local_dev/lvm.py:550 cinder/brick/local_dev/lvm.py:631 -#: cinder/brick/local_dev/lvm.py:669 +#: cinder/brick/local_dev/lvm.py:76 cinder/brick/local_dev/lvm.py:158 +#: cinder/brick/local_dev/lvm.py:478 cinder/brick/local_dev/lvm.py:508 +#: cinder/brick/local_dev/lvm.py:551 cinder/brick/local_dev/lvm.py:643 +#: cinder/brick/local_dev/lvm.py:681 #, python-format msgid "Cmd :%s" msgstr "" -#: cinder/brick/local_dev/lvm.py:76 cinder/brick/local_dev/lvm.py:158 -#: cinder/brick/local_dev/lvm.py:478 cinder/brick/local_dev/lvm.py:508 -#: cinder/brick/local_dev/lvm.py:551 cinder/brick/local_dev/lvm.py:632 -#: cinder/brick/local_dev/lvm.py:670 +#: cinder/brick/local_dev/lvm.py:77 cinder/brick/local_dev/lvm.py:159 +#: cinder/brick/local_dev/lvm.py:479 cinder/brick/local_dev/lvm.py:509 +#: cinder/brick/local_dev/lvm.py:552 cinder/brick/local_dev/lvm.py:644 +#: cinder/brick/local_dev/lvm.py:682 #, python-format msgid "StdOut :%s" msgstr "" -#: cinder/brick/local_dev/lvm.py:77 cinder/brick/local_dev/lvm.py:159 -#: cinder/brick/local_dev/lvm.py:479 cinder/brick/local_dev/lvm.py:509 -#: cinder/brick/local_dev/lvm.py:552 cinder/brick/local_dev/lvm.py:633 -#: cinder/brick/local_dev/lvm.py:671 +#: cinder/brick/local_dev/lvm.py:78 cinder/brick/local_dev/lvm.py:160 +#: cinder/brick/local_dev/lvm.py:480 cinder/brick/local_dev/lvm.py:510 +#: cinder/brick/local_dev/lvm.py:553 cinder/brick/local_dev/lvm.py:645 +#: cinder/brick/local_dev/lvm.py:683 #, python-format msgid "StdErr :%s" msgstr "" -#: cinder/brick/local_dev/lvm.py:81 +#: cinder/brick/local_dev/lvm.py:82 #, python-format msgid "Unable to locate Volume Group %s" msgstr "" -#: cinder/brick/local_dev/lvm.py:156 +#: cinder/brick/local_dev/lvm.py:157 msgid "Error querying thin pool about data_percent" msgstr "" -#: cinder/brick/local_dev/lvm.py:369 +#: cinder/brick/local_dev/lvm.py:370 #, python-format msgid "Unable to find VG: %s" msgstr "" -#: cinder/brick/local_dev/lvm.py:419 +#: cinder/brick/local_dev/lvm.py:420 msgid "" "Requested to setup thin provisioning, however current LVM version does not " "support it." @@ -2991,20 +3019,20 @@ msgid "Created thin pool '%(pool)s' with size %(size)s of total %(free)sg" msgstr "" -#: cinder/brick/local_dev/lvm.py:476 +#: cinder/brick/local_dev/lvm.py:477 msgid "Error creating Volume" msgstr "" -#: cinder/brick/local_dev/lvm.py:492 +#: cinder/brick/local_dev/lvm.py:493 #, python-format msgid "Trying to create snapshot by non-existent LV: %s" msgstr "" -#: cinder/brick/local_dev/lvm.py:506 +#: cinder/brick/local_dev/lvm.py:507 msgid "Error creating snapshot" msgstr "" -#: cinder/brick/local_dev/lvm.py:549 +#: cinder/brick/local_dev/lvm.py:550 msgid "Error activating LV" msgstr "" @@ -3013,7 +3041,7 @@ msgid "Error during lvchange -an: CMD: %(command)s, RESPONSE: %(response)s" msgstr "" -#: cinder/brick/local_dev/lvm.py:649 +#: cinder/brick/local_dev/lvm.py:652 #, python-format msgid "" "Error reported running lvremove: CMD: %(command)s, RESPONSE: %(response)s" @@ -3023,11 +3051,11 @@ msgid "Attempting udev settle and retry of lvremove..." msgstr "" -#: cinder/brick/local_dev/lvm.py:630 +#: cinder/brick/local_dev/lvm.py:642 msgid "Error extending Volume" msgstr "" -#: cinder/brick/local_dev/lvm.py:668 +#: cinder/brick/local_dev/lvm.py:680 msgid "Error renaming logical volume" msgstr "" @@ -3039,7 +3067,7 @@ msgid "glusterfs_mount_point_base required" msgstr "" -#: cinder/brick/remotefs/remotefs.py:96 +#: cinder/brick/remotefs/remotefs.py:89 #, python-format msgid "Already mounted: %s" msgstr "" @@ -3063,94 +3091,96 @@ msgid "Deploy v1 of the Cinder API." msgstr "" -#: cinder/common/config.py:125 +#: cinder/common/config.py:109 msgid "Deploy v2 of the Cinder API." -msgstr "" +msgstr "请部署 Cinder API V2。" -#: cinder/common/sqlalchemyutils.py:67 +#: cinder/common/sqlalchemyutils.py:66 +#: cinder/openstack/common/db/sqlalchemy/utils.py:72 msgid "Id not in sort_keys; is sort_keys unique?" msgstr "" -#: cinder/common/sqlalchemyutils.py:115 +#: cinder/common/sqlalchemyutils.py:116 msgid "Unknown sort direction, must be 'desc' or 'asc'" -msgstr "" +msgstr "排序方向未知，必须为“降序”或“升序”" #: cinder/compute/nova.py:97 #, python-format msgid "Novaclient connection created using URL: %s" msgstr "" -#: cinder/db/sqlalchemy/api.py:102 +#: cinder/db/sqlalchemy/api.py:111 msgid "Use of empty request context is deprecated" msgstr "使用空的请求上下文是不推荐的" -#: cinder/db/sqlalchemy/api.py:247 +#: cinder/db/sqlalchemy/api.py:256 #, python-format msgid "Unrecognized read_deleted value '%s'" msgstr "无法识别的 read_deleted 取值”%s“" -#: cinder/db/sqlalchemy/api.py:892 +#: cinder/db/sqlalchemy/api.py:845 #, python-format msgid "Change will make usage less than 0 for the following resources: %s" msgstr "" -#: cinder/db/sqlalchemy/api.py:1306 +#: cinder/db/sqlalchemy/api.py:1274 msgid "'migration_status' column could not be found." msgstr "" -#: cinder/db/sqlalchemy/api.py:1316 +#: cinder/db/sqlalchemy/api.py:1284 msgid "'metadata' filter value is not valid." msgstr "" -#: cinder/db/sqlalchemy/api.py:1326 +#: cinder/db/sqlalchemy/api.py:1294 #, python-format msgid "'%s' filter key is not valid, it maps to a relationship." msgstr "" -#: cinder/db/sqlalchemy/api.py:1331 +#: cinder/db/sqlalchemy/api.py:1299 #, python-format msgid "'%s' filter key is not valid." msgstr "" -#: cinder/db/sqlalchemy/api.py:2128 +#: cinder/db/sqlalchemy/api.py:2444 #, python-format msgid "VolumeType %s deletion failed, VolumeType in use." msgstr "" -#: cinder/db/sqlalchemy/api.py:2896 +#: cinder/db/sqlalchemy/api.py:3577 #, python-format msgid "No backup with id %s" -msgstr "" +msgstr "不存在任何具有标识 %s 的备份" -#: cinder/db/sqlalchemy/api.py:2980 +#: cinder/db/sqlalchemy/api.py:3661 msgid "Volume must be available" -msgstr "" +msgstr "卷必须可用" -#: cinder/db/sqlalchemy/api.py:3006 +#: cinder/db/sqlalchemy/api.py:3335 #, python-format msgid "Volume in unexpected state %s, expected awaiting-transfer" msgstr "" -#: cinder/db/sqlalchemy/api.py:3028 +#: cinder/db/sqlalchemy/api.py:3708 #, python-format msgid "" "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state " "%(status)s, expected awaiting-transfer" msgstr "" +"传输 %(transfer_id)s：具有标识 %(volume_id)s 的卷处于意外状态 %(status)s，需要的状态为正在等待传输" -#: cinder/db/sqlalchemy/migration.py:38 +#: cinder/db/sqlalchemy/migration.py:37 msgid "version should be an integer" msgstr "version应该是整数" -#: cinder/db/sqlalchemy/migration.py:65 +#: cinder/db/sqlalchemy/migration.py:64 msgid "Upgrade DB using Essex release first." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py:244 +#: cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py:243 msgid "Exception while creating table." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py:271 +#: cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py:269 msgid "Downgrade from initial Cinder install is unsupported." msgstr "" @@ -3166,19 +3196,19 @@ msgid "Table |%s| not created!" msgstr "表 |%s| 没有创建" -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:128 +#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:127 msgid "Dropping foreign key reservations_ibfk_1 failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:134 +#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:133 msgid "quota_classes table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:141 +#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:140 msgid "quota_usages table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:148 +#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:147 msgid "reservations table not dropped" msgstr "" @@ -3202,11 +3232,11 @@ msgid "transfers table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:32 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:31 msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:61 #, python-format msgid "Table |%s| not created" msgstr "" @@ -3269,74 +3299,76 @@ msgid "volume_admin_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:48 msgid "" "Found existing 'default' entries in the quota_classes table. Skipping " "insertion of default values." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:74 +#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:72 msgid "Added default quota class data into the DB." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:76 +#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:74 msgid "Default quota class data not inserted into the DB." msgstr "" -#: cinder/image/glance.py:180 cinder/image/glance.py:188 +#: cinder/image/glance.py:162 cinder/image/glance.py:170 #, python-format msgid "" "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s." msgstr "" -#: cinder/image/image_utils.py:156 cinder/image/image_utils.py:261 +#: cinder/image/image_utils.py:193 cinder/image/image_utils.py:303 +#: cinder/volume/drivers/solidfire.py:651 msgid "'qemu-img info' parsing failed." msgstr "'qemu-img info'解析失败" -#: cinder/image/image_utils.py:163 +#: cinder/image/image_utils.py:200 #, python-format msgid "fmt=%(fmt)s backed by: %(backing_file)s" -msgstr "" +msgstr "fmt=%(fmt)s 由 %(backing_file)s 支持" -#: cinder/image/image_utils.py:171 cinder/image/image_utils.py:254 +#: cinder/image/image_utils.py:208 cinder/image/image_utils.py:296 #, python-format msgid "" "Size is %(image_size)dGB and doesn't fit in a volume of size " "%(volume_size)dGB." -msgstr "" +msgstr "大小为 %(image_size)dGB，无法容纳在大小为 %(volume_size)dGB 的卷中。" -#: cinder/image/image_utils.py:218 +#: cinder/image/image_utils.py:255 #, python-format msgid "" "qemu-img is not installed and image is of type %s. Only RAW images can be " "used if qemu-img is not installed." -msgstr "" +msgstr "qemu-img 未安装，并且映像的类型为 %s。仅当 qemu-img 未安装时，才能使用原始映像。" -#: cinder/image/image_utils.py:225 +#: cinder/image/image_utils.py:262 msgid "" "qemu-img is not installed and the disk format is not specified. Only RAW " "images can be used if qemu-img is not installed." -msgstr "" +msgstr "qemu-img 未安装，并且磁盘格式未指定。仅当 qemu-img 未安装时，才能使用原始映像。" #: cinder/image/image_utils.py:178 #, python-format msgid "Copying image from %(tmp)s to volume %(dest)s - size: %(size)s" msgstr "" -#: cinder/image/image_utils.py:268 +#: cinder/image/image_utils.py:310 cinder/image/image_utils.py:373 +#: cinder/volume/drivers/solidfire.py:658 #, python-format msgid "fmt=%(fmt)s backed by:%(backing_file)s" -msgstr "" +msgstr "fmt=%(fmt)s 受以下项支持：%(backing_file)s" -#: cinder/image/image_utils.py:288 +#: cinder/image/image_utils.py:329 cinder/volume/drivers/solidfire.py:703 #, python-format msgid "Converted to %(vol_format)s, but format is now %(file_format)s" -msgstr "" +msgstr "已转换为 %(vol_format)s，但现在格式为 %(file_format)s" -#: cinder/image/image_utils.py:320 +#: cinder/image/image_utils.py:383 #, python-format msgid "Converted to %(f1)s, but format is now %(f2)s" -msgstr "" +msgstr "已转换为 %(f1)s，但现在格式为 %(f2)s" #: cinder/keymgr/conf_key_mgr.py:78 msgid "" @@ -3344,9 +3376,9 @@ "fail unexpectedly" msgstr "" -#: cinder/keymgr/conf_key_mgr.py:80 +#: cinder/keymgr/conf_key_mgr.py:81 msgid "keymgr.fixed_key not defined" -msgstr "" +msgstr "未定义 keymgr.fixed_key" #: cinder/keymgr/conf_key_mgr.py:134 #, python-format @@ -3386,11 +3418,11 @@ #: cinder/openstack/common/imageutils.py:76 #, python-format msgid "Invalid input value \"%s\"." -msgstr "" +msgstr "输入值“%s”无效。" #: cinder/openstack/common/imageutils.py:105 msgid "Snapshot list encountered but no header found!" -msgstr "" +msgstr "遇到快照列表，但是找不到任何标题！" #: cinder/openstack/common/lockutils.py:102 #, python-format @@ -3419,22 +3451,22 @@ "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..." msgstr "" -#: cinder/openstack/common/log.py:298 +#: cinder/openstack/common/versionutils.py:241 #, python-format msgid "Deprecated: %s" msgstr "" -#: cinder/openstack/common/log.py:406 +#: cinder/openstack/common/log.py:437 #, python-format msgid "Error loading logging config %(log_config)s: %(err_msg)s" msgstr "" -#: cinder/openstack/common/log.py:467 +#: cinder/openstack/common/log.py:488 #, python-format msgid "syslog facility must be one of: %s" msgstr "syslog设备必须作为一个 %s 。" -#: cinder/openstack/common/log.py:715 +#: cinder/openstack/common/versionutils.py:259 #, python-format msgid "Fatal call to deprecated config: %(msg)s" msgstr "" @@ -3444,7 +3476,8 @@ msgid "task run outlasted interval by %s sec" msgstr "" -#: cinder/tests/brick/test_brick_connector.py:492 +#: cinder/openstack/common/loopingcall.py:89 +#: cinder/tests/brick/test_brick_connector.py:466 msgid "in fixed duration looping call" msgstr "" @@ -3508,7 +3541,7 @@ msgid "Got unknown keyword args to utils.execute: %r" msgstr "发现未知的 utils.execute 关键字参数：%r" -#: cinder/openstack/common/processutils.py:158 +#: cinder/openstack/common/processutils.py:142 #, python-format msgid "Running cmd (subprocess): %s" msgstr "正在运行cmd (subprocess)：%s" @@ -3520,7 +3553,7 @@ msgid "Result was %s" msgstr "运行结果为 %s" -#: cinder/openstack/common/processutils.py:206 +#: cinder/openstack/common/processutils.py:179 #, python-format msgid "%r failed. Retrying." msgstr "%r 失败，重试。" @@ -3530,11 +3563,11 @@ msgid "Running cmd (SSH): %s" msgstr "运行cmd (SSH)：%s" -#: cinder/openstack/common/processutils.py:248 +#: cinder/openstack/common/processutils.py:220 msgid "Environment not supported over SSH" msgstr "SSH上不支持环境变量" -#: cinder/openstack/common/processutils.py:252 +#: cinder/openstack/common/processutils.py:224 msgid "process_input not supported over SSH" msgstr "SSH上不支持的进程输入参数。" @@ -3617,29 +3650,29 @@ msgid "Invalid SSL version : %s" msgstr "" -#: cinder/openstack/common/strutils.py:125 +#: cinder/openstack/common/strutils.py:92 #, python-format msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s" msgstr "" -#: cinder/openstack/common/strutils.py:230 +#: cinder/openstack/common/strutils.py:202 #, python-format msgid "Invalid unit system: \"%s\"" msgstr "" -#: cinder/openstack/common/strutils.py:239 +#: cinder/openstack/common/strutils.py:211 #, python-format msgid "Invalid string format: %s" msgstr "" -#: cinder/openstack/common/versionutils.py:90 +#: cinder/openstack/common/versionutils.py:108 #, python-format msgid "" "%(what)s is deprecated as of %(as_of)s in favor of %(in_favor_of)s and may " "be removed in %(remove_in)s." msgstr "" -#: cinder/openstack/common/versionutils.py:94 +#: cinder/openstack/common/versionutils.py:112 #, python-format msgid "" "%(what)s is deprecated as of %(as_of)s and may be removed in %(remove_in)s. " @@ -3701,42 +3734,42 @@ msgid "Host %(host)s %(pass_msg)s. Previously tried hosts: %(hosts)s" msgstr "" -#: cinder/scheduler/driver.py:80 +#: cinder/scheduler/driver.py:88 msgid "Must implement host_passes_filters" -msgstr "" +msgstr "必须实现 host_passes_filters" -#: cinder/scheduler/driver.py:85 +#: cinder/scheduler/driver.py:93 msgid "Must implement find_retype_host" -msgstr "" +msgstr "必须实现 find_retype_host" -#: cinder/scheduler/driver.py:89 +#: cinder/scheduler/driver.py:97 msgid "Must implement a fallback schedule" msgstr "必须实现一个回滚 schedule" -#: cinder/scheduler/driver.py:93 +#: cinder/scheduler/driver.py:101 msgid "Must implement schedule_create_volume" -msgstr "" +msgstr "必须实现 schedule_create_volume" #: cinder/scheduler/filter_scheduler.py:98 #, python-format msgid "cannot place volume %(id)s on %(host)s" msgstr "" -#: cinder/scheduler/filter_scheduler.py:136 +#: cinder/scheduler/filter_scheduler.py:133 #, python-format msgid "No valid hosts for volume %(id)s with type %(type)s" -msgstr "" +msgstr "对于类型为 %(type)s 的卷 %(id)s，不存在任何有效主机" -#: cinder/scheduler/filter_scheduler.py:162 +#: cinder/scheduler/filter_scheduler.py:159 #, python-format msgid "" "Current host not valid for volume %(id)s with type %(type)s, migration not " "allowed" -msgstr "" +msgstr "对于类型为 %(type)s 的卷 %(id)s，当前主机无效，不允许迁移" -#: cinder/scheduler/filter_scheduler.py:197 +#: cinder/scheduler/filter_scheduler.py:199 msgid "Invalid value for 'scheduler_max_attempts', must be >=1" -msgstr "" +msgstr "值对于“scheduler_max_attempts”无效，必须 >= 1" #: cinder/scheduler/filter_scheduler.py:215 #, python-format @@ -3744,11 +3777,11 @@ "Error scheduling %(volume_id)s from last vol-service: %(last_host)s : %(exc)s" msgstr "" -#: cinder/scheduler/filter_scheduler.py:248 +#: cinder/scheduler/filter_scheduler.py:247 #, python-format msgid "" "Exceeded max scheduling attempts %(max_attempts)d for volume %(volume_id)s" -msgstr "" +msgstr "对于卷 %(volume_id)s，已超过最大调度尝试次数 %(max_attempts)d" #: cinder/scheduler/filter_scheduler.py:259 #, python-format @@ -3775,12 +3808,12 @@ msgid "volume service is down or disabled. (host: %s)" msgstr "" -#: cinder/scheduler/host_manager.py:474 +#: cinder/scheduler/host_manager.py:319 #, python-format msgid "Removing non-active host: %(host)s from scheduler cache." msgstr "" -#: cinder/scheduler/manager.py:68 +#: cinder/scheduler/manager.py:70 msgid "" "ChanceScheduler and SimpleScheduler have been deprecated due to lack of " "support for advanced features like: volume types, volume encryption, QoS " @@ -3788,35 +3821,35 @@ "certain combination of filters and weighers." msgstr "" -#: cinder/scheduler/manager.py:130 +#: cinder/scheduler/manager.py:131 msgid "Failed to create scheduler manager volume flow" -msgstr "" +msgstr "未能创建调度程序管理器卷流" -#: cinder/scheduler/manager.py:191 +#: cinder/scheduler/manager.py:203 msgid "New volume type not specified in request_spec." -msgstr "" +msgstr "在 request_spec 中，未指定新的卷类型。" -#: cinder/scheduler/manager.py:206 +#: cinder/scheduler/manager.py:218 #, python-format msgid "Could not find a host for volume %(volume_id)s with type %(type_id)s." -msgstr "" +msgstr "对于类型为 %(type_id)s 的卷 %(volume_id)s，找不到主机。" -#: cinder/scheduler/manager.py:252 +#: cinder/scheduler/manager.py:280 #, python-format msgid "Failed to schedule_%(method)s: %(ex)s" msgstr "schedule_%(method)s 失败：%(ex)s" -#: cinder/scheduler/scheduler_options.py:69 +#: cinder/scheduler/scheduler_options.py:68 #, python-format msgid "Could not stat scheduler options file %(filename)s: '%(e)s'" msgstr "无法统计调度器的选项文件 %(filename)s：“%(e)s”" -#: cinder/scheduler/scheduler_options.py:79 +#: cinder/scheduler/scheduler_options.py:78 #, python-format msgid "Could not decode scheduler options: '%s'" msgstr "" -#: cinder/scheduler/filters/capacity_filter.py:44 +#: cinder/scheduler/filters/capacity_filter.py:43 msgid "Free capacity not set: volume node info collection broken." msgstr "" @@ -3827,7 +3860,7 @@ "%(requested)s/%(available)s" msgstr "" -#: cinder/scheduler/flows/create_volume.py:53 +#: cinder/scheduler/flows/create_volume.py:54 msgid "No volume_id provided to populate a request_spec from" msgstr "" @@ -3836,7 +3869,7 @@ msgid "Failed to schedule_create_volume: %(cause)s" msgstr "" -#: cinder/scheduler/flows/create_volume.py:120 +#: cinder/scheduler/flows/create_volume.py:133 #, python-format msgid "Failed notifying on %(topic)s payload %(payload)s" msgstr "" @@ -3851,7 +3884,7 @@ msgid "FAKE ISER: %s" msgstr "" -#: cinder/tests/fake_driver.py:135 +#: cinder/tests/fake_driver.py:97 msgid "local_path not implemented" msgstr "" @@ -3880,19 +3913,19 @@ msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'" msgstr "伪命令的标准输出stdout='%(stdout)s' 标准错误输出 stderr='%(stderr)s'" -#: cinder/tests/test_backup_ceph.py:958 +#: cinder/tests/unit/test_backup_ceph.py:1027 #, python-format msgid "" "Failed to backup volume metadata - Metadata backup object 'backup.%s.meta' " "already exists" -msgstr "" +msgstr "未能备份卷元数据 - 元数据备份对象“backup.%s.meta”已存在" -#: cinder/tests/test_ibm_xiv_ds8k.py:133 +#: cinder/tests/unit/test_ibm_xiv_ds8k.py:143 #, python-format msgid "Volume not found for instance %(instance_id)s." msgstr "没有为实例 %(instance_id)s 找到卷。" -#: cinder/tests/test_misc.py:59 +#: cinder/tests/unit/test_misc.py:59 #, python-format msgid "" "The following migrations are missing a downgrade:\n" @@ -3901,27 +3934,27 @@ "下面的迁移缺少了降级：\n" "\t%s" -#: cinder/tests/volume/drivers/netapp/dataontap/client/test_api.py:146 +#: cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_api.py:361 msgid "Error not a TypeError." -msgstr "" +msgstr "错误并非 TypeError。" -#: cinder/tests/volume/drivers/netapp/dataontap/client/test_api.py:155 +#: cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_api.py:370 msgid "Error not a KeyError." -msgstr "" +msgstr "错误并非 KeyError。" -#: cinder/tests/test_netapp_nfs.py:366 +#: cinder/tests/test_netapp_nfs.py:362 #, python-format msgid "Share %(share)s and file name %(file_name)s" msgstr "" -#: cinder/tests/test_rbd.py:1014 +#: cinder/tests/unit/test_rbd.py:1063 msgid "flush() not supported in this version of librbd" -msgstr "" +msgstr "在 librbd 的此版本中，flush() 不受支持" -#: cinder/tests/test_storwize_svc.py:257 +#: cinder/tests/unit/test_storwize_svc.py:291 #, python-format msgid "unrecognized argument %s" -msgstr "" +msgstr "无法识别自变量 %s" #: cinder/tests/test_storwize_svc.py:1504 #, python-format @@ -3954,9 +3987,9 @@ msgid "Result data: %s" msgstr "结果数据：%s" -#: cinder/tests/api/contrib/test_backups.py:777 +#: cinder/tests/unit/api/contrib/test_backups.py:1222 msgid "Invalid input" -msgstr "" +msgstr "输入无效" #: cinder/tests/brick/test_brick_remotefs.py:100 msgid "Unexpected call to _execute." @@ -3971,7 +4004,7 @@ msgid "volume: %s" msgstr "" -#: cinder/tests/integrated/api/client.py:34 +#: cinder/tests/unit/integrated/api/client.py:34 #, python-format msgid "" "%(message)s\n" @@ -3982,15 +4015,15 @@ "状态码: %(_status)s\n" "主体: %(_body)s" -#: cinder/tests/integrated/api/client.py:44 +#: cinder/tests/unit/integrated/api/client.py:44 msgid "Authentication error" msgstr "认证错误" -#: cinder/tests/integrated/api/client.py:52 +#: cinder/tests/unit/integrated/api/client.py:52 msgid "Authorization error" msgstr "授权错误" -#: cinder/tests/integrated/api/client.py:60 +#: cinder/tests/unit/integrated/api/client.py:60 msgid "Item not found" msgstr "条目没有找到" @@ -4014,7 +4047,7 @@ msgid "%(relative_uri)s => code %(http_status)s" msgstr "%(relative_uri)s => code %(http_status)s" -#: cinder/tests/integrated/api/client.py:158 +#: cinder/tests/unit/integrated/api/client.py:158 msgid "Unexpected status code" msgstr "意外的状态码" @@ -4028,22 +4061,22 @@ msgid "In Add GlobalVars._active_cfg: %s" msgstr "" -#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:127 +#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:126 #, python-format msgid "In Add GlobalVars._is_normal_test: %s" msgstr "" -#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:129 +#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:128 #, python-format msgid "In Add GlobalVars._zone_state: %s" msgstr "" -#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:184 +#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:179 #, python-format msgid "User: %s" msgstr "" -#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:185 +#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:180 #, python-format msgid "_zone_state: %s" msgstr "" @@ -4057,21 +4090,21 @@ msgid "Volume in unexpected state" msgstr "" -#: cinder/transfer/api.py:107 +#: cinder/transfer/api.py:111 msgid "status must be available" msgstr "状态必须可用" -#: cinder/transfer/api.py:124 +#: cinder/transfer/api.py:119 #, python-format msgid "Failed to create transfer record for %s" msgstr "" -#: cinder/transfer/api.py:142 +#: cinder/transfer/api.py:150 #, python-format msgid "Attempt to transfer %s with invalid auth key." -msgstr "" +msgstr "请尝试使用有效的认证密钥传输 %s。" -#: cinder/transfer/api.py:162 cinder/volume/flows/api/create_volume.py:574 +#: cinder/volume/flows/api/create_volume.py:596 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume " @@ -4083,18 +4116,18 @@ msgid "Failed to update quota donating volumetransfer id %s" msgstr "" -#: cinder/transfer/api.py:204 +#: cinder/transfer/api.py:199 #, python-format msgid "Volume %s has been transferred." msgstr "" -#: cinder/volume/api.py:188 +#: cinder/volume/api.py:141 msgid "" "Invalid volume_type provided (requested type must match source volume, or be " "omitted). You should omit the argument." msgstr "" -#: cinder/volume/api.py:201 +#: cinder/volume/api.py:148 msgid "" "Invalid volume_type provided (requested type must match source snapshot, or " "be omitted). You should omit the argument." @@ -4105,24 +4138,24 @@ msgid "Unable to query if %s is in the availability zone set" msgstr "" -#: cinder/volume/api.py:241 +#: cinder/volume/api.py:185 cinder/volume/api.py:187 msgid "Failed to create api volume flow" msgstr "" -#: cinder/volume/api.py:274 +#: cinder/volume/api.py:216 msgid "Failed to update quota for deleting volume" msgstr "" -#: cinder/volume/api.py:292 +#: cinder/volume/api.py:228 #, python-format msgid "Volume status must be available or error, but current status is: %s" msgstr "" -#: cinder/volume/api.py:305 +#: cinder/volume/api.py:383 msgid "Volume cannot be deleted while migrating" msgstr "" -#: cinder/volume/api.py:319 +#: cinder/volume/api.py:243 #, python-format msgid "Volume still has %d dependent snapshots" msgstr "" @@ -4141,147 +4174,146 @@ msgid "status must be in-use to detach" msgstr "" -#: cinder/volume/api.py:466 +#: cinder/volume/api.py:371 msgid "Volume status must be available to reserve" msgstr "" -#: cinder/volume/api.py:569 cinder/volume/api.py:687 +#: cinder/volume/api.py:447 msgid "Snapshot cannot be created while volume is migrating" msgstr "" -#: cinder/volume/api.py:578 +#: cinder/volume/api.py:451 msgid "must be available" msgstr "必须可用" -#: cinder/volume/api.py:600 cinder/volume/api.py:728 +#: cinder/volume/api.py:473 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot " "(%(d_consumed)dG of %(d_quota)dG already consumed)" msgstr "" -#: cinder/volume/api.py:612 cinder/volume/api.py:740 +#: cinder/volume/api.py:485 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d " "snapshots already consumed)" msgstr "" -#: cinder/volume/api.py:788 +#: cinder/volume/api.py:536 msgid "Volume Snapshot status must be available or error" msgstr "" -#: cinder/volume/api.py:827 cinder/volume/flows/api/create_volume.py:266 +#: cinder/volume/flows/api/create_volume.py:234 msgid "Metadata property key blank" -msgstr "" +msgstr "元数据属性关键字为空白" -#: cinder/volume/api.py:831 +#: cinder/volume/api.py:568 msgid "Metadata property key greater than 255 characters" msgstr "" -#: cinder/volume/api.py:835 +#: cinder/volume/api.py:572 msgid "Metadata property value greater than 255 characters" msgstr "" -#: cinder/volume/api.py:966 cinder/volume/api.py:1062 +#: cinder/volume/api.py:703 cinder/volume/api.py:777 msgid "Volume status must be available/in-use." msgstr "" -#: cinder/volume/api.py:969 +#: cinder/volume/api.py:1166 msgid "Volume status is in-use." -msgstr "" +msgstr "卷状态为“in-use”。" -#: cinder/volume/api.py:1017 +#: cinder/volume/api.py:735 msgid "Volume status must be available to extend." msgstr "" -#: cinder/volume/api.py:1022 +#: cinder/volume/api.py:740 #, python-format msgid "" "New size for extend must be greater than current size. (current: %(size)s, " "extended: %(new_size)s)" msgstr "" -#: cinder/volume/api.py:1040 +#: cinder/volume/api.py:755 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to extend volume by %(s_size)sG, " "(%(d_consumed)dG of %(d_quota)dG already consumed)." msgstr "" -#: cinder/volume/api.py:1068 +#: cinder/volume/api.py:783 msgid "Volume is already part of an active migration" msgstr "" -#: cinder/volume/api.py:1074 +#: cinder/volume/api.py:789 msgid "volume must not have snapshots" msgstr "" -#: cinder/volume/api.py:1103 +#: cinder/volume/api.py:1321 #, python-format msgid "No available service named %s" -msgstr "" +msgstr "不存在任何名为 %s 的可用服务" -#: cinder/volume/api.py:1109 +#: cinder/volume/api.py:808 msgid "Destination host must be different than current host" msgstr "" -#: cinder/volume/api.py:1139 +#: cinder/volume/api.py:1384 msgid "Source volume not mid-migration." -msgstr "" +msgstr "源卷未在迁移中。" -#: cinder/volume/api.py:1143 +#: cinder/volume/api.py:1388 msgid "Destination volume not mid-migration." -msgstr "" +msgstr "目标卷未在迁移中。" -#: cinder/volume/api.py:1148 +#: cinder/volume/api.py:1393 #, python-format msgid "Destination has migration_status %(stat)s, expected %(exp)s." -msgstr "" +msgstr "目标具有 migration_status %(stat)s，原应为 %(exp)s。" -#: cinder/volume/api.py:1159 +#: cinder/volume/api.py:858 msgid "Volume status must be available to update readonly flag." msgstr "" -#: cinder/volume/api.py:1168 +#: cinder/volume/api.py:867 #, python-format msgid "Unable to update type due to incorrect status on volume: %s" msgstr "" -#: cinder/volume/api.py:1174 +#: cinder/volume/api.py:1284 cinder/volume/api.py:1430 #, python-format msgid "Volume %s is already part of an active migration." -msgstr "" +msgstr "卷 %s 已作为活动迁移的一部分。" -#: cinder/volume/api.py:1180 +#: cinder/volume/api.py:1436 #, python-format msgid "migration_policy must be 'on-demand' or 'never', passed: %s" -msgstr "" +msgstr "migration_policy 必须为“on-demand”或“never”，已传递：%s" -#: cinder/volume/api.py:1199 +#: cinder/volume/api.py:892 #, python-format msgid "Invalid volume_type passed: %s" msgstr "" -#: cinder/volume/api.py:1212 +#: cinder/volume/api.py:905 #, python-format msgid "New volume_type same as original: %s" msgstr "" -#: cinder/volume/api.py:1227 +#: cinder/volume/api.py:920 msgid "Retype cannot change encryption requirements" msgstr "" -#: cinder/volume/api.py:1239 +#: cinder/volume/api.py:932 msgid "Retype cannot change front-end qos specs for in-use volumes" msgstr "" -#: cinder/volume/api.py:1236 +#: cinder/volume/api.py:963 msgid "Unable to find service for given host." msgstr "" -#: cinder/volume/driver.py:231 cinder/volume/drivers/hds/nfs.py:352 -#: cinder/volume/drivers/netapp/nfs.py:186 +#: cinder/volume/driver.py:195 cinder/volume/drivers/netapp/nfs.py:176 #, python-format msgid "Recovering from a failed execute. Try number %s" msgstr "从失败的执行中恢复。尝试编号 %s" @@ -4291,7 +4323,7 @@ msgid "copy_data_between_volumes %(src)s -> %(dest)s." msgstr "" -#: cinder/volume/driver.py:392 cinder/volume/driver.py:406 +#: cinder/volume/driver.py:502 cinder/volume/driver.py:516 #, python-format msgid "Failed to attach volume %(vol)s" msgstr "" @@ -4316,32 +4348,33 @@ msgid "Volume %s: creating export" msgstr "" -#: cinder/volume/driver.py:474 cinder/volume/manager.py:887 +#: cinder/volume/driver.py:385 cinder/volume/manager.py:789 #, python-format msgid "" "Failed updating model of volume %(volume_id)s with driver provided model " "%(model)s" msgstr "" -#: cinder/volume/driver.py:497 cinder/volume/manager.py:927 +#: cinder/volume/driver.py:953 cinder/volume/driver.py:1030 #, python-format msgid "Unable to fetch connection information from backend: %(err)s" -msgstr "" +msgstr "无法从后端访存连接信息：%(err)s" -#: cinder/volume/driver.py:503 +#: cinder/volume/driver.py:960 cinder/volume/driver.py:1037 #, python-format msgid "Error encountered during cleanup of a failed attach: %(ex)s" -msgstr "" +msgstr "在清除失败的连接期间遇到错误：%(ex)s" -#: cinder/volume/driver.py:528 cinder/volume/drivers/ibm/flashsystem.py:881 +#: cinder/volume/driver.py:1072 cinder/volume/manager.py:1481 +#: cinder/volume/drivers/ibm/flashsystem_common.py:788 #, python-format msgid "Unable to access the backend storage via the path %(path)s." -msgstr "" +msgstr "无法通过路径 %(path)s 访问后端存储器。" -#: cinder/volume/driver.py:268 cinder/volume/manager.py:978 +#: cinder/volume/driver.py:398 cinder/volume/driver.py:441 #, python-format msgid "Unable to terminate volume connection: %(err)s" -msgstr "" +msgstr "无法终止卷连接：%(err)s" #: cinder/volume/driver.py:456 cinder/volume/manager.py:399 #: cinder/volume/manager.py:867 @@ -4349,7 +4382,7 @@ msgid "volume %s: removing export" msgstr "卷%s：正在移除导出" -#: cinder/volume/driver.py:265 cinder/volume/manager.py:755 +#: cinder/volume/driver.py:459 cinder/volume/manager.py:870 #, python-format msgid "Error detaching volume %(volume)s, due to remove export failure." msgstr "" @@ -4364,20 +4397,19 @@ msgid "Restoring backup %(backup)s to volume %(volume)s." msgstr "" -#: cinder/volume/driver.py:614 +#: cinder/volume/driver.py:1988 msgid "Extend volume not implemented" -msgstr "" +msgstr "扩展卷未实现" -#: cinder/volume/driver.py:695 cinder/volume/driver.py:703 +#: cinder/volume/driver.py:1992 cinder/volume/driver.py:1996 msgid "Manage existing volume not implemented." -msgstr "" +msgstr "未实现对现有卷的管理。" -#: cinder/volume/driver.py:854 -#: cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py:150 +#: cinder/volume/driver.py:639 cinder/volume/drivers/emc/emc_smis_iscsi.py:154 msgid "ISCSI provider_location not stored, using discovery" msgstr "采用discovery，ISCSI provider_location 没有存储" -#: cinder/volume/driver.py:867 +#: cinder/volume/driver.py:652 #, python-format msgid "ISCSI discovery attempt failed for:%s" msgstr "" @@ -4387,10 +4419,10 @@ msgid "Error from iscsiadm -m discovery: %s" msgstr "" -#: cinder/volume/driver.py:981 cinder/volume/targets/iscsi.py:79 +#: cinder/volume/driver.py:2255 cinder/volume/targets/iscsi.py:97 #, python-format msgid "Could not find iSCSI export for volume %s" -msgstr "" +msgstr "对于卷 %s，找不到 iSCSI 导出" #: cinder/volume/driver.py:705 cinder/volume/drivers/emc/emc_cli_iscsi.py:169 #: cinder/volume/drivers/emc/emc_smis_iscsi.py:197 @@ -4398,9 +4430,9 @@ msgid "ISCSI Discovery: Found %s" msgstr "ISCSI Discovery：找到 %s" -#: cinder/volume/driver.py:1018 +#: cinder/volume/targets/scst.py:45 msgid "The volume driver requires the iSCSI initiator name in the connector." -msgstr "" +msgstr "卷驱动程序在连接器中需要 iSCSI 发起方名称。" #: cinder/volume/driver.py:823 cinder/volume/driver.py:944 #: cinder/volume/drivers/eqlx.py:247 cinder/volume/drivers/lvm.py:345 @@ -4416,30 +4448,30 @@ msgid "Updating volume stats" msgstr "" -#: cinder/volume/driver.py:1352 +#: cinder/volume/driver.py:2651 msgid "Driver must implement initialize_connection" -msgstr "" +msgstr "驱动程序必须实现 initialize_connection" -#: cinder/volume/iscsi.py:69 cinder/volume/iscsi.py:95 -#: cinder/volume/iscsi.py:240 +#: cinder/volume/iscsi.py:65 cinder/volume/iscsi.py:91 +#: cinder/volume/iscsi.py:234 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/iscsi.py:84 +#: cinder/volume/iscsi.py:80 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume: %s" msgstr "" -#: cinder/volume/iscsi.py:104 +#: cinder/volume/iscsi.py:100 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/cmd/manage.py:375 +#: cinder/cmd/manage.py:388 #, python-format msgid "%s" -msgstr "" +msgstr "%s" #: cinder/volume/iscsi.py:184 #, python-format @@ -4451,12 +4483,12 @@ msgid "volume_info:%s" msgstr "" -#: cinder/volume/iscsi.py:258 +#: cinder/volume/iscsi.py:252 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/manager.py:176 +#: cinder/volume/manager.py:193 #, python-format msgid "" "Driver path %s is deprecated, update your configuration to the new path." @@ -4474,12 +4506,12 @@ "Starting FC Zone Manager %(zm_version)s, Driver %(drv_name)s %(drv_version)s" msgstr "" -#: cinder/volume/manager.py:246 +#: cinder/volume/manager.py:238 #, python-format msgid "Starting volume driver %(driver_name)s (%(version)s)" msgstr "" -#: cinder/volume/manager.py:253 +#: cinder/volume/manager.py:245 #, python-format msgid "Error encountered during initialization of driver: %(name)s" msgstr "" @@ -4489,22 +4521,22 @@ msgid "Re-exporting %s volumes" msgstr "重新导出卷%s" -#: cinder/volume/manager.py:277 +#: cinder/volume/manager.py:267 #, python-format msgid "Failed to re-export volume %s: setting to error state" msgstr "" -#: cinder/volume/manager.py:284 +#: cinder/volume/manager.py:274 #, python-format msgid "volume %s stuck in a downloading state" msgstr "" -#: cinder/volume/manager.py:291 +#: cinder/volume/manager.py:281 #, python-format msgid "volume %s: skipping export" msgstr "卷 %s：跳过导出" -#: cinder/volume/manager.py:293 +#: cinder/volume/manager.py:283 #, python-format msgid "" "Error encountered during re-exporting phase of driver initialization: " @@ -4515,39 +4547,39 @@ msgid "Resuming any in progress delete operations" msgstr "" -#: cinder/volume/manager.py:306 +#: cinder/volume/manager.py:296 #, python-format msgid "Resuming delete on volume: %s" msgstr "" -#: cinder/volume/manager.py:351 +#: cinder/volume/manager.py:338 cinder/volume/manager.py:340 msgid "Failed to create manager volume flow" msgstr "" -#: cinder/volume/manager.py:422 +#: cinder/volume/manager.py:384 cinder/volume/manager.py:401 #, python-format msgid "volume %s: deleting" msgstr "卷%s：删除中" -#: cinder/volume/manager.py:457 +#: cinder/volume/manager.py:608 msgid "volume is not local to this node" -msgstr "" +msgstr "卷不是此节点的本地卷" -#: cinder/volume/manager.py:445 +#: cinder/volume/manager.py:407 #, python-format msgid "Cannot delete volume %s: volume is busy" msgstr "" -#: cinder/volume/manager.py:472 +#: cinder/volume/manager.py:434 msgid "Failed to update usages deleting volume" msgstr "" -#: cinder/volume/manager.py:478 +#: cinder/volume/manager.py:440 #, python-format msgid "volume %s: deleted successfully" msgstr "卷%s：删除成功" -#: cinder/volume/manager.py:508 +#: cinder/volume/manager.py:457 #, python-format msgid "snapshot %s: creating" msgstr "快照 %s：正在创建" @@ -4557,54 +4589,54 @@ msgid "snapshot %(snap_id)s: creating" msgstr "" -#: cinder/volume/manager.py:543 cinder/volume/manager.py:1834 +#: cinder/volume/manager.py:496 #, python-format msgid "" "Failed updating %(snapshot_id)s metadata using the provided volumes " "%(volume_id)s metadata" msgstr "" -#: cinder/volume/manager.py:558 +#: cinder/volume/manager.py:688 #, python-format msgid "snapshot %s: created successfully" msgstr "快照 %s：创建成功" -#: cinder/volume/manager.py:570 +#: cinder/volume/manager.py:698 #, python-format msgid "snapshot %s: deleting" msgstr "快照 %s：正在删除" -#: cinder/volume/manager.py:588 +#: cinder/volume/manager.py:532 #, python-format msgid "Cannot delete snapshot %s: snapshot is busy" msgstr "" -#: cinder/volume/manager.py:618 cinder/volume/manager.py:1934 +#: cinder/volume/manager.py:562 msgid "Failed to update usages deleting snapshot" msgstr "" -#: cinder/volume/manager.py:621 +#: cinder/volume/manager.py:565 #, python-format msgid "snapshot %s: deleted successfully" msgstr "快照 %s：删除成功" -#: cinder/volume/manager.py:670 +#: cinder/volume/manager.py:585 msgid "being attached by another instance" msgstr "" -#: cinder/volume/manager.py:674 +#: cinder/volume/manager.py:589 msgid "being attached by another host" msgstr "" -#: cinder/volume/manager.py:678 +#: cinder/volume/manager.py:845 msgid "being attached by different mode" -msgstr "" +msgstr "正在通过另一方式连接" -#: cinder/volume/manager.py:682 +#: cinder/volume/manager.py:596 msgid "status must be available or attaching" msgstr "" -#: cinder/volume/manager.py:751 +#: cinder/volume/manager.py:689 #, python-format msgid "Error detaching volume %(volume)s, due to uninitialized driver." msgstr "" @@ -4619,34 +4651,34 @@ msgid "Zoning Mode: %s" msgstr "" -#: cinder/volume/manager.py:1055 +#: cinder/volume/manager.py:1618 msgid "failed to create new_volume on destination host" -msgstr "" +msgstr "未能在目标主机上创建新卷" -#: cinder/volume/manager.py:1058 +#: cinder/volume/manager.py:1624 msgid "timeout creating new_volume on destination host" -msgstr "" +msgstr "在目标主机上创建新卷超时" -#: cinder/volume/manager.py:1082 +#: cinder/volume/manager.py:943 #, python-format msgid "Failed to copy volume %(vol1)s to %(vol2)s" msgstr "" -#: cinder/volume/manager.py:1111 +#: cinder/volume/manager.py:1349 #, python-format msgid "" "migrate_volume_completion: completing migration for volume %(vol1)s " "(temporary volume %(vol2)s" msgstr "" -#: cinder/volume/manager.py:1121 +#: cinder/volume/manager.py:1359 #, python-format msgid "" "migrate_volume_completion is cleaning up an error for volume %(vol1)s " "(temporary volume %(vol2)s" msgstr "" -#: cinder/volume/manager.py:1140 +#: cinder/volume/manager.py:1379 #, python-format msgid "Failed to delete migration source vol %(vol)s: %(err)s" msgstr "" @@ -4656,77 +4688,78 @@ msgid "volume %s: calling driver migrate_volume" msgstr "" -#: cinder/volume/manager.py:1192 +#: cinder/volume/manager.py:1079 cinder/volume/drivers/emc/emc_cli_iscsi.py:247 +#: cinder/volume/drivers/emc/emc_vnx_cli.py:226 msgid "Updating volume status" msgstr "" -#: cinder/volume/manager.py:1200 +#: cinder/volume/manager.py:1087 #, python-format msgid "" "Unable to update stats, %(driver_name)s -%(driver_version)s %(config_group)s " "driver is uninitialized." msgstr "" -#: cinder/volume/manager.py:1236 +#: cinder/volume/manager.py:1109 #, python-format msgid "Notification {%s} received" msgstr "收到通知 {%s}" -#: cinder/volume/manager.py:1304 +#: cinder/volume/manager.py:1144 #, python-format msgid "volume %s: extending" msgstr "" -#: cinder/volume/manager.py:1306 +#: cinder/volume/manager.py:1146 #, python-format msgid "volume %s: extended successfully" msgstr "" -#: cinder/volume/manager.py:1308 +#: cinder/volume/manager.py:1148 #, python-format msgid "volume %s: Error trying to extend volume" msgstr "" -#: cinder/volume/manager.py:1353 +#: cinder/volume/manager.py:1999 #, python-format msgid "Volume %s: Error trying to extend volume" -msgstr "" +msgstr "卷 %s：尝试扩展卷时出错" -#: cinder/volume/manager.py:1387 +#: cinder/volume/manager.py:1213 msgid "Failed to update usages while retyping volume." msgstr "" -#: cinder/volume/manager.py:1428 +#: cinder/volume/manager.py:2076 msgid "Failed to get old volume type quota reservations" msgstr "" -#: cinder/volume/manager.py:1419 +#: cinder/volume/manager.py:1234 #, python-format msgid "Volume %s: retyped successfully" msgstr "" -#: cinder/volume/manager.py:1422 +#: cinder/volume/manager.py:1237 #, python-format msgid "" "Volume %s: driver error when trying to retype, falling back to generic " "mechanism." msgstr "" -#: cinder/volume/manager.py:1473 +#: cinder/volume/manager.py:2130 msgid "Retype requires migration but is not allowed." -msgstr "" +msgstr "转型需要迁移，但是不允许。" -#: cinder/volume/manager.py:1481 +#: cinder/volume/manager.py:2138 msgid "Volume must not have snapshots." -msgstr "" +msgstr "卷不能具有快照。" -#: cinder/volume/manager.py:1489 +#: cinder/volume/manager.py:2187 msgid "Failed to create manage_existing flow." -msgstr "" +msgstr "未能创建 manage_existing 流。" -#: cinder/volume/manager.py:1531 +#: cinder/volume/manager.py:3283 msgid "Failed to create manage existing flow." -msgstr "" +msgstr "未能创建 manage_existing 流。" #: cinder/volume/manager.py:1318 #, python-format @@ -4741,95 +4774,95 @@ #: cinder/volume/qos_specs.py:58 #, python-format msgid "Valid consumer of QoS specs are: %s" -msgstr "" +msgstr "以下是 QoS 规范的有效使用者：%s" -#: cinder/volume/qos_specs.py:85 cinder/volume/qos_specs.py:106 -#: cinder/volume/qos_specs.py:156 cinder/volume/qos_specs.py:198 -#: cinder/volume/qos_specs.py:212 cinder/volume/qos_specs.py:226 -#: cinder/volume/volume_types.py:45 +#: cinder/volume/qos_specs.py:84 cinder/volume/qos_specs.py:105 +#: cinder/volume/qos_specs.py:155 cinder/volume/qos_specs.py:197 +#: cinder/volume/qos_specs.py:211 cinder/volume/qos_specs.py:225 +#: cinder/volume/volume_types.py:43 #, python-format msgid "DB error: %s" msgstr "数据库错误：%s" #: cinder/volume/qos_specs.py:124 cinder/volume/qos_specs.py:141 -#: cinder/volume/qos_specs.py:274 cinder/volume/volume_types.py:64 -#: cinder/volume/volume_types.py:79 cinder/volume/volume_types.py:133 +#: cinder/volume/qos_specs.py:274 cinder/volume/volume_types.py:63 +#: cinder/volume/volume_types.py:80 cinder/volume/volume_types.py:134 msgid "id cannot be None" msgstr "id不能是None" #: cinder/volume/qos_specs.py:157 #, python-format msgid "Failed to get all associations of qos specs %s" -msgstr "" +msgstr "未能获取 qos 规范 %s 的所有关联" #: cinder/volume/qos_specs.py:190 #, python-format msgid "" "Type %(type_id)s is already associated with another qos specs: " "%(qos_specs_id)s" -msgstr "" +msgstr "已使类型 %(type_id)s 与另一 qos 规范 %(qos_specs_id)s 关联" -#: cinder/volume/qos_specs.py:199 +#: cinder/volume/qos_specs.py:198 #, python-format msgid "Failed to associate qos specs %(id)s with type: %(vol_type_id)s" msgstr "" -#: cinder/volume/qos_specs.py:213 +#: cinder/volume/qos_specs.py:212 #, python-format msgid "Failed to disassociate qos specs %(id)s with type: %(vol_type_id)s" msgstr "" -#: cinder/volume/qos_specs.py:227 +#: cinder/volume/qos_specs.py:226 #, python-format msgid "Failed to disassociate qos specs %s." msgstr "" -#: cinder/volume/qos_specs.py:286 cinder/volume/volume_types.py:145 +#: cinder/volume/qos_specs.py:286 cinder/volume/volume_types.py:146 msgid "name cannot be None" msgstr "name不能是None" -#: cinder/volume/utils.py:309 +#: cinder/volume/utils.py:259 #, python-format msgid "" "Incorrect value error: %(blocksize)s, it may indicate that " "'volume_dd_blocksize' was configured incorrectly. Fall back to default." msgstr "" -#: cinder/volume/utils.py:363 +#: cinder/volume/utils.py:176 #, python-format msgid "Performing secure delete on volume: %s" msgstr "" -#: cinder/volume/volume_types.py:133 +#: cinder/volume/volume_types.py:130 #, python-format msgid "" "Default volume type is not found, please check default_volume_type config: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:142 cinder/volume/drivers/lvm.py:285 -#: cinder/volume/drivers/nexenta/nfs.py:191 +#: cinder/volume/drivers/block_device.py:138 cinder/volume/drivers/lvm.py:284 +#: cinder/volume/drivers/zadara.py:509 cinder/volume/drivers/nexenta/nfs.py:189 #, python-format msgid "Creating clone of volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:174 +#: cinder/volume/drivers/block_device.py:176 msgid "No free disk" -msgstr "" +msgstr "不存在任何可用磁盘" -#: cinder/volume/drivers/block_device.py:187 +#: cinder/volume/drivers/block_device.py:189 msgid "No big enough free disk" -msgstr "" +msgstr "不存在任何足够大的可用磁盘" -#: cinder/volume/drivers/coraid.py:88 +#: cinder/volume/drivers/coraid.py:84 #, python-format msgid "Invalid ESM url scheme \"%s\". Supported https only." msgstr "" -#: cinder/volume/drivers/coraid.py:115 +#: cinder/volume/drivers/coraid.py:111 msgid "Invalid REST handle name. Expected path." msgstr "" -#: cinder/volume/drivers/coraid.py:138 +#: cinder/volume/drivers/coraid.py:134 #, python-format msgid "Call to json.loads() failed: %(ex)s. Response: %(resp)s" msgstr "" @@ -4838,11 +4871,11 @@ msgid "Session is expired. Relogin on ESM." msgstr "" -#: cinder/volume/drivers/coraid.py:248 +#: cinder/volume/drivers/coraid.py:244 msgid "Reply is empty." msgstr "" -#: cinder/volume/drivers/coraid.py:250 +#: cinder/volume/drivers/coraid.py:246 msgid "Error message is empty." msgstr "" @@ -4876,7 +4909,7 @@ msgid "Volume \"%(name)s\" resized. New size is %(size)s GB." msgstr "" -#: cinder/volume/drivers/coraid.py:394 +#: cinder/volume/drivers/coraid.py:385 msgid "Cannot create clone volume in different repository." msgstr "" @@ -4906,25 +4939,23 @@ msgid "Sending CLI command: '%s'" msgstr "" -#: cinder/volume/drivers/eqlx.py:183 +#: cinder/volume/drivers/eqlx.py:225 msgid "Error executing EQL command" -msgstr "" +msgstr "执行 EQL 命令时出错" #: cinder/volume/drivers/eqlx.py:199 #, python-format msgid "EQL-driver: executing \"%s\"" msgstr "" -#: cinder/volume/drivers/eqlx.py:227 +#: cinder/volume/drivers/eqlx.py:267 #, python-format msgid "" "SSH Command failed after '%(total_attempts)r' attempts : '%(command)s'" -msgstr "" +msgstr "SSH 命令在“%(total_attempts)r”之后失败，尝试次数：“%(command)s”" -#: cinder/volume/drivers/san/san.py:151 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:417 -#: cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py:271 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:397 +#: cinder/volume/drivers/eqlx.py:215 cinder/volume/drivers/san/san.py:149 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:414 #, python-format msgid "Error running SSH command: %s" msgstr "" @@ -4943,11 +4974,11 @@ msgid "Failed to setup the Dell EqualLogic driver" msgstr "" -#: cinder/volume/drivers/dell/dell_storagecenter_common.py:201 -#: cinder/volume/drivers/dell/dell_storagecenter_common.py:231 +#: cinder/volume/drivers/dell/dell_storagecenter_common.py:241 +#: cinder/volume/drivers/dell/dell_storagecenter_common.py:272 #, python-format msgid "Failed to create volume %s" -msgstr "" +msgstr "未能创建卷 %s" #: cinder/volume/drivers/eqlx.py:329 #, python-format @@ -5005,38 +5036,38 @@ "Failed to extend_volume %(name)s from %(current_size)sGB to %(new_size)sGB" msgstr "" -#: cinder/volume/drivers/glusterfs.py:135 +#: cinder/volume/drivers/glusterfs.py:85 #, python-format msgid "There's no Gluster config file configured (%s)" -msgstr "" +msgstr "未配置 Gluster 配置文件 (%s)" -#: cinder/volume/drivers/glusterfs.py:140 +#: cinder/volume/drivers/glusterfs.py:90 #, python-format msgid "Gluster config file at %(config)s doesn't exist" -msgstr "" +msgstr "%(config)s 处不存在 Gluster 配置文件" -#: cinder/volume/drivers/glusterfs.py:152 +#: cinder/volume/drivers/glusterfs.py:102 msgid "mount.glusterfs is not installed" -msgstr "" +msgstr "未安装 mount.glusterfs" -#: cinder/volume/drivers/remotefs.py:616 +#: cinder/volume/drivers/glusterfs.py:176 #, python-format msgid "Cloning volume %(src)s to volume %(dst)s" msgstr "" -#: cinder/volume/drivers/remotefs.py:792 +#: cinder/volume/drivers/remotefs.py:884 msgid "Volume status must be 'available'." -msgstr "" +msgstr "卷状态必须为“可用”。" -#: cinder/volume/drivers/glusterfs.py:183 cinder/volume/drivers/remotefs.py:115 -#: cinder/volume/drivers/netapp/nfs.py:820 +#: cinder/volume/drivers/glusterfs.py:217 cinder/volume/drivers/nfs.py:141 +#: cinder/volume/drivers/netapp/nfs.py:787 #, python-format msgid "casted to %s" msgstr "" -#: cinder/volume/drivers/remotefs.py:1025 +#: cinder/volume/drivers/remotefs.py:1081 msgid "Snapshot status must be \"available\" to clone." -msgstr "" +msgstr "快照状态必须为“可用”，才能进行克隆。" #: cinder/volume/drivers/glusterfs.py:253 #, python-format @@ -5048,39 +5079,39 @@ msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:238 cinder/volume/drivers/remotefs.py:167 +#: cinder/volume/drivers/glusterfs.py:290 cinder/volume/drivers/nfs.py:191 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" -#: cinder/volume/drivers/remotefs.py:1155 +#: cinder/volume/drivers/remotefs.py:1235 #, python-format msgid "" "Volume status must be \"available\" or \"in-use\" for snapshot. (is %s)" -msgstr "" +msgstr "对于快照，卷状态必须为“available”或“in-use”。（卷状态现在为 %s）" #: cinder/volume/drivers/glusterfs.py:418 #, python-format msgid "nova call result: %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:605 +#: cinder/volume/drivers/glusterfs.py:420 msgid "Call to Nova to create snapshot failed" msgstr "" -#: cinder/volume/drivers/remotefs.py:1222 +#: cinder/volume/drivers/remotefs.py:1301 msgid "Nova returned \"error\" status while creating snapshot." -msgstr "" +msgstr "在创建快照时，Nova 返回了“错误”状态。" #: cinder/volume/drivers/glusterfs.py:446 #, python-format msgid "Status of snapshot %(id)s is now %(status)s" msgstr "" -#: cinder/volume/drivers/remotefs.py:1239 +#: cinder/volume/drivers/remotefs.py:1317 #, python-format msgid "Timed out while waiting for Nova update for creation of snapshot %s." -msgstr "" +msgstr "等待 Nova 更新（以便创建快照 %s）时超时。" #: cinder/volume/drivers/glusterfs.py:471 #, python-format @@ -5092,20 +5123,20 @@ msgid "volume id: %s" msgstr "" -#: cinder/volume/drivers/remotefs.py:591 +#: cinder/volume/drivers/remotefs.py:678 msgid "'active' must be present when writing snap_info." -msgstr "" +msgstr "写入 snap_info 时，状态必须为“活动”。" #: cinder/volume/drivers/glusterfs.py:579 #, python-format msgid "deleting snapshot %s" msgstr "" -#: cinder/volume/drivers/remotefs.py:855 +#: cinder/volume/drivers/remotefs.py:947 msgid "Volume status must be \"available\" or \"in-use\"." -msgstr "" +msgstr "卷状态必须为“available”或“in-use”。" -#: cinder/volume/drivers/remotefs.py:700 +#: cinder/volume/drivers/glusterfs.py:599 #, python-format msgid "" "Snapshot record for %s is not present, allowing snapshot_delete to proceed." @@ -5126,27 +5157,27 @@ msgid "No %(base_id)s found for %(file)s" msgstr "" -#: cinder/volume/drivers/remotefs.py:972 +#: cinder/volume/drivers/remotefs.py:1051 #, python-format msgid "No file found with %s as backing file." -msgstr "" +msgstr "在将 %s 作为支持文件的情况下，找不到任何文件。" -#: cinder/volume/drivers/remotefs.py:981 +#: cinder/volume/drivers/remotefs.py:1060 #, python-format msgid "No snap found with %s as backing file." -msgstr "" +msgstr "在将 %s 作为支持文件的情况下，找不到任何 snap。" #: cinder/volume/drivers/glusterfs.py:718 #, python-format msgid "No file depends on %s." msgstr "" -#: cinder/volume/drivers/remotefs.py:1010 +#: cinder/volume/drivers/remotefs.py:1045 #, python-format msgid "Check condition failed: %s expected to be None." msgstr "" -#: cinder/volume/drivers/glusterfs.py:317 +#: cinder/volume/drivers/glusterfs.py:795 msgid "Call to Nova delete snapshot failed" msgstr "" @@ -5155,44 +5186,46 @@ msgid "status of snapshot %s is still \"deleting\"... waiting" msgstr "" -#: cinder/volume/drivers/remotefs.py:1311 +#: cinder/volume/drivers/remotefs.py:1387 #, python-format msgid "Unable to delete snapshot %(id)s, status: %(status)s." -msgstr "" +msgstr "无法删除快照 %(id)s，状态：%(status)s。" -#: cinder/volume/drivers/remotefs.py:1324 +#: cinder/volume/drivers/remotefs.py:1400 #, python-format msgid "" "Timed out while waiting for Nova update for deletion of snapshot %(id)s." -msgstr "" +msgstr "等待 Nova 更新（以便删除快照 %(id)s）时超时。" -#: cinder/volume/drivers/glusterfs.py:345 cinder/volume/drivers/quobyte.py:242 +#: cinder/volume/drivers/glusterfs.py:297 cinder/volume/drivers/quobyte.py:240 +#: cinder/volume/drivers/scality.py:199 #, python-format msgid "%s must be a valid raw or qcow2 image." -msgstr "" +msgstr "%s 必须为有效的 raw 映像或 qcow2 映像。" -#: cinder/volume/drivers/glusterfs.py:388 cinder/volume/drivers/quobyte.py:264 -#: cinder/volume/drivers/smbfs.py:446 +#: cinder/volume/drivers/quobyte.py:262 cinder/volume/drivers/smbfs.py:441 +#: cinder/volume/drivers/vzstorage.py:257 msgid "" "Extend volume is only supported for this driver when no snapshots exist." -msgstr "" +msgstr "不存在任何快照时，扩展卷仅受此驱动程序支持。" -#: cinder/volume/drivers/glusterfs.py:396 cinder/volume/drivers/quobyte.py:272 +#: cinder/volume/drivers/glusterfs.py:318 cinder/volume/drivers/quobyte.py:270 +#: cinder/volume/drivers/scality.py:220 #, python-format msgid "Unrecognized backing format: %s" -msgstr "" +msgstr "无法识别支持格式：%s" #: cinder/volume/drivers/glusterfs.py:1008 #, python-format msgid "creating new volume at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:414 +#: cinder/volume/drivers/glusterfs.py:336 #, python-format msgid "file already exists at %s" -msgstr "" +msgstr "文件已存在在 %s" -#: cinder/volume/drivers/glusterfs.py:481 cinder/volume/drivers/remotefs.py:152 +#: cinder/volume/drivers/glusterfs.py:1037 cinder/volume/drivers/nfs.py:178 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -5209,9 +5242,9 @@ "Snapshot operations will not be supported." msgstr "" -#: cinder/volume/drivers/glusterfs.py:512 +#: cinder/volume/drivers/glusterfs.py:442 msgid "Backup is not supported for GlusterFS volumes with snapshots." -msgstr "" +msgstr "具有快照的 GlusterFS 卷不支持备份。" #: cinder/volume/drivers/glusterfs.py:527 #, python-format @@ -5220,53 +5253,53 @@ "%(backing_file)s!" msgstr "" -#: cinder/volume/drivers/glusterfs.py:535 +#: cinder/volume/drivers/glusterfs.py:464 msgid "Backup is only supported for raw-formatted GlusterFS volumes." -msgstr "" +msgstr "仅原始格式的 GlusterFS 卷支持备份。" -#: cinder/volume/drivers/lvm.py:153 +#: cinder/volume/drivers/lvm.py:137 #, python-format msgid "Volume device file path %s does not exist." -msgstr "" +msgstr "卷设备文件路径 %s 不存在。" -#: cinder/volume/drivers/lvm.py:160 +#: cinder/volume/drivers/lvm.py:144 #, python-format msgid "Size for volume: %s not found, cannot secure delete." -msgstr "" +msgstr "找不到卷 %s 的大小，无法进行安全删除。" -#: cinder/volume/drivers/lvm.py:230 +#: cinder/volume/drivers/lvm.py:229 #, python-format msgid "Unabled to delete due to existing snapshot for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:247 +#: cinder/volume/drivers/lvm.py:246 #, python-format msgid "snapshot: %s not found, skipping delete operations" msgstr "" -#: cinder/volume/drivers/lvm.py:349 +#: cinder/volume/drivers/lvm.py:347 #, python-format msgid "Unable to update stats on non-initialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:446 +#: cinder/volume/drivers/lvm.py:567 #, python-format msgid "" "Failed to rename logical volume %(name)s, error message was: %(err_msg)s" -msgstr "" +msgstr "未能重命名逻辑卷 %(name)s，错误消息如下：%(err_msg)s" #: cinder/volume/drivers/lvm.py:419 msgid "Reference must contain lv_name element." msgstr "" -#: cinder/volume/drivers/lvm.py:479 cinder/volume/drivers/rbd.py:979 +#: cinder/volume/drivers/rbd.py:1052 #, python-format msgid "" "Failed to manage existing volume %(name)s, because reported size %(size)s " "was not a floating-point number." -msgstr "" +msgstr "未能管理现有卷 %(name)s，因为已报告的大小 %(size)s 不是浮点数。" -#: cinder/volume/drivers/lvm.py:526 +#: cinder/volume/drivers/lvm.py:505 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" @@ -5275,37 +5308,37 @@ msgid "Driver specific implementation needs to return mount_point_base." msgstr "" -#: cinder/volume/drivers/remotefs.py:346 cinder/volume/drivers/smbfs.py:529 +#: cinder/volume/drivers/remotefs.py:422 cinder/volume/drivers/smbfs.py:506 #, python-format msgid "Expected volume size was %d" -msgstr "" +msgstr "需要的卷大小为 %d" -#: cinder/volume/drivers/remotefs.py:347 +#: cinder/volume/drivers/remotefs.py:423 #, python-format msgid " but size is now %d" -msgstr "" +msgstr " 但现在大小为 %d" -#: cinder/volume/drivers/remotefs.py:365 +#: cinder/volume/drivers/nfs.py:380 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:113 +#: cinder/volume/drivers/nfs.py:134 #, python-format msgid "There's no NFS config file configured (%s)" -msgstr "" +msgstr "未配置 NFS 配置文件 (%s)" -#: cinder/volume/drivers/nfs.py:118 +#: cinder/volume/drivers/nfs.py:139 #, python-format msgid "NFS config file at %(config)s doesn't exist" -msgstr "" +msgstr "%(config)s 处不存在 NFS 配置文件" -#: cinder/volume/drivers/nfs.py:123 +#: cinder/volume/drivers/nfs.py:132 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:131 +#: cinder/volume/drivers/nfs.py:140 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" @@ -5330,40 +5363,40 @@ msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/rbd.py:163 +#: cinder/volume/drivers/rbd.py:172 #, python-format msgid "Invalid argument - whence=%s not supported" -msgstr "" +msgstr "自变量无效 - whence=%s 不受支持" -#: cinder/volume/drivers/rbd.py:167 +#: cinder/volume/drivers/rbd.py:176 msgid "Invalid argument" -msgstr "" +msgstr "自变量无效" -#: cinder/volume/drivers/rbd.py:187 +#: cinder/volume/drivers/rbd.py:196 msgid "fileno() not supported by RBD()" -msgstr "" +msgstr "fileno() 不受 RBD() 支持" -#: cinder/volume/drivers/rbd.py:215 +#: cinder/volume/drivers/rbd.py:211 #, python-format msgid "error opening rbd image %s" msgstr "" -#: cinder/volume/drivers/rbd.py:274 +#: cinder/volume/drivers/rbd.py:293 msgid "rados and rbd python libraries not found" -msgstr "" +msgstr "找不到 rados 和 rbd python 库" -#: cinder/volume/drivers/rbd.py:280 +#: cinder/volume/drivers/rbd.py:266 msgid "error connecting to ceph cluster" msgstr "" -#: cinder/volume/drivers/rbd.py:369 cinder/volume/drivers/sheepdog.py:179 +#: cinder/volume/drivers/rbd.py:347 cinder/volume/drivers/sheepdog.py:178 msgid "error refreshing volume stats" msgstr "" -#: cinder/volume/drivers/rbd.py:403 +#: cinder/volume/drivers/rbd.py:438 #, python-format msgid "clone depth exceeds limit of %s" -msgstr "" +msgstr "克隆深度超过 %s 的限制" #: cinder/volume/drivers/rbd.py:412 #, python-format @@ -5423,7 +5456,7 @@ msgid "deleting parent %s" msgstr "" -#: cinder/volume/drivers/rbd.py:617 +#: cinder/volume/drivers/rbd.py:596 #, python-format msgid "volume %s no longer exists in backend" msgstr "" @@ -5437,12 +5470,13 @@ msgid "deleting rbd volume %s" msgstr "" -#: cinder/volume/drivers/rbd.py:660 +#: cinder/volume/drivers/rbd.py:711 msgid "" "ImageBusy error raised while deleting rbd volume. This may have been caused " "by a connection from a client that has crashed and, if so, may be resolved " "by retrying the delete after 30 seconds has elapsed." msgstr "" +"删除 rbd 卷时，发生 ImageBusy 错误。这可能是由于客户机的已崩溃连接导致，如果是这样，那么可通过在 30 秒之后重试该删除来解决问题。" #: cinder/volume/drivers/rbd.py:645 msgid "volume is a clone so cleaning references" @@ -5453,17 +5487,17 @@ msgid "connection data: %s" msgstr "" -#: cinder/volume/drivers/rbd.py:769 +#: cinder/volume/drivers/rbd.py:830 msgid "Not stored in rbd" -msgstr "" +msgstr "未存储在 rbd 中" -#: cinder/volume/drivers/rbd.py:773 +#: cinder/volume/drivers/rbd.py:835 msgid "Blank components" -msgstr "" +msgstr "空组件" -#: cinder/volume/drivers/rbd.py:776 +#: cinder/volume/drivers/rbd.py:838 msgid "Not an rbd snapshot" -msgstr "" +msgstr "不是 rbd 快照" #: cinder/volume/drivers/rbd.py:730 #, python-format @@ -5493,10 +5527,10 @@ msgid "volume restore complete." msgstr "" -#: cinder/volume/drivers/rbd.py:916 cinder/volume/drivers/sheepdog.py:188 +#: cinder/volume/drivers/rbd.py:989 cinder/volume/drivers/sheepdog.py:481 #, python-format msgid "Failed to Extend Volume %(volname)s" -msgstr "" +msgstr "未能扩展卷 %(volname)s" #: cinder/volume/drivers/rbd.py:851 cinder/volume/drivers/sheepdog.py:200 #: cinder/volume/drivers/windows/windows.py:223 @@ -5504,34 +5538,34 @@ msgid "Extend volume from %(old_size)s GB to %(new_size)s GB." msgstr "" -#: cinder/volume/drivers/scality.py:75 +#: cinder/volume/drivers/scality.py:89 msgid "Value required for 'scality_sofs_config'" -msgstr "" +msgstr "“scality_sofs_config”的必需值" -#: cinder/volume/drivers/scality.py:86 +#: cinder/volume/drivers/scality.py:85 #, python-format msgid "Cannot access 'scality_sofs_config': %s" msgstr "" -#: cinder/volume/drivers/scality.py:92 +#: cinder/volume/drivers/scality.py:108 msgid "Cannot execute /sbin/mount.sofs" -msgstr "" +msgstr "无法执行 /sbin/mount.sofs" -#: cinder/volume/drivers/scality.py:114 +#: cinder/volume/drivers/scality.py:140 msgid "Cannot mount Scality SOFS, check syslog for errors" -msgstr "" +msgstr "无法安装 Scality SOFS，请检查系统日志以获取错误" -#: cinder/volume/drivers/scality.py:146 +#: cinder/volume/drivers/scality.py:137 #, python-format msgid "Cannot find volume dir for Scality SOFS at '%s'" msgstr "" -#: cinder/volume/drivers/sheepdog.py:58 +#: cinder/volume/drivers/sheepdog.py:59 #, python-format msgid "Sheepdog is not working: %s" msgstr "Sheepdog 没有工作：%s" -#: cinder/volume/drivers/sheepdog.py:63 +#: cinder/volume/drivers/sheepdog.py:64 msgid "Sheepdog is not working" msgstr "Sheepdog 没有工作" @@ -5540,31 +5574,31 @@ msgid "Payload for SolidFire API call: %s" msgstr "SolidFire API 调用的参数：%s" -#: cinder/volume/drivers/solidfire.py:153 +#: cinder/volume/drivers/solidfire.py:149 #, python-format msgid "" "Failed to make httplib connection SolidFire Cluster: %s (verify san_ip " "settings)" msgstr "" -#: cinder/volume/drivers/solidfire.py:156 +#: cinder/volume/drivers/solidfire.py:152 #, python-format msgid "Failed to make httplib connection: %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:163 +#: cinder/volume/drivers/solidfire.py:159 #, python-format msgid "" "Request to SolidFire cluster returned bad status: %(status)s / %(reason)s " "(check san_login/san_password settings)" msgstr "" -#: cinder/volume/drivers/solidfire.py:168 +#: cinder/volume/drivers/solidfire.py:164 #, python-format msgid "HTTP request failed, with status: %(status)s and reason: %(reason)s" msgstr "" -#: cinder/volume/drivers/solidfire.py:179 +#: cinder/volume/drivers/solidfire.py:175 #, python-format msgid "Call to json.loads() raised an exception: %s" msgstr "调用 json.loads() 引起异常：%s" @@ -5574,27 +5608,26 @@ msgid "Results of SolidFire API call: %s" msgstr "SolidFire API调用结果：%s" -#: cinder/volume/drivers/solidfire.py:189 +#: cinder/volume/drivers/solidfire.py:185 #, python-format msgid "Clone operation encountered: %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:191 +#: cinder/volume/drivers/solidfire.py:187 #, python-format msgid "Waiting for outstanding operation before retrying snapshot: %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:197 +#: cinder/volume/drivers/solidfire.py:193 #, python-format msgid "Detected xDBVersionMismatch, retry %s of 5" msgstr "" -#: cinder/volume/drivers/solidfire.py:194 -#: cinder/volume/drivers/solidfire.py:267 -#: cinder/volume/drivers/solidfire.py:363 +#: cinder/volume/drivers/solidfire.py:317 +#: cinder/volume/drivers/solidfire.py:483 #, python-format msgid "API response: %s" -msgstr "" +msgstr "API 响应：%s" #: cinder/volume/drivers/solidfire.py:220 #, python-format @@ -5606,27 +5639,26 @@ msgid "solidfire account: %s does not exist, create it..." msgstr "solidfire帐户：%s 不存在，正在创建..." -#: cinder/volume/drivers/solidfire.py:317 +#: cinder/volume/drivers/solidfire.py:313 #, python-format msgid "Failed to retrieve volume SolidFire-ID: %s in get_by_account!" msgstr "" -#: cinder/volume/drivers/solidfire.py:395 +#: cinder/volume/drivers/solidfire.py:515 msgid "Failed to get model update from clone" -msgstr "" +msgstr "未能从克隆获取模型更新" -#: cinder/volume/drivers/solidfire.py:416 +#: cinder/volume/drivers/solidfire.py:433 #, python-format msgid "Failed volume create: %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:427 -#: cinder/volume/drivers/fusionio/ioControl.py:254 +#: cinder/volume/drivers/solidfire.py:423 #, python-format msgid "More than one valid preset was detected, using %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:469 +#: cinder/volume/drivers/solidfire.py:486 #, python-format msgid "Failed to get SolidFire Volume: %s" msgstr "" @@ -5636,12 +5668,12 @@ msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." msgstr "" -#: cinder/volume/drivers/solidfire.py:489 +#: cinder/volume/drivers/solidfire.py:476 #, python-format msgid "Volume %s, not found on SF Cluster." msgstr "" -#: cinder/volume/drivers/solidfire.py:492 +#: cinder/volume/drivers/solidfire.py:479 #, python-format msgid "Found %(count)s volumes mapped to id: %(uuid)s." msgstr "" @@ -5655,11 +5687,11 @@ msgid "Account for Volume ID %s was not found on the SolidFire Cluster!" msgstr "" -#: cinder/volume/drivers/solidfire.py:568 +#: cinder/volume/drivers/solidfire.py:554 msgid "This usually means the volume was never successfully created." msgstr "" -#: cinder/volume/drivers/solidfire.py:748 +#: cinder/volume/drivers/solidfire.py:765 #, python-format msgid "Failed to delete SolidFire Volume: %s" msgstr "" @@ -5696,7 +5728,7 @@ msgid "Updating cluster status info" msgstr "" -#: cinder/volume/drivers/solidfire.py:687 +#: cinder/volume/drivers/solidfire.py:671 msgid "Failed to get updated stats" msgstr "" @@ -5724,7 +5756,7 @@ msgid "Pool %(name)s: %(total)sGB total, %(free)sGB free" msgstr "" -#: cinder/volume/drivers/zadara.py:409 cinder/volume/drivers/zadara.py:532 +#: cinder/volume/drivers/zadara.py:408 cinder/volume/drivers/zadara.py:531 #, python-format msgid "Volume %(name)s could not be found. It might be already deleted" msgstr "" @@ -5734,8 +5766,8 @@ msgid "Create snapshot: %s" msgstr "" -#: cinder/volume/drivers/zadara.py:446 cinder/volume/drivers/zadara.py:491 -#: cinder/volume/drivers/zadara.py:517 +#: cinder/volume/drivers/zadara.py:445 cinder/volume/drivers/zadara.py:490 +#: cinder/volume/drivers/zadara.py:516 #, python-format msgid "Volume %(name)s not found" msgstr "" @@ -5745,12 +5777,12 @@ msgid "Delete snapshot: %s" msgstr "" -#: cinder/volume/drivers/zadara.py:465 +#: cinder/volume/drivers/zadara.py:464 #, python-format msgid "snapshot: original volume %s not found, skipping delete operation" msgstr "" -#: cinder/volume/drivers/zadara.py:473 +#: cinder/volume/drivers/zadara.py:472 #, python-format msgid "snapshot: snapshot %s not found, skipping delete operation" msgstr "" @@ -5760,7 +5792,7 @@ msgid "Creating volume from snapshot: %s" msgstr "" -#: cinder/volume/drivers/zadara.py:497 +#: cinder/volume/drivers/zadara.py:496 #, python-format msgid "Snapshot %(name)s not found" msgstr "" @@ -5775,12 +5807,14 @@ msgid "iSCSI provider_location not stored for volume %s, using discovery." msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py:190 +#: cinder/volume/drivers/emc/emc_cli_iscsi.py:165 +#: cinder/volume/drivers/emc/emc_smis_iscsi.py:193 #, python-format msgid "Could not find iSCSI export for volume %s" msgstr "无法为卷 %s 找到 iSCSI 导出" -#: cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py:199 +#: cinder/volume/drivers/emc/emc_cli_iscsi.py:176 +#: cinder/volume/drivers/emc/emc_smis_iscsi.py:202 #, python-format msgid "Cannot find device number for volume %s" msgstr "" @@ -5801,8 +5835,7 @@ msgid "update_volume_status:%s" msgstr "" -#: cinder/volume/drivers/emc/emc_vmax_common.py:82 -#: cinder/volume/drivers/emc/emc_vmax_utils.py:60 +#: cinder/volume/drivers/emc/emc_smis_common.py:40 msgid "" "Module PyWBEM not installed. Install PyWBEM using the python-pywbem package." msgstr "" @@ -5812,7 +5845,7 @@ msgid "Entering create_volume." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:160 +#: cinder/volume/drivers/emc/emc_smis_common.py:86 #, python-format msgid "Create Volume: %(volume)s Size: %(size)lu" msgstr "" @@ -5828,7 +5861,7 @@ "Create Volume: %(volume)s Pool: %(pool)s Storage System: %(storage_system)s" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:184 +#: cinder/volume/drivers/emc/emc_smis_common.py:110 #, python-format msgid "" "Error Create Volume: %(volumename)s. Storage Configuration Service not found " @@ -5848,7 +5881,7 @@ msgid "Create Volume: %(volumename)s Return code: %(rc)lu" msgstr "" -#: cinder/volume/drivers/emc/emc_vmax_provision.py:382 +#: cinder/volume/drivers/emc/emc_smis_common.py:143 #, python-format msgid "" "Error Create Volume: %(volumename)s. Return code: %(rc)lu. Error: %(error)s" @@ -5866,7 +5899,7 @@ msgid "Entering create_volume_from_snapshot." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:290 +#: cinder/volume/drivers/emc/emc_smis_common.py:181 #, python-format msgid "" "Create Volume from Snapshot: Volume: %(volumename)s Snapshot: " @@ -5888,7 +5921,7 @@ "%(snapshotname)s. Create Volume from Snapshot is NOT supported on VMAX." msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:310 +#: cinder/volume/drivers/emc/emc_smis_common.py:212 #, python-format msgid "" "Error Create Volume from Snapshot: Volume: %(volumename)s Snapshot: " @@ -5905,7 +5938,7 @@ "%(sourceelement)s" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:350 +#: cinder/volume/drivers/emc/emc_smis_common.py:242 #, python-format msgid "" "Error Create Volume from Snapshot: Volume: %(volumename)s " @@ -5954,7 +5987,7 @@ msgid "Entering create_cloned_volume." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:399 +#: cinder/volume/drivers/emc/emc_smis_common.py:333 #, python-format msgid "" "Create a Clone from Volume: Volume: %(volumename)s Source Volume: " @@ -5968,7 +6001,7 @@ "Source Instance: %(src_instance)s Storage System: %(storage_system)s." msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:419 +#: cinder/volume/drivers/emc/emc_smis_common.py:353 #, python-format msgid "" "Error Create Cloned Volume: Volume: %(volumename)s Source Volume: " @@ -5983,7 +6016,7 @@ "%(elementname)s SyncType: 8 SourceElement: %(sourceelement)s" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:459 +#: cinder/volume/drivers/emc/emc_smis_common.py:383 #, python-format msgid "" "Error Create Cloned Volume: Volume: %(volumename)s Source " @@ -6032,18 +6065,17 @@ msgid "Entering delete_volume." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:503 +#: cinder/volume/drivers/emc/emc_smis_common.py:471 #, python-format msgid "Delete Volume: %(volume)s" msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:519 -#: cinder/volume/drivers/emc/emc_vmax_common.py:1989 +#: cinder/volume/drivers/emc/emc_smis_common.py:478 #, python-format msgid "Volume %(name)s not found on the array. No volume to delete." msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:527 +#: cinder/volume/drivers/emc/emc_smis_common.py:488 #, python-format msgid "" "Error Delete Volume: %(volumename)s. Storage Configuration Service not found." @@ -6061,13 +6093,13 @@ "%(service)s TheElement: %(vol_instance)s" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:556 +#: cinder/volume/drivers/emc/emc_smis_common.py:514 #, python-format msgid "" "Error Delete Volume: %(volumename)s. Return code: %(rc)lu. Error: %(error)s" msgstr "" -#: cinder/volume/drivers/emc/emc_vmax_common.py:238 +#: cinder/volume/drivers/emc/emc_smis_common.py:523 #, python-format msgid "Leaving delete_volume: %(volumename)s Return code: %(rc)lu" msgstr "" @@ -6077,8 +6109,8 @@ msgid "Entering create_snapshot." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:577 -#: cinder/volume/drivers/emc/emc_vnx_cli.py:1863 +#: cinder/volume/drivers/emc/emc_smis_common.py:534 +#: cinder/volume/drivers/emc/emc_vnx_cli.py:278 #, python-format msgid "Create snapshot: %(snapshot)s: volume: %(volume)s" msgstr "" @@ -6089,8 +6121,9 @@ msgid "Device ID: %(deviceid)s: Storage System: %(storagesystem)s" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:598 -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:727 +#: cinder/volume/drivers/emc/emc_smis_common.py:551 +#: cinder/volume/drivers/emc/emc_smis_common.py:553 +#: cinder/volume/drivers/emc/emc_smis_common.py:639 #, python-format msgid "Cannot find Replication Service to create snapshot for volume %s." msgstr "" @@ -6110,7 +6143,7 @@ "code: %(rc)lu" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:665 +#: cinder/volume/drivers/emc/emc_smis_common.py:583 #, python-format msgid "" "Error Create Snapshot: %(snapshot)s Volume: %(volume)s Error: %(errordesc)s" @@ -6128,7 +6161,8 @@ msgid "Entering delete_snapshot." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:705 +#: cinder/volume/drivers/emc/emc_smis_common.py:617 +#: cinder/volume/drivers/emc/emc_vnx_cli.py:306 #, python-format msgid "Delete Snapshot: %(snapshot)s: volume: %(volume)s" msgstr "" @@ -6140,7 +6174,7 @@ "StorageSychronization_SV_SV." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:719 +#: cinder/volume/drivers/emc/emc_smis_common.py:631 #, python-format msgid "" "Snapshot: %(snapshot)s: volume: %(volume)s not found on the array. No " @@ -6162,27 +6196,27 @@ "code: %(rc)lu" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:759 +#: cinder/volume/drivers/emc/emc_smis_common.py:671 #, python-format msgid "" "Error Delete Snapshot: Volume: %(volumename)s Snapshot: %(snapshotname)s. " "Return code: %(rc)lu. Error: %(error)s" msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:786 -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:800 +#: cinder/volume/drivers/emc/emc_smis_common.py:696 +#: cinder/volume/drivers/emc/emc_smis_common.py:711 #, python-format msgid "Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot is deleted." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:792 +#: cinder/volume/drivers/emc/emc_smis_common.py:703 #, python-format msgid "" "Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot deleted but cleanup " "timed out." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:805 +#: cinder/volume/drivers/emc/emc_smis_common.py:716 #, python-format msgid "" "Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot deleted but error " @@ -6243,7 +6277,7 @@ "Members: %(vol)s" msgstr "" -#: cinder/volume/drivers/emc/emc_vmax_provision.py:263 +#: cinder/volume/drivers/emc/emc_smis_common.py:836 #, python-format msgid "Error mapping volume %(vol)s. %(error)s" msgstr "" @@ -6270,42 +6304,38 @@ msgid "RemoveMembers for volume %s completed successfully." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:934 +#: cinder/volume/drivers/emc/emc_smis_common.py:878 #, python-format msgid "Map volume: %(volume)s" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:943 -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:969 +#: cinder/volume/drivers/emc/emc_smis_common.py:887 +#: cinder/volume/drivers/emc/emc_smis_common.py:917 #, python-format msgid "Cannot find Controller Configuration Service for storage system %s" msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:953 -#: cinder/volume/drivers/emc/emc_vmax_common.py:299 +#: cinder/volume/drivers/emc/emc_smis_common.py:901 #, python-format msgid "Unmap volume: %(volume)s" msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:959 -#: cinder/volume/drivers/emc/emc_vmax_common.py:305 +#: cinder/volume/drivers/emc/emc_smis_common.py:907 #, python-format msgid "Volume %s is not mapped. No volume to unmap." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:978 -#: cinder/volume/drivers/emc/emc_vmax_common.py:352 +#: cinder/volume/drivers/emc/emc_smis_common.py:931 #, python-format msgid "Initialize connection: %(volume)s" msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:984 +#: cinder/volume/drivers/emc/emc_smis_common.py:937 #, python-format msgid "Volume %s is already mapped." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:996 -#: cinder/volume/drivers/emc/emc_vmax_common.py:412 +#: cinder/volume/drivers/emc/emc_smis_common.py:949 #, python-format msgid "Terminate connection: %(volume)s" msgstr "" @@ -6315,12 +6345,12 @@ msgid "Entering extend_volume." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1013 +#: cinder/volume/drivers/emc/emc_smis_common.py:960 #, python-format msgid "Extend Volume: %(volume)s New size: %(size)lu" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1033 +#: cinder/volume/drivers/emc/emc_smis_common.py:980 #, python-format msgid "" "Error Extend Volume: %(volumename)s. Storage Configuration Service not found." @@ -6339,7 +6369,7 @@ msgid "Extend Volume: %(volumename)s Return code: %(rc)lu" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1069 +#: cinder/volume/drivers/emc/emc_smis_common.py:1011 #, python-format msgid "" "Error Extend Volume: %(volumename)s. Return code: %(rc)lu. Error: %(error)s" @@ -6360,7 +6390,7 @@ msgid "Found Storage Type in config file: %s" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1124 +#: cinder/volume/drivers/emc/emc_smis_common.py:1063 msgid "Storage type not found." msgstr "" @@ -6395,8 +6425,7 @@ msgid "Ecom server not found." msgstr "" -#: cinder/volume/drivers/emc/emc_vmax_common.py:1154 -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1219 +#: cinder/volume/drivers/emc/emc_smis_common.py:1153 msgid "Cannot connect to ECOM server" msgstr "" @@ -6420,12 +6449,12 @@ msgid "Found Storage Hardware ID Management Service: %s" msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1301 +#: cinder/volume/drivers/emc/emc_smis_common.py:1248 #, python-format msgid "Pool %(storage_type)s is not found." msgstr "" -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1307 +#: cinder/volume/drivers/emc/emc_smis_common.py:1254 #, python-format msgid "Storage system not found for pool %(storage_type)s." msgstr "" @@ -6468,12 +6497,10 @@ "Storage system: %(storage_system)s Storage Synchronized instance: %(sync)s." msgstr "" -#: cinder/volume/drivers/emc/emc_vmax_common.py:1290 -#: cinder/volume/drivers/emc/emc_vmax_masking.py:466 -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1398 +#: cinder/volume/drivers/emc/emc_vmax_common.py:1414 #, python-format msgid "Error finding %s." -msgstr "" +msgstr "查找 %s 时出错。" #: cinder/volume/drivers/emc/emc_smis_common.py:1357 #, python-format @@ -6494,13 +6521,12 @@ "%(initiator)s is %(ctrl)s." msgstr "" -#: cinder/volume/drivers/emc/emc_vmax_common.py:2265 -#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1601 +#: cinder/volume/drivers/emc/emc_vmax_common.py:2261 #, python-format msgid "" "Volume %(name)s not found on the array. Cannot determine if there are " "volumes mapped." -msgstr "" +msgstr "数组中找不到卷 %(name)s。无法确定是否存在已映射的卷。" #: cinder/volume/drivers/emc/emc_smis_common.py:1484 #, python-format @@ -6528,7 +6554,7 @@ "%(connector)s is %(ctrl)s." msgstr "" -#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1671 +#: cinder/volume/drivers/emc/emc_smis_common.py:1592 #, python-format msgid "Device number not found for volume %(volumename)s %(vol_instance)s." msgstr "" @@ -6572,9 +6598,9 @@ "%(hardwareids)s." msgstr "" -#: cinder/volume/drivers/emc/emc_vmax_provision.py:655 +#: cinder/volume/drivers/emc/emc_vmax_provision.py:855 msgid "Error finding Target WWNs." -msgstr "" +msgstr "查找目标 WWN 时出错。" #: cinder/volume/drivers/emc/emc_smis_common.py:1748 #, python-format @@ -6897,15 +6923,12 @@ msgid "setting LU upper (end) limit to %s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:95 cinder/volume/drivers/hds/iscsi.py:73 -#: cinder/volume/drivers/hds/nfs.py:62 +#: cinder/volume/drivers/hds/hds.py:92 #, python-format msgid "%(element)s: %(val)s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:106 cinder/volume/drivers/hds/hds.py:108 -#: cinder/volume/drivers/hds/iscsi.py:84 cinder/volume/drivers/hds/iscsi.py:86 -#: cinder/volume/drivers/hds/nfs.py:73 cinder/volume/drivers/hds/nfs.py:75 +#: cinder/volume/drivers/hds/hds.py:103 cinder/volume/drivers/hds/hds.py:105 #, python-format msgid "XML exception reading parameter: %s" msgstr "" @@ -6915,23 +6938,22 @@ msgid "portal: %(ip)s:%(ipp)s, CTL: %(ctl)s, port: %(port)s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:200 cinder/volume/drivers/hds/iscsi.py:271 -#: cinder/volume/drivers/hds/nfs.py:192 +#: cinder/volume/drivers/hds/hds.py:197 #, python-format msgid "No configuration found for service: %s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:253 cinder/volume/drivers/hds/iscsi.py:349 +#: cinder/volume/drivers/hds/hds.py:250 #, python-format msgid "HDP not found: %s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:292 cinder/volume/drivers/hds/iscsi.py:396 +#: cinder/volume/drivers/hds/hds.py:289 #, python-format msgid "iSCSI portal not found for service: %s" msgstr "" -#: cinder/volume/drivers/hds/iscsi.py:448 +#: cinder/volume/drivers/hds/hds.py:327 #, python-format msgid "LUN %(lun)s of size %(sz)s MB is created." msgstr "" @@ -6941,7 +6963,7 @@ msgid "LUN %(lun)s of size %(size)s MB is cloned." msgstr "" -#: cinder/volume/drivers/hds/iscsi.py:499 +#: cinder/volume/drivers/hds/hds.py:372 #, python-format msgid "LUN %(lun)s extended to %(size)s GB." msgstr "" @@ -6966,7 +6988,7 @@ msgid "LUN %s is deleted." msgstr "" -#: cinder/volume/drivers/huawei/__init__.py:61 +#: cinder/volume/drivers/huawei/huawei_driver.py:55 msgid "_instantiate_driver: configuration not found." msgstr "" @@ -6977,7 +6999,7 @@ "%(product)s series storage arrays." msgstr "" -#: cinder/volume/drivers/huawei/__init__.py:86 +#: cinder/volume/drivers/huawei/__init__.py:84 #, python-format msgid "" "\"Product\" or \"Protocol\" is illegal. \"Product\" should be set to either " @@ -7004,8 +7026,7 @@ "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:161 -#: cinder/volume/drivers/huawei/rest_common.py:1523 +#: cinder/volume/drivers/huawei/rest_common.py:1542 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " @@ -7023,7 +7044,7 @@ msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:250 +#: cinder/volume/drivers/huawei/huawei_t.py:248 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure " @@ -7038,7 +7059,7 @@ "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:353 +#: cinder/volume/drivers/huawei/huawei_t.py:351 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" @@ -7054,12 +7075,12 @@ "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:582 +#: cinder/volume/drivers/huawei/huawei_t.py:578 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_utils.py:41 +#: cinder/volume/drivers/huawei/huawei_utils.py:40 #, python-format msgid "parse_xml_file: %s" msgstr "" @@ -7105,7 +7126,7 @@ "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:143 +#: cinder/volume/drivers/huawei/rest_client.py:163 #, python-format msgid "%s \"data\" was not in result." msgstr "" @@ -7230,14 +7251,14 @@ msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:120 -#: cinder/volume/drivers/huawei/ssh_common.py:1268 +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:118 +#: cinder/volume/drivers/huawei/ssh_common.py:1265 #, python-format msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1502 -#: cinder/volume/drivers/huawei/ssh_common.py:127 +#: cinder/volume/drivers/huawei/rest_common.py:1521 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" @@ -7252,12 +7273,12 @@ msgid "Can not find lun in array" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:56 +#: cinder/volume/drivers/huawei/ssh_common.py:54 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:72 +#: cinder/volume/drivers/huawei/ssh_common.py:70 msgid "No response message. Please check system status." msgstr "" @@ -7266,15 +7287,15 @@ msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:137 -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:135 +#: cinder/volume/drivers/huawei/ssh_common.py:1287 #, python-format msgid "" "_check_conf_file: Config file invalid. Host OSType is invalid.\n" "The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:170 +#: cinder/volume/drivers/huawei/ssh_common.py:169 #, python-format msgid "_get_login_info: %s" msgstr "" @@ -7290,7 +7311,7 @@ "_name_translate: Name in cinder: %(old)s, new name in storage system: %(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:280 +#: cinder/volume/drivers/huawei/ssh_common.py:279 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key in " @@ -7298,8 +7319,8 @@ "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:376 -#: cinder/volume/drivers/huawei/ssh_common.py:1454 +#: cinder/volume/drivers/huawei/ssh_common.py:373 +#: cinder/volume/drivers/huawei/ssh_common.py:1451 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" @@ -7309,7 +7330,7 @@ "_parse_conf_lun_params: Use default prefetch type. Prefetch type: Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:422 +#: cinder/volume/drivers/huawei/ssh_common.py:421 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config " @@ -7338,7 +7359,7 @@ msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:518 +#: cinder/volume/drivers/huawei/ssh_common.py:516 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" @@ -7350,13 +7371,12 @@ "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:546 -#: cinder/volume/drivers/huawei/ssh_common.py:582 +#: cinder/volume/drivers/huawei/huawei_driver.py:403 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." -msgstr "" +msgstr "create_volume_from_snapshot：快照 %(name)s 不存在。" -#: cinder/volume/drivers/huawei/ssh_common.py:652 +#: cinder/volume/drivers/huawei/ssh_common.py:650 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" @@ -7366,7 +7386,7 @@ msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:699 +#: cinder/volume/drivers/huawei/ssh_common.py:697 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" @@ -7378,7 +7398,7 @@ "name: %(added_name)s new added volume size: %(added_size)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:749 +#: cinder/volume/drivers/huawei/ssh_common.py:747 #, python-format msgid "extend_volume: volume %s does not exist." msgstr "" @@ -7388,11 +7408,11 @@ msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:787 +#: cinder/volume/drivers/huawei/ssh_common.py:785 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:794 +#: cinder/volume/drivers/huawei/ssh_common.py:792 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" @@ -7402,19 +7422,19 @@ msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:867 +#: cinder/volume/drivers/huawei/ssh_common.py:865 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:875 +#: cinder/volume/drivers/huawei/ssh_common.py:873 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:918 +#: cinder/volume/drivers/huawei/ssh_common.py:916 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7454,7 +7474,7 @@ "%(mapid)s 10s later." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1149 +#: cinder/volume/drivers/huawei/ssh_common.py:1146 #, python-format msgid "" "_delete_map: Failed to delete host map %(mapid)s.\n" @@ -7465,7 +7485,7 @@ msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1280 +#: cinder/volume/drivers/huawei/ssh_common.py:1277 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" @@ -7474,144 +7494,146 @@ "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1392 +#: cinder/volume/drivers/huawei/ssh_common.py:1389 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume from " "snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1399 +#: cinder/volume/drivers/huawei/ssh_common.py:1396 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1407 +#: cinder/volume/drivers/huawei/ssh_common.py:1404 #, python-format msgid "extend_volume: %(device)s does not support extend volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1416 +#: cinder/volume/drivers/huawei/ssh_common.py:1413 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:126 +#: cinder/volume/drivers/ibm/gpfs.py:125 #, python-format msgid "Failed to issue mmgetstate command, error: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:137 +#: cinder/volume/drivers/ibm/gpfs.py:136 #, python-format msgid "GPFS is not active. Detailed output: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:135 +#: cinder/volume/drivers/ibm/gpfs.py:158 #, python-format msgid "GPFS is not running, state: %s." -msgstr "" +msgstr "GPFS 没有在运行，状态：%s。" -#: cinder/volume/drivers/ibm/gpfs.py:150 +#: cinder/volume/drivers/ibm/gpfs.py:149 #, python-format msgid "Failed to issue df command for path %(path)s, error: %(error)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:166 cinder/volume/drivers/ibm/gpfs.py:255 +#: cinder/volume/drivers/ibm/gpfs.py:165 cinder/volume/drivers/ibm/gpfs.py:254 #, python-format msgid "Failed to issue mmlsconfig command, error: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:177 +#: cinder/volume/drivers/ibm/gpfs.py:176 #, python-format msgid "Failed to issue mmlsattr command on path %(path)s, error: %(error)s" msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:183 +#: cinder/volume/drivers/ibm/gpfs.py:202 #, python-format msgid "Failed to find fileset for path %(path)s, command output: %(cmdout)s." -msgstr "" +msgstr "对于路径 %(path)s，未能找到文件集，命令输出：%(cmdout)s。" -#: cinder/volume/drivers/ibm/gpfs.py:205 +#: cinder/volume/drivers/ibm/gpfs.py:223 #, python-format msgid "Invalid storage pool %s requested. Retype failed." -msgstr "" +msgstr "请求的存储池 %s 无效。转型失败。" -#: cinder/volume/drivers/ibm/gpfs.py:235 +#: cinder/volume/drivers/ibm/gpfs.py:234 #, python-format msgid "Failed to issue mmlsfs command for path %(path)s, error: %(error)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:272 +#: cinder/volume/drivers/ibm/gpfs.py:271 #, python-format msgid "Failed to issue mmlsattr command for path %(path)s, error: %(error)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:320 +#: cinder/volume/drivers/ibm/gpfs.py:338 #, python-format msgid "Could not find GPFS cluster id: %s." -msgstr "" +msgstr "找不到 GPFS 集群标识：%s。" -#: cinder/volume/drivers/ibm/gpfs.py:328 +#: cinder/volume/drivers/ibm/gpfs.py:346 #, python-format msgid "Could not find GPFS file system device: %s." -msgstr "" +msgstr "找不到 GPFS 文件系统设备：%s。" -#: cinder/volume/drivers/ibm/gpfs.py:336 +#: cinder/volume/drivers/ibm/gpfs.py:354 #, python-format msgid "Invalid storage pool %s specificed." -msgstr "" +msgstr "指定的存储池 %s 无效。" -#: cinder/volume/drivers/ibm/gpfs.py:346 +#: cinder/volume/drivers/ibm/gpfs.py:375 msgid "Option gpfs_mount_point_base is not set correctly." -msgstr "" +msgstr "选项 gpfs_mount_point_base 未正确设置。" -#: cinder/volume/drivers/ibm/gpfs.py:353 +#: cinder/volume/drivers/ibm/gpfs.py:382 msgid "Option gpfs_images_share_mode is not set correctly." -msgstr "" +msgstr "选项 gpfs_images_share_mode 未正确设置。" -#: cinder/volume/drivers/ibm/gpfs.py:359 +#: cinder/volume/drivers/ibm/gpfs.py:388 msgid "Option gpfs_images_dir is not set correctly." -msgstr "" +msgstr "选项 gpfs_images_dir 未正确设置。" -#: cinder/volume/drivers/ibm/gpfs.py:366 +#: cinder/volume/drivers/ibm/gpfs.py:395 #, python-format msgid "" "gpfs_images_share_mode is set to copy_on_write, but %(vol)s and %(img)s " "belong to different file systems." msgstr "" +"gpfs_images_share_mode 已设置为 copy_on_write，但 %(vol)s 和 %(img)s 属于不同文件系统。" -#: cinder/volume/drivers/ibm/gpfs.py:377 +#: cinder/volume/drivers/ibm/gpfs.py:406 #, python-format msgid "" "gpfs_images_share_mode is set to copy_on_write, but %(vol)s and %(img)s " "belong to different filesets." msgstr "" +"gpfs_images_share_mode 已设置为 copy_on_write，但 %(vol)s 和 %(img)s 属于不同文件集。" -#: cinder/volume/drivers/ibm/gpfs.py:386 +#: cinder/volume/drivers/ibm/gpfs.py:415 #, python-format msgid "" "Downlevel GPFS Cluster Detected. GPFS Clone feature not enabled in cluster " "daemon level %(cur)s - must be at least at level %(min)s." -msgstr "" +msgstr "检测到下层 GPFS 集群。在集群守护程序级别 %(cur)s 中未启用“GPFS 克隆”功能 - 必须至少处于级别 %(min)s。" -#: cinder/volume/drivers/ibm/gpfs.py:400 +#: cinder/volume/drivers/ibm/gpfs.py:429 #, python-format msgid "%s must be an absolute path." -msgstr "" +msgstr "%s 必须为绝对路径。" -#: cinder/volume/drivers/ibm/gpfs.py:405 +#: cinder/volume/drivers/ibm/gpfs.py:434 #, python-format msgid "%s is not a directory." -msgstr "" +msgstr "%s 不是一个目录。" -#: cinder/volume/drivers/ibm/gpfs.py:415 +#: cinder/volume/drivers/ibm/gpfs.py:444 #, python-format msgid "" "The GPFS filesystem %(fs)s is not at the required release level. Current " "level is %(cur)s, must be at least %(min)s." -msgstr "" +msgstr "GPFS 文件系统 %(fs)s 未处于所要求的发行版级别。当前级别为 %(cur)s，而要求的级别必须至少为 %(min)s。" -#: cinder/volume/drivers/ibm/gpfs.py:798 +#: cinder/volume/drivers/ibm/gpfs.py:797 #, python-format msgid "Failed to resize volume %(volume_id)s, error: %(error)s." msgstr "" @@ -7626,31 +7648,29 @@ msgid "Begin restore of backup %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:872 +#: cinder/volume/drivers/ibm/gpfs.py:871 #, python-format msgid "" "Driver-based migration of volume %(vol)s failed. Move from %(src)s to " "%(dst)s failed with error: %(error)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:955 +#: cinder/volume/drivers/ibm/gpfs.py:1087 #, python-format msgid "mkfs failed on volume %(vol)s, error message was: %(err)s." -msgstr "" +msgstr "mkfs 在卷 %(vol)s 上发生故障，错误消息如下：%(err)s。" -#: cinder/volume/drivers/ibm/gpfs.py:988 +#: cinder/volume/drivers/ibm/gpfs.py:1120 #, python-format msgid "" "%s cannot be accessed. Verify that GPFS is active and file system is mounted." -msgstr "" +msgstr "%s 无法访问。请验证 GPFS 是否处于活动状态并且文件系统是否已安装。" -#: cinder/volume/drivers/fusionio/ioControl.py:284 #: cinder/volume/drivers/ibm/ibmnas.py:110 -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:260 -#: cinder/volume/drivers/san/hp/hp_3par_common.py:215 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:258 #, python-format msgid "%s is not set" -msgstr "" +msgstr "未设置 %s" #: cinder/volume/drivers/ibm/ibmnas.py:116 msgid "" @@ -7698,18 +7718,19 @@ msgid "Failed in _create_ibmnas_copy. Error: %s" msgstr "" -#: cinder/volume/drivers/hds/nfs.py:216 cinder/volume/drivers/netapp/nfs.py:494 +#: cinder/volume/drivers/ibm/ibmnas.py:181 +#: cinder/volume/drivers/netapp/nfs.py:485 #, python-format msgid "Resizing file to %sG" msgstr "" -#: cinder/volume/drivers/ibm/ibmnas.py:223 +#: cinder/volume/drivers/ibm/ibmnas.py:224 #, python-format msgid "Failed to resize volume %(volume_id)s, error: %(error)s" msgstr "" -#: cinder/volume/drivers/nfs.py:249 cinder/volume/drivers/smbfs.py:407 -#: cinder/volume/drivers/netapp/nfs.py:620 +#: cinder/volume/drivers/ibm/ibmnas.py:195 +#: cinder/volume/drivers/netapp/nfs.py:611 #, python-format msgid "Extending volume %s." msgstr "" @@ -7720,28 +7741,28 @@ "Enter _delete_snapfiles: fchild %(fchild)s, mount_point %(mount_point)s" msgstr "" -#: cinder/volume/drivers/ibm/ibmnas.py:249 +#: cinder/volume/drivers/ibm/ibmnas.py:250 #, python-format msgid "Failed in _delete_snapfiles. Error: %s" msgstr "" -#: cinder/volume/drivers/smbfs.py:208 cinder/volume/drivers/ibm/ibmnas.py:287 +#: cinder/volume/drivers/vzstorage.py:314 #, python-format msgid "Volume %s does not have provider_location specified, skipping." -msgstr "" +msgstr "卷 %s 没有指定 provider_location，正在跳过。" #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:143 msgid "enter: do_setup" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:181 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:182 #, python-format msgid "Failed getting details for pool %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:217 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:242 msgid "do_setup: No configured nodes." -msgstr "" +msgstr "do_setup：不存在任何已配置的节点。" #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:214 msgid "leave: do_setup" @@ -7751,21 +7772,21 @@ msgid "enter: check_for_setup_error" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:250 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:251 msgid "Unable to determine system name" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:253 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:254 msgid "Unable to determine system id" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:266 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:267 msgid "" "Password or SSH private key is required for authentication: set either " "san_password or san_private_key option" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:274 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:275 #, python-format msgid "" "Illegal value %d specified for storwize_svc_flashcopy_timeout: valid values " @@ -7776,12 +7797,12 @@ msgid "leave: check_for_setup_error" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:292 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:264 #, python-format msgid "ensure_export: Volume %s not found on storage" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:311 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:283 msgid "The connector does not contain the required information." msgstr "" @@ -7790,43 +7811,43 @@ msgid "enter: initialize_connection: volume %(vol)s with connector %(conn)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:369 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:338 msgid "CHAP secret exists for host but CHAP is disabled" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:375 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:376 #, python-format msgid "initialize_connection: Failed to get attributes for volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:386 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:355 #, python-format msgid "Did not find expected column name in lsvdisk: %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:389 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:390 #, python-format msgid "initialize_connection: Missing volume attribute for volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:406 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:407 #, python-format msgid "" "initialize_connection: No node found in I/O group %(gid)s for volume %(vol)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:414 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:383 #, python-format msgid "initialize_connection: Did not find a preferred node for volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:447 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:467 msgid "" "Could not get FC connection information for the host-volume connection. Is " "the host configured properly for FC connections?" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:485 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:425 #, python-format msgid "" "initialize_connection: Failed to collect return properties for volume " @@ -7847,65 +7868,65 @@ msgid "enter: terminate_connection: volume %(vol)s with connector %(conn)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:537 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:562 msgid "terminate_connection: Failed to get host name from connector." -msgstr "" +msgstr "terminate_connection：未能从连接器获取主机名。" #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:482 #, python-format msgid "leave: terminate_connection: volume %(vol)s with connector %(conn)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:591 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:625 msgid "create_snapshot: get source volume failed." -msgstr "" +msgstr "create_snapshot：获取源卷失败。" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:604 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:638 msgid "create_volume_from_snapshot: Source and destination size differ." -msgstr "" +msgstr "create_volume_from_snapshot：源和目标大小不同。" -#: cinder/volume/drivers/ibm/flashsystem.py:1339 -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:626 -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:749 +#: cinder/volume/drivers/ibm/flashsystem_common.py:1060 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:660 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:780 msgid "create_cloned_volume: Source and destination size differ." -msgstr "" +msgstr "create_cloned_volume：源和目标大小不同。" #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:537 #, python-format msgid "enter: extend_volume: volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:651 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:685 msgid "extend_volume: Extending a volume with snapshots is not supported." -msgstr "" +msgstr "extend_volume：不支持通过快照扩展卷。" #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:548 #, python-format msgid "leave: extend_volume: volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:699 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:706 #, python-format msgid "" "_rm_vdisk_copy_op: Volume %s does not have any registered vdisk copy " "operations." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:704 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:711 #, python-format msgid "" "_rm_vdisk_copy_op: Volume %(vol)s does not have the specified vdisk copy " "operation: orig=%(orig)s new=%(new)s." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:716 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:723 #, python-format msgid "" "_rm_vdisk_copy_op: Volume metadata %s does not have any registered vdisk " "copy operations." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:724 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:731 #, python-format msgid "" "_rm_vdisk_copy_op: Volume %(vol)s metadata does not have the specified vdisk " @@ -7916,7 +7937,7 @@ msgid "enter: update volume copy status" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:783 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:790 #, python-format msgid "" "_check_volume_copy_ops: Volume %(vol)s does not have the specified vdisk " @@ -7959,39 +7980,39 @@ msgid "Reference must contain vdisk_UID element." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:992 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1053 msgid "The specified vdisk is mapped to a host." -msgstr "" +msgstr "指定的 vdisk 已映射到主机。" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1029 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:831 msgid "Could not get pool data from the storage" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1033 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1108 msgid "_update_volume_stats: Could not get storage pool data" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:56 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:60 #, python-format msgid "Could not find key in output of command %(cmd)s: %(out)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:76 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:80 #, python-format msgid "Failed to get code level (%s)." -msgstr "" +msgstr "未能获取代码级别 (%s)。" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:98 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:102 #, python-format msgid "Expected integer for node_count, svcinfo lsiogrp returned: %(node)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:155 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:143 #, python-format msgid "WWPN on node %(node)s: %(wwpn)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:177 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:181 #, python-format msgid "Failed to find host %s" msgstr "" @@ -8011,13 +8032,13 @@ msgid "enter: create_host: host %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:250 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:254 msgid "create_host: Host name is not unicode or string" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:261 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:266 msgid "create_host: No initiators or wwpns supplied." -msgstr "" +msgstr "create_host：未提供任何发起方或 wwpn。" #: cinder/volume/drivers/ibm/storwize_svc/helpers.py:270 #, python-format @@ -8042,20 +8063,20 @@ "enter: unmap_vol_from_host: volume %(volume_name)s from host %(host_name)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:344 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:323 #, python-format msgid "" "unmap_vol_from_host: No mapping of volume %(vol_name)s to any host found." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:350 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:329 #, python-format msgid "" "unmap_vol_from_host: Multiple mappings of volume %(vol_name)s found, no host " "specified." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:362 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:341 #, python-format msgid "" "unmap_vol_from_host: No mapping of volume %(vol_name)s to host %(host)s " @@ -8068,46 +8089,46 @@ "leave: unmap_vol_from_host: volume %(volume_name)s from host %(host_name)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:407 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:411 msgid "" "Illegal value specified for storwize_svc_vol_rsize: set to either a " "percentage (0-100) or -1" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:413 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:417 msgid "" "Illegal value specified for storwize_svc_vol_warning: set to a percentage (0-" "100)" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:420 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:424 msgid "" "Illegal value specified for storwize_svc_vol_grainsize: set to either 32, " "64, 128, or 256" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:427 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:431 msgid "System does not support compression" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:432 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:436 msgid "" "If compression is set to True, rsize must also be set (not equal to -1)" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:438 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:442 #, python-format msgid "" "Illegal value %(prot)s specified for storwize_svc_connection_protocol: valid " "values are %(enabled)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:447 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:451 #, python-format msgid "I/O group %(iogrp)d is not valid; available I/O groups are %(avail)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:474 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:458 msgid "Protocol must be specified as ' iSCSI' or ' FC'." msgstr "" @@ -8121,18 +8142,18 @@ msgid "leave: _create_vdisk: volume %s " msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:684 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:716 #, python-format msgid "" "Unexecpted mapping status %(status)s for mapping%(id)s. Attributes: %(attr)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:694 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:691 #, python-format msgid "" "Mapping %(id)s prepare failed to complete within theallotted %(to)d seconds " "timeout. Terminating." -msgstr "" +msgstr "映射 %(id)s 准备未能在已分配的 %(to)d 秒超时内完成。正在终止。" #: cinder/volume/drivers/ibm/storwize_svc/helpers.py:550 #, python-format @@ -8151,7 +8172,7 @@ msgid "Loopcall: _check_vdisk_fc_mappings(), vdisk %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:754 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:903 #, python-format msgid "Vdisk %(name)s not involved in mapping %(src)s -> %(tgt)s" msgstr "" @@ -8166,7 +8187,7 @@ msgid "enter: delete_vdisk: vdisk %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:800 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:647 #, python-format msgid "Tried to delete non-existant vdisk %s." msgstr "" @@ -8181,7 +8202,7 @@ msgid "enter: create_copy: snapshot %(src)s to %(tgt)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:814 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:963 #, python-format msgid "create_copy: Source vdisk %(src)s (%(src_id)s) does not exist" msgstr "" @@ -8191,9 +8212,9 @@ msgid "leave: _create_copy: snapshot %(tgt)s from vdisk %(src)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:849 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:963 msgid "add_vdisk_copy started without a vdisk copy in the expected pool." -msgstr "" +msgstr "在所需池中没有 vdisk 副本的情况下，add_vdisk_copy 已开始。" #: cinder/volume/drivers/ibm/storwize_svc/helpers.py:741 #, python-format @@ -8202,16 +8223,13 @@ "6.4.0.0" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:953 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:1102 msgid "" "Expected single vdisk returned from lsvdisk when filtering on vdisk_UID. " "%{count}s were returned." msgstr "" -#: cinder/volume/drivers/ibm/flashsystem.py:94 -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:37 -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:215 -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:252 +#: cinder/volume/drivers/ibm/flashsystem_common.py:96 #, python-format msgid "" "CLI Exception output:\n" @@ -8219,6 +8237,10 @@ " stdout: %(out)s\n" " stderr: %(err)s" msgstr "" +"CLI 异常输出：\n" +"命令：%(cmd)s\n" +"标准输出：%(out)s\n" +"标准错误：%(err)s" #: cinder/volume/drivers/ibm/storwize_svc/ssh.py:55 #, python-format @@ -8226,7 +8248,7 @@ msgstr "" #: cinder/volume/drivers/ibm/storwize_svc/ssh.py:67 -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:264 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:267 #, python-format msgid "" "Failed to parse CLI output:\n" @@ -8235,96 +8257,96 @@ " stderr: %(err)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:146 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:148 msgid "Must pass wwpn or host to lsfabric." -msgstr "" +msgstr "必须将 wwpn 或 host 传递给 lsfabric。" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:162 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:163 #, python-format msgid "Did not find success message nor error for %(fun)s: %(out)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:166 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:165 msgid "" "storwize_svc_multihostmap_enabled is set to False, not allowing multi host " "mapping." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:368 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:397 #, python-format msgid "Did not find expected key %(key)s in %(fun)s: %(raw)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:403 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:432 #, python-format msgid "" "Unexpected CLI response: header/row mismatch. header: %(header)s, row: " "%(row)s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/client/api.py:435 +#: cinder/volume/drivers/netapp/dataontap/client/api.py:450 #, python-format msgid "No element by given name %s." -msgstr "" +msgstr "没有具备给定名称 %s 的元素。" -#: cinder/volume/drivers/netapp/dataontap/client/api.py:455 +#: cinder/volume/drivers/netapp/dataontap/client/api.py:470 msgid "Not a valid value for NaElement." -msgstr "" +msgstr "此值对 NaElement 无效。" -#: cinder/volume/drivers/netapp/dataontap/client/api.py:459 +#: cinder/volume/drivers/netapp/dataontap/client/api.py:474 msgid "NaElement name cannot be null." -msgstr "" +msgstr "NaElement 名称不能为空。" -#: cinder/volume/drivers/netapp/dataontap/client/api.py:502 +#: cinder/volume/drivers/netapp/dataontap/client/api.py:517 msgid "Type cannot be converted into NaElement." -msgstr "" +msgstr "此类型不能转换为 NaElement。" -#: cinder/volume/drivers/netapp/common.py:70 +#: cinder/volume/drivers/netapp/common.py:72 msgid "Required configuration not found" -msgstr "" +msgstr "找不到必需的配置选项" -#: cinder/volume/drivers/netapp/common.py:111 +#: cinder/volume/drivers/netapp/common.py:108 #, python-format msgid "Requested unified config: %(storage_family)s and %(storage_protocol)s" msgstr "" -#: cinder/volume/drivers/netapp/common.py:117 +#: cinder/volume/drivers/netapp/common.py:114 #, python-format msgid "Storage family %s is not supported" msgstr "" -#: cinder/volume/drivers/netapp/common.py:124 +#: cinder/volume/drivers/netapp/common.py:121 #, python-format msgid "" "No default storage protocol found for storage family %(storage_family)s" msgstr "" -#: cinder/volume/drivers/netapp/common.py:131 +#: cinder/volume/drivers/netapp/common.py:128 #, python-format msgid "" "Protocol %(storage_protocol)s is not supported for storage family " "%(storage_family)s" msgstr "" -#: cinder/volume/drivers/netapp/common.py:138 +#: cinder/volume/drivers/netapp/common.py:135 #, python-format msgid "" "NetApp driver of family %(storage_family)s and protocol %(storage_protocol)s " "loaded" msgstr "" -#: cinder/volume/drivers/netapp/common.py:147 +#: cinder/volume/drivers/netapp/common.py:144 msgid "Only loading netapp drivers supported." msgstr "" -#: cinder/volume/drivers/netapp/common.py:166 +#: cinder/volume/drivers/netapp/common.py:163 #, python-format msgid "" "The configured NetApp driver is deprecated. Please refer the link to resolve " "the issue '%s'." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:58 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:59 #, python-format msgid "No metadata property %(prop)s defined for the LUN %(name)s" msgstr "" @@ -8343,7 +8365,7 @@ msgid "Created LUN with name %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:212 +#: cinder/volume/drivers/netapp/iscsi.py:175 #, python-format msgid "No entry in LUN table for volume/snapshot %(name)s." msgstr "" @@ -8353,87 +8375,86 @@ msgid "Destroyed LUN %s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:519 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:612 #, python-format msgid "Mapped LUN %(name)s to the initiator %(initiator_name)s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:523 +#: cinder/volume/drivers/netapp/iscsi.py:232 #, python-format msgid "" "Successfully fetched target details for LUN %(name)s and initiator " "%(initiator_name)s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:529 -#: cinder/volume/drivers/netapp/dataontap/block_base.py:635 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:835 #, python-format msgid "Failed to get LUN target details for the LUN %s" -msgstr "" +msgstr "未能获取 LUN %s 的 LUN 目标详细信息" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:542 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:729 #, python-format msgid "Failed to get target portal for the LUN %s" -msgstr "" +msgstr "未能获取 LUN %s 的目标门户网站" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:547 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:736 #, python-format msgid "Failed to get target IQN for the LUN %s" -msgstr "" +msgstr "未能获取 LUN %s 的目标 IQN" #: cinder/volume/drivers/netapp/iscsi.py:290 #, python-format msgid "Snapshot %s deletion successful" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:347 -#: cinder/volume/drivers/netapp/iscsi.py:601 -#: cinder/volume/drivers/netapp/nfs.py:111 -#: cinder/volume/drivers/netapp/nfs.py:218 +#: cinder/volume/drivers/netapp/iscsi.py:310 +#: cinder/volume/drivers/netapp/iscsi.py:557 +#: cinder/volume/drivers/netapp/nfs.py:101 +#: cinder/volume/drivers/netapp/nfs.py:208 #, python-format msgid "Resizing %s failed. Cleaning volume." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:568 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:669 #, python-format msgid "Unmapped LUN %(name)s from the initiator %(initiator_name)s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:458 +#: cinder/volume/drivers/netapp/iscsi.py:414 #, python-format msgid "Error mapping lun. Code :%(code)s, Message:%(message)s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:477 +#: cinder/volume/drivers/netapp/iscsi.py:433 #, python-format msgid "Error unmapping lun. Code :%(code)s, Message:%(message)s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:320 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:427 msgid "Object is not a NetApp LUN." -msgstr "" +msgstr "对象不是 NetApp LUN。" -#: cinder/volume/drivers/netapp/iscsi.py:579 +#: cinder/volume/drivers/netapp/iscsi.py:535 #, python-format msgid "Message: %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:581 +#: cinder/volume/drivers/netapp/iscsi.py:537 #, python-format msgid "Error getting lun attribute. Exception: %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:638 +#: cinder/volume/drivers/netapp/iscsi.py:593 #, python-format msgid "No need to extend volume %s as it is already the requested new size." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:644 +#: cinder/volume/drivers/netapp/iscsi.py:599 #, python-format msgid "Resizing lun %s directly to new size." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:671 +#: cinder/volume/drivers/netapp/iscsi.py:626 #, python-format msgid "Lun %(path)s geometry failed. Message - %(msg)s" msgstr "" @@ -8443,47 +8464,47 @@ msgid "Moving lun %(name)s to %(new_name)s." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:715 +#: cinder/volume/drivers/netapp/iscsi.py:670 #, python-format msgid "Resizing lun %s using sub clone to new size." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:722 +#: cinder/volume/drivers/netapp/iscsi.py:677 #, python-format msgid "%s cannot be sub clone resized as it is hosted on compressed volume" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:728 +#: cinder/volume/drivers/netapp/iscsi.py:683 #, python-format msgid "%s cannot be sub clone resized as it contains no blocks." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:745 +#: cinder/volume/drivers/netapp/iscsi.py:700 #, python-format msgid "Post clone resize lun %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:756 +#: cinder/volume/drivers/netapp/iscsi.py:711 #, python-format msgid "Failure staging lun %s to tmp." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:761 +#: cinder/volume/drivers/netapp/iscsi.py:716 #, python-format msgid "Failure moving new cloned lun to %s." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:765 +#: cinder/volume/drivers/netapp/iscsi.py:720 #, python-format msgid "Failure deleting staged tmp lun %s." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:768 +#: cinder/volume/drivers/netapp/iscsi.py:723 #, python-format msgid "Unknown exception in post clone resize lun %s." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:770 +#: cinder/volume/drivers/netapp/iscsi.py:725 #, python-format msgid "Exception details: %s" msgstr "" @@ -8492,7 +8513,7 @@ msgid "Getting lun block count." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:779 +#: cinder/volume/drivers/netapp/iscsi.py:734 #, python-format msgid "Failure getting lun info for %s." msgstr "" @@ -8517,7 +8538,7 @@ msgid "Cloned LUN with new name %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:1025 +#: cinder/volume/drivers/netapp/iscsi.py:1012 #, python-format msgid "No cloned lun named %s found on the filer" msgstr "" @@ -8526,15 +8547,15 @@ msgid "Cluster ssc is not updated. No volume stats found." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:1195 -#: cinder/volume/drivers/netapp/nfs.py:1343 +#: cinder/volume/drivers/netapp/iscsi.py:1175 +#: cinder/volume/drivers/netapp/nfs.py:1300 msgid "" "Unsupported ONTAP version. ONTAP version 7.3.1 and above is supported." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:1199 -#: cinder/volume/drivers/netapp/nfs.py:1347 -#: cinder/volume/drivers/netapp/utils.py:336 +#: cinder/volume/drivers/netapp/iscsi.py:1179 +#: cinder/volume/drivers/netapp/nfs.py:1304 +#: cinder/volume/drivers/netapp/utils.py:323 msgid "Api version could not be determined." msgstr "" @@ -8543,7 +8564,7 @@ msgid "Failed to get vol with required size for volume: %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:1309 +#: cinder/volume/drivers/netapp/iscsi.py:1299 #, python-format msgid "Error finding luns for volume %s. Verify volume exists." msgstr "" @@ -8558,7 +8579,7 @@ msgid "Clone operation with src %(name)s and dest %(new_name)s failed" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:1570 +#: cinder/volume/drivers/netapp/iscsi.py:1509 msgid "Volume refresh job already running. Returning..." msgstr "" @@ -8572,23 +8593,22 @@ msgid "Refreshing capacity info for %s." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:110 -#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:215 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:198 #, python-format msgid "NFS file %s not discovered." -msgstr "" +msgstr "未发现 NFS 文件 %s。" -#: cinder/volume/drivers/netapp/nfs.py:235 +#: cinder/volume/drivers/netapp/nfs.py:226 #, python-format msgid "Copied image to volume %s using regular download." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:242 +#: cinder/volume/drivers/netapp/nfs.py:233 #, python-format msgid "Registering image in cache %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:249 +#: cinder/volume/drivers/netapp/nfs.py:240 #, python-format msgid "" "Exception while registering image %(image_id)s in cache. Exception: %(exc)s" @@ -8599,7 +8619,7 @@ msgid "Found cache file for image %(image_id)s on share %(share)s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:275 +#: cinder/volume/drivers/netapp/nfs.py:266 #, python-format msgid "Cloning from cache to destination %s" msgstr "" @@ -8612,7 +8632,7 @@ msgid "Image cache cleaning in progress." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:305 +#: cinder/volume/drivers/netapp/nfs.py:296 #, python-format msgid "Cleaning cache for share %s." msgstr "" @@ -8622,7 +8642,7 @@ msgid "Files to be queued for deletion %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:317 +#: cinder/volume/drivers/netapp/nfs.py:308 #, python-format msgid "Exception during cache cleaning %(share)s. Message - %(ex)s" msgstr "" @@ -8646,17 +8666,17 @@ msgid "Deleting file at path %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:375 +#: cinder/volume/drivers/netapp/nfs.py:366 #, python-format msgid "Exception during deleting %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:407 +#: cinder/volume/drivers/netapp/nfs.py:398 #, python-format msgid "Image cloning unsuccessful for image %(image_id)s. Message: %(msg)s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:423 +#: cinder/volume/drivers/netapp/nfs.py:414 #, python-format msgid "Cloning image %s from cache" msgstr "" @@ -8666,12 +8686,12 @@ msgid "Cache share: %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:437 +#: cinder/volume/drivers/netapp/nfs.py:428 #, python-format msgid "Unexpected exception during image cloning in share %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:443 +#: cinder/volume/drivers/netapp/nfs.py:434 #, python-format msgid "Checking image clone %s from glance share." msgstr "" @@ -8686,35 +8706,37 @@ msgid "Image is raw %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:462 +#: cinder/volume/drivers/netapp/nfs.py:453 #, python-format msgid "Image will locally be converted to raw %s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:461 +#: cinder/volume/drivers/tintri.py:463 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:539 #, python-format msgid "Converted to raw, but format is now %s" msgstr "转化为裸格式，但目前格式是 %s" -#: cinder/volume/drivers/netapp/nfs.py:479 +#: cinder/volume/drivers/netapp/nfs.py:470 #, python-format msgid "Performing post clone for %s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:478 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:557 msgid "NFS file could not be discovered." -msgstr "" +msgstr "未能发现 NFS 文件。" #: cinder/volume/drivers/netapp/nfs.py:481 msgid "Checking file for resize" msgstr "" -#: cinder/volume/drivers/hds/nfs.py:228 -#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:493 +#: cinder/volume/drivers/tintri.py:493 +#: cinder/volume/drivers/hitachi/hnas_nfs.py:250 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:572 msgid "Resizing image file failed." -msgstr "" +msgstr "对映像文件调整大小失败。" -#: cinder/volume/drivers/netapp/nfs.py:522 +#: cinder/volume/drivers/netapp/nfs.py:513 msgid "Discover file retries exhausted." msgstr "" @@ -8728,55 +8750,56 @@ msgid "Found possible share matches %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:580 +#: cinder/volume/drivers/netapp/nfs.py:571 msgid "Unexpected exception while short listing used share." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:590 +#: cinder/volume/drivers/tintri.py:547 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:669 msgid "Image location not present." -msgstr "" +msgstr "映像位置不存在。" -#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:628 +#: cinder/volume/drivers/tintri.py:579 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:722 msgid "Container size smaller than required file size." -msgstr "" +msgstr "容器大小小于所需文件大小。" -#: cinder/volume/drivers/netapp/nfs.py:640 +#: cinder/volume/drivers/netapp/nfs.py:631 #, python-format msgid "Destination %s already exists." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:648 +#: cinder/volume/drivers/netapp/nfs.py:639 #, python-format msgid "Exception moving file %(src)s. Message - %(e)s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:767 +#: cinder/volume/drivers/netapp/nfs.py:741 #, python-format msgid "Shares on vserver %s will only be used for provisioning." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:771 +#: cinder/volume/drivers/netapp/nfs.py:745 +#: cinder/volume/drivers/netapp/nfs.py:947 msgid "No vserver set in config. SSC will be disabled." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:827 -#: cinder/volume/drivers/netapp/nfs.py:1390 +#: cinder/volume/drivers/netapp/nfs.py:794 #, python-format msgid "Exception creating vol %(name)s on share %(share)s. Details: %(ex)s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/nfs_7mode.py:99 -#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:120 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:171 #, python-format msgid "Volume %s could not be created on shares." -msgstr "" +msgstr "在共享项上，未能创建卷 %s。" -#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:321 +#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:436 #, python-format msgid "No interface found on cluster for ip %s" -msgstr "" +msgstr "集群中找不到 IP %s 的接口" -#: cinder/volume/drivers/netapp/nfs.py:924 +#: cinder/volume/drivers/netapp/nfs.py:907 #, python-format msgid "" "No volume on cluster with vserver\n" @@ -8785,7 +8808,7 @@ " " msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:931 +#: cinder/volume/drivers/netapp/nfs.py:914 #, python-format msgid "" "Cloning with params volume %(volume)s, src %(src_path)s,\n" @@ -8796,7 +8819,7 @@ msgid "No cluster ssc stats found. Wait for next volume stats update." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1039 +#: cinder/volume/drivers/netapp/nfs.py:996 msgid "No shares found hence skipping ssc refresh." msgstr "" @@ -8835,7 +8858,7 @@ msgid "Found volume %(vol)s for share %(share)s." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1169 +#: cinder/volume/drivers/netapp/nfs.py:1126 #, python-format msgid "Copied image %(img)s to volume %(vol)s using copy offload workflow." msgstr "" @@ -8844,12 +8867,12 @@ msgid "Copy offload either not configured or unsupported." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1176 +#: cinder/volume/drivers/netapp/nfs.py:1133 #, python-format msgid "Copy offload workflow unsuccessful. %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1200 +#: cinder/volume/drivers/netapp/nfs.py:1157 #, python-format msgid "No vserver owning the ip %s." msgstr "" @@ -8873,7 +8896,7 @@ msgid "Copied image from cache to volume %s using cloning." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1236 +#: cinder/volume/drivers/netapp/nfs.py:1193 #, python-format msgid "Error in workflow copy from cache. %s." msgstr "" @@ -8882,9 +8905,9 @@ msgid "Trying copy from image service using copy offload." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:452 +#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:515 msgid "Source host details not found." -msgstr "" +msgstr "找不到源主机详细信息。" #: cinder/volume/drivers/netapp/nfs.py:1239 #, python-format @@ -8906,20 +8929,20 @@ msgid "Image will be converted to raw %s." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:505 +#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:571 #, python-format msgid "Converted to raw, but format is now %s." -msgstr "" +msgstr "已转换为原始文件，但现在格式为 %s。" #: cinder/volume/drivers/netapp/nfs.py:1271 #, python-format msgid "Copied locally converted raw image %(img)s to volume %(vol)s." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/client/client_7mode.py:311 +#: cinder/volume/drivers/netapp/dataontap/client/client_7mode.py:313 #, python-format msgid "No storage path found for export path %s" -msgstr "" +msgstr "对于导出路径 %s，找不到存储路径" #: cinder/volume/drivers/netapp/nfs.py:1359 #, python-format @@ -8951,48 +8974,48 @@ msgid "Exception querying storage disk. %s" msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:424 +#: cinder/volume/drivers/netapp/ssc_utils.py:421 #, python-format msgid "Running stale ssc refresh job for %(server)s and vserver %(vs)s" msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:458 +#: cinder/volume/drivers/netapp/ssc_utils.py:455 #, python-format msgid "" "Successfully completed stale refresh job for %(server)s and vserver %(vs)s" msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:485 +#: cinder/volume/drivers/netapp/ssc_utils.py:482 #, python-format msgid "Running cluster latest ssc job for %(server)s and vserver %(vs)s" msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:491 +#: cinder/volume/drivers/netapp/ssc_utils.py:488 #, python-format msgid "Successfully completed ssc job for %(server)s and vserver %(vs)s" msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:503 +#: cinder/volume/drivers/netapp/ssc_utils.py:500 msgid "Backend not a VolumeDriver." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/ssc_cmode.py:503 +#: cinder/volume/drivers/netapp/dataontap/ssc_cmode.py:521 msgid "Backend server not NaServer." -msgstr "" +msgstr "后端服务器不是 NaServer。" -#: cinder/volume/drivers/netapp/ssc_utils.py:508 +#: cinder/volume/drivers/netapp/ssc_utils.py:505 msgid "ssc job in progress. Returning... " msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:520 +#: cinder/volume/drivers/netapp/ssc_utils.py:517 msgid "refresh stale ssc job in progress. Returning... " msgstr "" -#: cinder/volume/drivers/netapp/dataontap/ssc_cmode.py:614 +#: cinder/volume/drivers/netapp/dataontap/ssc_cmode.py:634 msgid "Fatal error: User not permitted to query NetApp volumes." -msgstr "" +msgstr "发生致命错误：不允许用户查询 NetApp 卷。" -#: cinder/volume/drivers/netapp/ssc_utils.py:623 +#: cinder/volume/drivers/netapp/ssc_utils.py:620 #, python-format msgid "" "The user does not have access or sufficient privileges to use all netapp " @@ -9003,45 +9026,45 @@ msgid "ems executed successfully." msgstr "" -#: cinder/volume/drivers/netapp/utils.py:139 +#: cinder/volume/drivers/netapp/utils.py:127 #, python-format msgid "Failed to invoke ems. Message : %s" msgstr "" -#: cinder/volume/drivers/netapp/utils.py:152 +#: cinder/volume/drivers/netapp/utils.py:140 msgid "" "It is not the recommended way to use drivers by NetApp. Please use " "NetAppDriver to achieve the functionality." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/client/api.py:540 +#: cinder/volume/drivers/netapp/dataontap/client/api.py:555 msgid "Requires an NaServer instance." -msgstr "" +msgstr "需要 NaServer 实例。" -#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:448 +#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:562 msgid "Unsupported Clustered Data ONTAP version." -msgstr "" +msgstr "不支持 Clustered Data ONTAP 版本。" -#: cinder/volume/drivers/netapp/eseries/client.py:47 +#: cinder/volume/drivers/netapp/eseries/client.py:49 msgid "One of the required inputs from host, port or scheme not found." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:51 +#: cinder/volume/drivers/netapp/eseries/client.py:63 msgid "Invalid transport type." -msgstr "" +msgstr "无效传输类型。" -#: cinder/volume/drivers/netapp/eseries/client.py:74 +#: cinder/volume/drivers/netapp/eseries/client.py:73 #, python-format msgid "Unexpected error while invoking web service. Error - %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:78 +#: cinder/volume/drivers/netapp/eseries/client.py:90 msgid "Invoking web service failed." -msgstr "" +msgstr "调用 Web Service 失败。" -#: cinder/volume/drivers/netapp/eseries/client.py:111 +#: cinder/volume/drivers/netapp/eseries/client.py:195 msgid "Storage system id not set." -msgstr "" +msgstr "未设置存储系统标识。" #: cinder/volume/drivers/netapp/eseries/client.py:121 #, python-format @@ -9050,71 +9073,72 @@ "%(sys)s, timeout: %(t)s, verify: %(v)s, kwargs: %(k)s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:144 +#: cinder/volume/drivers/netapp/eseries/client.py:225 msgid "Content type not supported." -msgstr "" +msgstr "不支持内容类型。" -#: cinder/volume/drivers/netapp/eseries/client.py:154 +#: cinder/volume/drivers/netapp/eseries/client.py:269 #, python-format msgid "Response error - %s." -msgstr "" +msgstr "响应错误 - %s。" -#: cinder/volume/drivers/netapp/eseries/client.py:156 +#: cinder/volume/drivers/netapp/eseries/client.py:278 #, python-format msgid "Response error code - %s." -msgstr "" +msgstr "响应错误代码 - %s。" -#: cinder/volume/drivers/nimble.py:90 -#: cinder/volume/drivers/ibm/flashsystem.py:1122 +#: cinder/volume/drivers/nimble.py:115 +#: cinder/volume/drivers/ibm/flashsystem_common.py:939 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:285 #, python-format msgid "%s is not set." -msgstr "" +msgstr "未设置 %s。" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:104 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:100 #, python-format msgid "Error resolving host %(host)s. Error - %(e)s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:114 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:110 msgid "Controller ips not valid after resolution." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:117 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:113 msgid "Embedded mode detected." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:120 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:116 msgid "Proxy mode detected." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:173 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:127 #, python-format msgid "" "System with controller addresses [%s] is not registered with web service." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:149 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:145 msgid "Waiting for web service array communication." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:195 +#: cinder/volume/drivers/netapp/eseries/library.py:278 #, python-format msgid "" "Failure in communication between web service and array. Waited %s seconds. " "Verify array configuration parameters." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:205 +#: cinder/volume/drivers/netapp/eseries/library.py:333 #, python-format msgid "System %(id)s found with bad status - %(status)s." -msgstr "" +msgstr "找到具有以下不正确状态的系统 %(id)s：%(status)s。" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:165 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:161 #, python-format msgid "System %(id)s has %(status)s status." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:181 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:177 #, python-format msgid "Configured storage pools %s." msgstr "" @@ -9134,40 +9158,38 @@ msgid "Mapping with id %s already removed." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:325 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:356 #, python-format msgid "No pit image found in snapshot group %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:346 -#: cinder/volume/drivers/netapp/eseries/iscsi.py:361 -#: cinder/volume/drivers/netapp/eseries/iscsi.py:378 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:296 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:330 #, python-format msgid "Created volume with label %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:349 -#: cinder/volume/drivers/netapp/eseries/iscsi.py:364 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:299 #, python-format msgid "Error creating volume. Msg - %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:409 +#: cinder/volume/drivers/netapp/eseries/library.py:526 #, python-format msgid "Failure creating volume %s." -msgstr "" +msgstr "创建卷 %s 时发生故障。" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:725 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:316 #, python-format msgid "No storage pool found with available capacity %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:387 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:339 #, python-format msgid "Failure deleting snap vol. Error: %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:389 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:341 msgid "Snapshot volume not found." msgstr "" @@ -9176,67 +9198,67 @@ msgid "Creating snap vol for group %s" msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:405 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:357 #, python-format msgid "Copying src vol %(src)s to dest vol %(dst)s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:418 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:370 #, python-format msgid "Vol copy job status %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:463 +#: cinder/volume/drivers/netapp/eseries/library.py:580 #, python-format msgid "Vol copy job for dest %s failed." -msgstr "" +msgstr "针对目标 %s 的卷复制作业失败。" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:422 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:374 #, python-format msgid "Vol copy job completed for dest %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:430 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:382 #, python-format msgid "Failure deleting job %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:432 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:384 #, python-format msgid "Volume copy job for src vol %s not found." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:434 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:386 #, python-format msgid "Copy job to dest vol %s completed." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:446 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:398 #, python-format msgid "Failure deleting temp snapshot %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:455 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:407 #, python-format msgid "Volume %s already deleted." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:479 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:431 #, python-format msgid "Created snap grp with label %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:490 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:442 #, python-format msgid "Snapshot %s already deleted." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:563 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:594 #, python-format msgid "Mapped volume %(id)s to the initiator %(initiator_name)s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:566 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:597 #, python-format msgid "" "Successfully fetched target details for volume %(id)s and initiator " @@ -9248,31 +9270,31 @@ msgid "No good iscsi portal information found for %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:600 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:527 #, python-format msgid "Message - %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:615 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:542 #, python-format msgid "Host with port %(port)s and type %(type)s not found." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:620 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:547 #, python-format msgid "Creating host with port %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:679 +#: cinder/volume/drivers/netapp/eseries/library.py:953 #, python-format msgid "Host type %s not supported." -msgstr "" +msgstr "不支持主机类型 %s。" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:643 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:569 msgid "No free luns. Host might exceeded max luns." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:719 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:750 #, python-format msgid "Mapping not found for %(vol)s to host %(ht)s." msgstr "" @@ -9281,12 +9303,12 @@ msgid "Updating volume stats." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:744 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:646 #, python-format msgid "Extended volume with label %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:758 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:660 msgid "Returning as clean tmp vol job already running." msgstr "" @@ -9295,22 +9317,22 @@ msgid "Error deleting vol with label %s." msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:106 +#: cinder/volume/drivers/nexenta/iscsi.py:112 #, python-format msgid "Volume %s does not exist in Nexenta SA" -msgstr "" +msgstr "卷 %s 在 Nexenta SA 中不存在" -#: cinder/volume/drivers/nexenta/iscsi.py:152 +#: cinder/volume/drivers/nexenta/iscsi.py:151 #, python-format msgid "Extending volume: %(id)s New size: %(size)s GB" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:168 +#: cinder/volume/drivers/nexenta/iscsi.py:167 #, python-format msgid "Volume %s does not exist, it seems it was already deleted." msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:181 +#: cinder/volume/drivers/nexenta/iscsi.py:180 #, python-format msgid "Cannot delete snapshot %(origin)s: %(exc)s" msgstr "" @@ -9321,15 +9343,15 @@ "Creating temp snapshot of the original volume: %(volume_name)s@%(name)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:202 -#: cinder/volume/drivers/nexenta/nfs.py:202 +#: cinder/volume/drivers/nexenta/iscsi.py:201 +#: cinder/volume/drivers/nexenta/nfs.py:200 #, python-format msgid "" "Volume creation failed, deleting created snapshot %(volume_name)s@%(name)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:207 -#: cinder/volume/drivers/nexenta/nfs.py:207 +#: cinder/volume/drivers/nexenta/iscsi.py:206 +#: cinder/volume/drivers/nexenta/nfs.py:205 #, python-format msgid "Failed to delete zfs snapshot %(volume_name)s@%(name)s" msgstr "" @@ -9339,77 +9361,77 @@ msgid "Enter: migrate_volume: id=%(id)s, host=%(host)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:269 +#: cinder/volume/drivers/nexenta/iscsi.py:268 #, python-format msgid "Remote NexentaStor appliance at %s should be SSH-bound." msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:289 +#: cinder/volume/drivers/nexenta/iscsi.py:288 #, python-format msgid "" "Cannot send source snapshot %(src)s to destination %(dst)s. Reason: %(exc)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:297 +#: cinder/volume/drivers/nexenta/iscsi.py:296 #, python-format msgid "" "Cannot delete temporary source snapshot %(src)s on NexentaStor Appliance: " "%(exc)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:303 +#: cinder/volume/drivers/nexenta/iscsi.py:302 #, python-format msgid "" "Cannot delete source volume %(volume)s on NexentaStor Appliance: %(exc)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:313 +#: cinder/volume/drivers/nexenta/iscsi.py:312 #, python-format msgid "" "Cannot delete temporary destination snapshot %(dst)s on NexentaStor " "Appliance: %(exc)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:356 +#: cinder/volume/drivers/nexenta/iscsi.py:355 #, python-format msgid "Snapshot %s does not exist, it seems it was already deleted." msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:477 -#: cinder/volume/drivers/windows/windows_utils.py:273 +#: cinder/volume/drivers/nexenta/iscsi.py:476 +#: cinder/volume/drivers/windows/windows_utils.py:230 #, python-format msgid "Ignored target creation error \"%s\" while ensuring export" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:487 +#: cinder/volume/drivers/nexenta/iscsi.py:486 #, python-format msgid "Ignored target group creation error \"%s\" while ensuring export" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:499 +#: cinder/volume/drivers/nexenta/iscsi.py:498 #, python-format msgid "" "Ignored target group member addition error \"%s\" while ensuring export" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:509 +#: cinder/volume/drivers/nexenta/iscsi.py:508 #, python-format msgid "Ignored LU creation error \"%s\" while ensuring export" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:519 +#: cinder/volume/drivers/nexenta/iscsi.py:518 #, python-format msgid "Ignored LUN mapping entry addition error \"%s\" while ensuring export" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:552 +#: cinder/volume/drivers/nexenta/iscsi.py:551 #, python-format msgid "" "Got error trying to destroy target group %(target_group)s, assuming it is " "already gone: %(exc)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:560 +#: cinder/volume/drivers/nexenta/iscsi.py:559 #, python-format msgid "" "Got error trying to delete target %(target)s, assuming it is already gone: " @@ -9421,15 +9443,15 @@ msgid "Sending JSON data: %s" msgstr "" -#: cinder/volume/drivers/nexenta/jsonrpc.py:89 +#: cinder/volume/drivers/nexenta/jsonrpc.py:88 msgid "No headers in server response" msgstr "" -#: cinder/volume/drivers/nexenta/jsonrpc.py:91 +#: cinder/volume/drivers/nexenta/jsonrpc.py:89 msgid "Bad response from server" msgstr "" -#: cinder/volume/drivers/nexenta/jsonrpc.py:91 +#: cinder/volume/drivers/nexenta/jsonrpc.py:90 #, python-format msgid "Auto switching to HTTPS connection to %s" msgstr "" @@ -9439,48 +9461,48 @@ msgid "Got response: %s" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:88 +#: cinder/volume/drivers/nexenta/nfs.py:119 #, python-format msgid "Volume %s does not exist in Nexenta Store appliance" -msgstr "" +msgstr "卷 %s 在 Nexenta 存储设备中不存在" -#: cinder/volume/drivers/nexenta/nfs.py:92 +#: cinder/volume/drivers/nexenta/nfs.py:123 #, python-format msgid "Folder %s does not exist in Nexenta Store appliance" -msgstr "" +msgstr "文件夹 %s 在 Nexenta 存储设备中不存在" #: cinder/volume/drivers/nexenta/nfs.py:114 #, python-format msgid "Creating folder on Nexenta Store %s" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:148 +#: cinder/volume/drivers/nexenta/nfs.py:146 #, python-format msgid "Cannot destroy created folder: %(vol)s/%(folder)s" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:178 +#: cinder/volume/drivers/nexenta/nfs.py:176 #, python-format msgid "Cannot destroy cloned folder: %(vol)s/%(folder)s" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:229 +#: cinder/volume/drivers/nexenta/nfs.py:227 #, python-format msgid "Folder %s does not exist, it was already deleted." msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:239 -#: cinder/volume/drivers/nexenta/nfs.py:270 +#: cinder/volume/drivers/nexenta/nfs.py:237 +#: cinder/volume/drivers/nexenta/nfs.py:268 #, python-format msgid "Snapshot %s does not exist, it was already deleted." msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:300 +#: cinder/volume/drivers/nexenta/nfs.py:302 #, python-format msgid "Creating regular file: %s.This may take some time." msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:311 +#: cinder/volume/drivers/nexenta/nfs.py:313 #, python-format msgid "Regular file: %s created." msgstr "" @@ -9495,10 +9517,10 @@ msgid "Shares loaded: %s" msgstr "" -#: cinder/volume/drivers/nexenta/utils.py:48 +#: cinder/volume/drivers/nexenta/utils.py:47 #, python-format msgid "Invalid value: \"%s\"" -msgstr "" +msgstr "无效值：“%s”" #: cinder/volume/drivers/san/san.py:171 msgid "Specify san_password or san_private_key" @@ -9513,38 +9535,38 @@ msgid "Cannot parse list-view output: %s" msgstr "" -#: cinder/volume/drivers/san/solaris.py:171 +#: cinder/volume/drivers/san/solaris.py:174 #, python-format msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s" msgstr "没有为 %(zfs_poolname)s 找到LUID。Output=%(out)s" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:224 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:267 #, python-format msgid "" "Invalid hp3parclient version found (%(found)s). Version %(minimum)s or " "greater required." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:239 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:290 #, python-format msgid "Failed to Login to 3PAR (%(url)s) because %(err)s" -msgstr "" +msgstr "未能登录到 3PAR (%(url)s)，因为存在 %(err)s" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:264 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:214 #, python-format msgid "HP3PARCommon %(common_ver)s, hp3parclient %(rest_ver)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:291 -#: cinder/volume/drivers/san/hp/hp_3par_common.py:690 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:365 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:961 #, python-format msgid "CPG (%s) doesn't exist on array" -msgstr "" +msgstr "数组中不存在 CPG (%s)" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:299 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:373 #, python-format msgid "Failed to get domain because CPG (%s) doesn't exist on array." -msgstr "" +msgstr "未能获取域，因为阵列上不存在 CPG (%s)。" #: cinder/volume/drivers/san/hp/hp_3par_common.py:253 #, python-format @@ -9555,25 +9577,25 @@ msgid "Converting to base volume prior to growing." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:463 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:283 #, python-format msgid "Error extending volume: %(vol)s. Exception: %(ex)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:731 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:770 #, python-format msgid "3PAR vlun %(name)s not found on host %(host)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:831 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:593 #, python-format msgid "Error creating QOS rule %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:892 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1251 #, python-format msgid "VV Set %s does not exist." -msgstr "" +msgstr "VV 集 %s 不存在。" #: cinder/volume/drivers/san/hp/hp_3par_common.py:644 #, python-format @@ -9581,17 +9603,17 @@ "Must specify a valid persona %(valid)s, value '%(persona)s' is invalid." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1019 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1385 #, python-format msgid "" "Must specify a valid provisioning type %(valid)s, value '%(prov)s' is " "invalid." -msgstr "" +msgstr "指定有效供应类型 %(valid)s，值“%(prov)s”无效。" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1113 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1505 #, python-format msgid "Volume (%s) already exists on array" -msgstr "" +msgstr "数组中已存在卷 (%s)" #: cinder/volume/drivers/san/hp/hp_3par_common.py:782 #, python-format @@ -9603,7 +9625,7 @@ msgid "Found an online copy for %(volume)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1267 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1374 #, python-format msgid "Delete volume id not found. Removing from cinder: %(id)s Ex: %(msg)s" msgstr "" @@ -9618,27 +9640,27 @@ msgid "Growing volume: %(id)s by %(size)s GiB." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1234 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:947 #, python-format msgid "Error extending volume %(id)s. Ex: %(ex)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1419 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1823 #, python-format msgid "Failure in update_volume_key_value_pair:%s" -msgstr "" +msgstr "update_volume_key_value_pair 中发生故障：%s" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1436 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1547 #, python-format msgid "Failure in clear_volume_key_value_pair:%s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1344 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1057 #, python-format msgid "Error attaching volume %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1352 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1065 #, python-format msgid "Error detaching volume %s" msgstr "" @@ -9678,12 +9700,12 @@ msgid "Copy volume scheduled: convert_to_base_volume: id=%s." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1533 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1984 #, python-format msgid "" "Copy volume task failed: convert_to_base_volume: id=%(id)s, " "status=%(status)s." -msgstr "" +msgstr "“复制卷”任务失败：convert_to_base_volume：id=%(id)s，status=%(status)s。" #: cinder/volume/drivers/san/hp/hp_3par_common.py:1169 #, python-format @@ -9700,43 +9722,44 @@ msgid "Delete src volume completed: convert_to_base_volume: id=%s." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1473 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1186 #, python-format msgid "Completed: convert_to_base_volume: id=%s." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1557 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:2008 #, python-format msgid "Volume (%s) already exists on array." -msgstr "" +msgstr "阵列上已存在卷 (%s)。" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1588 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1710 #, python-format msgid "" "Delete Snapshot id not found. Removing from cinder: %(id)s Ex: %(msg)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:154 +#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162 #, python-format msgid "Invalid IP address format '%s'" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:188 +#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:196 #, python-format msgid "" "Found invalid iSCSI IP address(s) in configuration option(s) " "hp3par_iscsi_ips or iscsi_ip_address '%s.'" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:194 +#: cinder/volume/drivers/dothill/dothill_iscsi.py:87 +#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:216 msgid "At least one valid iSCSI IP address must be set." -msgstr "" +msgstr "必须至少设置一个有效 iSCSI IP 地址。" -#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:289 +#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:315 msgid "Least busy iSCSI port not found, using first iSCSI port in list." msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:94 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:100 #, python-format msgid "CLIQ %(proxy_ver)s" msgstr "" @@ -9746,18 +9769,18 @@ msgid "CLIQ command returned %s" msgstr "返回CLIQ命令 %s" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:115 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:121 #, python-format msgid "" "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s" msgstr "CLIQ命令 %(verb)s %(cliq_args)s 错误格式的响应。Result=%(out)s" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:123 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:129 #, python-format msgid "Error running CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s" msgstr "在运行CLIQ命令 %(verb)s %(cliq_args)s 时发生错误。输出结果 Result=%(out)s" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:153 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:159 #, python-format msgid "" "Unexpected number of virtual ips for cluster %(cluster_name)s. " @@ -9774,21 +9797,21 @@ msgid "Snapshot info: %(name)s => %(attributes)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:320 -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:188 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:318 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:184 msgid "Volume did not exist. It will not be deleted" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:332 -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:221 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:330 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:217 msgid "Snapshot did not exist. It will not be deleted" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:341 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:347 msgid "local_path not supported" msgstr "不支持local_path" -#: cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py:80 +#: cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py:75 #, python-format msgid "HPLeftHand driver %(driver_ver)s, proxy %(proxy_ver)s" msgstr "" @@ -9797,30 +9820,30 @@ msgid "Module hplefthandclient not installed." msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:109 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:123 msgid "HPLeftHand url not found" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:147 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:162 msgid "LeftHand cluster not found" -msgstr "" +msgstr "找不到 LeftHand 集群" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:155 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:184 #, python-format msgid "REST %(proxy_ver)s hplefthandclient %(rest_ver)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:360 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:342 #, python-format msgid "'%(value)s' is an invalid value for extra spec '%(key)s'" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:380 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:362 #, python-format msgid "CHAP secret exists for host %s but CHAP is disabled" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:383 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:365 #, python-format msgid "CHAP is enabled, but server secret not configured on server %s" msgstr "" @@ -9840,15 +9863,15 @@ msgid "Clister info: %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:501 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:483 #, python-format msgid "" "Cannot provide backend assisted migration for volume: %s because volume is " "from a different backend." msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:506 -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:512 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:488 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:494 #, python-format msgid "" "Cannot provide backend assisted migration for volume: %s because cluster " @@ -9860,7 +9883,7 @@ msgid "Volume info: %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:523 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:505 #, python-format msgid "" "Cannot provide backend assisted migration for volume: %s because the volume " @@ -9872,14 +9895,14 @@ msgid "Snapshot info: %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:534 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:516 #, python-format msgid "" "Cannot provide backend assisted migration for volume: %s because the volume " "has snapshots." msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:542 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:524 #, python-format msgid "" "Cannot provide backend assisted migration for volume: %s because volume does " @@ -9890,12 +9913,12 @@ msgid "Connecting to MSA" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:67 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:66 #, python-format msgid "Failed to connect to MSA Array (%(host)s): %(err)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:72 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:71 msgid "Failed to log on MSA Array (invalid login?)" msgstr "" @@ -9903,7 +9926,7 @@ msgid "Disconnected from MSA Array" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:126 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:125 #, python-format msgid "%s configuration option is not set" msgstr "" @@ -9913,7 +9936,7 @@ msgid "Create Volume (%(display_name)s: %(name)s %(id)s)" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:167 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:166 msgid "Volume must be detached to perform a clone operation." msgstr "" @@ -9932,12 +9955,12 @@ msgid "Deleting Volume (%s)" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:244 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:243 #, python-format msgid "Unable to get stats for VDisk (%s)" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:253 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:252 msgid "Connector doesn't provide wwpns" msgstr "" @@ -9958,26 +9981,26 @@ "%(growth_size)s GB." msgstr "" -#: cinder/volume/drivers/vmware/api.py:72 +#: cinder/volume/drivers/vmware/api.py:71 #, python-format msgid "Failure while invoking function: %(func)s. Error: %(excep)s." msgstr "" -#: cinder/volume/drivers/vmware/api.py:170 +#: cinder/volume/drivers/vmware/api.py:168 #, python-format msgid "Error while terminating session: %s." msgstr "" -#: cinder/volume/drivers/vmware/api.py:183 +#: cinder/volume/drivers/vmware/api.py:173 msgid "Successfully established connection to the server." msgstr "" -#: cinder/volume/drivers/vmware/api.py:190 +#: cinder/volume/drivers/vmware/api.py:180 #, python-format msgid "Error while logging out from vim session: %s." msgstr "" -#: cinder/volume/drivers/vmware/api.py:196 +#: cinder/volume/drivers/vmware/api.py:186 #, python-format msgid "Error while logging out from pbm session: %s." msgstr "" @@ -9999,8 +10022,8 @@ msgid "Task %s status: success." msgstr "" -#: cinder/volume/drivers/vmware/api.py:313 -#: cinder/volume/drivers/vmware/api.py:317 +#: cinder/volume/drivers/vmware/api.py:274 +#: cinder/volume/drivers/vmware/api.py:278 #, python-format msgid "Task: %(task)s failed with error: %(err)s." msgstr "" @@ -10013,16 +10036,16 @@ msgid "Lease initializing..." msgstr "" -#: cinder/volume/drivers/vmware/api.py:347 +#: cinder/volume/drivers/vmware/api.py:306 #, python-format msgid "Error: unknown lease state %s." msgstr "" -#: cinder/volume/drivers/vmware/error_util.py:64 +#: cinder/volume/drivers/vmware/error_util.py:58 msgid "VMware VMDK driver exception." msgstr "" -#: cinder/volume/drivers/vmware/error_util.py:70 +#: cinder/volume/drivers/vmware/error_util.py:64 msgid "VMware VMDK driver configuration error." msgstr "" @@ -10047,12 +10070,12 @@ msgid "Glance image: %s is now active." msgstr "" -#: cinder/volume/drivers/vmware/io_util.py:130 +#: cinder/volume/drivers/vmware/io_util.py:123 #, python-format msgid "Glance image: %s is in killed state." msgstr "" -#: cinder/volume/drivers/vmware/io_util.py:139 +#: cinder/volume/drivers/vmware/io_util.py:132 #, python-format msgid "Glance image %(id)s is in unknown state - %(state)s" msgstr "" @@ -10063,12 +10086,12 @@ "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s." msgstr "" -#: cinder/volume/drivers/vmware/read_write_util.py:199 -#: cinder/volume/drivers/vmware/read_write_util.py:292 +#: cinder/volume/drivers/vmware/read_write_util.py:204 +#: cinder/volume/drivers/vmware/read_write_util.py:293 msgid "Could not retrieve URL from lease." msgstr "" -#: cinder/volume/drivers/vmware/read_write_util.py:209 +#: cinder/volume/drivers/vmware/read_write_util.py:207 #, python-format msgid "Opening vmdk url: %s for write." msgstr "" @@ -10095,7 +10118,7 @@ msgid "Lease is already in state: %s." msgstr "" -#: cinder/volume/drivers/vmware/read_write_util.py:302 +#: cinder/volume/drivers/vmware/read_write_util.py:296 #, python-format msgid "Opening vmdk url: %s for read." msgstr "" @@ -10105,32 +10128,32 @@ msgid "Read %s bytes from vmdk." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:145 +#: cinder/volume/drivers/vmware/vim.py:142 #, python-format msgid "Error(s): %s occurred in the call to RetrievePropertiesEx." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:185 +#: cinder/volume/drivers/vmware/vim.py:181 #, python-format msgid "No such SOAP method %(attr)s. Detailed error: %(excep)s." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:194 +#: cinder/volume/drivers/vmware/vim.py:190 #, python-format msgid "httplib error in %(attr)s: %(excep)s." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:211 +#: cinder/volume/drivers/vmware/vim.py:201 #, python-format msgid "Socket error in %(attr)s: %(excep)s." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:220 +#: cinder/volume/drivers/vmware/vim.py:210 #, python-format msgid "Type error in %(attr)s: %(excep)s." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:227 +#: cinder/volume/drivers/vmware/vim.py:217 #, python-format msgid "Error in %(attr)s. Detailed error: %(excep)s." msgstr "" @@ -10150,39 +10173,39 @@ msgid "Invalid spec value: %s specified." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:196 +#: cinder/volume/drivers/vmware/vmdk.py:146 msgid "" "The VMware ESX VMDK driver is now deprecated and will be removed in the Juno " "release. The VMware vCenter VMDK driver will remain and continue to be " "supported." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:258 +#: cinder/volume/drivers/vmware/vmdk.py:285 #, python-format msgid "%s not set." -msgstr "" +msgstr "未设置 %s。" -#: cinder/volume/drivers/vmware/vmdk.py:264 -#: cinder/volume/drivers/vmware/vmdk.py:1900 +#: cinder/volume/drivers/vmware/vmdk.py:206 +#: cinder/volume/drivers/vmware/vmdk.py:1190 #, python-format msgid "Successfully setup driver: %(driver)s for server: %(ip)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:308 +#: cinder/volume/drivers/vmware/vmdk.py:335 #, python-format msgid "Not able to find a suitable datastore for the volume: %s." -msgstr "" +msgstr "无法找到适合卷 %s 的数据存储器。" #: cinder/volume/drivers/vmware/vmdk.py:252 #, python-format msgid "Verified volume %s can be created." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:329 +#: cinder/volume/drivers/vmware/vmdk.py:271 msgid "Backing not available, no operation to be performed." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:400 +#: cinder/volume/drivers/vmware/vmdk.py:404 #, python-format msgid "" "Unable to pick datastore to accommodate %(size)s bytes from the datastores: " @@ -10201,7 +10224,7 @@ msgid "Filter datastores matching storage profile %(profile)s: %(dss)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:440 +#: cinder/volume/drivers/vmware/vmdk.py:444 #, python-format msgid "No such storage profile '%s; is defined in vCenter." msgstr "" @@ -10211,40 +10234,40 @@ msgid "Storage profile required for this volume: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:467 +#: cinder/volume/drivers/vmware/vmdk.py:472 #, python-format msgid "" "Aborting since none of the datastores match the given storage profile %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:469 +#: cinder/volume/drivers/vmware/vmdk.py:407 #, python-format msgid "" "Ignoring storage profile %s requirement for this volume since policy based " "placement is disabled." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:585 +#: cinder/volume/drivers/vmware/vmdk.py:483 #, python-format msgid "" "Unable to find suitable datastore for volume of size: %(vol)s GB under host: " "%(host)s. More details: %(excep)s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:598 +#: cinder/volume/drivers/vmware/vmdk.py:493 #, python-format msgid "" "Unable to find host to accommodate a disk of size: %s in the inventory." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:626 +#: cinder/volume/drivers/vmware/vmdk.py:520 #, python-format msgid "" "Unable to find suitable datastore for volume: %(vol)s under host: %(host)s. " "More details: %(excep)s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:639 +#: cinder/volume/drivers/vmware/vmdk.py:530 #, python-format msgid "Unable to create volume: %s in the inventory." msgstr "" @@ -10254,7 +10277,7 @@ msgid "The instance: %s for which initialize connection is called, exists." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:662 +#: cinder/volume/drivers/vmware/vmdk.py:556 #, python-format msgid "There is no backing for the volume: %s. Need to create one." msgstr "" @@ -10264,81 +10287,81 @@ "The instance for which initialize connection is called, does not exist." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:675 +#: cinder/volume/drivers/vmware/vmdk.py:569 #, python-format msgid "Trying to boot from an empty volume: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:684 +#: cinder/volume/drivers/vmware/vmdk.py:578 #, python-format msgid "" "Returning connection_info: %(info)s for volume: %(volume)s with connector: " "%(connector)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:735 +#: cinder/volume/drivers/vmware/vmdk.py:633 #, python-format msgid "Snapshot of volume not supported in state: %s." -msgstr "" +msgstr "不支持对处于以下状态的卷生成快照：%s。" -#: cinder/volume/drivers/vmware/vmdk.py:737 +#: cinder/volume/drivers/vmware/vmdk.py:631 #, python-format msgid "There is no backing, so will not create snapshot: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:742 +#: cinder/volume/drivers/vmware/vmdk.py:636 #, python-format msgid "Successfully created snapshot: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:766 +#: cinder/volume/drivers/vmware/vmdk.py:665 #, python-format msgid "Delete snapshot of volume not supported in state: %s." -msgstr "" +msgstr "不支持对处于以下状态的卷删除快照：%s。" -#: cinder/volume/drivers/vmware/vmdk.py:768 +#: cinder/volume/drivers/vmware/vmdk.py:662 #, python-format msgid "There is no backing, and so there is no snapshot: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:772 +#: cinder/volume/drivers/vmware/vmdk.py:666 #, python-format msgid "Successfully deleted snapshot: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:813 +#: cinder/volume/drivers/vmware/vmdk.py:707 #, python-format msgid "" "Successfully cloned new backing: %(back)s from source VMDK file: %(vmdk)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:830 +#: cinder/volume/drivers/vmware/vmdk.py:724 #, python-format msgid "" "There is no backing for the source volume: %(svol)s. Not creating any " "backing for the volume: %(vol)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:861 +#: cinder/volume/drivers/vmware/vmdk.py:755 #, python-format msgid "" "There is no backing for the source snapshot: %(snap)s. Not creating any " "backing for the volume: %(vol)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:870 -#: cinder/volume/drivers/vmware/vmdk.py:2030 +#: cinder/volume/drivers/vmware/vmdk.py:764 +#: cinder/volume/drivers/vmware/vmdk.py:1306 #, python-format msgid "" "There is no snapshot point for the snapshotted volume: %(snap)s. Not " "creating any backing for the volume: %(vol)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:908 +#: cinder/volume/drivers/vmware/vmdk.py:808 #, python-format msgid "" "Cannot create image of disk format: %s. Only vmdk disk format is accepted." -msgstr "" +msgstr "无法创建磁盘格式为 %s 映像。仅接受 vmdk 磁盘格式。" #: cinder/volume/drivers/vmware/vmdk.py:836 #: cinder/volume/drivers/vmware/vmdk.py:895 @@ -10346,7 +10369,8 @@ msgid "Fetching glance image: %(id)s to server: %(host)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1219 +#: cinder/volume/drivers/vmware/vmdk.py:845 +#: cinder/volume/drivers/vmware/vmdk.py:917 #, python-format msgid "Done copying image: %(id)s to volume: %(vol)s." msgstr "" @@ -10357,34 +10381,34 @@ "Exception in copy_image_to_volume: %(excep)s. Deleting the backing: %(back)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1172 +#: cinder/volume/drivers/vmware/vmdk.py:1135 #, python-format msgid "Exception in _select_ds_for_volume: %s." -msgstr "" +msgstr "_select_ds_for_volume %s 中发生异常。" #: cinder/volume/drivers/vmware/vmdk.py:873 #, python-format msgid "Selected datastore %(ds)s for new volume of size %(size)s GB." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1211 +#: cinder/volume/drivers/vmware/vmdk.py:909 #, python-format msgid "Exception in copy_image_to_volume: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1215 +#: cinder/volume/drivers/vmware/vmdk.py:913 #, python-format msgid "Deleting the backing: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1230 +#: cinder/volume/drivers/vmware/vmdk.py:928 #, python-format msgid "" "The backing is not found, so there is no need to extend the vmdk virtual " "disk for the volume %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1252 +#: cinder/volume/drivers/vmware/vmdk.py:950 #, python-format msgid "Unable to extend the size of the vmdk virtual disk at the path %s." msgstr "" @@ -10394,127 +10418,127 @@ msgid "Copy glance image: %s to create new volume." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1302 +#: cinder/volume/drivers/vmware/vmdk.py:992 #, python-format msgid "Exception in copying the image to the volume: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1344 +#: cinder/volume/drivers/vmware/vmdk.py:1325 msgid "Upload to glance of attached volume is not supported." -msgstr "" +msgstr "不支持上载至所连接卷的 Glance。" #: cinder/volume/drivers/vmware/vmdk.py:1026 #, python-format msgid "Copy Volume: %s to new image." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1350 +#: cinder/volume/drivers/vmware/vmdk.py:1032 #, python-format msgid "Backing not found, creating for volume: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1369 +#: cinder/volume/drivers/vmware/vmdk.py:1051 #, python-format msgid "Done copying volume %(vol)s to a new image %(img)s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1553 -#: cinder/volume/drivers/vmware/vmdk.py:1582 +#: cinder/volume/drivers/vmware/vmdk.py:1068 +#: cinder/volume/drivers/vmware/vmdk.py:1097 #, python-format msgid "Done extending volume %(vol)s to size %(size)s GB." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1557 +#: cinder/volume/drivers/vmware/vmdk.py:1072 #, python-format msgid "" "Relocating volume %s vmdk to a different datastore since trying to extend " "vmdk file in place failed." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1565 +#: cinder/volume/drivers/vmware/vmdk.py:1080 #, python-format msgid "" "Not able to find a different datastore to place the extended volume %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1568 +#: cinder/volume/drivers/vmware/vmdk.py:1083 #, python-format msgid "" "Selected datastore %(ds)s to place extended volume of size %(size)s GB." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1580 +#: cinder/volume/drivers/vmware/vmdk.py:1095 #, python-format msgid "Not able to relocate volume %s for extending." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1850 +#: cinder/volume/drivers/vmware/vmdk.py:1140 #, python-format msgid "PBM WSDL file %s is missing!" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1853 +#: cinder/volume/drivers/vmware/vmdk.py:1143 #, python-format msgid "Using PBM WSDL location: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1864 +#: cinder/volume/drivers/vmware/vmdk.py:1154 #, python-format msgid "Using overridden vmware_host_version from config: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1868 +#: cinder/volume/drivers/vmware/vmdk.py:1158 #, python-format msgid "Fetched VC server version: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1875 +#: cinder/volume/drivers/vmware/vmdk.py:1165 #, python-format msgid "Version string '%s' is not parseable" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1889 +#: cinder/volume/drivers/vmware/vmdk.py:1179 #, python-format msgid "Not able to configure PBM for VC server: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1953 +#: cinder/volume/drivers/vmware/vmdk.py:1238 #, python-format msgid "Relocating volume: %(backing)s to %(ds)s and %(rp)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:2008 -#: cinder/volume/drivers/vmware/volumeops.py:1069 +#: cinder/volume/drivers/vmware/vmdk.py:1284 +#: cinder/volume/drivers/vmware/volumeops.py:673 #, python-format msgid "Successfully created clone: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:2022 +#: cinder/volume/drivers/vmware/vmdk.py:1298 #, python-format msgid "" "There is no backing for the snapshotted volume: %(snap)s. Not creating any " "backing for the volume: %(vol)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:2059 +#: cinder/volume/drivers/vmware/vmdk.py:1335 #, python-format msgid "" "There is no backing for the source volume: %(src)s. Not creating any backing " "for volume: %(vol)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:2065 +#: cinder/volume/drivers/vmware/vmdk.py:2102 #, python-format msgid "Linked clone of source volume not supported in state: %s." -msgstr "" +msgstr "不支持处于以下状态的源卷的已链接克隆：%s。" #: cinder/volume/drivers/vmware/vmware_images.py:94 #, python-format msgid "Downloading image: %s from glance image server as a flat vmdk file." msgstr "" -#: cinder/volume/drivers/vmware/vmware_images.py:110 -#: cinder/volume/drivers/vmware/vmware_images.py:129 +#: cinder/volume/drivers/vmware/vmware_images.py:107 +#: cinder/volume/drivers/vmware/vmware_images.py:126 #, python-format msgid "Downloaded image: %s from glance image server." msgstr "" @@ -10529,7 +10553,7 @@ msgid "Uploading image: %s to the Glance image server using HttpNfc export." msgstr "" -#: cinder/volume/drivers/vmware/vmware_images.py:161 +#: cinder/volume/drivers/vmware/vmware_images.py:158 #, python-format msgid "Uploaded image: %s to the Glance image server." msgstr "" @@ -10549,7 +10573,7 @@ msgid "Initiated deletion of VM backing: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:306 +#: cinder/volume/drivers/vmware/volumeops.py:100 #, python-format msgid "Deleted the VM backing: %s." msgstr "" @@ -10559,10 +10583,10 @@ msgid "Datastores attached to host %(host)s are: %(ds)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:463 +#: cinder/volume/drivers/vmware/volumeops.py:493 #, python-format msgid "There are no valid datastores attached to %s." -msgstr "" +msgstr "不存在任何已连接至 %s 的有效数据存储器。" #: cinder/volume/drivers/vmware/volumeops.py:244 #, python-format @@ -10591,7 +10615,7 @@ msgid "Extending the volume %(name)s to %(size)s GB." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:579 +#: cinder/volume/drivers/vmware/volumeops.py:347 #, python-format msgid "Successfully extended the volume %(name)s to %(size)s GB." msgstr "" @@ -10614,7 +10638,7 @@ msgid "Initiated creation of volume backing: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:724 +#: cinder/volume/drivers/vmware/volumeops.py:441 #, python-format msgid "Successfully created volume backing: %s." msgstr "" @@ -10636,7 +10660,7 @@ msgid "Initiated relocation of volume backing: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:882 +#: cinder/volume/drivers/vmware/volumeops.py:507 #, python-format msgid "" "Successfully relocated volume backing: %(backing)s to datastore: %(ds)s and " @@ -10654,7 +10678,7 @@ "Initiated move of volume backing: %(backing)s into the folder: %(fol)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:900 +#: cinder/volume/drivers/vmware/volumeops.py:525 #, python-format msgid "" "Successfully moved volume backing: %(backing)s into the folder: %(fol)s." @@ -10670,7 +10694,7 @@ msgid "Initiated snapshot of volume backing: %(backing)s named: %(name)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:923 +#: cinder/volume/drivers/vmware/volumeops.py:548 #, python-format msgid "" "Successfully created snapshot: %(snap)s for volume backing: %(backing)s." @@ -10681,7 +10705,7 @@ msgid "Deleting the snapshot: %(name)s from backing: %(backing)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:985 +#: cinder/volume/drivers/vmware/volumeops.py:601 #, python-format msgid "" "Did not find the snapshot: %(name)s for backing: %(backing)s. Need not " @@ -10693,7 +10717,7 @@ msgid "Initiated snapshot: %(name)s deletion for backing: %(backing)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:996 +#: cinder/volume/drivers/vmware/volumeops.py:612 #, python-format msgid "Successfully deleted snapshot: %(name)s of backing: %(backing)s." msgstr "" @@ -10725,7 +10749,7 @@ msgid "Initiated deletion via task: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:1173 +#: cinder/volume/drivers/vmware/volumeops.py:691 #, python-format msgid "Successfully deleted file: %s." msgstr "" @@ -10739,7 +10763,7 @@ msgid "Initiated copying disk data via task: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:1321 +#: cinder/volume/drivers/vmware/volumeops.py:756 #, python-format msgid "Successfully copied disk at: %(src)s to: %(dest)s." msgstr "" @@ -10754,7 +10778,7 @@ msgid "Initiated deleting vmdk file via task: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:1339 +#: cinder/volume/drivers/vmware/volumeops.py:774 #, python-format msgid "Deleted vmdk file: %s." msgstr "" @@ -10793,32 +10817,32 @@ msgid "Creating folder %s " msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:56 +#: cinder/volume/drivers/windows/windows_utils.py:59 #, python-format msgid "" "check_for_setup_error: the state of the WT Portal could not be verified. WMI " "exception: %s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:62 +#: cinder/volume/drivers/windows/windows_utils.py:66 msgid "check_for_setup_error: there is no ISCSI traffic listening." msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:72 +#: cinder/volume/drivers/windows/windows_utils.py:76 #, python-format msgid "" "get_host_information: the state of the WT Portal could not be verified. WMI " "exception: %s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:82 +#: cinder/volume/drivers/windows/windows_utils.py:87 #, python-format msgid "" "get_host_information: the ISCSI target information could not be retrieved. " "WMI exception: %s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:116 +#: cinder/volume/drivers/windows/windows_utils.py:122 #, python-format msgid "" "associate_initiator_with_iscsi_target: an association between initiator: " @@ -10826,77 +10850,77 @@ "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:134 +#: cinder/volume/drivers/windows/windows_utils.py:140 #, python-format msgid "" "delete_iscsi_target: error when deleting the iscsi target associated with " "target name: %(target)s . WMI exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:154 +#: cinder/volume/drivers/windows/windows_utils.py:160 #, python-format msgid "" "create_volume: error when creating the volume name: %(vol_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:190 +#: cinder/volume/drivers/windows/windows_utils.py:211 #, python-format msgid "" "delete_volume: error when deleting the volume name: %(vol_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:210 +#: cinder/volume/drivers/windows/windows_utils.py:232 #, python-format msgid "" "create_snapshot: error when creating the snapshot name: %(vol_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:236 +#: cinder/volume/drivers/windows/windows_utils.py:259 #, python-format msgid "" "create_volume_from_snapshot: error when creating the volume name: " "%(vol_name)s from snapshot name: %(snap_name)s. WMI exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:251 +#: cinder/volume/drivers/windows/windows_utils.py:274 #, python-format msgid "" "delete_snapshot: error when deleting the snapshot name: %(snap_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:266 +#: cinder/volume/drivers/windows/windows_utils.py:289 #, python-format msgid "" "create_iscsi_target: error when creating iscsi target: %(tar_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:288 +#: cinder/volume/drivers/windows/windows_utils.py:312 #, python-format msgid "" "remove_iscsi_target: error when deleting iscsi target: %(tar_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:303 +#: cinder/volume/drivers/windows/windows_utils.py:350 #, python-format msgid "" "add_disk_to_target: error adding disk associated to volume : %(vol_name)s to " "the target name: %(tar_name)s . WMI exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:321 +#: cinder/volume/drivers/windows/windows_utils.py:273 #, python-format msgid "" "copy_vhd_disk: error when copying disk from source path : %(src_path)s to " "destination path: %(dest_path)s . WMI exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:338 +#: cinder/volume/drivers/windows/windows_utils.py:407 #, python-format msgid "" "extend: error when extending the volume: %(vol_name)s .WMI exception: " @@ -10908,7 +10932,7 @@ msgid "Restoring source %(source_volid)s status to %(status)s" msgstr "" -#: cinder/volume/flows/common.py:60 +#: cinder/volume/flows/common.py:59 #, python-format msgid "" "Failed setting source volume %(source_volid)s back to its initial " @@ -10920,108 +10944,107 @@ msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s" msgstr "" -#: cinder/volume/flows/common.py:92 -#: cinder/volume/flows/manager/create_volume.py:694 +#: cinder/volume/flows/common.py:91 +#: cinder/volume/flows/manager/create_volume.py:648 #, python-format msgid "Failed updating volume %(volume_id)s with %(update)s" msgstr "" -#: cinder/volume/flows/api/create_volume.py:101 +#: cinder/volume/flows/api/create_volume.py:120 #, python-format msgid "Originating snapshot status must be one of %s values" msgstr "" -#: cinder/volume/flows/api/create_volume.py:123 -#: cinder/volume/flows/api/create_volume.py:146 +#: cinder/volume/flows/api/create_volume.py:142 +#: cinder/volume/flows/api/create_volume.py:165 #, python-format msgid "" "Unable to create a volume from an originating source volume when its status " "is not one of %s values" msgstr "" -#: cinder/volume/flows/api/create_volume.py:178 +#: cinder/volume/flows/api/create_volume.py:126 #, python-format msgid "" "Volume size %(size)sGB cannot be smaller than the snapshot size " "%(snap_size)sGB. They must be >= original snapshot size." msgstr "" -#: cinder/volume/flows/api/create_volume.py:187 +#: cinder/volume/flows/api/create_volume.py:135 #, python-format msgid "" "Volume size %(size)sGB cannot be smaller than original volume size " "%(source_size)sGB. They must be >= original volume size." msgstr "" -#: cinder/volume/flows/api/create_volume.py:196 +#: cinder/volume/flows/api/create_volume.py:144 #, python-format msgid "Volume size %(size)s must be an integer and greater than 0" msgstr "" -#: cinder/volume/flows/api/create_volume.py:244 +#: cinder/volume/flows/api/create_volume.py:212 #, python-format msgid "" "Size of specified image %(image_size)sGB is larger than volume size " "%(volume_size)sGB." -msgstr "" +msgstr "所指定映像的大小 %(image_size)sGB 大于卷大小 %(volume_size)sGB。" -#: cinder/volume/flows/api/create_volume.py:252 +#: cinder/volume/flows/api/create_volume.py:220 #, python-format msgid "" "Volume size %(volume_size)sGB cannot be smaller than the image minDisk size " "%(min_disk)sGB." -msgstr "" +msgstr "卷大小 %(volume_size)sGB 不能小于映像 minDisk 大小 %(min_disk)sGB。" -#: cinder/volume/flows/api/create_volume.py:270 +#: cinder/volume/flows/api/create_volume.py:238 #, python-format msgid "Metadata property key %s greater than 255 characters" -msgstr "" +msgstr "元数据属性关键字 %s 超过 255 个字符" -#: cinder/volume/flows/api/create_volume.py:275 +#: cinder/volume/flows/api/create_volume.py:243 #, python-format msgid "Metadata property key %s value greater than 255 characters" -msgstr "" +msgstr "元数据属性关键字 %s 值超过 255 个字符" -#: cinder/consistencygroup/api.py:100 -#: cinder/volume/flows/api/create_volume.py:312 +#: cinder/volume/flows/api/create_volume.py:331 #, python-format msgid "Availability zone '%s' is invalid" msgstr "" -#: cinder/volume/flows/api/create_volume.py:325 +#: cinder/volume/flows/api/create_volume.py:305 msgid "Volume must be in the same availability zone as the snapshot" -msgstr "" +msgstr "卷必须与快照位于同一可用性区域中" -#: cinder/volume/flows/api/create_volume.py:334 +#: cinder/volume/flows/api/create_volume.py:314 msgid "Volume must be in the same availability zone as the source volume" -msgstr "" +msgstr "卷必须与源卷位于同一可用性区域中" -#: cinder/volume/flows/api/create_volume.py:370 +#: cinder/volume/flows/api/create_volume.py:389 msgid "Volume type will be changed to be the same as the source volume." msgstr "" -#: cinder/volume/flows/api/create_volume.py:536 +#: cinder/volume/flows/api/create_volume.py:463 #, python-format msgid "Failed destroying volume entry %s" msgstr "" -#: cinder/volume/flows/api/create_volume.py:620 +#: cinder/volume/flows/api/create_volume.py:546 #, python-format msgid "Failed rolling back quota for %s reservations" msgstr "" -#: cinder/volume/flows/api/create_volume.py:666 +#: cinder/volume/flows/api/create_volume.py:590 #, python-format msgid "Failed to update quota for deleting volume: %s" msgstr "" -#: cinder/volume/flows/api/create_volume.py:766 -#: cinder/volume/flows/manager/create_volume.py:190 +#: cinder/volume/flows/api/create_volume.py:678 +#: cinder/volume/flows/manager/create_volume.py:193 #, python-format msgid "Volume %s: create failed" msgstr "" -#: cinder/volume/flows/api/create_volume.py:770 +#: cinder/volume/flows/api/create_volume.py:682 msgid "Unexpected build error:" msgstr "" @@ -11042,35 +11065,35 @@ msgid "Updating volume %(volume_id)s with %(update)s." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:143 +#: cinder/volume/flows/manager/create_volume.py:142 #, python-format msgid "Volume %s: resetting 'creating' status failed." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:162 +#: cinder/volume/flows/manager/create_volume.py:161 #, python-format msgid "Volume %s: rescheduling failed" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:318 +#: cinder/volume/flows/manager/create_volume.py:308 #, python-format msgid "" "Failed notifying about the volume action %(event)s for volume %(volume_id)s" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:347 +#: cinder/volume/flows/manager/create_volume.py:373 #, python-format msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s." -msgstr "" +msgstr "正在将元数据从 %(src_type)s %(src_id)s 复制到 %(vol_id)s。" -#: cinder/volume/flows/manager/create_volume.py:349 +#: cinder/volume/flows/manager/create_volume.py:375 #, python-format msgid "" "Failed updating volume %(vol_id)s metadata using the provided %(src_type)s " "%(src_id)s metadata" -msgstr "" +msgstr "未能使用提供的 %(src_type)s %(src_id)s 元数据更新卷 %(vol_id)s 元数据" -#: cinder/volume/flows/manager/create_volume.py:417 +#: cinder/volume/flows/manager/create_volume.py:404 #, python-format msgid "" "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided " @@ -11082,7 +11105,7 @@ msgid "Marking volume %s as bootable." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:433 +#: cinder/volume/flows/manager/create_volume.py:420 #, python-format msgid "Failed updating volume %(volume_id)s bootable flag to true" msgstr "" @@ -11094,14 +11117,14 @@ "%(volume_id)s." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:488 -#: cinder/volume/flows/manager/create_volume.py:499 +#: cinder/volume/flows/manager/create_volume.py:454 +#: cinder/volume/flows/manager/create_volume.py:465 #, python-format msgid "" "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: %(error)s" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:494 +#: cinder/volume/flows/manager/create_volume.py:460 #, python-format msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s" msgstr "" @@ -11127,12 +11150,12 @@ "%(image_location)s." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:585 +#: cinder/volume/flows/manager/create_volume.py:551 #, python-format msgid "Failed updating volume %(volume_id)s with %(updates)s" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:609 +#: cinder/volume/flows/manager/create_volume.py:573 #, python-format msgid "Unable to create volume. Volume driver %s not initialized" msgstr "" @@ -11144,35 +11167,36 @@ "%(volume_spec)s" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:651 -#: cinder/volume/flows/manager/manage_existing.py:85 +#: cinder/volume/flows/manager/create_volume.py:605 +#: cinder/volume/flows/manager/manage_existing.py:84 #, python-format msgid "" "Failed updating model of volume %(volume_id)s with creation provided model " "%(model)s" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:703 +#: cinder/volume/flows/manager/create_volume.py:652 #, python-format msgid "Volume %(volume_name)s (%(volume_id)s): created successfully" msgstr "" -#: cinder/volume/flows/manager/manage_existing.py:46 +#: cinder/volume/flows/manager/manage_existing.py:45 #, python-format msgid "Unable to manage existing volume. Volume driver %s not initialized." msgstr "" #: cinder/volume/flows/manager/manage_existing.py:49 +#: cinder/volume/flows/manager/manage_existing_snapshot.py:114 #, python-format msgid "Volume driver %s not initialized." -msgstr "" +msgstr "卷驱动程序 %s 未初始化。" #: cinder/zonemanager/fc_san_lookup_service.py:77 #, python-format msgid "Lookup service to invoke: %s" msgstr "" -#: cinder/zonemanager/fc_san_lookup_service.py:84 +#: cinder/zonemanager/fc_san_lookup_service.py:82 msgid "" "Lookup service not configured. Config option for fc_san_lookup_service need " "to specify a concrete implementation of lookup service" @@ -11193,21 +11217,21 @@ msgid "Fabric Map after context lookup:%s" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:145 +#: cinder/zonemanager/fc_zone_manager.py:130 #, python-format msgid "Final filtered map for fabric: %s" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:151 +#: cinder/zonemanager/fc_zone_manager.py:136 msgid "Add Connection: Finished iterating over all target list" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:154 +#: cinder/zonemanager/fc_zone_manager.py:139 #, python-format msgid "Failed adding connection for fabric=%(fabric)s: Error:%(err)s" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:175 +#: cinder/zonemanager/fc_zone_manager.py:160 #, python-format msgid "Delete connection Target List:%s" msgstr "" @@ -11217,7 +11241,7 @@ msgid "Delete connection Fabric Map from SAN context: %s" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:191 +#: cinder/zonemanager/fc_zone_manager.py:176 #, python-format msgid "Final filtered map for delete connection: %s" msgstr "" @@ -11226,7 +11250,7 @@ msgid "Delete Connection - Finished iterating over all target list" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:201 +#: cinder/zonemanager/fc_zone_manager.py:186 #, python-format msgid "Failed removing connection for fabric=%(fabric)s: Error:%(err)s" msgstr "" @@ -11236,7 +11260,7 @@ msgid "Got SAN context:%s" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:242 +#: cinder/zonemanager/fc_zone_manager.py:227 #, python-format msgid "No targets to add or remove connection for I: %s" msgstr "" @@ -11250,10 +11274,10 @@ msgid "Fabric Names: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:106 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:93 #: cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py:104 msgid "Missing Fibre Channel SAN configuration param - fc_fabric_names" -msgstr "" +msgstr "缺少光纤通道 SAN 配置参数 - fc_fabric_names" #: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:98 #, python-format @@ -11265,15 +11289,15 @@ msgid "Getting name server data for fabric %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:140 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:131 #, python-format msgid "Failed collecting name server info from fabric %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:143 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:131 #, python-format msgid "SSH connection failed for %(fabric)s with error: %(err)s" -msgstr "" +msgstr "对于 %(fabric)s，SSH 连接失败，发生错误：%(err)s" #: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:141 #, python-format @@ -11311,11 +11335,11 @@ msgid "Device map for SAN context: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:199 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:190 msgid "Failed collecting nsshow info for fabric" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:206 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:197 msgid "Failed collecting nscamshow" msgstr "" @@ -11324,19 +11348,18 @@ msgid "Connector returning nsinfo-%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:219 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:218 #, python-format msgid "SSH Command failed with error '%(err)s' '%(command)s'" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:250 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:370 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:236 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:372 #, python-format msgid "Malformed nameserver string: %s" -msgstr "" +msgstr "以下名称服务器字符串的格式不正确：%s" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:82 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:90 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:80 #, python-format msgid "Failed getting active zone set from fabric %s" msgstr "" @@ -11347,7 +11370,7 @@ msgid "" "Malformed zone configuration: (switch=%(switch)s " "zone_config=%(zone_config)s)." -msgstr "" +msgstr "区域配置的格式不正确：(switch=%(switch)s zone_config=%(zone_config)s)。" #: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:130 #, python-format @@ -11364,8 +11387,7 @@ msgid "zone list:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:151 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:176 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:147 #, python-format msgid "Deleting zone failed %s" msgstr "" @@ -11393,25 +11415,25 @@ msgid "New zone %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:184 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:186 #, python-format msgid "" "Creating and activating zone set failed: (Zone set=%(cfg_name)s " "error=%(err)s)." -msgstr "" +msgstr "创建并激活区域集失败（区域集为 %(cfg_name)s，发生的错误为 %(err)s）。" #: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:223 #, python-format msgid "Delete zones: Config cmd to run:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:239 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:241 #: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:286 #, python-format msgid "Deleting zones failed: (command=%(cmd)s error=%(err)s)." -msgstr "" +msgstr "删除区域失败：（命令为 %(cmd)s，发生的错误为 %(err)s）。" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:260 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:249 #, python-format msgid "Failed collecting nsshow info for fabric %s" msgstr "" @@ -11421,10 +11443,10 @@ msgid "Failed collecting nscamshow info for fabric %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:291 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:293 #, python-format msgid "Error while checking transaction status: %s" -msgstr "" +msgstr "检查事务状态时发生错误：%s" #: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:300 #: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:433 @@ -11432,27 +11454,27 @@ msgid "Executing command via ssh: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:307 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:309 #, python-format msgid "Error while running zoning CLI: (command=%(cmd)s error=%(err)s)." -msgstr "" +msgstr "运行分区 CLI 时发生错误：（命令为 %(cmd)s，发生的错误为 %(err)s）。" #: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:323 #, python-format msgid "Firmware version string:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:332 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:329 msgid "No CLI output for firmware version check" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:335 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:348 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:337 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:350 #: cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py:201 #: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:329 #, python-format msgid "Error while getting data via ssh: (command=%(cmd)s error=%(err)s)." -msgstr "" +msgstr "通过 ssh 获取数据时发生错误：（命令为 %(cmd)s，发生的错误为 %(err)s）。" #: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:445 #, python-format @@ -11465,55 +11487,51 @@ msgstr "" #: cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py:342 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:470 #, python-format msgid "Error executing command via ssh: %s" -msgstr "" +msgstr "通过 ssh 执行命令时发生错误：%s" #: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:131 #, python-format msgid "Add connection for Fabric:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:137 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:132 #, python-format msgid "BrcdFCZoneDriver - Add connection for I-T map: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:145 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:144 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:144 #, python-format msgid "Zoning policy for Fabric %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:357 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:393 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:355 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:390 #, python-format msgid "" "Unsupported firmware on switch %s. Make sure switch is running firmware v6.4 " "or higher" -msgstr "" +msgstr "在交换机 %s 上存在不受支持的固件。请确保交换机正在运行固件 V6.4 或更高版本" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:207 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:221 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:199 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:224 #, python-format msgid "Failed to add zoning configuration %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:172 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:176 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:191 #, python-format msgid "Zone exists in I-T mode. Skipping zone creation %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:190 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:194 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:183 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:197 #, python-format msgid "Zoning Policy: %s, not recognized" -msgstr "" +msgstr "分区策略：%s，无法识别" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:195 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:199 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:214 #, python-format msgid "Zone map to add: %s" msgstr "" @@ -11528,13 +11546,12 @@ msgid "Delete connection for fabric:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:223 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:241 #, python-format msgid "BrcdFCZoneDriver - Delete connection for I-T map: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:231 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:259 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:253 #, python-format msgid "Zoning policy for fabric %s" msgstr "" @@ -11579,10 +11596,10 @@ msgid "Final Zone list to delete: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:324 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:372 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:321 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:373 msgid "Failed to update or delete zoning configuration" -msgstr "" +msgstr "未能更新或删除分区配置" #: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:377 #, python-format @@ -11609,18 +11626,17 @@ msgid "name server info from fabric:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:363 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:423 #, python-format msgid "Error getting name server info: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:366 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:363 #, python-format msgid "Failed to get name server info:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:374 -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:432 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:434 #, python-format msgid "Filtered targets for SAN is: %s" msgstr "" @@ -11635,7 +11651,7 @@ msgid "Southbound connector: %s" msgstr "" -#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:461 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:466 #, python-format msgid "Failed to access active zoning configuration:%s" msgstr "" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/click.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/click.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/click.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/click.po 2016-07-20 16:51:47.000000000 +0000 @@ -0,0 +1,34 @@ +# Chinese (Simplified) translation for click +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the click package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: click\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-09-08 02:17+0100\n" +"PO-Revision-Date: 2014-10-26 03:55+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2016-07-20 14:50+0000\n" +"X-Generator: Launchpad (build 18147)\n" + +#: ../pk-plugin/com.ubuntu.click.policy.in.h:1 +msgid "Install package" +msgstr "安装软件包" + +#: ../pk-plugin/com.ubuntu.click.policy.in.h:2 +msgid "To install software, you need to authenticate." +msgstr "您需要经过授权方可安装软件。" + +#: ../pk-plugin/com.ubuntu.click.policy.in.h:3 +msgid "Remove package" +msgstr "移除软件包" + +#: ../pk-plugin/com.ubuntu.click.policy.in.h:4 +msgid "To remove software, you need to authenticate." +msgstr "您需要经过授权方可移除软件。" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/colord.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/colord.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/colord.po 2015-02-19 15:26:25.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/colord.po 2016-07-20 16:51:54.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 13:20+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 14:24+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" #. TRANSLATORS: command line option diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/command-not-found.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/command-not-found.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/command-not-found.po 2015-02-19 15:26:17.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/command-not-found.po 2016-07-20 16:51:55.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 12:16+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 13:03+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: ../CommandNotFound/CommandNotFound.py:148 #, python-format diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/coreutils.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/coreutils.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/coreutils.po 2015-02-19 15:26:01.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/coreutils.po 2016-07-20 16:51:52.000000000 +0000 @@ -13,15 +13,15 @@ "Project-Id-Version: coreutils 8.11-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" "POT-Creation-Date: 2013-02-14 15:56+0000\n" -"PO-Revision-Date: 2014-03-25 03:45+0000\n" +"PO-Revision-Date: 2016-03-24 07:12+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-02-19 10:39+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:47+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" #: lib/argmatch.c:133 @@ -851,17 +851,17 @@ #: lib/xstrtol-error.c:63 #, c-format msgid "invalid %s%s argument '%s'" -msgstr "" +msgstr "非法的%s%s 参数\"%s\"" #: lib/xstrtol-error.c:68 #, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "" +msgstr "非法的后缀在%s%s 参数\"%s\"" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument '%s' too large" -msgstr "" +msgstr "%s%s 参数\"%s\"太大" #. This is a proper name. See the gettext manual, section Names. #: src/base64.c:40 @@ -965,6 +965,8 @@ "Usage: %s NAME [SUFFIX]\n" " or: %s OPTION... NAME...\n" msgstr "" +"用法：%s 名称 [后缀]\n" +"　或：%s 选项\n" #: src/basename.c:53 msgid "" @@ -3310,7 +3312,7 @@ #: src/df.c:545 src/df.c:554 #, c-format msgid "%s-%s" -msgstr "" +msgstr "%s-%s" #: src/df.c:1210 msgid "" @@ -5005,7 +5007,7 @@ #: src/ls.c:2057 msgid "Valid arguments are:\n" -msgstr "" +msgstr "有效的参数为：\n" #: src/ls.c:2061 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" @@ -5452,12 +5454,12 @@ #: src/md5sum.c:760 #, c-format msgid "--tag does not support --text mode" -msgstr "" +msgstr "--tag 不支持--text 模式" #: src/md5sum.c:766 #, c-format msgid "the --tag option is meaningless when verifying checksums" -msgstr "" +msgstr "在校验时--tag 选项无意义" #: src/md5sum.c:773 #, c-format @@ -9470,6 +9472,8 @@ "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" +"\n" +"必选参数对长短选项同时适用。\n" #: src/system.h:552 msgid "" @@ -10140,7 +10144,7 @@ #: src/timeout.c:229 msgid "Start COMMAND, and kill it if still running after DURATION.\n" -msgstr "" +msgstr "运行指定命令，在指定的停留时间后若该命令仍在运行则将其中止。\n" #: src/timeout.c:235 msgid "" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cpio.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cpio.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cpio.po 2015-02-19 15:26:01.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cpio.po 2016-07-20 16:51:45.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-02-19 10:40+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:47+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: gnu/argmatch.c:135 #, c-format diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cpplib-4.7.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cpplib-4.7.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cpplib-4.7.po 2015-02-19 15:26:25.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cpplib-4.7.po 2016-07-20 16:51:57.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 13:24+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 14:29+0000\n" +"X-Generator: Launchpad (build 18147)\n" "X-Poedit-Country: CHINA\n" "Language: zh_CN\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cpplib.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cpplib.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cpplib.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cpplib.po 2016-07-20 16:51:50.000000000 +0000 @@ -0,0 +1,903 @@ +# Simplified Chinese translation for cpplib. +# Copyright (C) 2005 Free Software Foundation, Inc. +# This file is distributed under the same license as the cpplib package. +# Meng Jie , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: cpplib 4.2.0\n" +"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" +"POT-Creation-Date: 2007-07-18 21:18-0700\n" +"PO-Revision-Date: 2010-06-08 01:21+0000\n" +"Last-Translator: Meng Jie \n" +"Language-Team: Chinese (simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2016-07-20 13:01+0000\n" +"X-Generator: Launchpad (build 18147)\n" + +#: charset.c:654 +#, c-format +msgid "conversion from %s to %s not supported by iconv" +msgstr "iconv 不支持从 %s 到 %s 的转换" + +#: charset.c:657 +msgid "iconv_open" +msgstr "iconv_open" + +#: charset.c:665 +#, c-format +msgid "no iconv implementation, cannot convert from %s to %s" +msgstr "没有 iconv 的实现，无法从 %s 转换到 %s" + +#: charset.c:742 +#, c-format +msgid "character 0x%lx is not in the basic source character set\n" +msgstr "字符 0x%lx 不在基本源字符集中\n" + +#: charset.c:759 +#: charset.c:1352 +msgid "converting to execution character set" +msgstr "转换到可执行文件的字符集" + +#: charset.c:765 +#, c-format +msgid "character 0x%lx is not unibyte in execution character set" +msgstr "字符 0x%lx 在执行字符集中不是单字节的" + +#: charset.c:889 +#, c-format +msgid "Character %x might not be NFKC" +msgstr "字符 %x 可能不是 NFKC" + +#: charset.c:949 +msgid "universal character names are only valid in C++ and C99" +msgstr "Unicode 字符名只在 C++ 和 C99 中有效" + +#: charset.c:952 +#, c-format +msgid "the meaning of '\\%c' is different in traditional C" +msgstr "‘\\%c’的意义与在传统 C 中不同" + +#: charset.c:961 +msgid "In _cpp_valid_ucn but not a UCN" +msgstr "在 _cpp_valid_ucn 中但不是一个 UCN" + +#: charset.c:986 +#, c-format +msgid "incomplete universal character name %.*s" +msgstr "不完全的 Unicode 字符名 %.*s" + +#: charset.c:998 +#, c-format +msgid "%.*s is not a valid universal character" +msgstr "%.*s 不是一个有效的 Unicode 字符" + +#: charset.c:1008 +#: lex.c:472 +msgid "'$' in identifier or number" +msgstr "‘$’出现在标识符或数字中" + +#: charset.c:1018 +#, c-format +msgid "universal character %.*s is not valid in an identifier" +msgstr "Unicode 字符 %.*s 在标识符中无效" + +#: charset.c:1022 +#, c-format +msgid "universal character %.*s is not valid at the start of an identifier" +msgstr "Unicode 字符 %.*s 在标识符开头无效" + +#: charset.c:1056 +#: charset.c:1571 +msgid "converting UCN to source character set" +msgstr "将 UCN 转换到源字符集" + +#: charset.c:1060 +msgid "converting UCN to execution character set" +msgstr "将 UCN 转换到执行字符集" + +#: charset.c:1132 +msgid "the meaning of '\\x' is different in traditional C" +msgstr "‘\\x’的意义与在传统 C 中不同" + +#: charset.c:1149 +msgid "\\x used with no following hex digits" +msgstr "\\x 后没有 16 进制数字" + +#: charset.c:1156 +msgid "hex escape sequence out of range" +msgstr "16 进制转义序列越界" + +#: charset.c:1195 +msgid "octal escape sequence out of range" +msgstr "8 进制转义序列越界" + +#: charset.c:1263 +msgid "the meaning of '\\a' is different in traditional C" +msgstr "‘\\a’的意义与在传统 C 中不同" + +#: charset.c:1270 +#, c-format +msgid "non-ISO-standard escape sequence, '\\%c'" +msgstr "非 ISO 标准的转义序列，‘\\%c’" + +#: charset.c:1278 +#, c-format +msgid "unknown escape sequence '\\%c'" +msgstr "未知的转义序列：‘\\%c’" + +#: charset.c:1286 +#, c-format +msgid "unknown escape sequence: '\\%s'" +msgstr "未知的转义序列：‘\\%s’" + +#: charset.c:1293 +msgid "converting escape sequence to execution character set" +msgstr "将转义序列转换到执行字符集" + +#: charset.c:1415 +#: charset.c:1478 +msgid "character constant too long for its type" +msgstr "字符常量大小超出其类型" + +#: charset.c:1418 +msgid "multi-character character constant" +msgstr "多字节字符常量" + +#: charset.c:1510 +msgid "empty character constant" +msgstr "空的字符常量" + +#: charset.c:1612 +#, c-format +msgid "failure to convert %s to %s" +msgstr "无法从 %s 转换到 %s" + +#: directives.c:214 +#: directives.c:240 +#, c-format +msgid "extra tokens at end of #%s directive" +msgstr "#%s 指示的末尾有多余的标识符" + +#: directives.c:343 +#, c-format +msgid "#%s is a GCC extension" +msgstr "#%s 是一个 GCC 扩展" + +#: directives.c:355 +msgid "suggest not using #elif in traditional C" +msgstr "建议在传统 C 中不使用 #elif" + +#: directives.c:358 +#, c-format +msgid "traditional C ignores #%s with the # indented" +msgstr "当 # 有缩进时传统 C 忽略 #%s" + +#: directives.c:362 +#, c-format +msgid "suggest hiding #%s from traditional C with an indented #" +msgstr "建议使用缩进的 # 以让 #%s 对传统 C 不可见" + +#: directives.c:388 +msgid "embedding a directive within macro arguments is not portable" +msgstr "将一个指示嵌入宏参数中是不可移植的" + +#: directives.c:408 +msgid "style of line directive is a GCC extension" +msgstr "line 指示的风格是一个 GCC 扩展" + +#: directives.c:458 +#, c-format +msgid "invalid preprocessing directive #%s" +msgstr "无效的预处理指示 #%s" + +#: directives.c:524 +msgid "\"defined\" cannot be used as a macro name" +msgstr "“defined”不能被用作宏名" + +#: directives.c:530 +#, c-format +msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" +msgstr "“%s”不能被用作宏名，因为它是 C++ 中的一个操作符" + +#: directives.c:533 +#, c-format +msgid "no macro name given in #%s directive" +msgstr "#%s 指示中未给出宏名" + +#: directives.c:536 +msgid "macro names must be identifiers" +msgstr "宏名必须是标识符" + +#: directives.c:577 +#, c-format +msgid "undefining \"%s\"" +msgstr "取消对“%s”的定义" + +#: directives.c:632 +msgid "missing terminating > character" +msgstr "缺少结尾的 > 字符" + +#: directives.c:687 +#, c-format +msgid "#%s expects \"FILENAME\" or " +msgstr "#%s 需要 \"FILENAME\" 或 " + +#: directives.c:727 +#, c-format +msgid "empty filename in #%s" +msgstr "#%s 中文件名为空" + +#: directives.c:737 +msgid "#include nested too deeply" +msgstr "#include 嵌套过深" + +#: directives.c:778 +msgid "#include_next in primary source file" +msgstr "#include_next 出现在主源文件中" + +#: directives.c:804 +#, c-format +msgid "invalid flag \"%s\" in line directive" +msgstr "line 指示中有无效的标记“%s”" + +#: directives.c:856 +#, c-format +msgid "\"%s\" after #line is not a positive integer" +msgstr "#line 后的“%s”不是一个正整数" + +#: directives.c:862 +msgid "line number out of range" +msgstr "行号超出范围" + +#: directives.c:875 +#: directives.c:952 +#, c-format +msgid "\"%s\" is not a valid filename" +msgstr "“%s”不是一个有效的文件名" + +#: directives.c:912 +#, c-format +msgid "\"%s\" after # is not a positive integer" +msgstr "# 后的“%s”不是一个正整数" + +#: directives.c:1014 +#, c-format +msgid "invalid #%s directive" +msgstr "无效的 #%s 指示" + +#: directives.c:1077 +#, c-format +msgid "" +"registering pragmas in namespace \"%s\" with mismatched name expansion" +msgstr "在命名空间“%s”中注册 pragma 时名称扩展不匹配" + +#: directives.c:1086 +#, c-format +msgid "registering pragma \"%s\" with name expansion and no namespace" +msgstr "pragma “%s”被注册为一个命名扩展，而没有命名空间" + +#: directives.c:1104 +#, c-format +msgid "registering \"%s\" as both a pragma and a pragma namespace" +msgstr "“%s”既被注册为一个pragma 又被注册为一个 pragma 命名空间" + +#: directives.c:1107 +#, c-format +msgid "#pragma %s %s is already registered" +msgstr "#pragma %s %s 已经被注册" + +#: directives.c:1110 +#, c-format +msgid "#pragma %s is already registered" +msgstr "#pragma %s 已经被注册" + +#: directives.c:1140 +msgid "registering pragma with NULL handler" +msgstr "pragma 注册为被 NULL 处理" + +#: directives.c:1350 +msgid "#pragma once in main file" +msgstr "#pragma once 出现在主文件中" + +#: directives.c:1373 +msgid "invalid #pragma GCC poison directive" +msgstr "无效的 #pragma GCC poison 指示" + +#: directives.c:1382 +#, c-format +msgid "poisoning existing macro \"%s\"" +msgstr "对已存在的宏“%s”投毒" + +#: directives.c:1403 +msgid "#pragma system_header ignored outside include file" +msgstr "#pragma system_heade 在包含文件外被忽略" + +#: directives.c:1427 +#, c-format +msgid "cannot find source file %s" +msgstr "找不到源文件 %s" + +#: directives.c:1431 +#, c-format +msgid "current file is older than %s" +msgstr "当前文件早于 %s" + +#: directives.c:1599 +msgid "_Pragma takes a parenthesized string literal" +msgstr "_Pragma 需要一个括起的字符串字面常量" + +#: directives.c:1671 +msgid "#else without #if" +msgstr "#else 没有匹配的 #if" + +#: directives.c:1676 +msgid "#else after #else" +msgstr "#else 出现在 #else 后" + +#: directives.c:1678 +#: directives.c:1711 +msgid "the conditional began here" +msgstr "条件自此开始" + +#: directives.c:1704 +msgid "#elif without #if" +msgstr "#elif 没有匹配的 #if" + +#: directives.c:1709 +msgid "#elif after #else" +msgstr "#elif 出现在 #else 后" + +#: directives.c:1739 +msgid "#endif without #if" +msgstr "#endif 没有匹配的 #if" + +#: directives.c:1816 +msgid "missing '(' after predicate" +msgstr "谓词后缺少‘(’" + +#: directives.c:1831 +msgid "missing ')' to complete answer" +msgstr "完整的答案缺少‘)’" + +#: directives.c:1851 +msgid "predicate's answer is empty" +msgstr "谓词的答案为空" + +#: directives.c:1878 +msgid "assertion without predicate" +msgstr "断言后没有谓词" + +#: directives.c:1880 +msgid "predicate must be an identifier" +msgstr "谓词必须是一个标识符" + +#: directives.c:1966 +#, c-format +msgid "\"%s\" re-asserted" +msgstr "重断言“%s”" + +#: directives.c:2190 +#, c-format +msgid "unterminated #%s" +msgstr "未终止的 #%s" + +#: errors.c:118 +msgid "warning: " +msgstr "警告： " + +#: errors.c:120 +msgid "internal error: " +msgstr "内部错误： " + +#: errors.c:122 +msgid "error: " +msgstr "错误： " + +#: errors.c:186 +msgid "stdout" +msgstr "stdout" + +#: errors.c:188 +#, c-format +msgid "%s: %s" +msgstr "%s：%s" + +#: expr.c:203 +msgid "too many decimal points in number" +msgstr "数字中有太多小数点" + +#: expr.c:223 +#, c-format +msgid "invalid digit \"%c\" in octal constant" +msgstr "8 进制常量中有非法字符“%c”" + +#: expr.c:229 +msgid "use of C99 hexadecimal floating constant" +msgstr "使用 C99 式的 16 进制浮点常量" + +#: expr.c:238 +msgid "exponent has no digits" +msgstr "指数部分没有数字" + +#: expr.c:245 +msgid "hexadecimal floating constants require an exponent" +msgstr "16 进制浮点常量需要指数部分" + +#: expr.c:251 +#, c-format +msgid "invalid suffix \"%.*s\" on floating constant" +msgstr "浮点常量的“%.*s”后缀无效" + +#: expr.c:261 +#: expr.c:295 +#, c-format +msgid "traditional C rejects the \"%.*s\" suffix" +msgstr "传统 C 不接受“%.*s”后缀" + +#: expr.c:268 +#, c-format +msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" +msgstr "十六进制浮点常量的“%.*s”后缀无效" + +#: expr.c:281 +#, c-format +msgid "invalid suffix \"%.*s\" on integer constant" +msgstr "整数常量的“%.*s”后缀无效" + +#: expr.c:303 +msgid "use of C99 long long integer constant" +msgstr "使用 C99 long long 整数常量" + +#: expr.c:310 +msgid "imaginary constants are a GCC extension" +msgstr "虚数常量是一个 GCC 扩展" + +#: expr.c:396 +msgid "integer constant is too large for its type" +msgstr "整数常量值超出其类型" + +#: expr.c:408 +msgid "integer constant is so large that it is unsigned" +msgstr "整数常量太大，认定为 unsigned" + +#: expr.c:490 +msgid "missing ')' after \"defined\"" +msgstr "“defined” 后出现‘)’" + +#: expr.c:497 +msgid "operator \"defined\" requires an identifier" +msgstr "操作符“defined”需要一个标识符" + +#: expr.c:505 +#, c-format +msgid "(\"%s\" is an alternative token for \"%s\" in C++)" +msgstr "(在 C++ 中“%s”会是“%s”的替代标识符)" + +#: expr.c:515 +msgid "this use of \"defined\" may not be portable" +msgstr "使用“defined”可能不利于移植" + +#: expr.c:554 +msgid "floating constant in preprocessor expression" +msgstr "浮点常量出现在预处理表达式中" + +#: expr.c:560 +msgid "imaginary number in preprocessor expression" +msgstr "预处理表达式中出现虚数" + +#: expr.c:605 +#, c-format +msgid "\"%s\" is not defined" +msgstr "“%s”未定义" + +#: expr.c:733 +#: expr.c:762 +#, c-format +msgid "missing binary operator before token \"%s\"" +msgstr "标识符“%s”前缺少二元运算符" + +#: expr.c:753 +#, c-format +msgid "token \"%s\" is not valid in preprocessor expressions" +msgstr "标识符“%s”在预处理表达式中无效" + +#: expr.c:770 +msgid "missing expression between '(' and ')'" +msgstr "‘(’与‘)’之间缺少表达式" + +#: expr.c:773 +msgid "#if with no expression" +msgstr "#if 后没有表达式" + +#: expr.c:776 +#, c-format +msgid "operator '%s' has no right operand" +msgstr "操作符‘%s’没有右操作数" + +#: expr.c:781 +#, c-format +msgid "operator '%s' has no left operand" +msgstr "操作符‘%s’没有左操作数" + +#: expr.c:807 +msgid " ':' without preceding '?'" +msgstr " ‘:’前没有‘?’" + +#: expr.c:834 +msgid "unbalanced stack in #if" +msgstr "#if 中不平衡的堆栈" + +#: expr.c:853 +#, c-format +msgid "impossible operator '%u'" +msgstr "不可能的操作‘%u’" + +#: expr.c:943 +msgid "missing ')' in expression" +msgstr "表达式中缺少‘)’" + +#: expr.c:964 +msgid "'?' without following ':'" +msgstr "‘?’后没有‘:’" + +#: expr.c:974 +msgid "integer overflow in preprocessor expression" +msgstr "预处理表达式中整数溢出" + +#: expr.c:979 +msgid "missing '(' in expression" +msgstr "表达式中缺少‘(’" + +#: expr.c:1011 +#, c-format +msgid "the left operand of \"%s\" changes sign when promoted" +msgstr "“%s”的左操作数在提升时变换了符号" + +#: expr.c:1016 +#, c-format +msgid "the right operand of \"%s\" changes sign when promoted" +msgstr "“%s”的右操作数在提升时变换了符号" + +#: expr.c:1275 +msgid "traditional C rejects the unary plus operator" +msgstr "传统 C 不接受单目 + 运算符" + +#: expr.c:1358 +msgid "comma operator in operand of #if" +msgstr "#if 操作数中出现逗号" + +#: expr.c:1490 +msgid "division by zero in #if" +msgstr "#if 中用零做除数" + +#: files.c:402 +msgid "NULL directory in find_file" +msgstr "find_file 中有 NULL 目录" + +#: files.c:440 +msgid "one or more PCH files were found, but they were invalid" +msgstr "找到一个或多个 PCH 文件，但它们是无效的" + +#: files.c:443 +msgid "use -Winvalid-pch for more information" +msgstr "使用 -Winvalid-pch 以获得更多信息" + +#: files.c:501 +#, c-format +msgid "%s is a block device" +msgstr "%s 是一个块设备" + +#: files.c:518 +#, c-format +msgid "%s is too large" +msgstr "%s 过大" + +#: files.c:553 +#, c-format +msgid "%s is shorter than expected" +msgstr "%s 短于预期" + +#: files.c:782 +#, c-format +msgid "no include path in which to search for %s" +msgstr "没有包含路径可供搜索 %s" + +#: files.c:1071 +msgid "Multiple include guards may be useful for:\n" +msgstr "多个防止重包含可能对其有用：\n" + +#: init.c:407 +msgid "cppchar_t must be an unsigned type" +msgstr "cppchar_t 必须是无符号型" + +#: init.c:411 +#, c-format +msgid "" +"preprocessor arithmetic has maximum precision of %lu bits; target requires " +"%lu bits" +msgstr "预处理算术的最高精度为 %lu 位；目标需要 %lu 位" + +#: init.c:418 +msgid "CPP arithmetic must be at least as precise as a target int" +msgstr "CPP 算术必须至少具有目标 int 的精度" + +#: init.c:421 +msgid "target char is less than 8 bits wide" +msgstr "目标 char 短于 8 位" + +#: init.c:425 +msgid "target wchar_t is narrower than target char" +msgstr "目录 wchar_t 短于目标 char" + +#: init.c:429 +msgid "target int is narrower than target char" +msgstr "目标 int 短于目标 char" + +#: init.c:434 +msgid "CPP half-integer narrower than CPP character" +msgstr "CPP 半整数短于 CPP 字符" + +#: init.c:438 +#, c-format +msgid "" +"CPP on this host cannot handle wide character constants over %lu bits, but " +"the target requires %lu bits" +msgstr "在此宿主机上，CPP 不能处理长于 %lu 位的宽字符常量，但目标需要 %lu 位" + +#: lex.c:271 +msgid "backslash and newline separated by space" +msgstr "反斜杠和换行为空格所分隔" + +#: lex.c:276 +msgid "backslash-newline at end of file" +msgstr "反斜杠续行出现在文件末尾" + +#: lex.c:291 +#, c-format +msgid "trigraph ??%c converted to %c" +msgstr "三元符 ??%c 转换为 %c" + +#: lex.c:298 +#, c-format +msgid "trigraph ??%c ignored, use -trigraphs to enable" +msgstr "三元符 ??%c 被忽略，请使用 -trigraphs 来启用" + +#: lex.c:344 +msgid "\"/*\" within comment" +msgstr "“/*”出现在注释中" + +#: lex.c:402 +#, c-format +msgid "%s in preprocessing directive" +msgstr "预处理指示中出现 %s" + +#: lex.c:411 +msgid "null character(s) ignored" +msgstr "忽略空字符" + +#: lex.c:448 +#, c-format +msgid "`%.*s' is not in NFKC" +msgstr "‘%.*s’不在 NFKC 中" + +#: lex.c:451 +#, c-format +msgid "`%.*s' is not in NFC" +msgstr "‘%.*s’不在 NFC 中" + +#: lex.c:539 +#, c-format +msgid "attempt to use poisoned \"%s\"" +msgstr "试图使用有毒的“%s”" + +#: lex.c:547 +msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" +msgstr "__VA_ARGS__ 只能出现在 C99 可变参数宏的展开中" + +#: lex.c:647 +msgid "null character(s) preserved in literal" +msgstr "空字符将保留在字面字符串中" + +#: lex.c:650 +#, c-format +msgid "missing terminating %c character" +msgstr "缺少结尾的 %c 字符" + +#: lex.c:842 +msgid "no newline at end of file" +msgstr "文件未以空白行结束" + +#: lex.c:1002 +#: traditional.c:162 +msgid "unterminated comment" +msgstr "未结束的注释" + +#: lex.c:1013 +msgid "C++ style comments are not allowed in ISO C90" +msgstr "C++ 风格的注释在 ISO C90 中不被允许" + +#: lex.c:1015 +msgid "(this will be reported only once per input file)" +msgstr "(此警告为每个输入文件只报告一次)" + +#: lex.c:1020 +msgid "multi-line comment" +msgstr "多行注释" + +#: lex.c:1333 +#, c-format +msgid "unspellable token %s" +msgstr "无法拼出的标识符 %s" + +#: line-map.c:313 +#, c-format +msgid "In file included from %s:%u" +msgstr "在包含自 %s：%u 的文件中" + +#: line-map.c:331 +#, c-format +msgid "" +",\n" +" from %s:%u" +msgstr "" +"，\n" +" 从 %s：%u" + +#: macro.c:83 +#, c-format +msgid "macro \"%s\" is not used" +msgstr "宏“%s”未被使用" + +#: macro.c:122 +#: macro.c:312 +#, c-format +msgid "invalid built-in macro \"%s\"" +msgstr "无效的内建宏“%s”" + +#: macro.c:156 +msgid "could not determine file timestamp" +msgstr "无法决定文件的时间戳" + +#: macro.c:253 +msgid "could not determine date and time" +msgstr "无法决定日期与时间" + +#: macro.c:416 +msgid "invalid string literal, ignoring final '\\'" +msgstr "无效的字面字符串，忽略最后的‘\\’" + +#: macro.c:466 +#, c-format +msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" +msgstr "毗连“%s”和“%s”不能给出一个有效的预处理标识符" + +#: macro.c:538 +msgid "ISO C99 requires rest arguments to be used" +msgstr "ISO C99 需要使用剩余的参数" + +#: macro.c:543 +#, c-format +msgid "macro \"%s\" requires %u arguments, but only %u given" +msgstr "宏“%s”需要 %u 个参数，但只给出了 %u 个" + +#: macro.c:548 +#, c-format +msgid "macro \"%s\" passed %u arguments, but takes just %u" +msgstr "宏“%s”传递了 %u 个参数，但只需要 %u 个" + +#: macro.c:659 +#: traditional.c:675 +#, c-format +msgid "unterminated argument list invoking macro \"%s\"" +msgstr "调用宏“%s”时参数列表未终止" + +#: macro.c:762 +#, c-format +msgid "" +"function-like macro \"%s\" must be used with arguments in traditional C" +msgstr "类似函数的宏“%s”在传统 C 中必须与参数一起使用" + +#: macro.c:1278 +#, c-format +msgid "duplicate macro parameter \"%s\"" +msgstr "重复的宏参数“%s”" + +#: macro.c:1324 +#, c-format +msgid "\"%s\" may not appear in macro parameter list" +msgstr "“%s”不能出现在宏参数列表中" + +#: macro.c:1332 +msgid "macro parameters must be comma-separated" +msgstr "宏参数必须由逗号隔开" + +#: macro.c:1349 +msgid "parameter name missing" +msgstr "缺少形参名" + +#: macro.c:1366 +msgid "anonymous variadic macros were introduced in C99" +msgstr "匿名可变参数宏在 C99 中被引入" + +#: macro.c:1371 +msgid "ISO C does not permit named variadic macros" +msgstr "ISO C 不允许有名的可变参数宏" + +#: macro.c:1380 +msgid "missing ')' in macro parameter list" +msgstr "在宏参数表中缺少‘)’" + +#: macro.c:1458 +msgid "ISO C99 requires whitespace after the macro name" +msgstr "ISO C99 要求宏名后必须有空白" + +#: macro.c:1482 +msgid "missing whitespace after the macro name" +msgstr "宏名后缺少空白" + +#: macro.c:1512 +msgid "'#' is not followed by a macro parameter" +msgstr "‘#’后没有宏参数" + +#: macro.c:1531 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "‘##’不能出现在宏展开的两端" + +#: macro.c:1629 +#, c-format +msgid "\"%s\" redefined" +msgstr "“%s”重定义" + +#: macro.c:1634 +msgid "this is the location of the previous definition" +msgstr "这是先前定义的位置" + +#: macro.c:1684 +#, c-format +msgid "macro argument \"%s\" would be stringified in traditional C" +msgstr "宏参数“%s”将在传统 C 中被字符串化" + +#: macro.c:1707 +#, c-format +msgid "invalid hash type %d in cpp_macro_definition" +msgstr "cpp_macro_definition 中有无效的散列类型 %d" + +#: pch.c:84 +#: pch.c:332 +#: pch.c:354 +#: pch.c:360 +msgid "while writing precompiled header" +msgstr "在写入预编译头时" + +#: pch.c:467 +#, c-format +msgid "%s: not used because `%.*s' not defined" +msgstr "%s：未使用因为‘%.*s’未定义" + +#: pch.c:479 +#, c-format +msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" +msgstr "%s：未使用因为‘%.*s’被定义为‘%s’而非‘%*.s’" + +#: pch.c:520 +#, c-format +msgid "%s: not used because `%s' is defined" +msgstr "%s：未使用因为‘%s’已定义" + +#: pch.c:533 +#: pch.c:696 +msgid "while reading precompiled header" +msgstr "在读取预编译头时" + +#: traditional.c:745 +#, c-format +msgid "detected recursion whilst expanding macro \"%s\"" +msgstr "展开宏“%s”时检测到递归" + +#: traditional.c:912 +msgid "syntax error in macro parameter list" +msgstr "宏参数列表语法错误" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cracklib.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cracklib.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cracklib.po 2015-02-19 15:26:01.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cracklib.po 2016-07-20 16:51:47.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:40+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:47+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: \n" #: lib/fascist.c:516 diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2015-02-19 15:26:12.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2016-07-20 16:51:47.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 11:47+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 12:27+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: luks/keyencryption.c:61 #, c-format diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cryptsetup.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cryptsetup.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cryptsetup.po 2015-02-19 15:26:12.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cryptsetup.po 2016-07-20 16:51:57.000000000 +0000 @@ -14,18 +14,18 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 11:47+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 12:26+0000\n" +"X-Generator: Launchpad (build 18147)\n" -#: lib/libdevmapper.c:232 +#: lib/libdevmapper.c:247 msgid "Cannot initialize device-mapper, running as non-root user.\n" msgstr "" -#: lib/libdevmapper.c:235 +#: lib/libdevmapper.c:250 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n" msgstr "" -#: lib/libdevmapper.c:523 +#: lib/libdevmapper.c:535 #, c-format msgid "DM-UUID for device %s was truncated.\n" msgstr "" @@ -55,256 +55,253 @@ msgid "Error %d reading from RNG: %s\n" msgstr "" -#: lib/setup.c:190 +#: lib/setup.c:200 msgid "Cannot initialize crypto RNG backend.\n" msgstr "" -#: lib/setup.c:196 +#: lib/setup.c:206 msgid "Cannot initialize crypto backend.\n" msgstr "" -#: lib/setup.c:219 lib/setup.c:1110 lib/verity/verity.c:123 +#: lib/setup.c:236 lib/setup.c:1162 lib/verity/verity.c:123 #, c-format msgid "Hash algorithm %s not supported.\n" msgstr "" -#: lib/setup.c:222 lib/loopaes/loopaes.c:90 +#: lib/setup.c:239 lib/loopaes/loopaes.c:90 #, c-format msgid "Key processing error (using hash %s).\n" msgstr "" -#: lib/setup.c:268 +#: lib/setup.c:320 msgid "All key slots full.\n" msgstr "" -#: lib/setup.c:275 +#: lib/setup.c:327 #, c-format msgid "Key slot %d is invalid, please select between 0 and %d.\n" msgstr "" -#: lib/setup.c:281 +#: lib/setup.c:333 #, c-format msgid "Key slot %d is full, please select another one.\n" msgstr "" -#: lib/setup.c:390 +#: lib/setup.c:442 #, c-format msgid "Enter passphrase for %s: " msgstr "" -#: lib/setup.c:571 +#: lib/setup.c:623 #, c-format msgid "Header detected but device %s is too small.\n" msgstr "" -#: lib/setup.c:587 lib/setup.c:1337 +#: lib/setup.c:639 lib/setup.c:1390 msgid "This operation is not supported for this device type.\n" msgstr "" -#: lib/setup.c:825 lib/setup.c:1298 lib/setup.c:2173 +#: lib/setup.c:878 lib/setup.c:1351 lib/setup.c:2227 #, c-format msgid "Device %s is not active.\n" msgstr "" -#: lib/setup.c:842 +#: lib/setup.c:895 #, c-format msgid "Underlying device for crypt device %s disappeared.\n" msgstr "" -#: lib/setup.c:907 +#: lib/setup.c:964 msgid "Invalid plain crypt parameters.\n" msgstr "" -#: lib/setup.c:912 lib/setup.c:1037 +#: lib/setup.c:969 lib/setup.c:1089 msgid "Invalid key size.\n" msgstr "" -#: lib/setup.c:917 lib/setup.c:1042 +#: lib/setup.c:974 lib/setup.c:1094 msgid "UUID is not supported for this crypt type.\n" msgstr "" -#: lib/setup.c:959 +#: lib/setup.c:1016 msgid "Can't format LUKS without device.\n" msgstr "" -#: lib/setup.c:1007 +#: lib/setup.c:1059 #, c-format msgid "Cannot format device %s which is still in use.\n" msgstr "" -#: lib/setup.c:1010 +#: lib/setup.c:1062 #, c-format msgid "Cannot format device %s, permission denied.\n" msgstr "" -#: lib/setup.c:1014 +#: lib/setup.c:1066 #, c-format msgid "Cannot wipe header on device %s.\n" msgstr "" -#: lib/setup.c:1032 +#: lib/setup.c:1084 msgid "Can't format LOOPAES without device.\n" msgstr "" -#: lib/setup.c:1070 +#: lib/setup.c:1122 msgid "Can't format VERITY without device.\n" msgstr "" -#: lib/setup.c:1078 lib/verity/verity.c:106 +#: lib/setup.c:1130 lib/verity/verity.c:106 #, c-format msgid "Unsupported VERITY hash type %d.\n" msgstr "" -#: lib/setup.c:1084 lib/verity/verity.c:114 +#: lib/setup.c:1136 lib/verity/verity.c:114 msgid "Unsupported VERITY block size.\n" msgstr "" -#: lib/setup.c:1089 lib/verity/verity.c:76 +#: lib/setup.c:1141 lib/verity/verity.c:76 msgid "Unsupported VERITY hash offset.\n" msgstr "" -#: lib/setup.c:1201 +#: lib/setup.c:1255 #, c-format msgid "Unknown crypt device type %s requested.\n" msgstr "" -#: lib/setup.c:1352 +#: lib/setup.c:1405 msgid "Do you really want to change UUID of device?" msgstr "" -#: lib/setup.c:1440 lib/setup.c:1485 lib/setup.c:1534 lib/setup.c:1600 -#: lib/setup.c:1673 lib/setup.c:1737 lib/setup.c:1818 lib/setup.c:1864 -#: lib/setup.c:2238 lib/setup.c:2532 +#: lib/setup.c:288 msgid "This operation is supported only for LUKS device.\n" msgstr "" -#: lib/setup.c:1447 +#: lib/setup.c:1508 #, c-format msgid "Volume %s is not active.\n" msgstr "" -#: lib/setup.c:1458 +#: lib/setup.c:1519 #, c-format msgid "Volume %s is already suspended.\n" msgstr "" -#: lib/setup.c:1465 +#: lib/setup.c:1526 #, c-format msgid "Suspend is not supported for device %s.\n" msgstr "" -#: lib/setup.c:1467 +#: lib/setup.c:1528 #, c-format msgid "Error during suspending device %s.\n" msgstr "" -#: lib/setup.c:1495 lib/setup.c:1544 +#: lib/setup.c:1554 lib/setup.c:1601 #, c-format msgid "Volume %s is not suspended.\n" msgstr "" -#: lib/setup.c:1509 +#: lib/setup.c:1568 #, c-format msgid "Resume is not supported for device %s.\n" msgstr "" -#: lib/setup.c:1511 lib/setup.c:1565 +#: lib/setup.c:1570 lib/setup.c:1622 #, c-format msgid "Error during resuming device %s.\n" msgstr "" -#: lib/setup.c:1551 lib/setup.c:1989 lib/setup.c:2003 src/cryptsetup.c:151 -#: src/cryptsetup.c:229 src/cryptsetup.c:316 src/cryptsetup.c:660 -#: src/cryptsetup.c:1070 +#: lib/setup.c:1608 lib/setup.c:2043 lib/setup.c:2057 src/cryptsetup.c:152 +#: src/cryptsetup.c:218 src/cryptsetup.c:699 src/cryptsetup.c:1115 msgid "Enter passphrase: " msgstr "" -#: lib/setup.c:1614 lib/setup.c:1751 +#: lib/setup.c:1670 lib/setup.c:1806 msgid "Cannot add key slot, all slots disabled and no volume key provided.\n" msgstr "" -#: lib/setup.c:1623 lib/setup.c:1757 lib/setup.c:1761 +#: lib/setup.c:1679 lib/setup.c:1812 lib/setup.c:1816 msgid "Enter any passphrase: " msgstr "" -#: lib/setup.c:1640 lib/setup.c:1774 lib/setup.c:1778 lib/setup.c:1841 -#: src/cryptsetup.c:942 +#: lib/setup.c:1696 lib/setup.c:1829 lib/setup.c:1833 lib/setup.c:1895 +#: src/cryptsetup.c:981 msgid "Enter new passphrase for key slot: " msgstr "" -#: lib/setup.c:1705 +#: lib/setup.c:1761 #, c-format msgid "Key slot %d changed.\n" msgstr "" -#: lib/setup.c:1708 +#: lib/setup.c:1764 #, c-format msgid "Replaced with key slot %d.\n" msgstr "" -#: lib/setup.c:1713 +#: lib/setup.c:1769 msgid "Failed to swap new key slot.\n" msgstr "" -#: lib/setup.c:1832 lib/setup.c:2093 lib/setup.c:2106 lib/setup.c:2249 +#: lib/setup.c:1886 lib/setup.c:2147 lib/setup.c:2160 lib/setup.c:2302 msgid "Volume key does not match the volume.\n" msgstr "" -#: lib/setup.c:1870 +#: lib/setup.c:1924 #, c-format msgid "Key slot %d is invalid.\n" msgstr "" -#: lib/setup.c:1875 +#: lib/setup.c:1929 #, c-format msgid "Key slot %d is not used.\n" msgstr "" -#: lib/setup.c:1905 lib/setup.c:1977 lib/setup.c:2069 +#: lib/setup.c:1959 lib/setup.c:2031 lib/setup.c:2123 #, c-format msgid "Device %s already exists.\n" msgstr "" -#: lib/setup.c:2080 +#: lib/setup.c:2134 msgid "Incorrect volume key specified for plain device.\n" msgstr "" -#: lib/setup.c:2113 +#: lib/setup.c:2167 msgid "Incorrect root hash specified for verity device.\n" msgstr "" -#: lib/setup.c:2136 +#: lib/setup.c:2190 msgid "Device type is not properly initialised.\n" msgstr "" -#: lib/setup.c:2168 +#: lib/setup.c:2222 #, c-format msgid "Device %s is still in use.\n" msgstr "" -#: lib/setup.c:2177 +#: lib/setup.c:2231 #, c-format msgid "Invalid device %s.\n" msgstr "" -#: lib/setup.c:2198 +#: lib/setup.c:2252 msgid "Function not available in FIPS mode.\n" msgstr "" -#: lib/setup.c:2204 +#: lib/setup.c:2258 msgid "Volume key buffer too small.\n" msgstr "" -#: lib/setup.c:2212 +#: lib/setup.c:2266 msgid "Cannot retrieve volume key for plain device.\n" msgstr "" -#: lib/setup.c:2219 +#: lib/setup.c:2273 #, c-format msgid "This operation is not supported for %s crypt device.\n" msgstr "" -#: lib/setup.c:2416 +#: lib/setup.c:2469 msgid "Dump operation is not supported for this device type.\n" msgstr "" @@ -316,312 +313,312 @@ msgid "Cannot unlock memory.\n" msgstr "" -#: lib/utils_crypt.c:227 lib/utils_crypt.c:240 lib/utils_crypt.c:387 -#: lib/utils_crypt.c:402 +#: lib/utils_crypt.c:229 lib/utils_crypt.c:242 lib/utils_crypt.c:389 +#: lib/utils_crypt.c:404 msgid "Out of memory while reading passphrase.\n" msgstr "" -#: lib/utils_crypt.c:232 lib/utils_crypt.c:247 +#: lib/utils_crypt.c:234 lib/utils_crypt.c:249 msgid "Error reading passphrase from terminal.\n" msgstr "" -#: lib/utils_crypt.c:245 +#: lib/utils_crypt.c:247 msgid "Verify passphrase: " msgstr "" -#: lib/utils_crypt.c:252 +#: lib/utils_crypt.c:254 msgid "Passphrases do not match.\n" msgstr "" -#: lib/utils_crypt.c:336 +#: lib/utils_crypt.c:338 msgid "Cannot use offset with terminal input.\n" msgstr "" -#: lib/utils_crypt.c:355 lib/tcrypt/tcrypt.c:443 +#: lib/utils_crypt.c:357 lib/tcrypt/tcrypt.c:453 msgid "Failed to open key file.\n" msgstr "" -#: lib/utils_crypt.c:364 +#: lib/utils_crypt.c:366 msgid "Failed to stat key file.\n" msgstr "" -#: lib/utils_crypt.c:372 lib/utils_crypt.c:393 +#: lib/utils_crypt.c:374 lib/utils_crypt.c:395 msgid "Cannot seek to requested keyfile offset.\n" msgstr "" -#: lib/utils_crypt.c:410 +#: lib/utils_crypt.c:412 msgid "Error reading passphrase.\n" msgstr "" -#: lib/utils_crypt.c:428 +#: lib/utils_crypt.c:430 msgid "Maximum keyfile size exceeded.\n" msgstr "" -#: lib/utils_crypt.c:433 +#: lib/utils_crypt.c:435 msgid "Cannot read requested amount of data.\n" msgstr "" -#: lib/utils_fips.c:47 +#: lib/utils_fips.c:44 msgid "FIPS checksum verification failed.\n" msgstr "" -#: lib/utils_fips.c:51 +#: src/cryptsetup.c:1533 msgid "Running in FIPS mode.\n" msgstr "" -#: lib/utils_device.c:52 lib/luks1/keyencryption.c:82 +#: lib/utils_device.c:52 lib/luks1/keyencryption.c:90 #, c-format msgid "Device %s doesn't exist or access denied.\n" msgstr "" -#: lib/utils_device.c:346 +#: lib/utils_device.c:352 msgid "Cannot use a loopback device, running as non-root user.\n" msgstr "" -#: lib/utils_device.c:349 +#: lib/utils_device.c:355 msgid "Cannot find a free loopback device.\n" msgstr "" -#: lib/utils_device.c:356 +#: lib/utils_device.c:362 msgid "" "Attaching loopback device failed (loop device with autoclear flag is " "required).\n" msgstr "" -#: lib/utils_device.c:396 +#: lib/utils_device.c:402 #, c-format msgid "Cannot use device %s which is in use (already mapped or mounted).\n" msgstr "" -#: lib/utils_device.c:400 +#: lib/utils_device.c:406 #, c-format msgid "Cannot get info about device %s.\n" msgstr "" -#: lib/utils_device.c:406 +#: lib/utils_device.c:412 #, c-format msgid "Requested offset is beyond real size of device %s.\n" msgstr "" -#: lib/utils_device.c:414 +#: lib/utils_device.c:420 #, c-format msgid "Device %s has zero size.\n" msgstr "" -#: lib/utils_device.c:425 lib/luks1/keymanage.c:89 +#: lib/utils_device.c:431 #, c-format msgid "Device %s is too small.\n" msgstr "" -#: lib/luks1/keyencryption.c:31 +#: lib/luks1/keyencryption.c:37 #, c-format msgid "" "Failed to setup dm-crypt key mapping for device %s.\n" "Check that kernel supports %s cipher (check syslog for more info).\n" msgstr "" -#: lib/luks1/keyencryption.c:36 +#: lib/luks1/keyencryption.c:42 msgid "Key size in XTS mode must be 256 or 512 bits.\n" msgstr "" -#: lib/luks1/keyencryption.c:88 lib/luks1/keymanage.c:290 -#: lib/luks1/keymanage.c:559 lib/luks1/keymanage.c:971 +#: lib/luks1/keyencryption.c:96 lib/luks1/keymanage.c:296 +#: lib/luks1/keymanage.c:565 lib/luks1/keymanage.c:1010 #, c-format msgid "Cannot write to device %s, permission denied.\n" msgstr "" -#: lib/luks1/keyencryption.c:103 +#: lib/luks1/keyencryption.c:111 msgid "Failed to open temporary keystore device.\n" msgstr "" -#: lib/luks1/keyencryption.c:110 +#: lib/luks1/keyencryption.c:118 msgid "Failed to access temporary keystore device.\n" msgstr "" -#: lib/luks1/keymanage.c:175 lib/luks1/keymanage.c:412 -#: src/cryptsetup_reencrypt.c:978 +#: lib/luks1/keymanage.c:180 lib/luks1/keymanage.c:418 +#: src/cryptsetup_reencrypt.c:1019 #, c-format msgid "Device %s is not a valid LUKS device.\n" msgstr "" -#: lib/luks1/keymanage.c:193 +#: lib/luks1/keymanage.c:198 #, c-format msgid "Requested header backup file %s already exists.\n" msgstr "" -#: lib/luks1/keymanage.c:195 +#: lib/luks1/keymanage.c:200 #, c-format msgid "Cannot create header backup file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:200 +#: lib/luks1/keymanage.c:205 #, c-format msgid "Cannot write header backup file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:233 +#: lib/luks1/keymanage.c:239 msgid "Backup file doesn't contain valid LUKS header.\n" msgstr "" -#: lib/luks1/keymanage.c:246 lib/luks1/keymanage.c:483 +#: lib/luks1/keymanage.c:252 lib/luks1/keymanage.c:489 #, c-format msgid "Cannot open header backup file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:252 +#: lib/luks1/keymanage.c:258 #, c-format msgid "Cannot read header backup file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:263 +#: lib/luks1/keymanage.c:269 msgid "" "Data offset or key size differs on device and backup, restore failed.\n" msgstr "" -#: lib/luks1/keymanage.c:271 +#: lib/luks1/keymanage.c:277 #, c-format msgid "Device %s %s%s" msgstr "" -#: lib/luks1/keymanage.c:272 +#: lib/luks1/keymanage.c:278 msgid "" "does not contain LUKS header. Replacing header can destroy data on that " "device." msgstr "" -#: lib/luks1/keymanage.c:273 +#: lib/luks1/keymanage.c:279 msgid "" "already contains LUKS header. Replacing header will destroy existing " "keyslots." msgstr "" -#: lib/luks1/keymanage.c:274 +#: lib/luks1/keymanage.c:280 msgid "" "\n" "WARNING: real device header has different UUID than backup!" msgstr "" -#: lib/luks1/keymanage.c:293 lib/luks1/keymanage.c:522 -#: lib/luks1/keymanage.c:562 lib/tcrypt/tcrypt.c:581 lib/verity/verity.c:82 -#: lib/verity/verity.c:179 lib/verity/verity_hash.c:294 -#: lib/verity/verity_hash.c:305 lib/verity/verity_hash.c:325 +#: lib/luks1/keymanage.c:299 lib/luks1/keymanage.c:528 +#: lib/luks1/keymanage.c:568 lib/tcrypt/tcrypt.c:608 lib/verity/verity.c:82 +#: lib/verity/verity.c:179 lib/verity/verity_hash.c:292 +#: lib/verity/verity_hash.c:303 lib/verity/verity_hash.c:323 #, c-format msgid "Cannot open device %s.\n" msgstr "" -#: lib/luks1/keymanage.c:323 +#: lib/luks1/keymanage.c:329 msgid "Non standard key size, manual repair required.\n" msgstr "" -#: lib/luks1/keymanage.c:328 +#: lib/luks1/keymanage.c:334 msgid "Non standard keyslots alignment, manual repair required.\n" msgstr "" -#: lib/luks1/keymanage.c:334 +#: lib/luks1/keymanage.c:340 msgid "Repairing keyslots.\n" msgstr "" -#: lib/luks1/keymanage.c:345 +#: lib/luks1/keymanage.c:351 msgid "Repair failed." msgstr "" -#: lib/luks1/keymanage.c:357 +#: lib/luks1/keymanage.c:363 #, c-format msgid "Keyslot %i: offset repaired (%u -> %u).\n" msgstr "" -#: lib/luks1/keymanage.c:365 +#: lib/luks1/keymanage.c:371 #, c-format msgid "Keyslot %i: stripes repaired (%u -> %u).\n" msgstr "" -#: lib/luks1/keymanage.c:374 +#: lib/luks1/keymanage.c:380 #, c-format msgid "Keyslot %i: bogus partition signature.\n" msgstr "" -#: lib/luks1/keymanage.c:379 +#: lib/luks1/keymanage.c:385 #, c-format msgid "Keyslot %i: salt wiped.\n" msgstr "" -#: lib/luks1/keymanage.c:390 +#: lib/luks1/keymanage.c:396 msgid "Writing LUKS header to disk.\n" msgstr "" -#: lib/luks1/keymanage.c:415 +#: lib/luks1/keymanage.c:421 #, c-format msgid "Unsupported LUKS version %d.\n" msgstr "" -#: lib/luks1/keymanage.c:421 lib/luks1/keymanage.c:619 +#: lib/luks1/keymanage.c:427 lib/luks1/keymanage.c:654 #, c-format msgid "Requested LUKS hash %s is not supported.\n" msgstr "" -#: lib/luks1/keymanage.c:436 +#: lib/luks1/keymanage.c:442 #, c-format msgid "LUKS keyslot %u is invalid.\n" msgstr "" -#: lib/luks1/keymanage.c:450 src/cryptsetup.c:596 +#: lib/luks1/keymanage.c:456 src/cryptsetup.c:635 msgid "No known problems detected for LUKS header.\n" msgstr "" -#: lib/luks1/keymanage.c:583 +#: lib/luks1/keymanage.c:589 #, c-format msgid "Error during update of LUKS header on device %s.\n" msgstr "" -#: lib/luks1/keymanage.c:590 +#: lib/luks1/keymanage.c:596 #, c-format msgid "Error re-reading LUKS header after update on device %s.\n" msgstr "" -#: lib/luks1/keymanage.c:624 lib/luks1/keymanage.c:711 +#: lib/luks1/keymanage.c:659 lib/luks1/keymanage.c:750 msgid "Wrong LUKS UUID format provided.\n" msgstr "" -#: lib/luks1/keymanage.c:649 +#: lib/luks1/keymanage.c:688 msgid "Cannot create LUKS header: reading random salt failed.\n" msgstr "" -#: lib/luks1/keymanage.c:656 lib/luks1/keymanage.c:752 +#: lib/luks1/keymanage.c:695 lib/luks1/keymanage.c:791 #, c-format msgid "Not compatible PBKDF2 options (using hash algorithm %s).\n" msgstr "" -#: lib/luks1/keymanage.c:671 +#: lib/luks1/keymanage.c:710 #, c-format msgid "Cannot create LUKS header: header digest failed (using hash %s).\n" msgstr "" -#: lib/luks1/keymanage.c:736 +#: lib/luks1/keymanage.c:775 #, c-format msgid "Key slot %d active, purge first.\n" msgstr "" -#: lib/luks1/keymanage.c:742 +#: lib/luks1/keymanage.c:781 #, c-format msgid "Key slot %d material includes too few stripes. Header manipulation?\n" msgstr "" -#: lib/luks1/keymanage.c:904 +#: lib/luks1/keymanage.c:943 #, c-format msgid "Key slot %d unlocked.\n" msgstr "" -#: lib/luks1/keymanage.c:939 src/cryptsetup.c:796 -#: src/cryptsetup_reencrypt.c:882 src/cryptsetup_reencrypt.c:916 +#: lib/luks1/keymanage.c:978 src/cryptsetup.c:835 +#: src/cryptsetup_reencrypt.c:910 src/cryptsetup_reencrypt.c:947 msgid "No key available with this passphrase.\n" msgstr "" -#: lib/luks1/keymanage.c:957 +#: lib/luks1/keymanage.c:996 #, c-format msgid "Key slot %d is invalid, please select keyslot between 0 and %d.\n" msgstr "" -#: lib/luks1/keymanage.c:975 +#: lib/luks1/keymanage.c:1014 #, c-format msgid "Cannot wipe device %s.\n" msgstr "" @@ -642,35 +639,35 @@ msgid "Kernel doesn't support loop-AES compatible mapping.\n" msgstr "" -#: lib/tcrypt/tcrypt.c:451 +#: lib/tcrypt/tcrypt.c:461 #, c-format msgid "Error reading keyfile %s.\n" msgstr "" -#: lib/tcrypt/tcrypt.c:489 +#: lib/tcrypt/tcrypt.c:499 #, c-format msgid "Maximum TCRYPT passphrase length (%d) exceeded.\n" msgstr "" -#: lib/tcrypt/tcrypt.c:518 +#: lib/tcrypt/tcrypt.c:528 #, c-format msgid "PBKDF2 hash algorithm %s not available, skipping.\n" msgstr "" -#: lib/tcrypt/tcrypt.c:536 src/cryptsetup.c:549 +#: lib/tcrypt/tcrypt.c:546 src/cryptsetup.c:588 msgid "Required kernel crypto interface not available.\n" msgstr "" -#: lib/tcrypt/tcrypt.c:538 src/cryptsetup.c:551 +#: lib/tcrypt/tcrypt.c:548 src/cryptsetup.c:590 msgid "Ensure you have algif_skcipher kernel module loaded.\n" msgstr "" -#: lib/tcrypt/tcrypt.c:660 +#: lib/tcrypt/tcrypt.c:691 #, c-format msgid "Activation is not supported for %d sector size.\n" msgstr "" -#: lib/tcrypt/tcrypt.c:666 +#: lib/tcrypt/tcrypt.c:697 msgid "Kernel doesn't support activation for this TCRYPT legacy mode.\n" msgstr "" @@ -678,7 +675,7 @@ msgid "Kernel doesn't support plain64 IV.\n" msgstr "" -#: lib/tcrypt/tcrypt.c:930 +#: lib/tcrypt/tcrypt.c:1004 msgid "This function is not supported without TCRYPT header load." msgstr "" @@ -723,7 +720,7 @@ msgstr "" #: lib/verity/verity_hash.c:121 lib/verity/verity_hash.c:249 -#: lib/verity/verity_hash.c:279 lib/verity/verity_hash.c:286 +#: lib/verity/verity_hash.c:277 lib/verity/verity_hash.c:284 msgid "Device offset overflow.\n" msgstr "" @@ -736,264 +733,266 @@ msgid "Invalid size parameters for verity device.\n" msgstr "" -#: lib/verity/verity_hash.c:267 +#: lib/verity/verity_hash.c:266 msgid "Too many tree levels for verity volume.\n" msgstr "" -#: lib/verity/verity_hash.c:356 +#: lib/verity/verity_hash.c:354 msgid "Verification of data area failed.\n" msgstr "" -#: lib/verity/verity_hash.c:361 +#: lib/verity/verity_hash.c:359 msgid "Verification of root hash failed.\n" msgstr "" -#: lib/verity/verity_hash.c:367 +#: lib/verity/verity_hash.c:365 msgid "Input/output error while creating hash area.\n" msgstr "" -#: lib/verity/verity_hash.c:369 +#: lib/verity/verity_hash.c:367 msgid "Creation of hash area failed.\n" msgstr "" -#: lib/verity/verity_hash.c:416 +#: lib/verity/verity_hash.c:414 #, c-format msgid "" "WARNING: Kernel cannot activate device if data block size exceeds page size " "(%u).\n" msgstr "" -#: src/cryptsetup.c:79 +#: src/cryptsetup.c:80 msgid "Can't do passphrase verification on non-tty inputs.\n" msgstr "" -#: src/cryptsetup.c:110 +#: src/cryptsetup.c:111 msgid "" "Ignoring keyfile offset and size options, keyfile read size is always the " "same as encryption key size.\n" msgstr "" -#: src/cryptsetup.c:116 src/cryptsetup.c:495 src/cryptsetup.c:639 -#: src/cryptsetup_reencrypt.c:485 src/cryptsetup_reencrypt.c:520 +#: src/cryptsetup.c:117 src/cryptsetup.c:531 src/cryptsetup.c:678 +#: src/cryptsetup_reencrypt.c:496 src/cryptsetup_reencrypt.c:547 msgid "No known cipher specification pattern detected.\n" msgstr "" -#: src/cryptsetup.c:183 +#: src/cryptsetup.c:184 msgid "Option --key-file is required.\n" msgstr "" -#: src/cryptsetup.c:254 src/cryptsetup.c:340 +#: src/cryptsetup.c:237 msgid "No device header detected with this passphrase.\n" msgstr "" -#: src/cryptsetup.c:269 src/cryptsetup.c:1059 +#: src/cryptsetup.c:300 src/cryptsetup.c:1104 msgid "" "Header dump with volume key is sensitive information\n" "which allows access to encrypted partition without passphrase.\n" "This dump should be always stored encrypted on safe place." msgstr "" -#: src/cryptsetup.c:489 +#: src/cryptsetup.c:525 msgid "# Tests are approximate using memory only (no storage IO).\n" msgstr "" -#: src/cryptsetup.c:511 src/cryptsetup.c:533 +#: src/cryptsetup.c:550 src/cryptsetup.c:572 msgid "# Algorithm | Key | Encryption | Decryption\n" msgstr "" -#: src/cryptsetup.c:515 +#: src/cryptsetup.c:554 #, c-format msgid "Cipher %s is not available.\n" msgstr "" -#: src/cryptsetup.c:542 +#: src/cryptsetup.c:581 msgid "N/A" msgstr "" -#: src/cryptsetup.c:567 +#: src/cryptsetup.c:606 #, c-format msgid "Cannot read keyfile %s.\n" msgstr "" -#: src/cryptsetup.c:571 +#: src/cryptsetup.c:610 #, c-format msgid "Cannot read %d bytes from keyfile %s.\n" msgstr "" -#: src/cryptsetup.c:600 +#: src/cryptsetup.c:639 msgid "Really try to repair LUKS device header?" msgstr "" -#: src/cryptsetup.c:625 +#: src/cryptsetup.c:664 #, c-format msgid "This will overwrite data on %s irrevocably." msgstr "这将不能取消地在 %s 上覆盖数据" -#: src/cryptsetup.c:627 +#: src/cryptsetup.c:666 msgid "memory allocation error in action_luksFormat" msgstr "内存配置错误在 action_luksFormat" -#: src/cryptsetup.c:645 +#: src/cryptsetup.c:684 #, c-format msgid "Cannot use %s as on-disk header.\n" msgstr "" -#: src/cryptsetup.c:718 +#: src/cryptsetup.c:757 msgid "Reduced data offset is allowed only for detached LUKS header.\n" msgstr "" -#: src/cryptsetup.c:819 src/cryptsetup.c:875 +#: src/cryptsetup.c:858 src/cryptsetup.c:914 #, c-format msgid "Key slot %d selected for deletion.\n" msgstr "" -#: src/cryptsetup.c:822 +#: src/cryptsetup.c:861 #, c-format msgid "Key %d not active. Can't wipe.\n" msgstr "密钥 %d 没有激活. 不能清除.\n" -#: src/cryptsetup.c:830 src/cryptsetup.c:878 +#: src/cryptsetup.c:869 src/cryptsetup.c:917 msgid "" "This is the last keyslot. Device will become unusable after purging this key." msgstr "这是最后的 keyslot. 设备将不可用在清除这个密钥后." -#: src/cryptsetup.c:831 +#: src/cryptsetup.c:870 msgid "Enter any remaining passphrase: " msgstr "" -#: src/cryptsetup.c:859 +#: src/cryptsetup.c:898 msgid "Enter passphrase to be deleted: " msgstr "" -#: src/cryptsetup.c:928 src/cryptsetup_reencrypt.c:948 +#: src/cryptsetup.c:967 src/cryptsetup_reencrypt.c:985 +#, c-format msgid "Enter any existing passphrase: " msgstr "" -#: src/cryptsetup.c:977 +#: src/cryptsetup.c:1016 msgid "Enter passphrase to be changed: " msgstr "" -#: src/cryptsetup.c:991 src/cryptsetup_reencrypt.c:934 +#: src/cryptsetup.c:1030 src/cryptsetup_reencrypt.c:970 msgid "Enter new passphrase: " msgstr "" -#: src/cryptsetup.c:1165 src/cryptsetup.c:1186 +#: src/cryptsetup.c:1210 src/cryptsetup.c:1231 msgid "Option --header-backup-file is required.\n" msgstr "" -#: src/cryptsetup.c:1223 +#: src/cryptsetup.c:1268 #, c-format msgid "Unrecognized metadata device type %s.\n" msgstr "" -#: src/cryptsetup.c:1226 +#: src/cryptsetup.c:1271 msgid "Command requires device and mapped name as arguments.\n" msgstr "" -#: src/cryptsetup.c:1238 +#: src/cryptsetup.c:1324 msgid " [--type ] []" msgstr "" -#: src/cryptsetup.c:1238 +#: src/cryptsetup.c:1324 msgid "open device as mapping " msgstr "" -#: src/cryptsetup.c:1239 src/cryptsetup.c:1240 src/cryptsetup.c:1241 -#: src/cryptsetup.c:1242 src/veritysetup.c:310 src/veritysetup.c:311 +#: src/cryptsetup.c:1325 src/cryptsetup.c:1326 src/cryptsetup.c:1327 +#: src/cryptsetup.c:1328 src/veritysetup.c:311 src/veritysetup.c:312 msgid "" msgstr "<名称>" -#: src/cryptsetup.c:1239 +#: src/cryptsetup.c:1325 msgid "close device (remove mapping)" msgstr "" -#: src/cryptsetup.c:1240 +#: src/cryptsetup.c:1326 msgid "resize active device" msgstr "改变激活分区大小" -#: src/cryptsetup.c:1241 +#: src/cryptsetup.c:1327 msgid "show device status" msgstr "显示设备状态" -#: src/cryptsetup.c:1242 +#: src/cryptsetup.c:1328 msgid "benchmark cipher" msgstr "" -#: src/cryptsetup.c:1243 src/cryptsetup.c:1249 src/cryptsetup.c:1250 -#: src/cryptsetup.c:1251 src/cryptsetup.c:1252 src/cryptsetup.c:1253 -#: src/cryptsetup.c:1254 src/cryptsetup.c:1255 src/cryptsetup.c:1256 +#: src/cryptsetup.c:1329 src/cryptsetup.c:1330 src/cryptsetup.c:1336 +#: src/cryptsetup.c:1337 src/cryptsetup.c:1338 src/cryptsetup.c:1339 +#: src/cryptsetup.c:1340 src/cryptsetup.c:1341 src/cryptsetup.c:1342 +#: src/cryptsetup.c:1343 msgid "" msgstr "<设备>" -#: src/cryptsetup.c:1243 +#: src/cryptsetup.c:1329 msgid "try to repair on-disk metadata" msgstr "" -#: src/cryptsetup.c:1244 src/cryptsetup.c:1245 +#: src/cryptsetup.c:1331 src/cryptsetup.c:1332 msgid " []" msgstr "<设备> [<新密钥文件>]" -#: src/cryptsetup.c:1244 +#: src/cryptsetup.c:1331 msgid "formats a LUKS device" msgstr "格式化成一个LUKS设备" -#: src/cryptsetup.c:1245 +#: src/cryptsetup.c:1332 msgid "add key to LUKS device" msgstr "添加密钥到LUKS设备" -#: src/cryptsetup.c:1246 src/cryptsetup.c:1247 +#: src/cryptsetup.c:1333 src/cryptsetup.c:1334 msgid " []" msgstr "" -#: src/cryptsetup.c:1246 +#: src/cryptsetup.c:1333 msgid "removes supplied key or key file from LUKS device" msgstr "" -#: src/cryptsetup.c:1247 +#: src/cryptsetup.c:1334 msgid "changes supplied key or key file of LUKS device" msgstr "" -#: src/cryptsetup.c:1248 +#: src/cryptsetup.c:1335 msgid " " msgstr "<设备> " -#: src/cryptsetup.c:1248 +#: src/cryptsetup.c:1335 msgid "wipes key with number from LUKS device" msgstr "从LUKS 设备用数字清除密钥" -#: src/cryptsetup.c:1249 +#: src/cryptsetup.c:1336 msgid "print UUID of LUKS device" msgstr "显示LUKS设备的UUID" -#: src/cryptsetup.c:1250 +#: src/cryptsetup.c:1337 msgid "tests for LUKS partition header" msgstr "为LUKS分区头检测<设备>" -#: src/cryptsetup.c:1251 +#: src/cryptsetup.c:1338 msgid "dump LUKS partition information" msgstr "复制LUKS分区信息" -#: src/cryptsetup.c:1252 +#: src/cryptsetup.c:1339 msgid "dump TCRYPT device information" msgstr "" -#: src/cryptsetup.c:1253 +#: src/cryptsetup.c:1340 msgid "Suspend LUKS device and wipe key (all IOs are frozen)." msgstr "" -#: src/cryptsetup.c:1254 +#: src/cryptsetup.c:1341 msgid "Resume suspended LUKS device." msgstr "" -#: src/cryptsetup.c:1255 +#: src/cryptsetup.c:1342 msgid "Backup LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:1256 +#: src/cryptsetup.c:1343 msgid "Restore LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:1273 src/veritysetup.c:327 +#: src/cryptsetup.c:1360 src/veritysetup.c:328 msgid "" "\n" " is one of:\n" @@ -1001,7 +1000,7 @@ "\n" " 是其中之一:\n" -#: src/cryptsetup.c:1279 +#: src/cryptsetup.c:1366 msgid "" "\n" "You can also use old syntax aliases:\n" @@ -1009,7 +1008,7 @@ "\tclose: remove (plainClose), luksClose, loopaesClose, tcryptClose\n" msgstr "" -#: src/cryptsetup.c:1283 +#: src/cryptsetup.c:1370 #, c-format msgid "" "\n" @@ -1024,7 +1023,7 @@ " 是 LUKS key slot 数字去设置\n" " optional key file for the new key for luksAddKey action\n" -#: src/cryptsetup.c:1290 +#: src/cryptsetup.c:1377 #, c-format msgid "" "\n" @@ -1034,7 +1033,7 @@ "Default PBKDF2 iteration time for LUKS: %d (ms)\n" msgstr "" -#: src/cryptsetup.c:1297 +#: src/cryptsetup.c:1384 #, c-format msgid "" "\n" @@ -1044,264 +1043,264 @@ "\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n" msgstr "" -#: src/cryptsetup.c:1314 src/veritysetup.c:459 +#: src/cryptsetup.c:1401 src/veritysetup.c:460 #, c-format msgid "%s: requires %s as arguments" msgstr "%s: requires %s 作为参数" -#: src/cryptsetup.c:1347 src/veritysetup.c:367 src/cryptsetup_reencrypt.c:1099 +#: src/cryptsetup.c:1434 src/veritysetup.c:368 src/cryptsetup_reencrypt.c:1144 msgid "Show this help message" msgstr "显示该帮助信息" -#: src/cryptsetup.c:1348 src/veritysetup.c:368 src/cryptsetup_reencrypt.c:1100 +#: src/cryptsetup.c:1435 src/veritysetup.c:369 src/cryptsetup_reencrypt.c:1145 msgid "Display brief usage" msgstr "显示简短用法" -#: src/cryptsetup.c:1352 src/veritysetup.c:372 src/cryptsetup_reencrypt.c:1104 +#: src/cryptsetup.c:1439 src/veritysetup.c:373 src/cryptsetup_reencrypt.c:1149 msgid "Help options:" msgstr "帮助选项" -#: src/cryptsetup.c:1353 src/veritysetup.c:373 src/cryptsetup_reencrypt.c:1105 +#: src/cryptsetup.c:1440 src/veritysetup.c:374 src/cryptsetup_reencrypt.c:1150 msgid "Print package version" msgstr "显示包版本" -#: src/cryptsetup.c:1354 src/veritysetup.c:374 src/cryptsetup_reencrypt.c:1106 +#: src/cryptsetup.c:1441 src/veritysetup.c:375 src/cryptsetup_reencrypt.c:1151 msgid "Shows more detailed error messages" msgstr "显示更多的详细错误信息" -#: src/cryptsetup.c:1355 src/veritysetup.c:375 src/cryptsetup_reencrypt.c:1107 +#: src/cryptsetup.c:1442 src/veritysetup.c:376 src/cryptsetup_reencrypt.c:1152 msgid "Show debug messages" msgstr "" -#: src/cryptsetup.c:1356 src/cryptsetup_reencrypt.c:1109 +#: src/cryptsetup.c:1443 src/cryptsetup_reencrypt.c:1154 msgid "The cipher used to encrypt the disk (see /proc/crypto)" msgstr "这个密码用于加密这个磁盘(参看 /proc/crypto)" -#: src/cryptsetup.c:1357 src/cryptsetup_reencrypt.c:1111 +#: src/cryptsetup.c:1444 src/cryptsetup_reencrypt.c:1156 msgid "The hash used to create the encryption key from the passphrase" msgstr "hash用于从密钥中创建加密密钥" -#: src/cryptsetup.c:1358 +#: src/cryptsetup.c:1445 msgid "Verifies the passphrase by asking for it twice" msgstr "通过两次来校验密钥" -#: src/cryptsetup.c:1359 src/cryptsetup_reencrypt.c:1112 +#: src/cryptsetup.c:1446 src/cryptsetup_reencrypt.c:1158 msgid "Read the key from a file." msgstr "" -#: src/cryptsetup.c:1360 +#: src/cryptsetup.c:1447 msgid "Read the volume (master) key from file." msgstr "" -#: src/cryptsetup.c:1361 +#: src/cryptsetup.c:1448 msgid "Dump volume (master) key instead of keyslots info." msgstr "" -#: src/cryptsetup.c:1362 src/cryptsetup_reencrypt.c:1110 +#: src/cryptsetup.c:1449 src/cryptsetup_reencrypt.c:1155 msgid "The size of the encryption key" msgstr "加密密码的长度" -#: src/cryptsetup.c:1362 src/cryptsetup_reencrypt.c:1110 +#: src/cryptsetup.c:1449 src/cryptsetup_reencrypt.c:1155 msgid "BITS" msgstr "位数" -#: src/cryptsetup.c:1363 src/cryptsetup_reencrypt.c:1123 +#: src/cryptsetup.c:1450 src/cryptsetup_reencrypt.c:1169 msgid "Limits the read from keyfile" msgstr "" -#: src/cryptsetup.c:1363 src/cryptsetup.c:1364 src/cryptsetup.c:1365 -#: src/cryptsetup.c:1366 src/veritysetup.c:378 src/veritysetup.c:379 -#: src/veritysetup.c:381 src/cryptsetup_reencrypt.c:1122 -#: src/cryptsetup_reencrypt.c:1123 src/cryptsetup_reencrypt.c:1124 -#: src/cryptsetup_reencrypt.c:1125 +#: src/cryptsetup.c:1450 src/cryptsetup.c:1451 src/cryptsetup.c:1452 +#: src/cryptsetup.c:1453 src/veritysetup.c:379 src/veritysetup.c:380 +#: src/veritysetup.c:382 src/cryptsetup_reencrypt.c:1168 +#: src/cryptsetup_reencrypt.c:1169 src/cryptsetup_reencrypt.c:1170 +#: src/cryptsetup_reencrypt.c:1171 msgid "bytes" msgstr "" -#: src/cryptsetup.c:1364 src/cryptsetup_reencrypt.c:1122 +#: src/cryptsetup.c:1451 src/cryptsetup_reencrypt.c:1168 msgid "Number of bytes to skip in keyfile" msgstr "" -#: src/cryptsetup.c:1365 +#: src/cryptsetup.c:1452 msgid "Limits the read from newly added keyfile" msgstr "" -#: src/cryptsetup.c:1366 +#: src/cryptsetup.c:1453 msgid "Number of bytes to skip in newly added keyfile" msgstr "" -#: src/cryptsetup.c:1367 +#: src/cryptsetup.c:1454 msgid "Slot number for new key (default is first free)" msgstr "" -#: src/cryptsetup.c:1368 +#: src/cryptsetup.c:1455 msgid "The size of the device" msgstr "设备尺寸" -#: src/cryptsetup.c:1368 src/cryptsetup.c:1369 src/cryptsetup.c:1370 -#: src/cryptsetup.c:1376 +#: src/cryptsetup.c:1455 src/cryptsetup.c:1456 src/cryptsetup.c:1457 +#: src/cryptsetup.c:1463 msgid "SECTORS" msgstr "扇区数" -#: src/cryptsetup.c:1369 +#: src/cryptsetup.c:1456 msgid "The start offset in the backend device" msgstr "在后台设备中的开始偏移量" -#: src/cryptsetup.c:1370 +#: src/cryptsetup.c:1457 msgid "How many sectors of the encrypted data to skip at the beginning" msgstr "加密数据在开始跳过多少扇区" -#: src/cryptsetup.c:1371 +#: src/cryptsetup.c:1458 msgid "Create a readonly mapping" msgstr "创建一个只读映射" -#: src/cryptsetup.c:1372 src/cryptsetup_reencrypt.c:1113 +#: src/cryptsetup.c:1459 src/cryptsetup_reencrypt.c:1159 msgid "PBKDF2 iteration time for LUKS (in ms)" msgstr "用于LUKS的PBKDF2 重复时间 (毫秒内)" -#: src/cryptsetup.c:1372 src/cryptsetup_reencrypt.c:1113 +#: src/cryptsetup.c:1459 src/cryptsetup_reencrypt.c:1159 msgid "msecs" msgstr "毫秒" -#: src/cryptsetup.c:1373 src/cryptsetup_reencrypt.c:1114 +#: src/cryptsetup.c:1460 src/cryptsetup_reencrypt.c:1160 msgid "Do not ask for confirmation" msgstr "不询问确认" -#: src/cryptsetup.c:1374 +#: src/cryptsetup.c:1461 msgid "Timeout for interactive passphrase prompt (in seconds)" msgstr "交互密钥提示的时间限制(秒数)" -#: src/cryptsetup.c:1374 +#: src/cryptsetup.c:1461 msgid "secs" msgstr "秒" -#: src/cryptsetup.c:1375 src/cryptsetup_reencrypt.c:1115 +#: src/cryptsetup.c:1462 src/cryptsetup_reencrypt.c:1161 msgid "How often the input of the passphrase can be retried" msgstr "多久能重试再输入密钥" -#: src/cryptsetup.c:1376 +#: src/cryptsetup.c:1463 msgid "Align payload at sector boundaries - for luksFormat" msgstr "为luksFormat排列有效负荷在扇区边界" -#: src/cryptsetup.c:1377 +#: src/cryptsetup.c:1464 msgid "File with LUKS header and keyslots backup." msgstr "" -#: src/cryptsetup.c:1378 src/cryptsetup_reencrypt.c:1116 +#: src/cryptsetup.c:1465 src/cryptsetup_reencrypt.c:1162 msgid "Use /dev/random for generating volume key." msgstr "" -#: src/cryptsetup.c:1379 src/cryptsetup_reencrypt.c:1117 +#: src/cryptsetup.c:1466 src/cryptsetup_reencrypt.c:1163 msgid "Use /dev/urandom for generating volume key." msgstr "" -#: src/cryptsetup.c:1380 +#: src/cryptsetup.c:1467 msgid "Share device with another non-overlapping crypt segment." msgstr "" -#: src/cryptsetup.c:1381 src/veritysetup.c:384 +#: src/cryptsetup.c:1468 src/veritysetup.c:385 msgid "UUID for device to use." msgstr "" -#: src/cryptsetup.c:1382 +#: src/cryptsetup.c:1469 msgid "Allow discards (aka TRIM) requests for device." msgstr "" -#: src/cryptsetup.c:1383 +#: src/cryptsetup.c:1470 msgid "Device or file with separated LUKS header." msgstr "" -#: src/cryptsetup.c:1384 +#: src/cryptsetup.c:1471 msgid "Do not activate device, just check passphrase." msgstr "" -#: src/cryptsetup.c:1385 +#: src/cryptsetup.c:1472 msgid "Use hidden header (hidden TCRYPT device)." msgstr "" -#: src/cryptsetup.c:1386 +#: src/cryptsetup.c:1473 msgid "Device is system TCRYPT drive (with bootloader)." msgstr "" -#: src/cryptsetup.c:1387 +#: src/cryptsetup.c:1475 msgid "Type of device metadata: luks, plain, loopaes, tcrypt." msgstr "" -#: src/cryptsetup.c:1388 +#: src/cryptsetup.c:1476 msgid "Disable password quality check (if enabled)." msgstr "" -#: src/cryptsetup.c:1406 src/veritysetup.c:401 +#: src/cryptsetup.c:1492 src/veritysetup.c:402 msgid "[OPTION...] " msgstr "" -#: src/cryptsetup.c:1452 src/veritysetup.c:438 +#: src/cryptsetup.c:1542 src/veritysetup.c:439 msgid "Argument missing." msgstr "缺少参数." -#: src/cryptsetup.c:1500 src/veritysetup.c:444 +#: src/cryptsetup.c:1593 src/veritysetup.c:445 msgid "Unknown action." msgstr "未知参数" -#: src/cryptsetup.c:1510 +#: src/cryptsetup.c:1603 msgid "Option --shared is allowed only for open of plain device.\n" msgstr "" -#: src/cryptsetup.c:1515 +#: src/cryptsetup.c:1608 msgid "Option --allow-discards is allowed only for open operation.\n" msgstr "" -#: src/cryptsetup.c:1523 +#: src/cryptsetup.c:1616 msgid "" "Option --key-size is allowed only for luksFormat, open and benchmark.\n" "To limit read from keyfile use --keyfile-size=(bytes)." msgstr "" -#: src/cryptsetup.c:1530 +#: src/cryptsetup.c:1623 msgid "" "Option --test-passphrase is allowed only for open of LUKS and TCRYPT " "devices.\n" msgstr "" -#: src/cryptsetup.c:1535 src/cryptsetup_reencrypt.c:1185 +#: src/cryptsetup.c:1628 src/cryptsetup_reencrypt.c:1231 msgid "Key size must be a multiple of 8 bits" msgstr "密码长度必须是8的倍数" -#: src/cryptsetup.c:1542 src/cryptsetup_reencrypt.c:1190 +#: src/cryptsetup.c:1635 src/cryptsetup_reencrypt.c:1236 msgid "Key slot is invalid." msgstr "" -#: src/cryptsetup.c:1549 +#: src/cryptsetup.c:1642 msgid "" "Option --key-file takes precedence over specified key file argument.\n" msgstr "" -#: src/cryptsetup.c:1557 src/veritysetup.c:466 src/cryptsetup_reencrypt.c:1174 +#: src/cryptsetup.c:1650 src/veritysetup.c:467 src/cryptsetup_reencrypt.c:1220 msgid "Negative number for option not permitted." msgstr "" -#: src/cryptsetup.c:1561 src/cryptsetup_reencrypt.c:1168 -#: src/cryptsetup_reencrypt.c:1194 +#: src/cryptsetup.c:1654 src/cryptsetup_reencrypt.c:1214 +#: src/cryptsetup_reencrypt.c:1240 msgid "Only one of --use-[u]random options is allowed." msgstr "" -#: src/cryptsetup.c:1565 +#: src/cryptsetup.c:1658 msgid "Option --use-[u]random is allowed only for luksFormat." msgstr "" -#: src/cryptsetup.c:1569 +#: src/cryptsetup.c:1662 msgid "Option --uuid is allowed only for luksFormat and luksUUID." msgstr "" -#: src/cryptsetup.c:1573 +#: src/cryptsetup.c:1666 msgid "Option --align-payload is allowed only for luksFormat." msgstr "" -#: src/cryptsetup.c:1579 +#: src/cryptsetup.c:1672 msgid "" "Option --skip is supported only for open of plain and loopaes devices.\n" msgstr "" -#: src/cryptsetup.c:1585 +#: src/cryptsetup.c:1678 msgid "" "Option --offset is supported only for open of plain and loopaes devices.\n" msgstr "" @@ -1312,60 +1311,60 @@ "device.\n" msgstr "" -#: src/veritysetup.c:57 +#: src/veritysetup.c:58 msgid "Invalid salt string specified.\n" msgstr "" -#: src/veritysetup.c:87 +#: src/veritysetup.c:88 #, c-format msgid "Cannot create hash image %s for writing.\n" msgstr "" -#: src/veritysetup.c:147 +#: src/veritysetup.c:148 msgid "Invalid root hash string specified.\n" msgstr "" -#: src/veritysetup.c:307 +#: src/veritysetup.c:308 msgid " " msgstr "" -#: src/veritysetup.c:307 +#: src/veritysetup.c:308 msgid "format device" msgstr "" -#: src/veritysetup.c:308 +#: src/veritysetup.c:309 msgid " " msgstr "" -#: src/veritysetup.c:308 +#: src/veritysetup.c:309 msgid "verify device" msgstr "" -#: src/veritysetup.c:309 +#: src/veritysetup.c:310 msgid " " msgstr "" -#: src/veritysetup.c:309 +#: src/veritysetup.c:310 msgid "create active device" msgstr "" -#: src/veritysetup.c:310 +#: src/veritysetup.c:311 msgid "remove (deactivate) device" msgstr "" -#: src/veritysetup.c:311 +#: src/veritysetup.c:312 msgid "show active device status" msgstr "" -#: src/veritysetup.c:312 +#: src/veritysetup.c:313 msgid "" msgstr "" -#: src/veritysetup.c:312 +#: src/veritysetup.c:313 msgid "show on-disk information" msgstr "" -#: src/veritysetup.c:331 +#: src/veritysetup.c:332 #, c-format msgid "" "\n" @@ -1375,7 +1374,7 @@ " hash of the root node on \n" msgstr "" -#: src/veritysetup.c:338 +#: src/veritysetup.c:339 #, c-format msgid "" "\n" @@ -1384,189 +1383,189 @@ "Hash format: %u\n" msgstr "" -#: src/veritysetup.c:376 +#: src/veritysetup.c:377 msgid "Do not use verity superblock" msgstr "" -#: src/veritysetup.c:377 +#: src/veritysetup.c:378 msgid "Format type (1 - normal, 0 - original Chrome OS)" msgstr "" -#: src/veritysetup.c:377 +#: src/veritysetup.c:378 msgid "number" msgstr "" -#: src/veritysetup.c:378 +#: src/veritysetup.c:379 msgid "Block size on the data device" msgstr "" -#: src/veritysetup.c:379 +#: src/veritysetup.c:380 msgid "Block size on the hash device" msgstr "" -#: src/veritysetup.c:380 +#: src/veritysetup.c:381 msgid "The number of blocks in the data file" msgstr "" -#: src/veritysetup.c:380 +#: src/veritysetup.c:381 msgid "blocks" msgstr "" -#: src/veritysetup.c:381 +#: src/veritysetup.c:382 msgid "Starting offset on the hash device" msgstr "" -#: src/veritysetup.c:382 +#: src/veritysetup.c:383 msgid "Hash algorithm" msgstr "" -#: src/veritysetup.c:382 +#: src/veritysetup.c:383 msgid "string" msgstr "" -#: src/veritysetup.c:383 +#: src/veritysetup.c:384 msgid "Salt" msgstr "" -#: src/veritysetup.c:383 +#: src/veritysetup.c:384 msgid "hex string" msgstr "" -#: src/cryptsetup_reencrypt.c:136 +#: src/cryptsetup_reencrypt.c:144 #, c-format msgid "Cannot exclusively open %s, device in use.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:140 +#: src/cryptsetup_reencrypt.c:148 #, c-format msgid "Cannot open device %s\n" msgstr "" -#: src/cryptsetup_reencrypt.c:150 src/cryptsetup_reencrypt.c:367 -#: src/cryptsetup_reencrypt.c:786 +#: src/cryptsetup_reencrypt.c:158 src/cryptsetup_reencrypt.c:375 +#: src/cryptsetup_reencrypt.c:813 msgid "Allocation of aligned memory failed.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:157 +#: src/cryptsetup_reencrypt.c:165 #, c-format msgid "Cannot read device %s.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:168 +#: src/cryptsetup_reencrypt.c:176 #, c-format msgid "Marking LUKS device %s unusable.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:173 +#: src/cryptsetup_reencrypt.c:181 #, c-format msgid "Marking LUKS device %s usable.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:189 +#: src/cryptsetup_reencrypt.c:197 #, c-format msgid "Cannot write device %s.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:270 +#: src/cryptsetup_reencrypt.c:278 msgid "Cannot write reencryption log file.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:319 +#: src/cryptsetup_reencrypt.c:327 msgid "Cannot read reencryption log file.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:358 +#: src/cryptsetup_reencrypt.c:366 #, c-format msgid "Log file %s exists, resuming reencryption.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:393 +#: src/cryptsetup_reencrypt.c:401 msgid "Activating temporary device using old LUKS header.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:404 +#: src/cryptsetup_reencrypt.c:412 msgid "Activating temporary device using new LUKS header.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:414 +#: src/cryptsetup_reencrypt.c:422 msgid "Activation of temporary devices failed.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:439 +#: src/cryptsetup_reencrypt.c:448 #, c-format msgid "New LUKS header for device %s created.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:447 +#: src/cryptsetup_reencrypt.c:456 #, c-format msgid "Activated keyslot %i.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:471 +#: src/cryptsetup_reencrypt.c:482 #, c-format msgid "LUKS header backup of device %s created.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:499 +#: src/cryptsetup_reencrypt.c:526 msgid "Creation of LUKS backup headers failed.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:594 +#: src/cryptsetup_reencrypt.c:621 #, c-format msgid "Cannot restore LUKS header on device %s.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:596 +#: src/cryptsetup_reencrypt.c:623 #, c-format msgid "LUKS header on device %s restored.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:629 +#: src/cryptsetup_reencrypt.c:656 #, c-format msgid "" "Progress: %5.1f%%, ETA %02llu:%02llu, %4llu MiB written, speed %5.1f MiB/s%s" msgstr "" -#: src/cryptsetup_reencrypt.c:645 src/cryptsetup_reencrypt.c:721 +#: src/cryptsetup_reencrypt.c:672 src/cryptsetup_reencrypt.c:748 msgid "Cannot seek to device offset.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:767 src/cryptsetup_reencrypt.c:773 +#: src/cryptsetup_reencrypt.c:794 src/cryptsetup_reencrypt.c:800 msgid "Cannot open temporary LUKS header file.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:779 +#: src/cryptsetup_reencrypt.c:806 msgid "Cannot get device size.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:803 +#: src/cryptsetup_reencrypt.c:830 msgid "Interrupted by a signal.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:805 +#: src/cryptsetup_reencrypt.c:832 msgid "IO error during reencryption.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:906 +#: src/cryptsetup_reencrypt.c:939 msgid "" "Key file can be used only with --key-slot or with exactly one key slot " "active.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:955 +#: src/cryptsetup_reencrypt.c:983 src/cryptsetup_reencrypt.c:996 #, c-format msgid "Enter passphrase for key slot %u: " msgstr "" -#: src/cryptsetup_reencrypt.c:1004 +#: src/cryptsetup_reencrypt.c:1045 msgid "Cannot open reencryption log file.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:1108 +#: src/cryptsetup_reencrypt.c:1153 msgid "Reencryption block size" msgstr "" -#: src/cryptsetup_reencrypt.c:1108 +#: src/cryptsetup_reencrypt.c:1153 msgid "MiB" msgstr "" @@ -1574,74 +1573,74 @@ msgid "Use direct-io when accesing devices." msgstr "" -#: src/cryptsetup_reencrypt.c:1119 +#: src/cryptsetup_reencrypt.c:1165 msgid "Use fsync after each block." msgstr "" -#: src/cryptsetup_reencrypt.c:1120 +#: src/cryptsetup_reencrypt.c:1166 msgid "Update log file after every block." msgstr "" -#: src/cryptsetup_reencrypt.c:1121 +#: src/cryptsetup_reencrypt.c:1167 msgid "Use only this slot (others will be disabled)." msgstr "" -#: src/cryptsetup_reencrypt.c:1124 +#: src/cryptsetup_reencrypt.c:1170 msgid "Reduce data device size (move data offset). DANGEROUS!" msgstr "" -#: src/cryptsetup_reencrypt.c:1125 +#: src/cryptsetup_reencrypt.c:1171 msgid "Use only specified device size (ignore rest of device). DANGEROUS!" msgstr "" -#: src/cryptsetup_reencrypt.c:1126 +#: src/cryptsetup_reencrypt.c:1172 msgid "Create new header on not encrypted device." msgstr "" -#: src/cryptsetup_reencrypt.c:1142 +#: src/cryptsetup_reencrypt.c:1188 msgid "[OPTION...] " msgstr "" -#: src/cryptsetup_reencrypt.c:1156 +#: src/cryptsetup_reencrypt.c:1202 msgid "" "WARNING: this is experimental code, it can completely break your data.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:1157 +#: src/cryptsetup_reencrypt.c:1203 #, c-format msgid "Reencryption will change: volume key%s%s%s%s.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:1158 +#: src/cryptsetup_reencrypt.c:1204 msgid ", set hash to " msgstr "" -#: src/cryptsetup_reencrypt.c:1159 +#: src/cryptsetup_reencrypt.c:1205 msgid ", set cipher to " msgstr "" -#: src/cryptsetup_reencrypt.c:1164 +#: src/cryptsetup_reencrypt.c:1210 msgid "Argument required." msgstr "" -#: src/cryptsetup_reencrypt.c:1180 +#: src/cryptsetup_reencrypt.c:1226 msgid "" "Only values between 1 MiB and 64 MiB allowed for reencryption block size." msgstr "" -#: src/cryptsetup_reencrypt.c:1199 src/cryptsetup_reencrypt.c:1204 +#: src/cryptsetup_reencrypt.c:1245 src/cryptsetup_reencrypt.c:1250 msgid "Invalid device size specification." msgstr "" -#: src/cryptsetup_reencrypt.c:1207 +#: src/cryptsetup_reencrypt.c:1253 msgid "Maximum device reduce size is 64 MiB." msgstr "" -#: src/cryptsetup_reencrypt.c:1210 +#: src/cryptsetup_reencrypt.c:1256 msgid "Reduce size must be multiple of 512 bytes sector." msgstr "" -#: src/cryptsetup_reencrypt.c:1214 +#: src/cryptsetup_reencrypt.c:1260 msgid "Option --new must be used together with --reduce-device-size." msgstr "" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cups.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cups.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cups.po 2015-02-19 15:26:21.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/cups.po 2016-07-20 16:51:49.000000000 +0000 @@ -9,8 +9,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 12:49+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 13:48+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: \n" #: systemv/lpstat.c:1867 systemv/lpstat.c:1990 @@ -166,61 +166,61 @@ msgid "\treason unknown" msgstr "" -#: systemv/cupstestppd.c:454 +#: systemv/cupstestppd.c:434 msgid "" "\n" " DETAILED CONFORMANCE TEST RESULTS" msgstr "" -#: systemv/cupstestppd.c:3820 +#: systemv/cupstestppd.c:3864 msgid " Ignore specific warnings." msgstr "" -#: systemv/cupstestppd.c:3824 +#: systemv/cupstestppd.c:3868 msgid " Issue warnings instead of errors." msgstr "" -#: systemv/cupstestppd.c:410 systemv/cupstestppd.c:415 +#: systemv/cupstestppd.c:390 systemv/cupstestppd.c:395 msgid " REF: Page 15, section 3.1." msgstr "" -#: systemv/cupstestppd.c:405 +#: systemv/cupstestppd.c:385 msgid " REF: Page 15, section 3.2." msgstr "" -#: systemv/cupstestppd.c:425 +#: systemv/cupstestppd.c:405 msgid " REF: Page 19, section 3.3." msgstr "" -#: systemv/cupstestppd.c:378 +#: systemv/cupstestppd.c:358 msgid " REF: Page 20, section 3.4." msgstr "" -#: systemv/cupstestppd.c:430 +#: systemv/cupstestppd.c:410 msgid " REF: Page 27, section 3.5." msgstr "" -#: systemv/cupstestppd.c:373 +#: systemv/cupstestppd.c:353 msgid " REF: Page 42, section 5.2." msgstr "" -#: systemv/cupstestppd.c:420 +#: systemv/cupstestppd.c:400 msgid " REF: Pages 16-17, section 3.2." msgstr "" -#: systemv/cupstestppd.c:390 +#: systemv/cupstestppd.c:370 msgid " REF: Pages 42-45, section 5.2." msgstr "" -#: systemv/cupstestppd.c:384 +#: systemv/cupstestppd.c:364 msgid " REF: Pages 45-46, section 5.2." msgstr "" -#: systemv/cupstestppd.c:395 +#: systemv/cupstestppd.c:375 msgid " REF: Pages 48-49, section 5.2." msgstr "" -#: systemv/cupstestppd.c:400 +#: systemv/cupstestppd.c:380 msgid " REF: Pages 52-54, section 5.2." msgstr "" @@ -229,84 +229,84 @@ msgid " %-39.39s %.0f bytes" msgstr "" -#: systemv/cupstestppd.c:589 +#: systemv/cupstestppd.c:569 #, c-format msgid " PASS Default%s" msgstr "" -#: systemv/cupstestppd.c:524 +#: systemv/cupstestppd.c:504 msgid " PASS DefaultImageableArea" msgstr "" -#: systemv/cupstestppd.c:558 +#: systemv/cupstestppd.c:538 msgid " PASS DefaultPaperDimension" msgstr "" -#: systemv/cupstestppd.c:631 +#: systemv/cupstestppd.c:611 msgid " PASS FileVersion" msgstr "" -#: systemv/cupstestppd.c:675 +#: systemv/cupstestppd.c:655 msgid " PASS FormatVersion" msgstr "" -#: systemv/cupstestppd.c:695 +#: systemv/cupstestppd.c:675 msgid " PASS LanguageEncoding" msgstr "" -#: systemv/cupstestppd.c:715 +#: systemv/cupstestppd.c:695 msgid " PASS LanguageVersion" msgstr "" -#: systemv/cupstestppd.c:769 +#: systemv/cupstestppd.c:749 msgid " PASS Manufacturer" msgstr "" -#: systemv/cupstestppd.c:809 +#: systemv/cupstestppd.c:789 msgid " PASS ModelName" msgstr "" -#: systemv/cupstestppd.c:829 +#: systemv/cupstestppd.c:809 msgid " PASS NickName" msgstr "" -#: systemv/cupstestppd.c:889 +#: systemv/cupstestppd.c:869 msgid " PASS PCFileName" msgstr "" -#: systemv/cupstestppd.c:964 +#: systemv/cupstestppd.c:944 msgid " PASS PSVersion" msgstr "" -#: systemv/cupstestppd.c:869 +#: systemv/cupstestppd.c:849 msgid " PASS PageRegion" msgstr "" -#: systemv/cupstestppd.c:849 +#: systemv/cupstestppd.c:829 msgid " PASS PageSize" msgstr "" -#: systemv/cupstestppd.c:924 +#: systemv/cupstestppd.c:904 msgid " PASS Product" msgstr "" -#: systemv/cupstestppd.c:999 +#: systemv/cupstestppd.c:979 msgid " PASS ShortNickName" msgstr "" -#: systemv/cupstestppd.c:1374 +#: systemv/cupstestppd.c:1354 #, c-format msgid " WARN %s has no corresponding options." msgstr "" -#: systemv/cupstestppd.c:1486 +#: systemv/cupstestppd.c:1466 #, c-format msgid "" " WARN %s shares a common prefix with %s\n" " REF: Page 15, section 3.2." msgstr "" -#: systemv/cupstestppd.c:1345 +#: systemv/cupstestppd.c:1325 #, c-format msgid "" " WARN Duplex option keyword %s may not work as expected and should " @@ -314,66 +314,66 @@ " REF: Page 122, section 5.17" msgstr "" -#: systemv/cupstestppd.c:1744 +#: systemv/cupstestppd.c:1724 msgid "" " WARN File contains a mix of CR, LF, and CR LF line endings." msgstr "" -#: systemv/cupstestppd.c:1390 +#: systemv/cupstestppd.c:1370 msgid "" " WARN LanguageEncoding required by PPD 4.3 spec.\n" " REF: Pages 56-57, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1726 +#: systemv/cupstestppd.c:1706 #, c-format msgid " WARN Line %d only contains whitespace." msgstr "" -#: systemv/cupstestppd.c:1398 +#: systemv/cupstestppd.c:1378 msgid "" " WARN Manufacturer required by PPD 4.3 spec.\n" " REF: Pages 58-59, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1749 +#: systemv/cupstestppd.c:1729 msgid "" " WARN Non-Windows PPD files should use lines ending with only LF, " "not CR LF." msgstr "" -#: systemv/cupstestppd.c:1382 +#: systemv/cupstestppd.c:1362 #, c-format msgid "" " WARN Obsolete PPD version %.1f.\n" " REF: Page 42, section 5.2." msgstr "" -#: systemv/cupstestppd.c:1413 +#: systemv/cupstestppd.c:1393 msgid "" " WARN PCFileName longer than 8.3 in violation of PPD spec.\n" " REF: Pages 61-62, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1421 +#: systemv/cupstestppd.c:1401 msgid "" " WARN PCFileName should contain a unique filename.\n" " REF: Pages 61-62, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1456 +#: systemv/cupstestppd.c:1436 msgid "" " WARN Protocols contains PJL but JCL attributes are not set.\n" " REF: Pages 78-79, section 5.7." msgstr "" -#: systemv/cupstestppd.c:1447 +#: systemv/cupstestppd.c:1427 msgid "" " WARN Protocols contains both PJL and BCP; expected TBCP.\n" " REF: Pages 78-79, section 5.7." msgstr "" -#: systemv/cupstestppd.c:1430 +#: systemv/cupstestppd.c:1410 msgid "" " WARN ShortNickName required by PPD 4.3 spec.\n" " REF: Pages 64-65, section 5.3." @@ -387,382 +387,382 @@ msgid " cupstestdsc [options] -" msgstr "" -#: systemv/cupstestppd.c:3815 +#: systemv/cupstestppd.c:3859 msgid " program | cupstestppd [options] -" msgstr "" -#: systemv/cupstestppd.c:3747 +#: systemv/cupstestppd.c:3791 #, c-format msgid "" " %s \"%s %s\" conflicts with \"%s %s\"\n" " (constraint=\"%s %s %s %s\")." msgstr "" -#: systemv/cupstestppd.c:2248 +#: systemv/cupstestppd.c:2228 #, c-format msgid " %s %s %s does not exist." msgstr "" -#: systemv/cupstestppd.c:3904 +#: systemv/cupstestppd.c:3948 #, c-format msgid " %s %s file \"%s\" has the wrong capitalization." msgstr "" -#: systemv/cupstestppd.c:2318 +#: systemv/cupstestppd.c:2298 #, c-format msgid "" " %s Bad %s choice %s.\n" " REF: Page 122, section 5.17" msgstr "" -#: systemv/cupstestppd.c:3507 systemv/cupstestppd.c:3556 -#: systemv/cupstestppd.c:3595 +#: systemv/cupstestppd.c:3551 systemv/cupstestppd.c:3600 +#: systemv/cupstestppd.c:3639 #, c-format msgid "" " %s Bad UTF-8 \"%s\" translation string for option %s, choice %s." msgstr "" -#: systemv/cupstestppd.c:3461 +#: systemv/cupstestppd.c:3505 #, c-format msgid " %s Bad UTF-8 \"%s\" translation string for option %s." msgstr "" -#: systemv/cupstestppd.c:2389 +#: systemv/cupstestppd.c:2369 systemv/cupstestppd.c:2391 #, c-format msgid " %s Bad cupsFilter value \"%s\"." msgstr "" -#: systemv/cupstestppd.c:2475 +#: systemv/cupstestppd.c:2487 systemv/cupstestppd.c:2509 #, c-format msgid " %s Bad cupsFilter2 value \"%s\"." msgstr "" -#: systemv/cupstestppd.c:2964 +#: systemv/cupstestppd.c:3008 #, c-format msgid " %s Bad cupsICCProfile %s." msgstr "" -#: systemv/cupstestppd.c:2571 +#: systemv/cupstestppd.c:2615 #, c-format msgid " %s Bad cupsPreFilter value \"%s\"." msgstr "" -#: systemv/cupstestppd.c:1822 +#: systemv/cupstestppd.c:1802 #, c-format msgid " %s Bad cupsUIConstraints %s: \"%s\"" msgstr "" -#: systemv/cupstestppd.c:3411 +#: systemv/cupstestppd.c:3455 #, c-format msgid " %s Bad language \"%s\"." msgstr "" -#: systemv/cupstestppd.c:2433 systemv/cupstestppd.c:2529 -#: systemv/cupstestppd.c:2615 systemv/cupstestppd.c:2673 -#: systemv/cupstestppd.c:2728 systemv/cupstestppd.c:2783 -#: systemv/cupstestppd.c:2838 systemv/cupstestppd.c:2891 -#: systemv/cupstestppd.c:3013 +#: systemv/cupstestppd.c:2445 systemv/cupstestppd.c:2573 +#: systemv/cupstestppd.c:2659 systemv/cupstestppd.c:2717 +#: systemv/cupstestppd.c:2772 systemv/cupstestppd.c:2827 +#: systemv/cupstestppd.c:2882 systemv/cupstestppd.c:2935 +#: systemv/cupstestppd.c:3057 #, c-format msgid " %s Bad permissions on %s file \"%s\"." msgstr "" -#: systemv/cupstestppd.c:2373 systemv/cupstestppd.c:2459 -#: systemv/cupstestppd.c:2555 systemv/cupstestppd.c:2642 -#: systemv/cupstestppd.c:2697 systemv/cupstestppd.c:2752 -#: systemv/cupstestppd.c:2807 systemv/cupstestppd.c:2862 +#: systemv/cupstestppd.c:2353 systemv/cupstestppd.c:2471 +#: systemv/cupstestppd.c:2599 systemv/cupstestppd.c:2686 +#: systemv/cupstestppd.c:2741 systemv/cupstestppd.c:2796 +#: systemv/cupstestppd.c:2851 systemv/cupstestppd.c:2906 #, c-format msgid " %s Bad spelling of %s - should be %s." msgstr "" -#: systemv/cupstestppd.c:2907 +#: systemv/cupstestppd.c:2951 #, c-format msgid " %s Cannot provide both APScanAppPath and APScanAppBundleID." msgstr "" -#: systemv/cupstestppd.c:2205 +#: systemv/cupstestppd.c:2185 #, c-format msgid " %s Default choices conflicting." msgstr "" -#: systemv/cupstestppd.c:1803 +#: systemv/cupstestppd.c:1783 #, c-format msgid " %s Empty cupsUIConstraints %s" msgstr "" -#: systemv/cupstestppd.c:3539 systemv/cupstestppd.c:3579 +#: systemv/cupstestppd.c:3583 systemv/cupstestppd.c:3623 #, c-format msgid " %s Missing \"%s\" translation string for option %s, choice %s." msgstr "" -#: systemv/cupstestppd.c:3447 +#: systemv/cupstestppd.c:3491 #, c-format msgid " %s Missing \"%s\" translation string for option %s." msgstr "" -#: systemv/cupstestppd.c:2418 systemv/cupstestppd.c:2514 -#: systemv/cupstestppd.c:2600 systemv/cupstestppd.c:2658 -#: systemv/cupstestppd.c:2713 systemv/cupstestppd.c:2768 -#: systemv/cupstestppd.c:2823 systemv/cupstestppd.c:2875 -#: systemv/cupstestppd.c:2998 +#: systemv/cupstestppd.c:2430 systemv/cupstestppd.c:2558 +#: systemv/cupstestppd.c:2644 systemv/cupstestppd.c:2702 +#: systemv/cupstestppd.c:2757 systemv/cupstestppd.c:2812 +#: systemv/cupstestppd.c:2867 systemv/cupstestppd.c:2919 +#: systemv/cupstestppd.c:3042 #, c-format msgid " %s Missing %s file \"%s\"." msgstr "" -#: systemv/cupstestppd.c:3121 +#: systemv/cupstestppd.c:3165 #, c-format msgid "" " %s Missing REQUIRED PageRegion option.\n" " REF: Page 100, section 5.14." msgstr "" -#: systemv/cupstestppd.c:3106 +#: systemv/cupstestppd.c:3150 #, c-format msgid "" " %s Missing REQUIRED PageSize option.\n" " REF: Page 99, section 5.14." msgstr "" -#: systemv/cupstestppd.c:2013 systemv/cupstestppd.c:2054 +#: systemv/cupstestppd.c:1993 systemv/cupstestppd.c:2034 #, c-format msgid " %s Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"." msgstr "" -#: systemv/cupstestppd.c:1908 +#: systemv/cupstestppd.c:1888 #, c-format msgid " %s Missing choice *%s %s in cupsUIConstraints %s: \"%s\"" msgstr "" -#: systemv/cupstestppd.c:1840 +#: systemv/cupstestppd.c:1820 #, c-format msgid " %s Missing cupsUIResolver %s" msgstr "" -#: systemv/cupstestppd.c:1999 systemv/cupstestppd.c:2040 +#: systemv/cupstestppd.c:1979 systemv/cupstestppd.c:2020 #, c-format msgid " %s Missing option %s in UIConstraints \"*%s %s *%s %s\"." msgstr "" -#: systemv/cupstestppd.c:1892 +#: systemv/cupstestppd.c:1872 #, c-format msgid " %s Missing option %s in cupsUIConstraints %s: \"%s\"" msgstr "" -#: systemv/cupstestppd.c:3633 +#: systemv/cupstestppd.c:3677 #, c-format msgid " %s No base translation \"%s\" is included in file." msgstr "" -#: systemv/cupstestppd.c:2294 +#: systemv/cupstestppd.c:2274 #, c-format msgid "" " %s REQUIRED %s does not define choice None.\n" " REF: Page 122, section 5.17" msgstr "" -#: systemv/cupstestppd.c:3180 systemv/cupstestppd.c:3194 +#: systemv/cupstestppd.c:3224 systemv/cupstestppd.c:3238 #, c-format msgid " %s Size \"%s\" defined for %s but not for %s." msgstr "" -#: systemv/cupstestppd.c:3160 +#: systemv/cupstestppd.c:3204 #, c-format msgid " %s Size \"%s\" has unexpected dimensions (%gx%g)." msgstr "" -#: systemv/cupstestppd.c:3351 +#: systemv/cupstestppd.c:3395 #, c-format msgid " %s Size \"%s\" should be \"%s\"." msgstr "" -#: systemv/cupstestppd.c:3300 +#: systemv/cupstestppd.c:3344 #, c-format msgid " %s Size \"%s\" should be the Adobe standard name \"%s\"." msgstr "" -#: systemv/cupstestppd.c:3041 +#: systemv/cupstestppd.c:3085 #, c-format msgid " %s cupsICCProfile %s hash value collides with %s." msgstr "" -#: systemv/cupstestppd.c:1963 +#: systemv/cupstestppd.c:1943 #, c-format msgid " %s cupsUIResolver %s causes a loop." msgstr "" -#: systemv/cupstestppd.c:1945 +#: systemv/cupstestppd.c:1925 #, c-format msgid "" " %s cupsUIResolver %s does not list at least two different options." msgstr "" -#: systemv/cupstestppd.c:1168 +#: systemv/cupstestppd.c:1148 #, c-format msgid "" " **FAIL** %s must be 1284DeviceID\n" " REF: Page 72, section 5.5" msgstr "" -#: systemv/cupstestppd.c:580 +#: systemv/cupstestppd.c:560 #, c-format msgid "" " **FAIL** Bad Default%s %s\n" " REF: Page 40, section 4.5." msgstr "" -#: systemv/cupstestppd.c:514 +#: systemv/cupstestppd.c:494 #, c-format msgid "" " **FAIL** Bad DefaultImageableArea %s\n" " REF: Page 102, section 5.15." msgstr "" -#: systemv/cupstestppd.c:550 +#: systemv/cupstestppd.c:530 #, c-format msgid "" " **FAIL** Bad DefaultPaperDimension %s\n" " REF: Page 103, section 5.15." msgstr "" -#: systemv/cupstestppd.c:623 +#: systemv/cupstestppd.c:603 #, c-format msgid "" " **FAIL** Bad FileVersion \"%s\"\n" " REF: Page 56, section 5.3." msgstr "" -#: systemv/cupstestppd.c:667 +#: systemv/cupstestppd.c:647 #, c-format msgid "" " **FAIL** Bad FormatVersion \"%s\"\n" " REF: Page 56, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1025 +#: systemv/cupstestppd.c:1005 msgid "" " **FAIL** Bad JobPatchFile attribute in file\n" " REF: Page 24, section 3.4." msgstr "" -#: systemv/cupstestppd.c:1213 +#: systemv/cupstestppd.c:1193 #, c-format msgid " **FAIL** Bad LanguageEncoding %s - must be ISOLatin1." msgstr "" -#: systemv/cupstestppd.c:1227 +#: systemv/cupstestppd.c:1207 #, c-format msgid " **FAIL** Bad LanguageVersion %s - must be English." msgstr "" -#: systemv/cupstestppd.c:743 systemv/cupstestppd.c:760 +#: systemv/cupstestppd.c:723 systemv/cupstestppd.c:740 #, c-format msgid "" " **FAIL** Bad Manufacturer (should be \"%s\")\n" " REF: Page 211, table D.1." msgstr "" -#: systemv/cupstestppd.c:800 +#: systemv/cupstestppd.c:780 #, c-format msgid "" " **FAIL** Bad ModelName - \"%c\" not allowed in string.\n" " REF: Pages 59-60, section 5.3." msgstr "" -#: systemv/cupstestppd.c:956 +#: systemv/cupstestppd.c:936 msgid "" " **FAIL** Bad PSVersion - not \"(string) int\".\n" " REF: Pages 62-64, section 5.3." msgstr "" -#: systemv/cupstestppd.c:917 +#: systemv/cupstestppd.c:897 msgid "" " **FAIL** Bad Product - not \"(string)\".\n" " REF: Page 62, section 5.3." msgstr "" -#: systemv/cupstestppd.c:991 +#: systemv/cupstestppd.c:971 msgid "" " **FAIL** Bad ShortNickName - longer than 31 chars.\n" " REF: Pages 64-65, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1149 +#: systemv/cupstestppd.c:1129 #, c-format msgid "" " **FAIL** Bad option %s choice %s\n" " REF: Page 84, section 5.9" msgstr "" -#: systemv/cupstestppd.c:3774 systemv/cupstestppd.c:3796 +#: systemv/cupstestppd.c:3818 systemv/cupstestppd.c:3840 #, c-format msgid " **FAIL** Default option code cannot be interpreted: %s" msgstr "" -#: systemv/cupstestppd.c:1286 +#: systemv/cupstestppd.c:1266 #, c-format msgid "" " **FAIL** Default translation string for option %s choice %s contains " "8-bit characters." msgstr "" -#: systemv/cupstestppd.c:1259 +#: systemv/cupstestppd.c:1239 #, c-format msgid "" " **FAIL** Default translation string for option %s contains 8-bit " "characters." msgstr "" -#: systemv/cupstestppd.c:2101 +#: systemv/cupstestppd.c:2081 #, c-format msgid " **FAIL** Group names %s and %s differ only by case." msgstr "" -#: systemv/cupstestppd.c:2146 +#: systemv/cupstestppd.c:2126 #, c-format msgid " **FAIL** Multiple occurrences of option %s choice name %s." msgstr "" -#: systemv/cupstestppd.c:2163 +#: systemv/cupstestppd.c:2143 #, c-format msgid " **FAIL** Option %s choice names %s and %s differ only by case." msgstr "" -#: systemv/cupstestppd.c:2123 +#: systemv/cupstestppd.c:2103 #, c-format msgid " **FAIL** Option names %s and %s differ only by case." msgstr "" -#: systemv/cupstestppd.c:600 +#: systemv/cupstestppd.c:580 #, c-format msgid "" " **FAIL** REQUIRED Default%s\n" " REF: Page 40, section 4.5." msgstr "" -#: systemv/cupstestppd.c:499 +#: systemv/cupstestppd.c:479 msgid "" " **FAIL** REQUIRED DefaultImageableArea\n" " REF: Page 102, section 5.15." msgstr "" -#: systemv/cupstestppd.c:535 +#: systemv/cupstestppd.c:515 msgid "" " **FAIL** REQUIRED DefaultPaperDimension\n" " REF: Page 103, section 5.15." msgstr "" -#: systemv/cupstestppd.c:641 +#: systemv/cupstestppd.c:621 msgid "" " **FAIL** REQUIRED FileVersion\n" " REF: Page 56, section 5.3." msgstr "" -#: systemv/cupstestppd.c:685 +#: systemv/cupstestppd.c:665 msgid "" " **FAIL** REQUIRED FormatVersion\n" " REF: Page 56, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1076 +#: systemv/cupstestppd.c:1056 #, c-format msgid "" " **FAIL** REQUIRED ImageableArea for PageSize %s\n" @@ -770,68 +770,68 @@ " REF: Page 102, section 5.15." msgstr "" -#: systemv/cupstestppd.c:705 +#: systemv/cupstestppd.c:685 msgid "" " **FAIL** REQUIRED LanguageEncoding\n" " REF: Pages 56-57, section 5.3." msgstr "" -#: systemv/cupstestppd.c:725 +#: systemv/cupstestppd.c:705 msgid "" " **FAIL** REQUIRED LanguageVersion\n" " REF: Pages 57-58, section 5.3." msgstr "" -#: systemv/cupstestppd.c:779 +#: systemv/cupstestppd.c:759 msgid "" " **FAIL** REQUIRED Manufacturer\n" " REF: Pages 58-59, section 5.3." msgstr "" -#: systemv/cupstestppd.c:819 +#: systemv/cupstestppd.c:799 msgid "" " **FAIL** REQUIRED ModelName\n" " REF: Pages 59-60, section 5.3." msgstr "" -#: systemv/cupstestppd.c:839 +#: systemv/cupstestppd.c:819 msgid "" " **FAIL** REQUIRED NickName\n" " REF: Page 60, section 5.3." msgstr "" -#: systemv/cupstestppd.c:899 +#: systemv/cupstestppd.c:879 msgid "" " **FAIL** REQUIRED PCFileName\n" " REF: Pages 61-62, section 5.3." msgstr "" -#: systemv/cupstestppd.c:974 +#: systemv/cupstestppd.c:954 msgid "" " **FAIL** REQUIRED PSVersion\n" " REF: Pages 62-64, section 5.3." msgstr "" -#: systemv/cupstestppd.c:879 +#: systemv/cupstestppd.c:859 msgid "" " **FAIL** REQUIRED PageRegion\n" " REF: Page 100, section 5.14." msgstr "" -#: systemv/cupstestppd.c:1045 +#: systemv/cupstestppd.c:1025 msgid "" " **FAIL** REQUIRED PageSize\n" " REF: Page 41, section 5.\n" " REF: Page 99, section 5.14." msgstr "" -#: systemv/cupstestppd.c:859 +#: systemv/cupstestppd.c:839 msgid "" " **FAIL** REQUIRED PageSize\n" " REF: Pages 99-100, section 5.14." msgstr "" -#: systemv/cupstestppd.c:1098 +#: systemv/cupstestppd.c:1078 #, c-format msgid "" " **FAIL** REQUIRED PaperDimension for PageSize %s\n" @@ -839,25 +839,25 @@ " REF: Page 103, section 5.15." msgstr "" -#: systemv/cupstestppd.c:934 +#: systemv/cupstestppd.c:914 msgid "" " **FAIL** REQUIRED Product\n" " REF: Page 62, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1009 +#: systemv/cupstestppd.c:989 msgid "" " **FAIL** REQUIRED ShortNickName\n" " REF: Page 64-65, section 5.3." msgstr "" -#: systemv/cupstestppd.c:334 systemv/cupstestppd.c:353 -#: systemv/cupstestppd.c:365 +#: systemv/cupstestppd.c:314 systemv/cupstestppd.c:333 +#: systemv/cupstestppd.c:345 #, c-format msgid " **FAIL** Unable to open PPD file - %s on line %d." msgstr "" -#: systemv/cupstestppd.c:1498 +#: systemv/cupstestppd.c:1478 #, c-format msgid " %d ERRORS FOUND" msgstr "" @@ -926,7 +926,7 @@ " REF: Page 43, %%Pages:" msgstr "" -#: systemv/cupstestppd.c:1500 +#: systemv/cupstestppd.c:1480 msgid " NO ERRORS FOUND" msgstr "" @@ -959,11 +959,11 @@ msgid " Warning: obsolete DSC version %.1f in file." msgstr "" -#: test/ippfind.c:2788 +#: test/ippfind.c:2796 msgid " ! expression Unary NOT of expression." msgstr "" -#: test/ippfind.c:2787 +#: test/ippfind.c:2795 msgid " ( expressions ) Group expressions." msgstr "" @@ -995,25 +995,25 @@ msgid " --crlf End lines with CR + LF (Windows)." msgstr "" -#: test/ippfind.c:2769 +#: test/ippfind.c:2777 msgid " --domain regex Match domain to regular expression." msgstr "" -#: test/ippfind.c:2770 +#: test/ippfind.c:2778 msgid "" " --exec utility [argument ...] ;\n" " Execute program if true." msgstr "" -#: test/ippfind.c:2790 +#: test/ippfind.c:2798 msgid " --false Always false." msgstr "" -#: test/ippfind.c:2752 +#: test/ippfind.c:2760 msgid " --help Show this help." msgstr "" -#: test/ippfind.c:2772 +#: test/ippfind.c:2780 msgid " --host regex Match hostname to regular expression." msgstr "" @@ -1021,75 +1021,75 @@ msgid " --lf End lines with LF (UNIX/Linux/OS X)." msgstr "" -#: test/ippfind.c:2774 +#: test/ippfind.c:2782 msgid " --local True if service is local." msgstr "" -#: test/ippfind.c:2773 +#: test/ippfind.c:2781 msgid " --ls List attributes." msgstr "" -#: test/ippfind.c:2775 +#: test/ippfind.c:2783 msgid " --name regex Match service name to regular expression." msgstr "" -#: test/ippfind.c:2789 +#: test/ippfind.c:2797 msgid " --not expression Unary NOT of expression." msgstr "" -#: test/ippfind.c:2776 +#: test/ippfind.c:2784 msgid " --path regex Match resource path to regular expression." msgstr "" -#: test/ippfind.c:2777 +#: test/ippfind.c:2785 msgid " --port number[-number] Match port to number or range." msgstr "" -#: test/ippfind.c:2778 +#: test/ippfind.c:2786 msgid " --print Print URI if true." msgstr "" -#: test/ippfind.c:2779 +#: test/ippfind.c:2787 msgid " --print-name Print service name if true." msgstr "" -#: test/ippfind.c:2780 +#: test/ippfind.c:2788 msgid " --quiet Quietly report match via exit code." msgstr "" -#: test/ippfind.c:2781 +#: test/ippfind.c:2789 msgid " --remote True if service is remote." msgstr "" -#: test/ippfind.c:2791 +#: test/ippfind.c:2799 msgid " --true Always true." msgstr "" -#: test/ippfind.c:2782 +#: test/ippfind.c:2790 msgid " --txt key True if the TXT record contains the key." msgstr "" -#: test/ippfind.c:2783 +#: test/ippfind.c:2791 msgid " --txt-* regex Match TXT record key to regular expression." msgstr "" -#: test/ippfind.c:2784 +#: test/ippfind.c:2792 msgid " --uri regex Match URI to regular expression." msgstr "" -#: test/ippfind.c:2753 +#: test/ippfind.c:2761 msgid " --version Show program version." msgstr "" -#: test/ippfind.c:2746 test/ipptool.c:4810 +#: test/ippfind.c:2754 test/ipptool.c:4862 msgid " -4 Connect using IPv4." msgstr "" -#: test/ippfind.c:2747 test/ipptool.c:4811 +#: test/ippfind.c:2755 test/ipptool.c:4863 msgid " -6 Connect using IPv6." msgstr "" -#: test/ipptool.c:4812 +#: test/ipptool.c:4864 msgid " -C Send requests using chunking (default)." msgstr "" @@ -1097,7 +1097,7 @@ msgid " -D Remove the input file when finished." msgstr "" -#: ppdc/ppdc.cxx:433 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255 +#: ppdc/ppdc.cxx:433 ppdc/ppdhtml.cxx:180 ppdc/ppdpo.cxx:250 msgid " -D name=value Set named variable to value." msgstr "" @@ -1105,11 +1105,11 @@ msgid " -E Encrypt the connection." msgstr "" -#: test/ipptool.c:4814 +#: test/ipptool.c:4866 msgid " -E Test with HTTP Upgrade to TLS." msgstr "" -#: scheduler/main.c:2149 +#: scheduler/main.c:2180 msgid "" " -F Run in the foreground but detach from console." msgstr "" @@ -1118,19 +1118,19 @@ msgid " -H samba-server Use the named SAMBA server." msgstr "" -#: test/ipptool.c:4816 +#: test/ipptool.c:4868 msgid " -I Ignore errors." msgstr "" -#: ppdc/ppdc.cxx:435 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257 +#: ppdc/ppdc.cxx:435 ppdc/ppdhtml.cxx:182 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:252 msgid " -I include-dir Add include directory to search path." msgstr "" -#: systemv/cupstestppd.c:3819 +#: systemv/cupstestppd.c:3863 msgid " -I {filename,filters,none,profiles}" msgstr "" -#: test/ipptool.c:4817 +#: test/ipptool.c:4869 msgid " -L Send requests using content-length." msgstr "" @@ -1138,23 +1138,23 @@ msgid " -P filename.ppd Set PPD file." msgstr "" -#: test/ippfind.c:2756 +#: test/ippfind.c:2764 msgid " -P number[-number] Match port to number or range." msgstr "" -#: systemv/cupstestppd.c:3821 +#: systemv/cupstestppd.c:3865 msgid " -R root-directory Set alternate root." msgstr "" -#: test/ipptool.c:4820 +#: test/ipptool.c:4872 msgid " -S Test with SSL encryption." msgstr "" -#: test/ippfind.c:2748 +#: test/ippfind.c:2756 msgid " -T seconds Set the browse timeout in seconds." msgstr "" -#: test/ipptool.c:4822 +#: test/ipptool.c:4874 msgid " -T seconds Set the receive/send timeout in seconds." msgstr "" @@ -1162,17 +1162,17 @@ msgid " -U username Specify username." msgstr "" -#: test/ippfind.c:2750 test/ipptool.c:4824 +#: test/ippfind.c:2758 test/ipptool.c:4876 msgid " -V version Set default IPP version." msgstr "" -#: systemv/cupstestppd.c:3822 +#: systemv/cupstestppd.c:3866 msgid "" " -W " "{all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}" msgstr "" -#: test/ipptool.c:4826 +#: test/ipptool.c:4878 msgid " -X Produce XML plist instead of plain text." msgstr "" @@ -1192,7 +1192,7 @@ msgid " -c cups-files.conf Set cups-files.conf file to use." msgstr "" -#: scheduler/main.c:2147 +#: scheduler/main.c:2178 msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr "" @@ -1200,7 +1200,7 @@ msgid " -d domain Browse/resolve in specified domain." msgstr "" -#: test/ipptool.c:4829 +#: test/ipptool.c:4881 msgid " -d name=value Set named variable to value." msgstr "" @@ -1212,7 +1212,7 @@ msgid " -d printer Use the named printer." msgstr "" -#: test/ippfind.c:2757 +#: test/ippfind.c:2765 msgid " -d regex Match domain to regular expression." msgstr "" @@ -1220,19 +1220,19 @@ msgid " -e Use every filter from the PPD file." msgstr "" -#: scheduler/main.c:2148 +#: scheduler/main.c:2179 msgid " -f Run in the foreground." msgstr "" -#: test/ipptool.c:4831 +#: test/ipptool.c:4883 msgid " -f filename Set default request filename." msgstr "" -#: scheduler/main.c:2151 +#: scheduler/main.c:2182 msgid " -h Show this usage message." msgstr "" -#: test/ippfind.c:2758 +#: test/ippfind.c:2766 msgid " -h regex Match hostname to regular expression." msgstr "" @@ -1244,7 +1244,7 @@ msgid " -i mime/type Set input MIME type (otherwise auto-typed)." msgstr "" -#: test/ipptool.c:4833 +#: test/ipptool.c:4885 msgid "" " -i seconds Repeat the last file with the given time interval." msgstr "" @@ -1255,7 +1255,7 @@ "file 1)." msgstr "" -#: test/ippfind.c:2759 +#: test/ippfind.c:2767 msgid " -l List attributes." msgstr "" @@ -1280,12 +1280,12 @@ msgid " -n copies Set number of copies." msgstr "" -#: test/ipptool.c:4836 +#: test/ipptool.c:4888 msgid "" " -n count Repeat the last file the given number of times." msgstr "" -#: test/ippfind.c:2760 +#: test/ippfind.c:2768 msgid " -n regex Match service name to regular expression." msgstr "" @@ -1302,7 +1302,7 @@ msgid " -o name=value Set option(s)." msgstr "" -#: test/ippfind.c:2761 +#: test/ippfind.c:2769 msgid " -p Print URI if true." msgstr "" @@ -1314,27 +1314,27 @@ msgid " -p program Run specified program for each service." msgstr "" -#: test/ippfind.c:2762 +#: test/ippfind.c:2770 msgid " -q Quietly report match via exit code." msgstr "" -#: systemv/cupstestppd.c:3826 test/ipptool.c:4838 +#: systemv/cupstestppd.c:3870 test/ipptool.c:4890 msgid " -q Run silently." msgstr "" -#: test/ippfind.c:2763 +#: test/ippfind.c:2771 msgid " -r True if service is remote." msgstr "" -#: systemv/cupstestppd.c:3827 +#: systemv/cupstestppd.c:3871 msgid " -r Use 'relaxed' open mode." msgstr "" -#: test/ippfind.c:2764 +#: test/ippfind.c:2772 msgid " -s Print service name if true." msgstr "" -#: test/ipptool.c:4839 +#: test/ipptool.c:4891 msgid " -t Produce a test report." msgstr "" @@ -1342,11 +1342,11 @@ msgid " -t Test PPDs instead of generating them." msgstr "" -#: scheduler/main.c:2153 +#: scheduler/main.c:2184 msgid " -t Test the configuration file." msgstr "" -#: test/ippfind.c:2765 +#: test/ippfind.c:2773 msgid " -t key True if the TXT record contains the key." msgstr "" @@ -1362,20 +1362,20 @@ msgid " -u Remove the PPD file when finished." msgstr "" -#: test/ippfind.c:2766 +#: test/ippfind.c:2774 msgid " -u regex Match URI to regular expression." msgstr "" -#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4840 -#: ppdc/ppdc.cxx:447 ppdc/ppdpo.cxx:259 +#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3872 test/ipptool.c:4892 +#: ppdc/ppdc.cxx:447 ppdc/ppdpo.cxx:254 msgid " -v Be verbose." msgstr "" -#: systemv/cupstestppd.c:3829 +#: systemv/cupstestppd.c:3873 msgid " -vv Be very verbose." msgstr "" -#: test/ippfind.c:2767 +#: test/ippfind.c:2775 msgid "" " -x utility [argument ...] ;\n" " Execute program if true." @@ -1385,150 +1385,151 @@ msgid " -z Compress PPD files using GNU zip." msgstr "" -#: test/ippfind.c:2810 +#: test/ippfind.c:2818 msgid " IPPFIND_SERVICE_DOMAIN Domain name" msgstr "" -#: test/ippfind.c:2811 +#: test/ippfind.c:2819 msgid "" " IPPFIND_SERVICE_HOSTNAME\n" " Fully-qualified domain name" msgstr "" -#: test/ippfind.c:2813 +#: test/ippfind.c:2821 msgid " IPPFIND_SERVICE_NAME Service instance name" msgstr "" -#: test/ippfind.c:2814 +#: test/ippfind.c:2822 msgid " IPPFIND_SERVICE_PORT Port number" msgstr "" -#: test/ippfind.c:2815 +#: test/ippfind.c:2823 msgid " IPPFIND_SERVICE_REGTYPE DNS-SD registration type" msgstr "" -#: test/ippfind.c:2816 +#: test/ippfind.c:2824 msgid " IPPFIND_SERVICE_SCHEME URI scheme" msgstr "" -#: test/ippfind.c:2817 +#: test/ippfind.c:2825 msgid " IPPFIND_SERVICE_URI URI" msgstr "" -#: test/ippfind.c:2818 +#: test/ippfind.c:2826 msgid " IPPFIND_TXT_* Value of TXT record key" msgstr "" -#: test/ippfind.c:2793 +#: test/ippfind.c:2801 msgid "" " expression --and expression\n" " Logical AND." msgstr "" -#: test/ippfind.c:2795 +#: test/ippfind.c:2803 msgid "" " expression --or expression\n" " Logical OR." msgstr "" -#: test/ippfind.c:2792 +#: test/ippfind.c:2800 msgid " expression expression Logical AND." msgstr "" -#: test/ippfind.c:2800 +#: test/ippfind.c:2808 msgid " {service_domain} Domain name" msgstr "" -#: test/ippfind.c:2801 +#: test/ippfind.c:2809 msgid " {service_hostname} Fully-qualified domain name" msgstr "" -#: test/ippfind.c:2802 +#: test/ippfind.c:2810 msgid " {service_name} Service instance name" msgstr "" -#: test/ippfind.c:2803 +#: test/ippfind.c:2811 msgid " {service_port} Port number" msgstr "" -#: test/ippfind.c:2804 +#: test/ippfind.c:2812 msgid " {service_regtype} DNS-SD registration type" msgstr "" -#: test/ippfind.c:2805 +#: test/ippfind.c:2813 msgid " {service_scheme} URI scheme" msgstr "" -#: test/ippfind.c:2806 +#: test/ippfind.c:2814 msgid " {service_uri} URI" msgstr "" -#: test/ippfind.c:2807 +#: test/ippfind.c:2815 msgid " {txt_*} Value of TXT record key" msgstr "" -#: test/ippfind.c:2799 +#: test/ippfind.c:2807 msgid " {} URI" msgstr "" -#: systemv/cupstestppd.c:332 systemv/cupstestppd.c:351 -#: systemv/cupstestppd.c:363 systemv/cupstestppd.c:496 -#: systemv/cupstestppd.c:511 systemv/cupstestppd.c:532 -#: systemv/cupstestppd.c:547 systemv/cupstestppd.c:577 -#: systemv/cupstestppd.c:597 systemv/cupstestppd.c:620 -#: systemv/cupstestppd.c:638 systemv/cupstestppd.c:664 -#: systemv/cupstestppd.c:682 systemv/cupstestppd.c:702 -#: systemv/cupstestppd.c:722 systemv/cupstestppd.c:740 -#: systemv/cupstestppd.c:757 systemv/cupstestppd.c:776 -#: systemv/cupstestppd.c:797 systemv/cupstestppd.c:816 -#: systemv/cupstestppd.c:836 systemv/cupstestppd.c:856 -#: systemv/cupstestppd.c:876 systemv/cupstestppd.c:896 -#: systemv/cupstestppd.c:914 systemv/cupstestppd.c:931 -#: systemv/cupstestppd.c:953 systemv/cupstestppd.c:971 -#: systemv/cupstestppd.c:988 systemv/cupstestppd.c:1006 -#: systemv/cupstestppd.c:1022 systemv/cupstestppd.c:1042 -#: systemv/cupstestppd.c:1073 systemv/cupstestppd.c:1095 -#: systemv/cupstestppd.c:1146 systemv/cupstestppd.c:1165 -#: systemv/cupstestppd.c:1209 systemv/cupstestppd.c:1223 -#: systemv/cupstestppd.c:1255 systemv/cupstestppd.c:1282 -#: systemv/cupstestppd.c:1800 systemv/cupstestppd.c:1819 -#: systemv/cupstestppd.c:1837 systemv/cupstestppd.c:1889 -#: systemv/cupstestppd.c:1905 systemv/cupstestppd.c:1942 -#: systemv/cupstestppd.c:1960 systemv/cupstestppd.c:1996 -#: systemv/cupstestppd.c:2010 systemv/cupstestppd.c:2037 -#: systemv/cupstestppd.c:2051 systemv/cupstestppd.c:2097 -#: systemv/cupstestppd.c:2119 systemv/cupstestppd.c:2142 -#: systemv/cupstestppd.c:2159 systemv/cupstestppd.c:2201 -#: systemv/cupstestppd.c:2244 systemv/cupstestppd.c:2291 -#: systemv/cupstestppd.c:2315 systemv/cupstestppd.c:2369 -#: systemv/cupstestppd.c:2385 systemv/cupstestppd.c:2415 -#: systemv/cupstestppd.c:2429 systemv/cupstestppd.c:2455 -#: systemv/cupstestppd.c:2471 systemv/cupstestppd.c:2511 -#: systemv/cupstestppd.c:2525 systemv/cupstestppd.c:2551 -#: systemv/cupstestppd.c:2567 systemv/cupstestppd.c:2597 -#: systemv/cupstestppd.c:2611 systemv/cupstestppd.c:2638 -#: systemv/cupstestppd.c:2655 systemv/cupstestppd.c:2669 -#: systemv/cupstestppd.c:2693 systemv/cupstestppd.c:2710 -#: systemv/cupstestppd.c:2724 systemv/cupstestppd.c:2748 -#: systemv/cupstestppd.c:2765 systemv/cupstestppd.c:2779 -#: systemv/cupstestppd.c:2803 systemv/cupstestppd.c:2820 -#: systemv/cupstestppd.c:2834 systemv/cupstestppd.c:2858 -#: systemv/cupstestppd.c:2872 systemv/cupstestppd.c:2887 -#: systemv/cupstestppd.c:2904 systemv/cupstestppd.c:2960 -#: systemv/cupstestppd.c:2995 systemv/cupstestppd.c:3009 -#: systemv/cupstestppd.c:3037 systemv/cupstestppd.c:3102 -#: systemv/cupstestppd.c:3117 systemv/cupstestppd.c:3156 -#: systemv/cupstestppd.c:3176 systemv/cupstestppd.c:3190 -#: systemv/cupstestppd.c:3407 systemv/cupstestppd.c:3443 -#: systemv/cupstestppd.c:3457 systemv/cupstestppd.c:3503 -#: systemv/cupstestppd.c:3535 systemv/cupstestppd.c:3552 -#: systemv/cupstestppd.c:3575 systemv/cupstestppd.c:3591 -#: systemv/cupstestppd.c:3629 systemv/cupstestppd.c:3770 -#: systemv/cupstestppd.c:3792 systemv/cupstestppd.c:3900 +#: systemv/cupstestppd.c:312 systemv/cupstestppd.c:331 +#: systemv/cupstestppd.c:343 systemv/cupstestppd.c:476 +#: systemv/cupstestppd.c:491 systemv/cupstestppd.c:512 +#: systemv/cupstestppd.c:527 systemv/cupstestppd.c:557 +#: systemv/cupstestppd.c:577 systemv/cupstestppd.c:600 +#: systemv/cupstestppd.c:618 systemv/cupstestppd.c:644 +#: systemv/cupstestppd.c:662 systemv/cupstestppd.c:682 +#: systemv/cupstestppd.c:702 systemv/cupstestppd.c:720 +#: systemv/cupstestppd.c:737 systemv/cupstestppd.c:756 +#: systemv/cupstestppd.c:777 systemv/cupstestppd.c:796 +#: systemv/cupstestppd.c:816 systemv/cupstestppd.c:836 +#: systemv/cupstestppd.c:856 systemv/cupstestppd.c:876 +#: systemv/cupstestppd.c:894 systemv/cupstestppd.c:911 +#: systemv/cupstestppd.c:933 systemv/cupstestppd.c:951 +#: systemv/cupstestppd.c:968 systemv/cupstestppd.c:986 +#: systemv/cupstestppd.c:1002 systemv/cupstestppd.c:1022 +#: systemv/cupstestppd.c:1053 systemv/cupstestppd.c:1075 +#: systemv/cupstestppd.c:1126 systemv/cupstestppd.c:1145 +#: systemv/cupstestppd.c:1189 systemv/cupstestppd.c:1203 +#: systemv/cupstestppd.c:1235 systemv/cupstestppd.c:1262 +#: systemv/cupstestppd.c:1780 systemv/cupstestppd.c:1799 +#: systemv/cupstestppd.c:1817 systemv/cupstestppd.c:1869 +#: systemv/cupstestppd.c:1885 systemv/cupstestppd.c:1922 +#: systemv/cupstestppd.c:1940 systemv/cupstestppd.c:1976 +#: systemv/cupstestppd.c:1990 systemv/cupstestppd.c:2017 +#: systemv/cupstestppd.c:2031 systemv/cupstestppd.c:2077 +#: systemv/cupstestppd.c:2099 systemv/cupstestppd.c:2122 +#: systemv/cupstestppd.c:2139 systemv/cupstestppd.c:2181 +#: systemv/cupstestppd.c:2224 systemv/cupstestppd.c:2271 +#: systemv/cupstestppd.c:2295 systemv/cupstestppd.c:2349 +#: systemv/cupstestppd.c:2365 systemv/cupstestppd.c:2387 +#: systemv/cupstestppd.c:2427 systemv/cupstestppd.c:2441 +#: systemv/cupstestppd.c:2467 systemv/cupstestppd.c:2483 +#: systemv/cupstestppd.c:2505 systemv/cupstestppd.c:2555 +#: systemv/cupstestppd.c:2569 systemv/cupstestppd.c:2595 +#: systemv/cupstestppd.c:2611 systemv/cupstestppd.c:2641 +#: systemv/cupstestppd.c:2655 systemv/cupstestppd.c:2682 +#: systemv/cupstestppd.c:2699 systemv/cupstestppd.c:2713 +#: systemv/cupstestppd.c:2737 systemv/cupstestppd.c:2754 +#: systemv/cupstestppd.c:2768 systemv/cupstestppd.c:2792 +#: systemv/cupstestppd.c:2809 systemv/cupstestppd.c:2823 +#: systemv/cupstestppd.c:2847 systemv/cupstestppd.c:2864 +#: systemv/cupstestppd.c:2878 systemv/cupstestppd.c:2902 +#: systemv/cupstestppd.c:2916 systemv/cupstestppd.c:2931 +#: systemv/cupstestppd.c:2948 systemv/cupstestppd.c:3004 +#: systemv/cupstestppd.c:3039 systemv/cupstestppd.c:3053 +#: systemv/cupstestppd.c:3081 systemv/cupstestppd.c:3146 +#: systemv/cupstestppd.c:3161 systemv/cupstestppd.c:3200 +#: systemv/cupstestppd.c:3220 systemv/cupstestppd.c:3234 +#: systemv/cupstestppd.c:3451 systemv/cupstestppd.c:3487 +#: systemv/cupstestppd.c:3501 systemv/cupstestppd.c:3547 +#: systemv/cupstestppd.c:3579 systemv/cupstestppd.c:3596 +#: systemv/cupstestppd.c:3619 systemv/cupstestppd.c:3635 +#: systemv/cupstestppd.c:3673 systemv/cupstestppd.c:3814 +#: systemv/cupstestppd.c:3836 systemv/cupstestppd.c:3944 msgid " FAIL" msgstr "" -#: systemv/cupstestppd.c:1306 +#: systemv/cupstestppd.c:1286 msgid " PASS" msgstr "" @@ -1747,7 +1748,7 @@ msgid "%s accepting requests since %s" msgstr "" -#: scheduler/ipp.c:9952 +#: scheduler/ipp.c:9986 #, c-format msgid "%s cannot be changed." msgstr "%s 不能更改。" @@ -1772,7 +1773,7 @@ msgid "%s is ready and printing" msgstr "" -#: filter/rastertoepson.c:970 filter/rastertohp.c:700 +#: filter/rastertoepson.c:982 filter/rastertohp.c:700 #: filter/rastertolabel.c:1120 #, c-format msgid "%s job-id user title copies options [file]" @@ -1783,7 +1784,7 @@ msgid "%s not accepting requests since %s -" msgstr "" -#: scheduler/ipp.c:618 +#: scheduler/ipp.c:617 #, c-format msgid "%s not supported." msgstr "" @@ -1804,10 +1805,10 @@ msgstr "" #. TRANSLATORS: Message is "subject: error" -#: cups/langprintf.c:77 scheduler/cupsfilter.c:726 systemv/lpadmin.c:791 -#: systemv/lpadmin.c:842 systemv/lpadmin.c:892 systemv/lpadmin.c:948 -#: systemv/lpadmin.c:1046 systemv/lpadmin.c:1098 systemv/lpadmin.c:1154 -#: systemv/lpadmin.c:1463 +#: cups/langprintf.c:77 scheduler/cupsfilter.c:726 systemv/lpadmin.c:803 +#: systemv/lpadmin.c:854 systemv/lpadmin.c:904 systemv/lpadmin.c:960 +#: systemv/lpadmin.c:1058 systemv/lpadmin.c:1110 systemv/lpadmin.c:1166 +#: systemv/lpadmin.c:1581 #, c-format msgid "%s: %s" msgstr "" @@ -1817,7 +1818,7 @@ msgid "%s: %s failed: %s" msgstr "" -#: test/ippfind.c:777 test/ipptool.c:378 +#: test/ippfind.c:777 test/ipptool.c:381 #, c-format msgid "%s: Bad version %s for \"-V\"." msgstr "" @@ -1947,7 +1948,7 @@ msgstr "" #: berkeley/lpq.c:97 berkeley/lpr.c:81 berkeley/lprm.c:104 systemv/cancel.c:95 -#: systemv/cupsaccept.c:101 systemv/lp.c:110 systemv/lpadmin.c:424 +#: systemv/cupsaccept.c:101 systemv/lp.c:110 systemv/lpadmin.c:426 #: systemv/lpstat.c:124 #, c-format msgid "%s: Error - expected username after \"-U\" option." @@ -2036,12 +2037,12 @@ msgid "%s: Invalid filter string \"%s\"." msgstr "" -#: test/ippfind.c:749 test/ipptool.c:346 +#: test/ippfind.c:749 test/ipptool.c:349 #, c-format msgid "%s: Missing timeout for \"-T\"." msgstr "" -#: test/ippfind.c:762 test/ipptool.c:360 +#: test/ippfind.c:762 test/ipptool.c:363 #, c-format msgid "%s: Missing version for \"-V\"." msgstr "" @@ -2063,8 +2064,8 @@ #: berkeley/lpq.c:83 berkeley/lpr.c:67 berkeley/lprm.c:67 systemv/cancel.c:82 #: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:96 -#: systemv/lpadmin.c:225 systemv/lpinfo.c:88 systemv/lpmove.c:73 -#: systemv/lpstat.c:88 test/ipptool.c:291 test/ipptool.c:335 +#: systemv/lpadmin.c:230 systemv/lpinfo.c:88 systemv/lpmove.c:73 +#: systemv/lpstat.c:88 test/ipptool.c:294 test/ipptool.c:338 #, c-format msgid "%s: Sorry, no encryption support." msgstr "" @@ -2953,20 +2954,20 @@ msgid "?Invalid help command unknown." msgstr "" -#: cgi-bin/admin.c:2348 +#: cgi-bin/admin.c:2354 msgid "A Samba password is required to export printer drivers" msgstr "" -#: cgi-bin/admin.c:2344 +#: cgi-bin/admin.c:2350 msgid "A Samba username is required to export printer drivers" msgstr "" -#: scheduler/ipp.c:2274 +#: scheduler/ipp.c:2252 #, c-format msgid "A class named \"%s\" already exists." msgstr "" -#: scheduler/ipp.c:916 +#: scheduler/ipp.c:915 #, c-format msgid "A printer named \"%s\" already exists." msgstr "" @@ -3115,16 +3116,16 @@ msgid "Accepted" msgstr "已接受" -#: cgi-bin/admin.c:548 +#: cgi-bin/admin.c:546 msgid "Add Class" msgstr "添加类" -#: cgi-bin/admin.c:860 +#: cgi-bin/admin.c:859 msgid "Add Printer" msgstr "添加打印机" -#: cgi-bin/admin.c:422 cgi-bin/admin.c:455 cgi-bin/admin.c:503 -#: cgi-bin/admin.c:513 +#: cgi-bin/admin.c:420 cgi-bin/admin.c:453 cgi-bin/admin.c:501 +#: cgi-bin/admin.c:511 msgid "Add RSS Subscription" msgstr "添加 RSS 订阅" @@ -3132,7 +3133,7 @@ msgid "Address" msgstr "地址" -#: cgi-bin/admin.c:188 cgi-bin/admin.c:262 cgi-bin/admin.c:2725 +#: cgi-bin/admin.c:186 cgi-bin/admin.c:260 cgi-bin/admin.c:2731 msgid "Administration" msgstr "管理" @@ -3148,7 +3149,7 @@ msgid "Applicator" msgstr "涂敷器" -#: scheduler/ipp.c:991 +#: scheduler/ipp.c:998 #, c-format msgid "Attempt to set %s printer-state to bad value %d." msgstr "" @@ -3206,12 +3207,12 @@ msgid "B9" msgstr "B9" -#: scheduler/ipp.c:10877 +#: scheduler/ipp.c:10931 #, c-format msgid "Bad 'document-format' value \"%s\"." msgstr "" -#: cups/dest.c:1736 +#: cups/dest.c:1737 msgid "Bad NULL dests pointer" msgstr "错误的 NULL dests 指针" @@ -3227,16 +3228,16 @@ msgid "Bad OrderDependency" msgstr "错误的 OrderDependency" -#: cups/ppd-cache.c:117 cups/ppd-cache.c:164 cups/ppd-cache.c:202 -#: cups/ppd-cache.c:208 cups/ppd-cache.c:224 cups/ppd-cache.c:240 -#: cups/ppd-cache.c:249 cups/ppd-cache.c:257 cups/ppd-cache.c:274 -#: cups/ppd-cache.c:282 cups/ppd-cache.c:297 cups/ppd-cache.c:305 -#: cups/ppd-cache.c:326 cups/ppd-cache.c:338 cups/ppd-cache.c:353 -#: cups/ppd-cache.c:365 cups/ppd-cache.c:387 cups/ppd-cache.c:395 -#: cups/ppd-cache.c:413 cups/ppd-cache.c:421 cups/ppd-cache.c:436 -#: cups/ppd-cache.c:444 cups/ppd-cache.c:462 cups/ppd-cache.c:470 -#: cups/ppd-cache.c:497 cups/ppd-cache.c:567 cups/ppd-cache.c:575 -#: cups/ppd-cache.c:583 +#: cups/ppd-cache.c:434 cups/ppd-cache.c:481 cups/ppd-cache.c:566 +#: cups/ppd-cache.c:572 cups/ppd-cache.c:588 cups/ppd-cache.c:604 +#: cups/ppd-cache.c:613 cups/ppd-cache.c:621 cups/ppd-cache.c:638 +#: cups/ppd-cache.c:646 cups/ppd-cache.c:661 cups/ppd-cache.c:669 +#: cups/ppd-cache.c:690 cups/ppd-cache.c:702 cups/ppd-cache.c:717 +#: cups/ppd-cache.c:729 cups/ppd-cache.c:751 cups/ppd-cache.c:759 +#: cups/ppd-cache.c:777 cups/ppd-cache.c:785 cups/ppd-cache.c:800 +#: cups/ppd-cache.c:808 cups/ppd-cache.c:826 cups/ppd-cache.c:834 +#: cups/ppd-cache.c:861 cups/ppd-cache.c:931 cups/ppd-cache.c:939 +#: cups/ppd-cache.c:947 msgid "Bad PPD cache file." msgstr "" @@ -3252,7 +3253,7 @@ msgid "Bad UIConstraints" msgstr "错误的 UIConstraints" -#: scheduler/ipp.c:1352 +#: scheduler/ipp.c:1368 #, c-format msgid "Bad copies value %d." msgstr "错误的份数值 %d。" @@ -3261,22 +3262,22 @@ msgid "Bad custom parameter" msgstr "错误的自定参数" -#: cups/http-support.c:1598 scheduler/ipp.c:2360 +#: cups/http-support.c:1598 scheduler/ipp.c:2347 #, c-format msgid "Bad device-uri \"%s\"." msgstr "" -#: scheduler/ipp.c:2399 +#: scheduler/ipp.c:2386 #, c-format msgid "Bad device-uri scheme \"%s\"." msgstr "" -#: scheduler/ipp.c:8125 scheduler/ipp.c:8141 scheduler/ipp.c:9360 +#: scheduler/ipp.c:8143 scheduler/ipp.c:8161 scheduler/ipp.c:9387 #, c-format msgid "Bad document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9376 +#: scheduler/ipp.c:9405 #, c-format msgid "Bad document-format-default \"%s\"." msgstr "" @@ -3285,51 +3286,51 @@ msgid "Bad filename buffer" msgstr "" -#: scheduler/ipp.c:1527 +#: scheduler/ipp.c:1543 #, c-format msgid "Bad job-name value: %s" msgstr "" -#: scheduler/ipp.c:1520 +#: scheduler/ipp.c:1536 msgid "Bad job-name value: Wrong type or count." msgstr "" -#: scheduler/ipp.c:9967 +#: scheduler/ipp.c:10001 msgid "Bad job-priority value." msgstr "" -#: scheduler/ipp.c:1382 +#: scheduler/ipp.c:1398 #, c-format msgid "Bad job-sheets value \"%s\"." msgstr "" -#: scheduler/ipp.c:1366 +#: scheduler/ipp.c:1382 msgid "Bad job-sheets value type." msgstr "" -#: scheduler/ipp.c:9997 +#: scheduler/ipp.c:10031 msgid "Bad job-state value." msgstr "" -#: scheduler/ipp.c:2981 scheduler/ipp.c:3441 scheduler/ipp.c:5930 -#: scheduler/ipp.c:6077 scheduler/ipp.c:7559 scheduler/ipp.c:7828 -#: scheduler/ipp.c:8678 scheduler/ipp.c:8904 scheduler/ipp.c:9256 -#: scheduler/ipp.c:9860 +#: scheduler/ipp.c:2970 scheduler/ipp.c:3432 scheduler/ipp.c:5937 +#: scheduler/ipp.c:6084 scheduler/ipp.c:7572 scheduler/ipp.c:7841 +#: scheduler/ipp.c:8705 scheduler/ipp.c:8929 scheduler/ipp.c:9281 +#: scheduler/ipp.c:9894 #, c-format msgid "Bad job-uri \"%s\"." msgstr "" -#: scheduler/ipp.c:2040 scheduler/ipp.c:5468 +#: scheduler/ipp.c:2018 scheduler/ipp.c:5475 #, c-format msgid "Bad notify-pull-method \"%s\"." msgstr "" -#: scheduler/ipp.c:2004 scheduler/ipp.c:5432 +#: scheduler/ipp.c:1982 scheduler/ipp.c:5439 #, c-format msgid "Bad notify-recipient-uri \"%s\"." msgstr "" -#: scheduler/ipp.c:1398 +#: scheduler/ipp.c:1414 #, c-format msgid "Bad number-up value %d." msgstr "错误的 number-up 值 %d。" @@ -3339,12 +3340,12 @@ msgid "Bad option + choice on line %d." msgstr "" -#: scheduler/ipp.c:1415 +#: scheduler/ipp.c:1431 #, c-format msgid "Bad page-ranges values %d-%d." msgstr "错误的 page-ranges 值 %d-%d。" -#: scheduler/ipp.c:2442 +#: scheduler/ipp.c:2429 #, c-format msgid "Bad port-monitor \"%s\"." msgstr "" @@ -3353,7 +3354,7 @@ msgid "Bad printer URI." msgstr "" -#: scheduler/ipp.c:2503 +#: scheduler/ipp.c:2490 #, c-format msgid "Bad printer-state value %d." msgstr "" @@ -3368,7 +3369,7 @@ msgid "Bad request version number %d.%d." msgstr "" -#: cgi-bin/admin.c:1464 +#: cgi-bin/admin.c:1470 msgid "Bad subscription ID" msgstr "" @@ -3376,7 +3377,7 @@ msgid "Bad value string" msgstr "" -#: cgi-bin/admin.c:3270 cgi-bin/admin.c:3516 +#: cgi-bin/admin.c:3276 cgi-bin/admin.c:3522 msgid "Banners" msgstr "标题" @@ -3384,12 +3385,12 @@ msgid "Bond Paper" msgstr "半透明纸" -#: backend/usb-darwin.c:1874 +#: backend/usb-darwin.c:2024 #, c-format msgid "Boolean expected for waiteof option \"%s\"." msgstr "" -#: filter/pstops.c:2029 +#: filter/pstops.c:2034 msgid "Buffer overflow detected, aborting." msgstr "" @@ -3401,15 +3402,15 @@ msgid "CPCL Label Printer" msgstr "CPCL 标签打印机" -#: cgi-bin/admin.c:1465 cgi-bin/admin.c:1504 cgi-bin/admin.c:1514 +#: cgi-bin/admin.c:1471 cgi-bin/admin.c:1510 cgi-bin/admin.c:1520 msgid "Cancel RSS Subscription" msgstr "取消 RSS 订阅" -#: backend/ipp.c:2198 +#: backend/ipp.c:2206 msgid "Canceling print job." msgstr "" -#: scheduler/ipp.c:2483 +#: scheduler/ipp.c:2470 msgid "Cannot share a remote Kerberized printer." msgstr "" @@ -3417,12 +3418,12 @@ msgid "Cassette" msgstr "" -#: cgi-bin/admin.c:1635 cgi-bin/admin.c:1777 cgi-bin/admin.c:1790 -#: cgi-bin/admin.c:1801 +#: cgi-bin/admin.c:1641 cgi-bin/admin.c:1783 cgi-bin/admin.c:1796 +#: cgi-bin/admin.c:1807 msgid "Change Settings" msgstr "更改设置" -#: scheduler/ipp.c:2052 scheduler/ipp.c:5480 +#: scheduler/ipp.c:2030 scheduler/ipp.c:5487 #, c-format msgid "Character set \"%s\" not supported." msgstr "" @@ -3435,7 +3436,7 @@ msgid "Clean Print Heads" msgstr "清洁打印头" -#: scheduler/ipp.c:3893 +#: scheduler/ipp.c:3884 msgid "Close-Job doesn't support the job-uri attribute." msgstr "" @@ -3458,11 +3459,11 @@ msgid "Community name uses indefinite length" msgstr "团体名称使用不定长度" -#: backend/ipp.c:854 backend/lpd.c:879 backend/socket.c:400 +#: backend/ipp.c:858 backend/lpd.c:879 backend/socket.c:400 msgid "Connected to printer." msgstr "" -#: backend/ipp.c:759 backend/lpd.c:702 backend/socket.c:319 +#: backend/ipp.c:763 backend/lpd.c:702 backend/socket.c:319 msgid "Connecting to printer." msgstr "" @@ -3478,7 +3479,7 @@ msgid "Control file sent successfully." msgstr "" -#: backend/ipp.c:1349 backend/lpd.c:472 +#: backend/ipp.c:1358 backend/lpd.c:472 msgid "Copying print data." msgstr "" @@ -3518,11 +3519,11 @@ msgid "Data file sent successfully." msgstr "" -#: cgi-bin/admin.c:2074 cgi-bin/admin.c:2085 cgi-bin/admin.c:2130 +#: cgi-bin/admin.c:2080 cgi-bin/admin.c:2091 cgi-bin/admin.c:2136 msgid "Delete Class" msgstr "删除类" -#: cgi-bin/admin.c:2159 cgi-bin/admin.c:2170 cgi-bin/admin.c:2215 +#: cgi-bin/admin.c:2165 cgi-bin/admin.c:2176 cgi-bin/admin.c:2221 msgid "Delete Printer" msgstr "删除打印机" @@ -3530,7 +3531,7 @@ msgid "DeskJet Series" msgstr "DeskJet 系列" -#: scheduler/ipp.c:1276 +#: scheduler/ipp.c:1297 #, c-format msgid "Destination \"%s\" is not accepting jobs." msgstr "目的位置“%s”没有接受作业。" @@ -3579,7 +3580,7 @@ msgid "Disabled" msgstr "停用" -#: scheduler/ipp.c:5979 +#: scheduler/ipp.c:5986 #, c-format msgid "Document #%d does not exist in job #%d." msgstr "" @@ -3600,9 +3601,9 @@ msgid "EPL2 Label Printer" msgstr "EPL2 标签打印机" -#: cgi-bin/admin.c:1829 cgi-bin/admin.c:1841 cgi-bin/admin.c:1895 -#: cgi-bin/admin.c:1902 cgi-bin/admin.c:1937 cgi-bin/admin.c:1950 -#: cgi-bin/admin.c:1974 cgi-bin/admin.c:2047 +#: cgi-bin/admin.c:1835 cgi-bin/admin.c:1847 cgi-bin/admin.c:1901 +#: cgi-bin/admin.c:1908 cgi-bin/admin.c:1943 cgi-bin/admin.c:1956 +#: cgi-bin/admin.c:1980 cgi-bin/admin.c:2053 msgid "Edit Configuration File" msgstr "编辑配置文件" @@ -3611,7 +3612,7 @@ msgstr "" #. TRANSLATORS: Banner/cover sheet after the print job. -#: cgi-bin/admin.c:3541 +#: cgi-bin/admin.c:3547 msgid "Ending Banner" msgstr "结束标题" @@ -3631,7 +3632,7 @@ msgid "Enter password:" msgstr "输入密码：" -#: scheduler/client.c:2209 +#: scheduler/client.c:2226 msgid "" "Enter your username and password or the root username and password to access " "this page. If you are using Kerberos authentication, make sure you have a " @@ -3852,7 +3853,7 @@ msgid "Envelope You4 Long Edge" msgstr "" -#: test/ippfind.c:2809 +#: test/ippfind.c:2817 msgid "Environment Variables:" msgstr "" @@ -3860,12 +3861,12 @@ msgid "Epson" msgstr "Epson" -#: cgi-bin/admin.c:3584 +#: cgi-bin/admin.c:3590 msgid "Error Policy" msgstr "错误策略" -#: filter/rastertopwg.c:395 filter/rastertopwg.c:410 filter/rastertopwg.c:421 -#: filter/rastertopwg.c:432 +#: filter/rastertopwg.c:395 filter/rastertopwg.c:413 filter/rastertopwg.c:431 +#: filter/rastertopwg.c:442 msgid "Error sending raster data." msgstr "" @@ -3921,11 +3922,11 @@ msgid "Expectation Failed" msgstr "预期失败" -#: cgi-bin/admin.c:2336 cgi-bin/admin.c:2355 +#: cgi-bin/admin.c:2342 cgi-bin/admin.c:2361 msgid "Export Printers to Samba" msgstr "将打印机导出为 Samba" -#: test/ippfind.c:2755 +#: test/ippfind.c:2763 msgid "Expressions:" msgstr "" @@ -3980,14 +3981,14 @@ msgid "File Folder " msgstr "" -#: scheduler/ipp.c:2378 +#: scheduler/ipp.c:2365 #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " "in \"%s/cups-files.conf\"." msgstr "" -#: filter/rastertoepson.c:1102 filter/rastertohp.c:834 +#: filter/rastertoepson.c:1114 filter/rastertohp.c:834 #: filter/rastertolabel.c:1259 #, c-format msgid "Finished page %d." @@ -4017,10 +4018,10 @@ msgid "Glossy Paper" msgstr "光面纸" -#: scheduler/ipp.c:2959 scheduler/ipp.c:3367 scheduler/ipp.c:3905 -#: scheduler/ipp.c:5908 scheduler/ipp.c:6055 scheduler/ipp.c:7536 -#: scheduler/ipp.c:8656 scheduler/ipp.c:8882 scheduler/ipp.c:9234 -#: scheduler/ipp.c:9838 +#: scheduler/ipp.c:2948 scheduler/ipp.c:3358 scheduler/ipp.c:3896 +#: scheduler/ipp.c:5915 scheduler/ipp.c:6062 scheduler/ipp.c:7549 +#: scheduler/ipp.c:8683 scheduler/ipp.c:8907 scheduler/ipp.c:9259 +#: scheduler/ipp.c:9872 msgid "Got a printer-uri attribute but no job-id." msgstr "" @@ -4048,7 +4049,7 @@ msgid "IPP attribute has no name." msgstr "" -#: cups/ipp.c:7000 +#: cups/ipp.c:7016 msgid "IPP attribute is not a member of the message." msgstr "" @@ -4188,7 +4189,7 @@ msgid "Internet Postage 3-Part" msgstr "Internet 邮寄 3 部分" -#: backend/ipp.c:319 +#: backend/ipp.c:323 msgid "Internet Printing Protocol" msgstr "Internet 打印协议" @@ -4265,73 +4266,73 @@ msgid "JIS B9" msgstr "" -#: scheduler/ipp.c:8954 +#: scheduler/ipp.c:8979 #, c-format msgid "Job #%d cannot be restarted - no files." msgstr "" -#: scheduler/ipp.c:2999 scheduler/ipp.c:3233 scheduler/ipp.c:3292 -#: scheduler/ipp.c:3469 scheduler/ipp.c:3915 scheduler/ipp.c:5566 -#: scheduler/ipp.c:5948 scheduler/ipp.c:6095 scheduler/ipp.c:6433 -#: scheduler/ipp.c:7383 scheduler/ipp.c:7405 scheduler/ipp.c:7577 -#: scheduler/ipp.c:7802 scheduler/ipp.c:7845 scheduler/ipp.c:8696 -#: scheduler/ipp.c:8922 scheduler/ipp.c:9274 scheduler/ipp.c:9878 +#: scheduler/ipp.c:2988 scheduler/ipp.c:3222 scheduler/ipp.c:3281 +#: scheduler/ipp.c:3460 scheduler/ipp.c:3906 scheduler/ipp.c:5573 +#: scheduler/ipp.c:5955 scheduler/ipp.c:6102 scheduler/ipp.c:6440 +#: scheduler/ipp.c:7396 scheduler/ipp.c:7418 scheduler/ipp.c:7590 +#: scheduler/ipp.c:7815 scheduler/ipp.c:7858 scheduler/ipp.c:8723 +#: scheduler/ipp.c:8947 scheduler/ipp.c:9299 scheduler/ipp.c:9912 #, c-format msgid "Job #%d does not exist." msgstr "" -#: scheduler/ipp.c:3501 +#: scheduler/ipp.c:3492 #, c-format msgid "Job #%d is already aborted - can't cancel." msgstr "作业 #%d 已经中止 - 不能取消。" -#: scheduler/ipp.c:3495 +#: scheduler/ipp.c:3486 #, c-format msgid "Job #%d is already canceled - can't cancel." msgstr "作业 #%d 已经取消 - 不能取消。" -#: scheduler/ipp.c:3507 +#: scheduler/ipp.c:3498 #, c-format msgid "Job #%d is already completed - can't cancel." msgstr "作业 #%d 已经完成 - 不能取消。" -#: scheduler/ipp.c:7603 scheduler/ipp.c:7887 scheduler/ipp.c:9893 +#: scheduler/ipp.c:7616 scheduler/ipp.c:7900 scheduler/ipp.c:9927 #, c-format msgid "Job #%d is finished and cannot be altered." msgstr "" -#: scheduler/ipp.c:8936 +#: scheduler/ipp.c:8961 #, c-format msgid "Job #%d is not complete." msgstr "" -#: scheduler/ipp.c:3014 +#: scheduler/ipp.c:3003 #, c-format msgid "Job #%d is not held for authentication." msgstr "" -#: scheduler/ipp.c:8710 +#: scheduler/ipp.c:8737 #, c-format msgid "Job #%d is not held." msgstr "" -#: cgi-bin/ipp-var.c:1035 +#: cgi-bin/ipp-var.c:1038 msgid "Job Completed" msgstr "作业已完成" -#: cgi-bin/ipp-var.c:1033 +#: cgi-bin/ipp-var.c:1036 msgid "Job Created" msgstr "作业已创建" -#: cgi-bin/ipp-var.c:1039 +#: cgi-bin/ipp-var.c:1042 msgid "Job Options Changed" msgstr "作业选项已更改" -#: cgi-bin/ipp-var.c:1037 +#: cgi-bin/ipp-var.c:1040 msgid "Job Stopped" msgstr "作业已停止" -#: scheduler/ipp.c:9975 +#: scheduler/ipp.c:10009 msgid "Job is completed and cannot be changed." msgstr "作业已完成，不能更改。" @@ -4339,11 +4340,11 @@ msgid "Job operation failed" msgstr "" -#: scheduler/ipp.c:10011 scheduler/ipp.c:10028 scheduler/ipp.c:10039 +#: scheduler/ipp.c:10045 scheduler/ipp.c:10062 scheduler/ipp.c:10073 msgid "Job state cannot be changed." msgstr "作业状态不能更改。" -#: scheduler/ipp.c:8802 +#: scheduler/ipp.c:8827 msgid "Job subscriptions cannot be renewed." msgstr "" @@ -4363,7 +4364,7 @@ msgid "Label Top" msgstr "标签顶部" -#: scheduler/ipp.c:2061 scheduler/ipp.c:5489 +#: scheduler/ipp.c:2039 scheduler/ipp.c:5496 #, c-format msgid "Language \"%s\" not supported." msgstr "" @@ -4392,7 +4393,7 @@ msgid "Line longer than the maximum allowed (255 characters)" msgstr "行多于所允许的最大字符数（255 个字符）" -#: cgi-bin/admin.c:2373 +#: cgi-bin/admin.c:2379 msgid "List Available Printers" msgstr "列出可用的打印机" @@ -4400,7 +4401,7 @@ msgid "Long-Edge (Portrait)" msgstr "长边（纵向）" -#: cups/http-support.c:1725 +#: cups/http-support.c:1640 msgid "Looking for printer." msgstr "" @@ -4444,7 +4445,7 @@ msgid "Missing asterisk in column 1" msgstr "栏 1 缺少星号" -#: scheduler/ipp.c:5971 +#: scheduler/ipp.c:5978 msgid "Missing document-number attribute." msgstr "" @@ -4453,13 +4454,13 @@ msgid "Missing double quote on line %d." msgstr "" -#: cgi-bin/admin.c:714 cgi-bin/admin.c:2086 cgi-bin/admin.c:2171 -#: cgi-bin/admin.c:2765 cgi-bin/admin.c:3019 cgi-bin/admin.c:3130 -#: cgi-bin/admin.c:3840 +#: cgi-bin/admin.c:712 cgi-bin/admin.c:2092 cgi-bin/admin.c:2177 +#: cgi-bin/admin.c:2771 cgi-bin/admin.c:3025 cgi-bin/admin.c:3136 +#: cgi-bin/admin.c:3846 msgid "Missing form variable" msgstr "" -#: scheduler/ipp.c:9328 +#: scheduler/ipp.c:9353 msgid "Missing last-document attribute in request." msgstr "" @@ -4471,7 +4472,7 @@ msgid "Missing media-size in media-col." msgstr "" -#: scheduler/ipp.c:6574 +#: scheduler/ipp.c:6581 msgid "Missing notify-subscription-ids attribute." msgstr "" @@ -4479,7 +4480,7 @@ msgid "Missing option keyword" msgstr "" -#: scheduler/ipp.c:3140 scheduler/ipp.c:3165 +#: scheduler/ipp.c:3129 scheduler/ipp.c:3154 msgid "Missing requesting-user-name attribute." msgstr "" @@ -4513,23 +4514,23 @@ " device-id = %s" msgstr "" -#: test/ippfind.c:2786 +#: test/ippfind.c:2794 msgid "Modifiers:" msgstr "" -#: cgi-bin/admin.c:548 +#: cgi-bin/admin.c:546 msgid "Modify Class" msgstr "修改类" -#: cgi-bin/admin.c:860 +#: cgi-bin/admin.c:859 msgid "Modify Printer" msgstr "修改打印机" -#: cgi-bin/ipp-var.c:410 cgi-bin/ipp-var.c:501 +#: cgi-bin/ipp-var.c:413 cgi-bin/ipp-var.c:504 msgid "Move All Jobs" msgstr "移动所有作业" -#: cgi-bin/ipp-var.c:349 cgi-bin/ipp-var.c:408 cgi-bin/ipp-var.c:499 +#: cgi-bin/ipp-var.c:352 cgi-bin/ipp-var.c:411 cgi-bin/ipp-var.c:502 msgid "Move Job" msgstr "移动作业" @@ -4545,7 +4546,7 @@ msgid "Name OID uses indefinite length" msgstr "名称 OID 使用不定长度" -#: scheduler/ipp.c:1054 +#: scheduler/ipp.c:1061 msgid "Nested classes are not allowed." msgstr "" @@ -4585,7 +4586,7 @@ msgid "No active connection" msgstr "无活跃连接" -#: scheduler/ipp.c:3418 +#: scheduler/ipp.c:3409 #, c-format msgid "No active jobs on %s." msgstr "" @@ -4594,7 +4595,7 @@ msgid "No attributes in request." msgstr "" -#: scheduler/ipp.c:3041 +#: scheduler/ipp.c:3030 msgid "No authentication information provided." msgstr "" @@ -4602,11 +4603,11 @@ msgid "No community name" msgstr "无团体名称" -#: scheduler/ipp.c:5771 +#: scheduler/ipp.c:5778 msgid "No default printer." msgstr "" -#: cgi-bin/ipp-var.c:421 scheduler/ipp.c:7149 +#: cgi-bin/ipp-var.c:424 scheduler/ipp.c:7162 msgid "No destinations added." msgstr "未添加目的位置。" @@ -4622,7 +4623,7 @@ msgid "No error-status" msgstr "无错误状态" -#: scheduler/ipp.c:8091 scheduler/ipp.c:9342 +#: scheduler/ipp.c:8105 scheduler/ipp.c:9367 msgid "No file in print request." msgstr "" @@ -4634,7 +4635,7 @@ msgid "No name OID" msgstr "无名称 OID" -#: filter/rastertoepson.c:1132 filter/rastertohp.c:865 +#: filter/rastertoepson.c:1144 filter/rastertohp.c:865 #: filter/rastertolabel.c:1288 msgid "No pages were found." msgstr "" @@ -4651,7 +4652,7 @@ msgid "No printer-uri found for class" msgstr "" -#: scheduler/ipp.c:6179 +#: scheduler/ipp.c:6186 msgid "No printer-uri in request." msgstr "" @@ -4659,11 +4660,11 @@ msgid "No request-id" msgstr "无 request-id" -#: scheduler/ipp.c:5374 +#: scheduler/ipp.c:5381 msgid "No subscription attributes in request." msgstr "" -#: scheduler/ipp.c:7476 +#: scheduler/ipp.c:7489 msgid "No subscriptions found." msgstr "找不到订阅。" @@ -4707,7 +4708,7 @@ msgid "Not Supported" msgstr "不支持" -#: scheduler/ipp.c:1490 scheduler/ipp.c:10572 +#: scheduler/ipp.c:1506 scheduler/ipp.c:10626 msgid "Not allowed to print." msgstr "不允许打印。" @@ -4750,32 +4751,32 @@ msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first" msgstr "OpenUI/JCLOpenUI 没有 CloseUI/JCLCloseUI 优先" -#: cgi-bin/admin.c:3611 +#: cgi-bin/admin.c:3617 msgid "Operation Policy" msgstr "操作策略" -#: filter/pstops.c:2177 +#: filter/pstops.c:2182 #, c-format msgid "Option \"%s\" cannot be included via %%%%IncludeFeature." msgstr "" -#: cgi-bin/admin.c:3261 cgi-bin/admin.c:3345 +#: cgi-bin/admin.c:3267 cgi-bin/admin.c:3351 msgid "Options Installed" msgstr "选项已安装" -#: scheduler/cupsfilter.c:1482 scheduler/main.c:2146 systemv/cupsaddsmb.c:284 -#: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3817 -#: test/ippfind.c:2745 test/ipptool.c:4805 ppdc/ppdc.cxx:432 -#: ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:363 -#: ppdc/ppdpo.cxx:254 +#: scheduler/cupsfilter.c:1482 scheduler/main.c:2177 systemv/cupsaddsmb.c:284 +#: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3861 +#: test/ippfind.c:2753 test/ipptool.c:4857 ppdc/ppdc.cxx:432 +#: ppdc/ppdhtml.cxx:179 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:363 +#: ppdc/ppdpo.cxx:249 msgid "Options:" msgstr "" -#: cups/ppd-cache.c:125 +#: cups/ppd-cache.c:442 msgid "Out of date PPD cache file." msgstr "" -#: cups/ppd-cache.c:1410 +#: cups/ppd-cache.c:1810 msgid "Out of memory." msgstr "" @@ -4885,11 +4886,11 @@ msgid "Plain Paper" msgstr "普通纸张" -#: cgi-bin/admin.c:3279 cgi-bin/admin.c:3560 +#: cgi-bin/admin.c:3285 cgi-bin/admin.c:3566 msgid "Policies" msgstr "策略" -#: cgi-bin/admin.c:3286 cgi-bin/admin.c:3629 cgi-bin/admin.c:3642 +#: cgi-bin/admin.c:3292 cgi-bin/admin.c:3635 cgi-bin/admin.c:3648 msgid "Port Monitor" msgstr "端口监视器" @@ -4913,7 +4914,7 @@ msgid "Postcard Long Edge" msgstr "" -#: backend/ipp.c:961 backend/ipp.c:969 +#: backend/ipp.c:965 backend/ipp.c:973 msgid "Preparing to print." msgstr "" @@ -4941,7 +4942,7 @@ msgid "Print Speed" msgstr "打印速度" -#: cgi-bin/ipp-var.c:777 +#: cgi-bin/ipp-var.c:780 msgid "Print Test Page" msgstr "打印测试页" @@ -4957,19 +4958,19 @@ msgid "Print file sent." msgstr "" -#: backend/ipp.c:2172 +#: backend/ipp.c:2180 msgid "Print job canceled at printer." msgstr "" -#: backend/ipp.c:2164 +#: backend/ipp.c:2172 msgid "Print job too large." msgstr "" -#: backend/ipp.c:1642 +#: backend/ipp.c:1654 msgid "Print job was not accepted." msgstr "" -#: cgi-bin/ipp-var.c:1027 +#: cgi-bin/ipp-var.c:1030 msgid "Printer Added" msgstr "打印机已添加" @@ -4977,15 +4978,15 @@ msgid "Printer Default" msgstr "打印机默认" -#: cgi-bin/ipp-var.c:1031 +#: cgi-bin/ipp-var.c:1034 msgid "Printer Deleted" msgstr "打印机已删除" -#: cgi-bin/ipp-var.c:1029 +#: cgi-bin/ipp-var.c:1032 msgid "Printer Modified" msgstr "打印机已修改" -#: cgi-bin/ipp-var.c:1025 +#: cgi-bin/ipp-var.c:1028 msgid "Printer Paused" msgstr "打印机已暂停" @@ -4993,11 +4994,11 @@ msgid "Printer Settings" msgstr "打印机设置" -#: backend/ipp.c:2167 +#: backend/ipp.c:2175 msgid "Printer cannot print supplied content." msgstr "" -#: backend/ipp.c:2170 +#: backend/ipp.c:2178 msgid "Printer cannot print with supplied options." msgstr "" @@ -5023,7 +5024,7 @@ msgid "Quarto" msgstr "四开" -#: scheduler/ipp.c:1485 scheduler/ipp.c:10567 +#: scheduler/ipp.c:1501 scheduler/ipp.c:10621 msgid "Quota limit reached." msgstr "已达到配额限制。" @@ -5096,23 +5097,23 @@ msgid "See Other" msgstr "请参阅其他" -#: backend/usb-darwin.c:552 backend/usb-libusb.c:346 +#: backend/usb-darwin.c:564 backend/usb-libusb.c:346 msgid "Sending data to printer." msgstr "" -#: cgi-bin/ipp-var.c:1041 +#: cgi-bin/ipp-var.c:1044 msgid "Server Restarted" msgstr "服务器已重新启动" -#: cgi-bin/ipp-var.c:1047 +#: cgi-bin/ipp-var.c:1050 msgid "Server Security Auditing" msgstr "服务器安全性审核" -#: cgi-bin/ipp-var.c:1043 +#: cgi-bin/ipp-var.c:1046 msgid "Server Started" msgstr "服务器已启动" -#: cgi-bin/ipp-var.c:1045 +#: cgi-bin/ipp-var.c:1048 msgid "Server Stopped" msgstr "服务器已停止" @@ -5120,24 +5121,24 @@ msgid "Service Unavailable" msgstr "服务不可用" -#: cgi-bin/admin.c:2766 cgi-bin/admin.c:2812 cgi-bin/admin.c:2969 -#: cgi-bin/admin.c:2988 +#: cgi-bin/admin.c:2772 cgi-bin/admin.c:2818 cgi-bin/admin.c:2975 +#: cgi-bin/admin.c:2994 msgid "Set Allowed Users" msgstr "设定允许的用户" -#: cgi-bin/admin.c:3015 +#: cgi-bin/admin.c:3021 msgid "Set As Server Default" msgstr "设定为服务器默认" -#: cgi-bin/admin.c:3115 +#: cgi-bin/admin.c:3121 msgid "Set Class Options" msgstr "设定类选项" -#: cgi-bin/admin.c:3115 cgi-bin/admin.c:3289 cgi-bin/admin.c:3671 +#: cgi-bin/admin.c:3121 cgi-bin/admin.c:3295 cgi-bin/admin.c:3677 msgid "Set Printer Options" msgstr "设定打印机选项" -#: cgi-bin/admin.c:3841 cgi-bin/admin.c:3885 cgi-bin/admin.c:3903 +#: cgi-bin/admin.c:3847 cgi-bin/admin.c:3891 cgi-bin/admin.c:3909 msgid "Set Publishing" msgstr "设定出版" @@ -5163,11 +5164,11 @@ msgstr "标准" #. TRANSLATORS: Banner/cover sheet before the print job. -#: cgi-bin/admin.c:3532 +#: cgi-bin/admin.c:3538 msgid "Starting Banner" msgstr "启动标题" -#: filter/rastertoepson.c:1054 filter/rastertohp.c:782 +#: filter/rastertoepson.c:1066 filter/rastertohp.c:782 #: filter/rastertolabel.c:1211 #, c-format msgid "Starting page %d." @@ -5185,13 +5186,13 @@ msgid "Stylus Photo Series" msgstr "Stylus Photo 系列" -#: scheduler/ipp.c:3564 scheduler/ipp.c:6590 scheduler/ipp.c:7289 -#: scheduler/ipp.c:8790 +#: scheduler/ipp.c:3555 scheduler/ipp.c:6597 scheduler/ipp.c:7302 +#: scheduler/ipp.c:8815 #, c-format msgid "Subscription #%d does not exist." msgstr "" -#: test/ippfind.c:2798 +#: test/ippfind.c:2806 msgid "Substitutions:" msgstr "" @@ -5235,46 +5236,46 @@ msgid "Tear-Off Adjust Position" msgstr "撕纸调整位置" -#: scheduler/ipp.c:1321 +#: scheduler/ipp.c:1337 #, c-format msgid "The \"%s\" attribute is required for print jobs." msgstr "" -#: scheduler/ipp.c:6250 scheduler/ipp.c:6330 scheduler/ipp.c:6343 -#: scheduler/ipp.c:6355 scheduler/ipp.c:6370 +#: scheduler/ipp.c:6257 scheduler/ipp.c:6337 scheduler/ipp.c:6350 +#: scheduler/ipp.c:6362 scheduler/ipp.c:6377 #, c-format msgid "The %s attribute cannot be provided with job-ids." msgstr "" -#: scheduler/ipp.c:1297 +#: scheduler/ipp.c:1317 #, c-format msgid "" "The '%s' Job Description attribute cannot be supplied in a job creation " "request." msgstr "" -#: scheduler/ipp.c:5183 +#: scheduler/ipp.c:5190 #, c-format msgid "" "The '%s' operation attribute cannot be supplied in a Create-Job request." msgstr "" -#: scheduler/ipp.c:6820 +#: scheduler/ipp.c:6827 #, c-format msgid "The PPD file \"%s\" could not be found." msgstr "PPD 文件“%s”未能找到。" -#: scheduler/ipp.c:6807 +#: scheduler/ipp.c:6814 #, c-format msgid "The PPD file \"%s\" could not be opened: %s" msgstr "PPD 文件“%s”未能打开。%s" -#: filter/rastertoepson.c:1023 filter/rastertohp.c:753 +#: filter/rastertoepson.c:1035 filter/rastertohp.c:753 #: filter/rastertolabel.c:1175 msgid "The PPD file could not be opened." msgstr "" -#: cgi-bin/admin.c:727 +#: cgi-bin/admin.c:725 msgid "" "The class name may only contain up to 127 printable characters and may not " "contain spaces, slashes (/), or the pound sign (#)." @@ -5296,12 +5297,12 @@ msgid "The fuser's temperature is low." msgstr "" -#: scheduler/ipp.c:2088 +#: scheduler/ipp.c:2066 msgid "" "The notify-lease-duration attribute cannot be used with job subscriptions." msgstr "notify-lease-duration 属性不能配合作业订阅使用。" -#: scheduler/ipp.c:2071 scheduler/ipp.c:5499 +#: scheduler/ipp.c:2049 scheduler/ipp.c:5506 #, c-format msgid "The notify-user-data value is too large (%d > 63 octets)." msgstr "" @@ -5342,7 +5343,7 @@ msgid "The paper tray needs to be filled." msgstr "" -#: backend/ipp.c:981 +#: backend/ipp.c:985 msgid "" "The printer configuration is incorrect or the printer no longer exists." msgstr "" @@ -5351,8 +5352,8 @@ msgid "The printer did not respond." msgstr "" -#: backend/ipp.c:825 backend/ipp.c:944 backend/ipp.c:1058 backend/ipp.c:1449 -#: backend/ipp.c:1614 backend/lpd.c:836 backend/socket.c:379 +#: backend/ipp.c:829 backend/ipp.c:948 backend/ipp.c:1062 backend/ipp.c:1459 +#: backend/ipp.c:1626 backend/lpd.c:836 backend/socket.c:379 #: backend/usb-unix.c:124 backend/usb-unix.c:414 backend/usb-unix.c:497 msgid "The printer is in use." msgstr "" @@ -5361,7 +5362,7 @@ msgid "The printer is not connected." msgstr "" -#: backend/ipp.c:803 backend/ipp.c:836 backend/ipp.c:940 backend/lpd.c:815 +#: backend/ipp.c:807 backend/ipp.c:840 backend/ipp.c:944 backend/lpd.c:815 #: backend/lpd.c:856 backend/socket.c:358 backend/socket.c:391 msgid "The printer is not responding." msgstr "" @@ -5370,11 +5371,11 @@ msgid "The printer is now connected." msgstr "" -#: backend/usb-darwin.c:1300 +#: backend/usb-darwin.c:1342 msgid "The printer is now online." msgstr "" -#: backend/usb-darwin.c:1321 +#: backend/usb-darwin.c:1381 msgid "The printer is offline." msgstr "" @@ -5386,7 +5387,7 @@ msgid "The printer is running low on toner." msgstr "" -#: backend/ipp.c:818 backend/lpd.c:829 backend/socket.c:372 +#: backend/ipp.c:822 backend/lpd.c:829 backend/socket.c:372 msgid "The printer is unreachable at this time." msgstr "" @@ -5398,28 +5399,28 @@ msgid "The printer may be out of toner." msgstr "" -#: backend/ipp.c:812 backend/lpd.c:823 backend/socket.c:366 +#: backend/ipp.c:816 backend/lpd.c:823 backend/socket.c:366 msgid "The printer may not exist or is unavailable at this time." msgstr "" -#: cgi-bin/admin.c:909 +#: cgi-bin/admin.c:908 msgid "" "The printer name may only contain up to 127 printable characters and may not " "contain spaces, slashes (/), or the pound sign (#)." msgstr "打印机名称可能最多包含 127 个可打印的字符，且不能包含空格、斜线 (/) 或磅符号 (#)。" -#: scheduler/ipp.c:788 scheduler/ipp.c:1048 scheduler/ipp.c:3205 -#: scheduler/ipp.c:3384 scheduler/ipp.c:5166 scheduler/ipp.c:5333 -#: scheduler/ipp.c:5647 scheduler/ipp.c:6216 scheduler/ipp.c:7025 -#: scheduler/ipp.c:7081 scheduler/ipp.c:7395 scheduler/ipp.c:7661 -#: scheduler/ipp.c:7750 scheduler/ipp.c:7783 scheduler/ipp.c:8106 -#: scheduler/ipp.c:8500 scheduler/ipp.c:8582 scheduler/ipp.c:9747 -#: scheduler/ipp.c:10199 scheduler/ipp.c:10530 scheduler/ipp.c:10612 -#: scheduler/ipp.c:10987 +#: scheduler/ipp.c:787 scheduler/ipp.c:1055 scheduler/ipp.c:3194 +#: scheduler/ipp.c:3375 scheduler/ipp.c:5173 scheduler/ipp.c:5340 +#: scheduler/ipp.c:5654 scheduler/ipp.c:6223 scheduler/ipp.c:7032 +#: scheduler/ipp.c:7088 scheduler/ipp.c:7408 scheduler/ipp.c:7674 +#: scheduler/ipp.c:7763 scheduler/ipp.c:7796 scheduler/ipp.c:8120 +#: scheduler/ipp.c:8527 scheduler/ipp.c:8609 scheduler/ipp.c:9781 +#: scheduler/ipp.c:10233 scheduler/ipp.c:10584 scheduler/ipp.c:10666 +#: scheduler/ipp.c:11041 msgid "The printer or class does not exist." msgstr "" -#: scheduler/ipp.c:1234 +#: scheduler/ipp.c:1255 msgid "The printer or class is not shared." msgstr "" @@ -5443,43 +5444,43 @@ msgid "The printer's waste bin is full." msgstr "" -#: scheduler/ipp.c:894 scheduler/ipp.c:2252 +#: scheduler/ipp.c:893 scheduler/ipp.c:2230 #, c-format msgid "The printer-uri \"%s\" contains invalid characters." msgstr "printer-uri“%s”含有无效字符。" -#: scheduler/ipp.c:3182 +#: scheduler/ipp.c:3171 msgid "The printer-uri attribute is required." msgstr "" -#: scheduler/ipp.c:878 +#: scheduler/ipp.c:877 msgid "" "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"." msgstr "printer-uri 必须是“ipp://HOSTNAME/classes/CLASSNAME”形式。" -#: scheduler/ipp.c:2236 +#: scheduler/ipp.c:2214 msgid "" "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"." msgstr "printer-uri 必须是“ipp://HOSTNAME/classes/PRINTERNAME”形式。" -#: cgi-bin/admin.c:452 +#: cgi-bin/admin.c:450 msgid "" "The subscription name may not contain spaces, slashes (/), question marks " "(?), or the pound sign (#)." msgstr "订阅名称可能不包含空格、斜线 (/)、问号 (?) 或磅符号 (#)。" -#: scheduler/client.c:2232 +#: scheduler/client.c:2249 msgid "" "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to " "enable it." msgstr "" -#: scheduler/ipp.c:6314 +#: scheduler/ipp.c:6321 #, c-format msgid "The which-jobs value \"%s\" is not supported." msgstr "" -#: scheduler/ipp.c:5577 +#: scheduler/ipp.c:5584 msgid "There are too many subscriptions." msgstr "有太多订阅。" @@ -5487,8 +5488,8 @@ msgid "There is a paper jam." msgstr "" -#: backend/usb-darwin.c:386 backend/usb-darwin.c:445 backend/usb-darwin.c:514 -#: backend/usb-darwin.c:535 backend/usb-libusb.c:271 backend/usb-libusb.c:325 +#: backend/usb-darwin.c:398 backend/usb-darwin.c:457 backend/usb-darwin.c:526 +#: backend/usb-darwin.c:547 backend/usb-libusb.c:271 backend/usb-libusb.c:325 msgid "There was an unrecoverable USB error." msgstr "" @@ -5496,16 +5497,16 @@ msgid "Thermal Transfer Media" msgstr "热转印介质" -#: scheduler/ipp.c:1479 +#: scheduler/ipp.c:1495 msgid "Too many active jobs." msgstr "太多活跃的作业。" -#: scheduler/ipp.c:1373 +#: scheduler/ipp.c:1389 #, c-format msgid "Too many job-sheets values (%d > 2)." msgstr "" -#: scheduler/ipp.c:2537 +#: scheduler/ipp.c:2524 #, c-format msgid "Too many printer-state-reasons values (%d > %d)." msgstr "" @@ -5570,7 +5571,7 @@ msgid "US Letter Small" msgstr "" -#: cgi-bin/admin.c:1939 cgi-bin/admin.c:1952 cgi-bin/admin.c:1976 +#: cgi-bin/admin.c:1945 cgi-bin/admin.c:1958 cgi-bin/admin.c:1982 msgid "Unable to access cupsd.conf file" msgstr "" @@ -5578,56 +5579,56 @@ msgid "Unable to access help file." msgstr "" -#: cgi-bin/admin.c:504 +#: cgi-bin/admin.c:502 msgid "Unable to add RSS subscription" msgstr "" -#: cgi-bin/admin.c:792 +#: cgi-bin/admin.c:790 msgid "Unable to add class" msgstr "" -#: backend/ipp.c:1796 +#: backend/ipp.c:1808 msgid "Unable to add document to print job." msgstr "" -#: scheduler/ipp.c:1537 +#: scheduler/ipp.c:1553 #, c-format msgid "Unable to add job for destination \"%s\"." msgstr "" -#: cgi-bin/admin.c:1037 cgi-bin/admin.c:1399 +#: cgi-bin/admin.c:1036 cgi-bin/admin.c:1405 msgid "Unable to add printer" msgstr "" -#: scheduler/ipp.c:1164 +#: scheduler/ipp.c:1173 msgid "Unable to allocate memory for file types." msgstr "" -#: filter/pstops.c:418 +#: filter/pstops.c:423 msgid "Unable to allocate memory for page info" msgstr "" -#: filter/pstops.c:412 +#: filter/pstops.c:417 msgid "Unable to allocate memory for pages array" msgstr "" -#: cgi-bin/admin.c:1505 +#: cgi-bin/admin.c:1511 msgid "Unable to cancel RSS subscription" msgstr "" -#: backend/ipp.c:2077 backend/ipp.c:2512 +#: backend/ipp.c:2085 backend/ipp.c:2533 msgid "Unable to cancel print job." msgstr "" -#: cgi-bin/admin.c:2970 +#: cgi-bin/admin.c:2976 msgid "Unable to change printer" msgstr "" -#: cgi-bin/admin.c:3886 +#: cgi-bin/admin.c:3892 msgid "Unable to change printer-is-shared attribute" msgstr "" -#: cgi-bin/admin.c:1637 cgi-bin/admin.c:1779 +#: cgi-bin/admin.c:1643 cgi-bin/admin.c:1785 msgid "Unable to change server settings" msgstr "" @@ -5649,7 +5650,7 @@ msgid "Unable to connect to host." msgstr "无法连接到主机。" -#: backend/ipp.c:781 backend/ipp.c:1254 backend/lpd.c:795 backend/socket.c:338 +#: backend/ipp.c:785 backend/ipp.c:1258 backend/lpd.c:795 backend/socket.c:338 #: backend/usb-unix.c:110 msgid "Unable to contact printer, queuing on next printer in class." msgstr "" @@ -5669,12 +5670,12 @@ msgid "Unable to copy CUPS printer driver files (%d)." msgstr "" -#: scheduler/ipp.c:2657 +#: scheduler/ipp.c:2644 #, c-format msgid "Unable to copy PPD file - %s" msgstr "" -#: scheduler/ipp.c:2712 +#: scheduler/ipp.c:2699 msgid "Unable to copy PPD file." msgstr "" @@ -5688,7 +5689,7 @@ msgid "Unable to copy Windows 9x printer driver files (%d)." msgstr "" -#: scheduler/ipp.c:2634 +#: scheduler/ipp.c:2621 #, c-format msgid "Unable to copy interface script - %s" msgstr "" @@ -5697,15 +5698,15 @@ msgid "Unable to create printer-uri" msgstr "" -#: cgi-bin/admin.c:1830 cgi-bin/admin.c:1842 scheduler/cupsfilter.c:1290 +#: cgi-bin/admin.c:1836 cgi-bin/admin.c:1848 scheduler/cupsfilter.c:1290 msgid "Unable to create temporary file" msgstr "" -#: cgi-bin/admin.c:2133 +#: cgi-bin/admin.c:2139 msgid "Unable to delete class" msgstr "" -#: cgi-bin/admin.c:2218 +#: cgi-bin/admin.c:2224 msgid "Unable to delete printer" msgstr "" @@ -5713,50 +5714,50 @@ msgid "Unable to do maintenance command" msgstr "" -#: cgi-bin/admin.c:1954 +#: cgi-bin/admin.c:1960 msgid "Unable to edit cupsd.conf files larger than 1MB" msgstr "" -#: cups/tls-darwin.c:1284 +#: cups/tls-darwin.c:1459 msgid "" "Unable to establish a secure connection to host (certificate chain invalid)." msgstr "" -#: cups/tls-darwin.c:1274 +#: cups/tls-darwin.c:1449 msgid "" "Unable to establish a secure connection to host (certificate not yet valid)." msgstr "" -#: cups/tls-darwin.c:1269 +#: cups/tls-darwin.c:1444 msgid "" "Unable to establish a secure connection to host (expired certificate)." msgstr "" -#: cups/tls-darwin.c:1279 +#: cups/tls-darwin.c:1454 msgid "Unable to establish a secure connection to host (host name mismatch)." msgstr "" -#: cups/tls-darwin.c:1289 +#: cups/tls-darwin.c:1464 msgid "" "Unable to establish a secure connection to host (peer dropped connection " "before responding)." msgstr "" -#: cups/tls-darwin.c:1264 +#: cups/tls-darwin.c:1439 msgid "" "Unable to establish a secure connection to host (self-signed certificate)." msgstr "" -#: cups/tls-darwin.c:1259 +#: cups/tls-darwin.c:1434 msgid "" "Unable to establish a secure connection to host (untrusted certificate)." msgstr "" -#: cups/tls-darwin.c:1316 cups/tls-sspi.c:1247 cups/tls-sspi.c:1264 +#: cups/tls-darwin.c:1491 cups/tls-sspi.c:1279 cups/tls-sspi.c:1296 msgid "Unable to establish a secure connection to host." msgstr "" -#: cgi-bin/ipp-var.c:350 +#: cgi-bin/ipp-var.c:353 msgid "Unable to find destination for job" msgstr "" @@ -5764,7 +5765,7 @@ msgid "Unable to find printer." msgstr "" -#: backend/ipp.c:3493 +#: backend/ipp.c:3221 msgid "Unable to get backend exit status." msgstr "" @@ -5776,11 +5777,11 @@ msgid "Unable to get class status" msgstr "" -#: cgi-bin/admin.c:1300 +#: cgi-bin/admin.c:1299 msgid "Unable to get list of printer drivers" msgstr "" -#: cgi-bin/admin.c:2820 +#: cgi-bin/admin.c:2826 msgid "Unable to get printer attributes" msgstr "" @@ -5792,7 +5793,7 @@ msgid "Unable to get printer status" msgstr "" -#: backend/ipp.c:1005 +#: backend/ipp.c:1009 msgid "Unable to get printer status." msgstr "" @@ -5810,37 +5811,37 @@ msgid "Unable to load help index." msgstr "" -#: backend/ipp.c:668 backend/lpd.c:426 backend/socket.c:277 +#: backend/ipp.c:672 backend/lpd.c:426 backend/socket.c:277 #, c-format msgid "Unable to locate printer \"%s\"." msgstr "" -#: backend/dnssd.c:787 backend/ipp.c:336 backend/lpd.c:196 +#: backend/dnssd.c:787 backend/ipp.c:340 backend/lpd.c:196 #: backend/socket.c:163 msgid "Unable to locate printer." msgstr "" -#: cgi-bin/admin.c:791 +#: cgi-bin/admin.c:789 msgid "Unable to modify class" msgstr "" -#: cgi-bin/admin.c:1036 cgi-bin/admin.c:1398 +#: cgi-bin/admin.c:1035 cgi-bin/admin.c:1404 msgid "Unable to modify printer" msgstr "" -#: cgi-bin/ipp-var.c:417 cgi-bin/ipp-var.c:506 +#: cgi-bin/ipp-var.c:420 cgi-bin/ipp-var.c:509 msgid "Unable to move job" msgstr "无法移动作业" -#: cgi-bin/ipp-var.c:419 cgi-bin/ipp-var.c:508 +#: cgi-bin/ipp-var.c:422 cgi-bin/ipp-var.c:511 msgid "Unable to move jobs" msgstr "无法移动作业" -#: cgi-bin/admin.c:3166 cups/ppd.c:297 +#: cgi-bin/admin.c:3172 cups/ppd.c:297 msgid "Unable to open PPD file" msgstr "无法打开 PPD 文件" -#: cgi-bin/admin.c:2588 +#: cgi-bin/admin.c:2594 msgid "Unable to open cupsd.conf file:" msgstr "无法打开 cupsd.conf 文件：" @@ -5848,7 +5849,7 @@ msgid "Unable to open device file" msgstr "" -#: scheduler/ipp.c:5992 +#: scheduler/ipp.c:5999 #, c-format msgid "Unable to open document #%d in job #%d." msgstr "" @@ -5857,23 +5858,23 @@ msgid "Unable to open help file." msgstr "" -#: backend/ipp.c:378 backend/ipp.c:1543 backend/ipp.c:1751 backend/lpd.c:496 -#: backend/socket.c:150 backend/usb.c:237 filter/gziptoany.c:67 -#: filter/pstops.c:267 +#: backend/ipp.c:382 backend/ipp.c:1554 backend/ipp.c:1763 backend/lpd.c:496 +#: backend/socket.c:150 backend/usb.c:237 filter/gziptoany.c:73 +#: filter/pstops.c:270 msgid "Unable to open print file" msgstr "" -#: filter/rastertoepson.c:983 filter/rastertohp.c:713 +#: filter/rastertoepson.c:995 filter/rastertohp.c:713 #: filter/rastertolabel.c:1133 msgid "Unable to open raster file" msgstr "" -#: cgi-bin/ipp-var.c:780 +#: cgi-bin/ipp-var.c:783 msgid "Unable to print test page" msgstr "" -#: backend/runloop.c:85 backend/runloop.c:314 backend/usb-darwin.c:622 -#: backend/usb-darwin.c:666 backend/usb-libusb.c:416 backend/usb-libusb.c:451 +#: backend/runloop.c:85 backend/runloop.c:314 backend/usb-darwin.c:634 +#: backend/usb-darwin.c:678 backend/usb-libusb.c:416 backend/usb-libusb.c:451 msgid "Unable to read print data." msgstr "" @@ -5886,15 +5887,15 @@ msgid "Unable to run \"%s\": %s" msgstr "" -#: filter/pstops.c:530 +#: filter/pstops.c:535 msgid "Unable to see in file" msgstr "" -#: cgi-bin/ipp-var.c:583 cgi-bin/ipp-var.c:603 +#: cgi-bin/ipp-var.c:586 cgi-bin/ipp-var.c:606 msgid "Unable to send command to printer driver" msgstr "" -#: backend/usb-darwin.c:744 backend/usb-libusb.c:527 +#: backend/usb-darwin.c:756 backend/usb-libusb.c:527 msgid "Unable to send data to printer." msgstr "" @@ -5903,23 +5904,23 @@ msgid "Unable to set Windows printer driver (%d)." msgstr "" -#: cgi-bin/admin.c:3787 +#: cgi-bin/admin.c:3793 msgid "Unable to set options" msgstr "" -#: cgi-bin/admin.c:3057 +#: cgi-bin/admin.c:3063 msgid "Unable to set server default" msgstr "" -#: backend/ipp.c:3352 backend/ipp.c:3429 backend/ipp.c:3437 +#: backend/ipp.c:3080 backend/ipp.c:3157 backend/ipp.c:3165 msgid "Unable to start backend process." msgstr "" -#: cgi-bin/admin.c:1892 +#: cgi-bin/admin.c:1898 msgid "Unable to upload cupsd.conf file" msgstr "" -#: backend/usb-darwin.c:2016 backend/usb-darwin.c:2040 +#: backend/usb-darwin.c:2166 backend/usb-darwin.c:2190 msgid "Unable to use legacy USB class driver." msgstr "" @@ -5927,7 +5928,7 @@ msgid "Unable to write print data" msgstr "" -#: filter/gziptoany.c:86 +#: filter/gziptoany.c:92 #, c-format msgid "Unable to write uncompressed print data: %s" msgstr "" @@ -5936,7 +5937,7 @@ msgid "Unauthorized" msgstr "未授权" -#: cgi-bin/admin.c:3483 +#: cgi-bin/admin.c:3489 msgid "Units" msgstr "单位" @@ -5944,12 +5945,12 @@ msgid "Unknown" msgstr "未知" -#: filter/pstops.c:2185 +#: filter/pstops.c:2190 #, c-format msgid "Unknown choice \"%s\" for option \"%s\"." msgstr "" -#: backend/ipp.c:520 +#: backend/ipp.c:524 #, c-format msgid "Unknown encryption option value: \"%s\"." msgstr "" @@ -5968,12 +5969,12 @@ msgid "Unknown media size name." msgstr "" -#: backend/ipp.c:584 +#: backend/ipp.c:588 #, c-format msgid "Unknown option \"%s\" with value \"%s\"." msgstr "" -#: filter/pstops.c:2168 +#: filter/pstops.c:2173 #, c-format msgid "Unknown option \"%s\"." msgstr "" @@ -5983,12 +5984,12 @@ msgid "Unknown print mode: \"%s\"." msgstr "" -#: scheduler/ipp.c:10401 +#: scheduler/ipp.c:10455 #, c-format msgid "Unknown printer-error-policy \"%s\"." msgstr "未知 printer-error-policy“%s”。" -#: scheduler/ipp.c:10384 +#: scheduler/ipp.c:10438 #, c-format msgid "Unknown printer-op-policy \"%s\"." msgstr "未知 printer-op-policy“%s”。" @@ -5997,22 +5998,22 @@ msgid "Unknown service name." msgstr "" -#: backend/ipp.c:549 +#: backend/ipp.c:553 #, c-format msgid "Unknown version option value: \"%s\"." msgstr "" -#: scheduler/ipp.c:10858 +#: scheduler/ipp.c:10912 #, c-format msgid "Unsupported 'compression' value \"%s\"." msgstr "" -#: scheduler/ipp.c:10888 +#: scheduler/ipp.c:10942 #, c-format msgid "Unsupported 'document-format' value \"%s\"." msgstr "" -#: scheduler/ipp.c:10963 +#: scheduler/ipp.c:11017 msgid "Unsupported 'job-name' value." msgstr "" @@ -6021,27 +6022,27 @@ msgid "Unsupported character set \"%s\"." msgstr "" -#: scheduler/ipp.c:8072 scheduler/ipp.c:9307 +#: scheduler/ipp.c:8086 scheduler/ipp.c:9332 #, c-format msgid "Unsupported compression \"%s\"." msgstr "" -#: scheduler/ipp.c:8206 scheduler/ipp.c:9457 +#: scheduler/ipp.c:8222 scheduler/ipp.c:9485 #, c-format msgid "Unsupported document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9440 +#: scheduler/ipp.c:9468 #, c-format msgid "Unsupported document-format \"%s/%s\"." msgstr "" -#: scheduler/ipp.c:1339 +#: scheduler/ipp.c:1355 #, c-format msgid "Unsupported format \"%s\"." msgstr "" -#: scheduler/ipp.c:1437 +#: scheduler/ipp.c:1453 msgid "Unsupported margins." msgstr "" @@ -6049,17 +6050,17 @@ msgid "Unsupported media value." msgstr "" -#: filter/pstops.c:2450 +#: filter/pstops.c:2455 #, c-format msgid "Unsupported number-up value %d, using number-up=1." msgstr "" -#: filter/pstops.c:2484 +#: filter/pstops.c:2489 #, c-format msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb." msgstr "" -#: filter/pstops.c:2535 +#: filter/pstops.c:2540 #, c-format msgid "Unsupported page-border value %s, using page-border=none." msgstr "" @@ -6076,7 +6077,7 @@ msgid "Upgrade Required" msgstr "要求升级" -#: systemv/lpadmin.c:654 +#: systemv/lpadmin.c:666 msgid "" "Usage:\n" "\n" @@ -6088,7 +6089,7 @@ " [-u allow:user,user] [-u deny:user,user]" msgstr "" -#: backend/dnssd.c:227 backend/ipp.c:325 backend/lpd.c:183 +#: backend/dnssd.c:227 backend/ipp.c:329 backend/lpd.c:183 #: backend/socket.c:127 backend/usb.c:183 filter/commandtops.c:63 #: filter/gziptoany.c:46 filter/pstops.c:231 monitor/bcp.c:56 #: monitor/tbcp.c:55 @@ -6104,7 +6105,7 @@ msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]" msgstr "" -#: scheduler/main.c:2145 +#: scheduler/main.c:2176 msgid "Usage: cupsd [options]" msgstr "" @@ -6116,7 +6117,7 @@ msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" msgstr "" -#: systemv/cupstestppd.c:3813 +#: systemv/cupstestppd.c:3857 msgid "" "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]" msgstr "" @@ -6129,7 +6130,7 @@ "Options:" msgstr "" -#: test/ippfind.c:2738 +#: test/ippfind.c:2746 msgid "" "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n" " ippfind [options] name[.regtype[.domain.]] ... [expression]\n" @@ -6137,7 +6138,7 @@ " ippfind --version" msgstr "" -#: test/ipptool.c:4803 +#: test/ipptool.c:4855 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]" msgstr "" @@ -6173,7 +6174,7 @@ msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]" msgstr "" -#: ppdc/ppdhtml.cxx:172 +#: ppdc/ppdhtml.cxx:177 msgid "Usage: ppdhtml [options] filename.drv >filename.html" msgstr "" @@ -6185,7 +6186,7 @@ msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]" msgstr "" -#: ppdc/ppdpo.cxx:252 +#: ppdc/ppdpo.cxx:247 msgid "" "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]" msgstr "" @@ -6206,11 +6207,11 @@ msgid "Version uses indefinite length" msgstr "Version 使用不定长度" -#: backend/ipp.c:1913 +#: backend/ipp.c:1925 msgid "Waiting for job to complete." msgstr "" -#: backend/usb-darwin.c:469 backend/usb-libusb.c:223 +#: backend/usb-darwin.c:481 backend/usb-libusb.c:223 msgid "Waiting for printer to become available." msgstr "" @@ -6230,7 +6231,7 @@ msgid "Yes" msgstr "是" -#: scheduler/client.c:2219 +#: scheduler/client.c:2236 #, c-format msgid "" "You must access this page using the URL >." msgstr "" -#: grep-dctrl/grep-dctrl.c:92 +#: grep-dctrl/grep-dctrl.c:95 msgid "Version number comparison: >=." msgstr "版本号比较：>=。" -#: grep-dctrl/grep-dctrl.c:93 +#: grep-dctrl/grep-dctrl.c:96 msgid "Debug option parsing." msgstr "调试选项语法分析。" -#: grep-dctrl/grep-dctrl.c:94 grep-dctrl/grep-dctrl.c:95 +#: grep-dctrl/grep-dctrl.c:97 grep-dctrl/grep-dctrl.c:98 msgid "Do not output to stdout." msgstr "" -#: grep-dctrl/grep-dctrl.c:96 sort-dctrl/sort-dctrl.c:41 +#: grep-dctrl/grep-dctrl.c:99 sort-dctrl/sort-dctrl.c:41 #: tbl-dctrl/tbl-dctrl.c:44 join-dctrl/join-dctrl.c:46 msgid "Attempt mmapping input files" msgstr "尝试映射输入文件。" -#: grep-dctrl/grep-dctrl.c:97 +#: grep-dctrl/grep-dctrl.c:100 msgid "Ignore parse errors" msgstr "忽略语法分析错误" -#: grep-dctrl/grep-dctrl.c:98 +#: grep-dctrl/grep-dctrl.c:101 msgid "PATTERN" msgstr "模型" -#: grep-dctrl/grep-dctrl.c:98 +#: grep-dctrl/grep-dctrl.c:101 msgid "Specify the pattern to search for" msgstr "指定模型来搜索" -#: grep-dctrl/grep-dctrl.c:99 +#: grep-dctrl/grep-dctrl.c:102 msgid "Match only whole package names (this implies -e)" msgstr "仅匹配整个软件包名(隐含包含选项 -e )" -#: grep-dctrl/grep-dctrl.c:100 +#: grep-dctrl/grep-dctrl.c:103 msgid "Ensure that the output is in dctrl format (overridden by -n)" msgstr "" -#: grep-dctrl/grep-dctrl.c:101 +#: grep-dctrl/grep-dctrl.c:104 msgid "Override the effect of an earlier --ensure-dctrl" msgstr "" -#: grep-dctrl/grep-dctrl.c:180 +#: grep-dctrl/grep-dctrl.c:185 msgid "filter is too long" msgstr "" -#: grep-dctrl/grep-dctrl.c:241 grep-dctrl/grep-dctrl.c:852 +#: grep-dctrl/grep-dctrl.c:278 grep-dctrl/grep-dctrl.c:890 #: join-dctrl/join-dctrl.c:113 msgid "too many output fields" msgstr "过多输出字段" -#: grep-dctrl/grep-dctrl.c:265 sort-dctrl/sort-dctrl.c:104 +#: grep-dctrl/grep-dctrl.c:302 sort-dctrl/sort-dctrl.c:104 #: tbl-dctrl/tbl-dctrl.c:305 join-dctrl/join-dctrl.c:168 #, c-format msgid "no such log level '%s'" msgstr "没有“%s”这个日志级别" -#: grep-dctrl/grep-dctrl.c:472 +#: grep-dctrl/grep-dctrl.c:509 #, c-format msgid "internal error: unknown token %d" msgstr "" -#: grep-dctrl/grep-dctrl.c:481 +#: grep-dctrl/grep-dctrl.c:518 msgid "unexpected end of filter" msgstr "" -#: grep-dctrl/grep-dctrl.c:484 +#: grep-dctrl/grep-dctrl.c:521 msgid "unexpected pattern in command line" msgstr "" -#: grep-dctrl/grep-dctrl.c:487 +#: grep-dctrl/grep-dctrl.c:524 msgid "unexpected string in command line" msgstr "" -#: grep-dctrl/grep-dctrl.c:491 +#: grep-dctrl/grep-dctrl.c:528 #, c-format msgid "unexpected '%s' in command line" msgstr "" -#: grep-dctrl/grep-dctrl.c:595 +#: grep-dctrl/grep-dctrl.c:632 msgid "missing ')' in command line" msgstr "命令行中缺失“)“" -#: grep-dctrl/grep-dctrl.c:603 +#: grep-dctrl/grep-dctrl.c:640 msgid "Multiple patterns for the same simple filter are not allowed" msgstr "" -#: grep-dctrl/grep-dctrl.c:623 +#: grep-dctrl/grep-dctrl.c:660 msgid "A pattern is mandatory" msgstr "必须有一个模型" -#: grep-dctrl/grep-dctrl.c:651 +#: grep-dctrl/grep-dctrl.c:688 msgid "inconsistent modifiers of simple filters" msgstr "" -#: grep-dctrl/grep-dctrl.c:724 sort-dctrl/sort-dctrl.c:120 +#: grep-dctrl/grep-dctrl.c:761 sort-dctrl/sort-dctrl.c:120 #: tbl-dctrl/tbl-dctrl.c:317 join-dctrl/join-dctrl.c:180 msgid "too many file names" msgstr "过多文件名" -#: grep-dctrl/grep-dctrl.c:733 +#: grep-dctrl/grep-dctrl.c:770 msgid "file names are not allowed within the filter" msgstr "" -#: grep-dctrl/grep-dctrl.c:846 +#: grep-dctrl/grep-dctrl.c:884 msgid "malformed filter" msgstr "" -#: grep-dctrl/grep-dctrl.c:856 +#: grep-dctrl/grep-dctrl.c:894 msgid "Adding \"Description\" to selected output fields because of -d" msgstr "添加\"描述\"到选择的输出字段因为 -d" -#: grep-dctrl/grep-dctrl.c:864 +#: grep-dctrl/grep-dctrl.c:902 msgid "-I requires at least one instance of -s" msgstr "-I 需要至少一个 -s 情况" -#: grep-dctrl/grep-dctrl.c:870 +#: grep-dctrl/grep-dctrl.c:908 msgid "cannot suppress field names when showing whole paragraphs" msgstr "当显示整个段落时不能压缩字段名" -#: grep-dctrl/grep-dctrl.c:902 +#: grep-dctrl/grep-dctrl.c:940 #, c-format msgid "executable name '%s' is not recognised" msgstr "" @@ -417,15 +417,15 @@ msgid "expected either '1.' or '2.' at the start of the field specification" msgstr "希望 '1.' 或 '2.' 在域指定的开头" -#: join-dctrl/join-dctrl.c:251 +#: join-dctrl/join-dctrl.c:267 msgid "join-dctrl -- join two Debian control files" msgstr "join-dctrl -- 加入两个 Debian 控制文件" -#: join-dctrl/join-dctrl.c:270 +#: join-dctrl/join-dctrl.c:286 msgid "need exactly two input files" msgstr "需要确切地两个输入文件" -#: join-dctrl/join-dctrl.c:295 +#: join-dctrl/join-dctrl.c:311 msgid "cannot join a stream with itself" msgstr "不能够加入一个流到自己" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/debconf.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/debconf.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/debconf.po 2015-02-19 15:26:01.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/debconf.po 2016-07-20 16:51:57.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:40+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:47+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: zh_CN\n" #: ../Debconf/AutoSelect.pm:76 @@ -225,14 +225,14 @@ msgid "Next" msgstr "下一步" -#: ../Debconf/Template.pm:91 +#: ../Debconf/Template.pm:96 #, perl-format msgid "" "warning: possible database corruption. Will attempt to repair by adding back " "missing question %s." msgstr "警告：数据库可能已被损坏。将会尝试修复缺失的项目 %s。" -#: ../Debconf/Template.pm:206 +#: ../Debconf/Template.pm:211 #, perl-format msgid "" "Template #%s in %s has a duplicate field \"%s\" with new value \"%s\". " @@ -240,17 +240,17 @@ msgstr "" "%2$s 中的第 %1$s 模板有一个重复字段“%3$s”，其中新值为“%4$s”。造成问题的原因可能是两个模板没有以正确地用换行符分隔开。\n" -#: ../Debconf/Template.pm:231 +#: ../Debconf/Template.pm:236 #, perl-format msgid "Unknown template field '%s', in stanza #%s of %s\n" msgstr "%3$s 中第 %2$s 部分有未知的模板字段“%1$s”\n" -#: ../Debconf/Template.pm:257 +#: ../Debconf/Template.pm:262 #, perl-format msgid "Template parse error near `%s', in stanza #%s of %s\n" msgstr "%3$s 中第 %2$s 部分“%1$s”附近的模板解析出错\n" -#: ../Debconf/Template.pm:263 +#: ../Debconf/Template.pm:268 #, perl-format msgid "Template #%s in %s does not contain a 'Template:' line\n" msgstr "%2$s 中第 %1$s 模板未包含“Template:”行\n" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/debian-tasks.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/debian-tasks.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/debian-tasks.po 2015-02-19 15:26:14.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/debian-tasks.po 2016-07-20 16:51:48.000000000 +0000 @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 11:57+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 12:39+0000\n" +"X-Generator: Launchpad (build 18147)\n" "Language: \n" #. Description @@ -173,7 +173,7 @@ msgstr "标准系统工具" #. Description -#: ../po/debian-tasks.desc:13001 +#: ../po/debian-tasks.desc:10001 msgid "" "This task sets up a basic user environment, providing a reasonably small " "selection of services and tools usable on the command line." diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/debianutils.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/debianutils.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/debianutils.po 2015-02-19 15:26:02.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/debianutils.po 2016-07-20 16:51:56.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:40+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:48+0000\n" +"X-Generator: Launchpad (build 18147)\n" #. type: TH #: ../add-shell.8:1 diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/desktop_kubuntu-driver-manager.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/desktop_kubuntu-driver-manager.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/desktop_kubuntu-driver-manager.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/desktop_kubuntu-driver-manager.po 2016-07-20 16:51:47.000000000 +0000 @@ -0,0 +1,33 @@ +# Chinese (Simplified) translation for kubuntu-driver-manager +# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016 +# This file is distributed under the same license as the kubuntu-driver-manager package. +# FIRST AUTHOR , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: kubuntu-driver-manager\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-05-12 12:03+0000\n" +"PO-Revision-Date: 2016-04-20 08:32+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2016-07-20 14:51+0000\n" +"X-Generator: Launchpad (build 18147)\n" + +#: src/kcm_driver_manager.desktop:11 +msgctxt "X-KDE-Keywords" +msgid "drivers" +msgstr "" + +#: src/kcm_driver_manager.desktop:14 +msgctxt "Name" +msgid "Driver Manager" +msgstr "驱动管理器" + +#: src/kcm_driver_manager.desktop:15 +msgctxt "Comment" +msgid "Driver management software" +msgstr "驱动管理软件" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/desktop_kubuntu-notification-helper.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/desktop_kubuntu-notification-helper.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2015-02-19 15:26:23.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2016-07-20 16:51:44.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 13:03+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 14:06+0000\n" +"X-Generator: Launchpad (build 18147)\n" #: src/daemon/notificationhelper.desktop:2 msgctxt "Name" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/desktop_plasma-widget-menubar.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/desktop_plasma-widget-menubar.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/desktop_plasma-widget-menubar.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/desktop_plasma-widget-menubar.po 2016-07-20 16:51:57.000000000 +0000 @@ -0,0 +1,28 @@ +# Chinese (Simplified) translation for plasma-widget-menubar +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the plasma-widget-menubar package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: plasma-widget-menubar\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-02-19 17:43+0000\n" +"PO-Revision-Date: 2013-05-01 22:53+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2016-07-20 14:09+0000\n" +"X-Generator: Launchpad (build 18147)\n" + +#: src/plasma-applet-menubar.desktop:2 +msgctxt "Name" +msgid "Window Menubar" +msgstr "窗口菜单栏" + +#: src/plasma-applet-menubar.desktop:3 +msgctxt "Comment" +msgid "Show window menubars" +msgstr "显示窗口菜单栏" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/devscripts.po language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/devscripts.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/devscripts.po 2015-02-19 15:26:02.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20160720/data/zh_CN/LC_MESSAGES/devscripts.po 2016-07-20 16:51:46.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-02-19 10:42+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2016-07-20 10:49+0000\n" +"X-Generator: Launchpad (build 18147)\n" #. type: TH #: ../scripts/annotate-output.1:1 @@ -24,19 +24,19 @@ msgstr "ANNOTATE-OUTPUT" #. type: TH -#: ../scripts/annotate-output.1:1 ../scripts/archpath.1:1 ../scripts/checkbashisms.1:1 ../scripts/cvs-debc.1:1 ../scripts/cvs-debi.1:1 ../scripts/cvs-debrelease.1:1 ../scripts/cvs-debuild.1:1 ../scripts/dcmd.1:1 ../scripts/debc.1:1 ../scripts/debchange.1:1 ../scripts/debclean.1:1 ../scripts/debdiff.1:1 ../scripts/debi.1:1 ../scripts/debpkg.1:1 ../scripts/debrelease.1:1 ../scripts/debrsign.1:1 ../scripts/debsign.1:1 ../scripts/debuild.1:1 ../scripts/dep3changelog.1:1 ../scripts/devscripts.1:1 ../scripts/dpkg-genbuilddeps.1:1 ../doc/edit-patch.1:1 ../scripts/dscextract.1:1 ../scripts/dscverify.1:1 ../scripts/getbuildlog.1:1 ../scripts/grep-excuses.1:1 ../scripts/list-unreleased.1:1 ../scripts/manpage-alert.1:1 ../scripts/mergechanges.1:1 ../scripts/nmudiff.1:1 ../scripts/plotchangelog.1:1 ../scripts/pts-subscribe.1:1 ../scripts/rc-alert.1:1 ../doc/suspicious-source.1:15 ../scripts/uscan.1:1 ../scripts/uupdate.1:1 ../doc/what-patch.1:1 ../scripts/whodepends.1:1 ../scripts/who-uploads.1:1 ../scripts/wnpp-alert.1:1 ../scripts/wnpp-check.1:1 ../doc/wrap-and-sort.1:15 ../scripts/devscripts.conf.5:1 +#: ../scripts/annotate-output.1:1 ../scripts/archpath.1:1 ../scripts/checkbashisms.1:1 ../scripts/cvs-debc.1:1 ../scripts/cvs-debi.1:1 ../scripts/cvs-debrelease.1:1 ../scripts/cvs-debuild.1:1 ../scripts/dcmd.1:1 ../scripts/debc.1:1 ../scripts/debchange.1:1 ../scripts/debclean.1:1 ../scripts/debdiff.1:1 ../scripts/debi.1:1 ../scripts/debpkg.1:1 ../scripts/debrelease.1:1 ../scripts/debrsign.1:1 ../scripts/debsign.1:1 ../scripts/debuild.1:1 ../scripts/dep3changelog.1:1 ../scripts/devscripts.1:1 ../scripts/dpkg-genbuilddeps.1:1 ../doc/edit-patch.1:1 ../scripts/dscextract.1:1 ../scripts/dscverify.1:1 ../scripts/getbuildlog.1:1 ../scripts/grep-excuses.1:1 ../scripts/list-unreleased.1:1 ../scripts/manpage-alert.1:1 ../scripts/mergechanges.1:1 ../scripts/nmudiff.1:1 ../scripts/plotchangelog.1:1 ../scripts/pts-subscribe.1:1 ../scripts/rc-alert.1:1 ../doc/suspicious-source.1:15 ../scripts/uupdate.1:1 ../doc/what-patch.1:1 ../scripts/whodepends.1:1 ../scripts/who-uploads.1:1 ../scripts/wnpp-alert.1:1 ../scripts/wnpp-check.1:1 ../doc/wrap-and-sort.1:15 ../scripts/devscripts.conf.5:1 #, no-wrap msgid "Debian Utilities" msgstr "Debian 组件" #. type: TH -#: ../scripts/annotate-output.1:1 ../scripts/archpath.1:1 ../scripts/checkbashisms.1:1 ../scripts/cvs-debc.1:1 ../scripts/cvs-debi.1:1 ../scripts/cvs-debrelease.1:1 ../scripts/cvs-debuild.1:1 ../scripts/dcmd.1:1 ../scripts/debc.1:1 ../scripts/debchange.1:1 ../scripts/debclean.1:1 ../scripts/debdiff.1:1 ../scripts/debi.1:1 ../scripts/debpkg.1:1 ../scripts/debrelease.1:1 ../scripts/debrsign.1:1 ../scripts/debsign.1:1 ../scripts/debuild.1:1 ../scripts/dep3changelog.1:1 ../scripts/devscripts.1:1 ../scripts/dpkg-depcheck.1:1 ../scripts/dpkg-genbuilddeps.1:1 ../doc/edit-patch.1:1 ../scripts/dscextract.1:1 ../scripts/dscverify.1:1 ../scripts/getbuildlog.1:1 ../scripts/grep-excuses.1:1 ../scripts/list-unreleased.1:1 ../scripts/manpage-alert.1:1 ../scripts/mergechanges.1:1 ../scripts/nmudiff.1:1 ../scripts/plotchangelog.1:1 ../scripts/pts-subscribe.1:1 ../scripts/rc-alert.1:1 ../doc/suspicious-source.1:15 ../scripts/uscan.1:1 ../scripts/uupdate.1:1 ../doc/what-patch.1:1 ../scripts/whodepends.1:1 ../scripts/who-uploads.1:1 ../scripts/wnpp-alert.1:1 ../scripts/wnpp-check.1:1 ../doc/wrap-and-sort.1:15 ../scripts/devscripts.conf.5:1 +#: ../scripts/annotate-output.1:1 ../scripts/archpath.1:1 ../scripts/checkbashisms.1:1 ../scripts/cvs-debc.1:1 ../scripts/cvs-debi.1:1 ../scripts/cvs-debrelease.1:1 ../scripts/cvs-debuild.1:1 ../scripts/dcmd.1:1 ../scripts/debc.1:1 ../scripts/debchange.1:1 ../scripts/debclean.1:1 ../scripts/debdiff.1:1 ../scripts/debi.1:1 ../scripts/debpkg.1:1 ../scripts/debrelease.1:1 ../scripts/debrsign.1:1 ../scripts/debsign.1:1 ../scripts/debuild.1:1 ../scripts/dep3changelog.1:1 ../scripts/devscripts.1:1 ../scripts/dpkg-depcheck.1:1 ../scripts/dpkg-genbuilddeps.1:1 ../doc/edit-patch.1:1 ../scripts/dscextract.1:1 ../scripts/dscverify.1:1 ../scripts/getbuildlog.1:1 ../scripts/grep-excuses.1:1 ../scripts/list-unreleased.1:1 ../scripts/manpage-alert.1:1 ../scripts/mergechanges.1:1 ../scripts/nmudiff.1:1 ../scripts/plotchangelog.1:1 ../scripts/pts-subscribe.1:1 ../scripts/rc-alert.1:1 ../doc/suspicious-source.1:15 ../scripts/uupdate.1:1 ../doc/what-patch.1:1 ../scripts/whodepends.1:1 ../scripts/who-uploads.1:1 ../scripts/wnpp-alert.1:1 ../scripts/wnpp-check.1:1 ../doc/wrap-and-sort.1:15 ../scripts/devscripts.conf.5:1 #, no-wrap msgid "DEBIAN" msgstr "DEBIAN" #. type: SH -#: ../scripts/annotate-output.1:2 ../scripts/archpath.1:2 ../scripts/bts.pl:39 ../scripts/build-rdeps.pl:18 ../scripts/chdist.pl:18 ../scripts/checkbashisms.1:2 ../scripts/cowpoke.1:18 ../scripts/cvs-debc.1:2 ../scripts/cvs-debi.1:2 ../scripts/cvs-debrelease.1:2 ../scripts/cvs-debuild.1:2 ../scripts/dcmd.1:2 ../scripts/dcontrol.pl:196 ../scripts/dd-list.1:18 ../scripts/debc.1:2 ../scripts/debchange.1:2 ../scripts/debcheckout.pl:24 ../scripts/debclean.1:2 ../scripts/debcommit.pl:3 ../scripts/debdiff.1:2 ../scripts/debi.1:2 ../scripts/debpkg.1:2 ../scripts/debrelease.1:2 ../scripts/debrsign.1:2 ../scripts/debsign.1:2 ../scripts/debsnap.1:3 ../scripts/debuild.1:2 ../scripts/desktop2menu.pl:24 ../scripts/dep3changelog.1:2 ../scripts/devscripts.1:2 ../scripts/dget.pl:508 ../scripts/diff2patches.1:2 ../scripts/dpkg-depcheck.1:2 ../scripts/dpkg-genbuilddeps.1:2 ../doc/edit-patch.1:2 ../scripts/dscextract.1:2 ../scripts/dscverify.1:2 ../scripts/getbuildlog.1:2 ../scripts/grep-excuses.1:2 ../scripts/licensecheck.pl:22 ../scripts/list-unreleased.1:2 ../scripts/manpage-alert.1:2 ../scripts/mass-bug.pl:21 ../scripts/mergechanges.1:2 ../scripts/mk-build-deps.pl:24 ../scripts/mk-origtargz.pl:24 ../scripts/namecheck.pl:3 ../scripts/nmudiff.1:2 ../scripts/origtargz.pl:20 ../scripts/plotchangelog.1:2 ../scripts/pts-subscribe.1:2 ../scripts/rc-alert.1:2 ../scripts/rmadison.pl:200 ../scripts/sadt.pod:17 ../doc/suspicious-source.1:17 ../scripts/svnpath.pl:3 ../scripts/tagpending.pl:79 ../scripts/transition-check.pl:23 ../scripts/uscan.1:2 ../scripts/uupdate.1:2 ../doc/what-patch.1:2 ../scripts/whodepends.1:2 ../scripts/who-uploads.1:2 ../scripts/who-permits-upload.pl:42 ../scripts/wnpp-alert.1:2 ../scripts/wnpp-check.1:2 ../doc/wrap-and-sort.1:16 ../scripts/devscripts.conf.5:2 +#: ../scripts/annotate-output.1:2 ../scripts/archpath.1:2 ../scripts/bts.pl:39 ../scripts/build-rdeps.pl:21 ../scripts/chdist.pl:18 ../scripts/checkbashisms.1:2 ../scripts/cowpoke.1:18 ../scripts/cvs-debc.1:2 ../scripts/cvs-debi.1:2 ../scripts/cvs-debrelease.1:2 ../scripts/cvs-debuild.1:2 ../scripts/dcmd.1:2 ../scripts/dcontrol.pl:198 ../scripts/dd-list.1:18 ../scripts/debc.1:2 ../scripts/debchange.1:2 ../scripts/debcheckout.pl:24 ../scripts/debclean.1:2 ../scripts/debcommit.pl:3 ../scripts/debdiff.1:2 ../scripts/debi.1:2 ../scripts/debpkg.1:2 ../scripts/debrelease.1:2 ../scripts/debrsign.1:2 ../scripts/debsign.1:2 ../scripts/debsnap.1:3 ../scripts/debuild.1:2 ../scripts/desktop2menu.pl:24 ../scripts/dep3changelog.1:2 ../scripts/devscripts.1:2 ../scripts/dget.pl:537 ../scripts/diff2patches.1:2 ../scripts/dpkg-depcheck.1:2 ../scripts/dpkg-genbuilddeps.1:2 ../doc/edit-patch.1:2 ../scripts/dscextract.1:2 ../scripts/dscverify.1:2 ../scripts/getbuildlog.1:2 ../scripts/grep-excuses.1:2 ../scripts/licensecheck.pl:23 ../scripts/list-unreleased.1:2 ../scripts/manpage-alert.1:2 ../scripts/mass-bug.pl:21 ../scripts/mergechanges.1:2 ../scripts/mk-build-deps.pl:24 ../scripts/mk-origtargz.pl:25 ../scripts/namecheck.pl:3 ../scripts/nmudiff.1:2 ../scripts/origtargz.pl:20 ../scripts/plotchangelog.1:2 ../scripts/pts-subscribe.1:2 ../scripts/rc-alert.1:2 ../scripts/rmadison.pl:228 ../scripts/sadt.pod:17 ../doc/suspicious-source.1:17 ../scripts/svnpath.pl:3 ../scripts/tagpending.pl:77 ../scripts/transition-check.pl:23 ../scripts/uscan.pl:27 ../scripts/uupdate.1:2 ../doc/what-patch.1:2 ../scripts/whodepends.1:2 ../scripts/who-uploads.1:2 ../scripts/who-permits-upload.pl:43 ../scripts/wnpp-alert.1:2 ../scripts/wnpp-check.1:2 ../doc/wrap-and-sort.1:16 ../scripts/devscripts.conf.5:2 #, no-wrap msgid "NAME" msgstr "名称" @@ -47,7 +47,7 @@ msgstr "annotate-output - 用时间和流信息对程序输出作注解" #. type: SH -#: ../scripts/annotate-output.1:4 ../scripts/archpath.1:4 ../scripts/bts.pl:186 ../scripts/build-rdeps.pl:22 ../scripts/chdist.pl:22 ../scripts/checkbashisms.1:4 ../scripts/cowpoke.1:20 ../scripts/cvs-debc.1:4 ../scripts/cvs-debi.1:4 ../scripts/cvs-debrelease.1:4 ../scripts/cvs-debuild.1:4 ../scripts/dcmd.1:4 ../scripts/dcontrol.pl:200 ../scripts/dd-list.1:21 ../scripts/debc.1:4 ../scripts/debchange.1:4 ../scripts/debcheckout.pl:28 ../scripts/debclean.1:4 ../scripts/debcommit.pl:7 ../scripts/debdiff.1:4 ../scripts/debi.1:4 ../scripts/debpkg.1:4 ../scripts/debrelease.1:4 ../scripts/debrsign.1:4 ../scripts/debsign.1:4 ../scripts/debsnap.1:6 ../scripts/debuild.1:4 ../scripts/desktop2menu.pl:28 ../scripts/dep3changelog.1:4 ../scripts/dget.pl:512 ../scripts/dpkg-depcheck.1:4 ../scripts/dpkg-genbuilddeps.1:4 ../doc/edit-patch.1:6 ../scripts/dscextract.1:4 ../scripts/dscverify.1:4 ../scripts/getbuildlog.1:4 ../scripts/grep-excuses.1:4 ../scripts/licensecheck.pl:26 ../scripts/list-unreleased.1:4 ../scripts/manpage-alert.1:4 ../scripts/mass-bug.pl:25 ../scripts/mergechanges.1:4 ../scripts/mk-build-deps.pl:28 ../scripts/mk-origtargz.pl:28 ../scripts/nmudiff.1:4 ../scripts/origtargz.pl:24 ../scripts/plotchangelog.1:4 ../scripts/pts-subscribe.1:4 ../scripts/rc-alert.1:4 ../scripts/rmadison.pl:204 ../scripts/sadt.pod:21 ../doc/suspicious-source.1:21 ../scripts/svnpath.pl:7 ../scripts/tagpending.pl:83 ../scripts/transition-check.pl:27 ../scripts/uscan.1:4 ../scripts/uupdate.1:4 ../doc/what-patch.1:5 ../scripts/whodepends.1:4 ../scripts/who-uploads.1:4 ../scripts/who-permits-upload.pl:46 ../scripts/wnpp-alert.1:4 ../scripts/wnpp-check.1:4 ../doc/wrap-and-sort.1:18 +#: ../scripts/annotate-output.1:4 ../scripts/archpath.1:4 ../scripts/bts.pl:191 ../scripts/build-rdeps.pl:25 ../scripts/chdist.pl:22 ../scripts/checkbashisms.1:4 ../scripts/cowpoke.1:20 ../scripts/cvs-debc.1:4 ../scripts/cvs-debi.1:4 ../scripts/cvs-debrelease.1:4 ../scripts/cvs-debuild.1:4 ../scripts/dcmd.1:4 ../scripts/dcontrol.pl:202 ../scripts/dd-list.1:21 ../scripts/debc.1:4 ../scripts/debchange.1:4 ../scripts/debcheckout.pl:28 ../scripts/debclean.1:4 ../scripts/debcommit.pl:7 ../scripts/debdiff.1:4 ../scripts/debi.1:4 ../scripts/debpkg.1:4 ../scripts/debrelease.1:4 ../scripts/debrsign.1:4 ../scripts/debsign.1:4 ../scripts/debsnap.1:6 ../scripts/debuild.1:4 ../scripts/desktop2menu.pl:28 ../scripts/dep3changelog.1:4 ../scripts/dget.pl:541 ../scripts/dpkg-depcheck.1:4 ../scripts/dpkg-genbuilddeps.1:4 ../doc/edit-patch.1:6 ../scripts/dscextract.1:4 ../scripts/dscverify.1:4 ../scripts/getbuildlog.1:4 ../scripts/grep-excuses.1:4 ../scripts/licensecheck.pl:27 ../scripts/list-unreleased.1:4 ../scripts/manpage-alert.1:4 ../scripts/mass-bug.pl:25 ../scripts/mergechanges.1:4 ../scripts/mk-build-deps.pl:28 ../scripts/mk-origtargz.pl:29 ../scripts/nmudiff.1:4 ../scripts/origtargz.pl:24 ../scripts/plotchangelog.1:4 ../scripts/pts-subscribe.1:4 ../scripts/rc-alert.1:4 ../scripts/rmadison.pl:232 ../scripts/sadt.pod:21 ../doc/suspicious-source.1:21 ../scripts/svnpath.pl:7 ../scripts/tagpending.pl:81 ../scripts/transition-check.pl:27 ../scripts/uscan.pl:31 ../scripts/uupdate.1:4 ../doc/what-patch.1:5 ../scripts/whodepends.1:4 ../scripts/who-uploads.1:4 ../scripts/who-permits-upload.pl:47 ../scripts/wnpp-alert.1:4 ../scripts/wnpp-check.1:4 ../doc/wrap-and-sort.1:18 #, no-wrap msgid "SYNOPSIS" msgstr "概要" @@ -58,7 +58,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:6 ../scripts/archpath.1:12 ../scripts/bts.pl:190 ../scripts/build-rdeps.pl:26 ../scripts/chdist.pl:26 ../scripts/checkbashisms.1:8 ../scripts/cowpoke.1:24 ../scripts/cvs-debc.1:6 ../scripts/cvs-debi.1:6 ../scripts/cvs-debrelease.1:7 ../scripts/cvs-debuild.1:7 ../scripts/dcmd.1:6 ../scripts/dcontrol.pl:208 ../scripts/dd-list.1:26 ../scripts/debc.1:6 ../scripts/debchange.1:8 ../scripts/debcheckout.pl:40 ../scripts/debclean.1:6 ../scripts/debcommit.pl:11 ../scripts/debdiff.1:15 ../scripts/debi.1:6 ../scripts/debpkg.1:6 ../scripts/debrelease.1:6 ../scripts/deb-reversion.dbk:82 ../scripts/debrsign.1:7 ../scripts/debsign.1:6 ../scripts/debsnap.1:14 ../scripts/debuild.1:10 ../scripts/desktop2menu.pl:34 ../scripts/dep3changelog.1:6 ../scripts/devscripts.1:4 ../scripts/dget.pl:522 ../scripts/diff2patches.1:10 ../scripts/dpkg-depcheck.1:6 ../scripts/dpkg-genbuilddeps.1:6 ../doc/edit-patch.1:11 ../scripts/dscextract.1:6 ../scripts/dscverify.1:6 ../scripts/getbuildlog.1:8 ../scripts/grep-excuses.1:6 ../scripts/licensecheck.pl:35 ../scripts/list-unreleased.1:6 ../scripts/manpage-alert.1:8 ../scripts/mass-bug.pl:29 ../scripts/mergechanges.1:6 ../scripts/mk-build-deps.pl:34 ../scripts/mk-origtargz.pl:38 ../scripts/nmudiff.1:6 ../scripts/origtargz.pl:34 ../scripts/plotchangelog.1:7 ../scripts/pts-subscribe.1:8 ../scripts/rc-alert.1:8 ../scripts/rmadison.pl:212 ../scripts/sadt.pod:25 ../doc/suspicious-source.1:24 ../scripts/svnpath.pl:17 ../scripts/tagpending.pl:87 ../scripts/transition-check.pl:33 ../scripts/uscan.1:6 ../scripts/uupdate.1:8 ../doc/what-patch.1:8 ../scripts/whodepends.1:6 ../scripts/who-uploads.1:6 ../scripts/who-permits-upload.pl:50 ../scripts/wnpp-alert.1:8 ../scripts/wnpp-check.1:8 ../doc/wrap-and-sort.1:22 ../scripts/devscripts.conf.5:4 +#: ../scripts/annotate-output.1:6 ../scripts/archpath.1:12 ../scripts/bts.pl:195 ../scripts/build-rdeps.pl:29 ../scripts/chdist.pl:26 ../scripts/checkbashisms.1:8 ../scripts/cowpoke.1:24 ../scripts/cvs-debc.1:6 ../scripts/cvs-debi.1:6 ../scripts/cvs-debrelease.1:7 ../scripts/cvs-debuild.1:7 ../scripts/dcmd.1:6 ../scripts/dcontrol.pl:210 ../scripts/dd-list.1:26 ../scripts/debc.1:6 ../scripts/debchange.1:8 ../scripts/debcheckout.pl:40 ../scripts/debclean.1:6 ../scripts/debcommit.pl:11 ../scripts/debdiff.1:15 ../scripts/debi.1:6 ../scripts/debpkg.1:6 ../scripts/debrelease.1:6 ../scripts/deb-reversion.dbk:82 ../scripts/debrsign.1:7 ../scripts/debsign.1:6 ../scripts/debsnap.1:14 ../scripts/debuild.1:10 ../scripts/desktop2menu.pl:34 ../scripts/dep3changelog.1:6 ../scripts/devscripts.1:4 ../scripts/dget.pl:551 ../scripts/diff2patches.1:10 ../scripts/dpkg-depcheck.1:6 ../scripts/dpkg-genbuilddeps.1:6 ../doc/edit-patch.1:11 ../scripts/dscextract.1:6 ../scripts/dscverify.1:6 ../scripts/getbuildlog.1:8 ../scripts/grep-excuses.1:6 ../scripts/licensecheck.pl:36 ../scripts/list-unreleased.1:6 ../scripts/manpage-alert.1:6 ../scripts/mass-bug.pl:29 ../scripts/mergechanges.1:6 ../scripts/mk-build-deps.pl:34 ../scripts/mk-origtargz.pl:39 ../scripts/nmudiff.1:6 ../scripts/origtargz.pl:34 ../scripts/plotchangelog.1:7 ../scripts/pts-subscribe.1:8 ../scripts/rc-alert.1:8 ../scripts/rmadison.pl:240 ../scripts/sadt.pod:25 ../doc/suspicious-source.1:24 ../scripts/svnpath.pl:17 ../scripts/tagpending.pl:85 ../scripts/transition-check.pl:33 ../scripts/uscan.pl:35 ../scripts/uupdate.1:10 ../doc/what-patch.1:8 ../scripts/whodepends.1:6 ../scripts/who-uploads.1:6 ../scripts/who-permits-upload.pl:51 ../scripts/wnpp-alert.1:8 ../scripts/wnpp-check.1:8 ../doc/wrap-and-sort.1:22 ../scripts/devscripts.conf.5:4 #, no-wrap msgid "DESCRIPTION" msgstr "描述" @@ -71,7 +71,7 @@ msgstr "B 会执行指定的程序并在每行上添加当前时间、O(标准输出) 和 E(标准错误)。" #. type: SH -#: ../scripts/annotate-output.1:11 ../scripts/bts.pl:242 ../scripts/build-rdeps.pl:30 ../scripts/chdist.pl:33 ../scripts/checkbashisms.1:23 ../scripts/cowpoke.1:29 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dcmd.1:15 ../scripts/dcontrol.pl:242 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:145 ../scripts/debcheckout.pl:68 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:52 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debsnap.1:26 ../scripts/debuild.1:219 ../scripts/dep3changelog.1:15 ../scripts/dget.pl:563 ../scripts/diff2patches.1:16 ../scripts/dpkg-depcheck.1:15 ../scripts/dscextract.1:14 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:24 ../scripts/grep-excuses.1:13 ../scripts/licensecheck.pl:44 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:14 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/mk-origtargz.pl:52 ../scripts/nmudiff.1:21 ../scripts/origtargz.pl:95 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:221 ../scripts/sadt.pod:42 ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:93 ../scripts/transition-check.pl:42 ../scripts/uscan.1:363 ../scripts/uupdate.1:52 ../doc/what-patch.1:15 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/who-permits-upload.pl:56 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:33 +#: ../scripts/annotate-output.1:11 ../scripts/bts.pl:247 ../scripts/build-rdeps.pl:45 ../scripts/chdist.pl:33 ../scripts/checkbashisms.1:23 ../scripts/cowpoke.1:29 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dcmd.1:15 ../scripts/dcontrol.pl:244 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:145 ../scripts/debcheckout.pl:68 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:52 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debsnap.1:26 ../scripts/debuild.1:219 ../scripts/dep3changelog.1:15 ../scripts/dget.pl:592 ../scripts/diff2patches.1:16 ../scripts/dpkg-depcheck.1:15 ../scripts/dscextract.1:14 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:24 ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:45 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:12 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/mk-origtargz.pl:62 ../scripts/nmudiff.1:21 ../scripts/origtargz.pl:95 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:249 ../scripts/sadt.pod:42 ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:91 ../scripts/transition-check.pl:42 ../scripts/uupdate.1:54 ../doc/what-patch.1:15 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/who-permits-upload.pl:57 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:35 #, no-wrap msgid "OPTIONS" msgstr "选项" @@ -89,18 +89,18 @@ msgstr "" #. type: TP -#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:254 ../scripts/dd-list.1:59 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:57 ../scripts/dget.pl:621 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:245 ../scripts/sadt.pod:59 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:34 +#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:256 ../scripts/dd-list.1:59 ../scripts/debcheckout.pl:96 ../scripts/debsnap.1:73 ../scripts/dget.pl:652 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:103 ../scripts/rmadison.pl:273 ../scripts/sadt.pod:59 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:36 #, no-wrap msgid "B<-h>, B<--help>" msgstr "B<-h>, B<--help>" #. type: Plain text -#: ../scripts/annotate-output.1:19 ../scripts/debchange.1:389 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/dep3changelog.1:19 ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47 +#: ../scripts/annotate-output.1:19 ../scripts/debchange.1:389 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/dep3changelog.1:19 ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:104 ../scripts/who-uploads.1:47 msgid "Display a help message and exit successfully." msgstr "显示一条帮助信息并成功退出。" #. type: SH -#: ../scripts/annotate-output.1:20 ../scripts/dscextract.1:30 ../scripts/uscan.1:348 +#: ../scripts/annotate-output.1:20 ../scripts/dscextract.1:30 #, no-wrap msgid "EXAMPLE" msgstr "示例" @@ -126,7 +126,7 @@ "21:43:19 I: Finished with exitcode 2\n" #. type: SH -#: ../scripts/annotate-output.1:32 ../scripts/debsnap.1:136 ../scripts/rc-alert.1:119 ../scripts/whodepends.1:17 +#: ../scripts/annotate-output.1:32 ../scripts/debsnap.1:152 ../scripts/rc-alert.1:119 ../scripts/whodepends.1:17 #, no-wrap msgid "BUGS" msgstr "缺陷" @@ -159,7 +159,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4113 ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:379 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:107 ../scripts/dcontrol.pl:287 ../scripts/debc.1:115 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:228 ../scripts/debclean.1:107 ../scripts/debcommit.pl:912 ../scripts/debdiff.1:217 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:410 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:683 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:75 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/mk-origtargz.pl:143 ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:157 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:332 ../scripts/sadt.pod:69 ../scripts/tagpending.pl:148 ../scripts/uscan.1:585 ../scripts/uupdate.1:170 ../doc/what-patch.1:35 ../scripts/who-permits-upload.pl:161 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 +#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4179 ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:379 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:107 ../scripts/dcontrol.pl:289 ../scripts/debc.1:115 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:231 ../scripts/debclean.1:107 ../scripts/debcommit.pl:911 ../scripts/debdiff.1:234 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:134 ../scripts/debuild.1:410 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:714 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:75 ../scripts/grep-excuses.1:45 ../scripts/list-unreleased.1:19 ../scripts/mk-origtargz.pl:181 ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:157 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:370 ../scripts/sadt.pod:69 ../scripts/tagpending.pl:146 ../scripts/uscan.pl:1672 ../scripts/uupdate.1:189 ../doc/what-patch.1:35 ../scripts/who-permits-upload.pl:162 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:26 ../scripts/devscripts.conf.5:54 #, no-wrap msgid "SEE ALSO" msgstr "参见" @@ -184,7 +184,7 @@ msgstr "本程序是由社区支持（这意味着：您需要自己修补软件缺陷）。欢迎打补丁和提供反馈（正面或负面的）。" #. type: SH -#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:344 ../scripts/checkbashisms.1:65 ../scripts/cowpoke.1:385 ../scripts/cvs-debc.1:63 ../scripts/cvs-debi.1:67 ../scripts/cvs-debrelease.1:68 ../scripts/cvs-debuild.1:58 ../scripts/dcmd.1:110 ../scripts/dcontrol.pl:280 ../scripts/dd-list.1:100 ../scripts/debc.1:119 ../scripts/debchange.1:475 ../scripts/debcheckout.pl:233 ../scripts/debclean.1:110 ../scripts/debcommit.pl:908 ../scripts/debdiff.1:224 ../scripts/debi.1:135 ../scripts/debpkg.1:23 ../scripts/debrelease.1:136 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:70 ../scripts/debsign.1:145 ../scripts/debuild.1:422 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:675 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:79 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:40 ../scripts/licensecheck.pl:129 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:522 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:94 ../scripts/mk-origtargz.pl:147 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:112 ../scripts/origtargz.pl:161 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:336 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.1:591 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/who-permits-upload.pl:156 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58 +#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:515 ../scripts/checkbashisms.1:65 ../scripts/cowpoke.1:385 ../scripts/cvs-debc.1:63 ../scripts/cvs-debi.1:67 ../scripts/cvs-debrelease.1:68 ../scripts/cvs-debuild.1:58 ../scripts/dcmd.1:110 ../scripts/dcontrol.pl:282 ../scripts/dd-list.1:106 ../scripts/debc.1:119 ../scripts/debchange.1:475 ../scripts/debcheckout.pl:236 ../scripts/debclean.1:110 ../scripts/debcommit.pl:907 ../scripts/debdiff.1:241 ../scripts/debi.1:135 ../scripts/debpkg.1:23 ../scripts/debrelease.1:136 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:70 ../scripts/debsign.1:146 ../scripts/debuild.1:422 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:706 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:80 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:47 ../scripts/licensecheck.pl:152 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:28 ../scripts/mass-bug.pl:523 ../scripts/mergechanges.1:28 ../scripts/mk-build-deps.pl:118 ../scripts/mk-origtargz.pl:185 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:112 ../scripts/origtargz.pl:161 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:374 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.pl:1676 ../scripts/uupdate.1:196 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/who-permits-upload.pl:157 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:36 ../scripts/devscripts.conf.5:58 #, no-wrap msgid "AUTHOR" msgstr "作者" @@ -304,14 +304,14 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:188 +#: ../scripts/bts.pl:193 msgid "" "B [I] I [I] [B<#>I] [B<.>|B<,> " "I [I] [B<#>I]] ..." msgstr "" #. type: textblock -#: ../scripts/bts.pl:192 +#: ../scripts/bts.pl:197 msgid "" "This is a command line interface to the Debian Bug Tracking System (BTS), " "intended mainly for use by developers. It lets the BTS be manipulated using " @@ -322,7 +322,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:200 +#: ../scripts/bts.pl:205 msgid "" "In general, the command line interface is the same as what you would write " "in a mail to control@bugs.debian.org, just prefixed with \"bts\". For " @@ -330,7 +330,7 @@ msgstr "" #. type: verbatim -#: ../scripts/bts.pl:204 +#: ../scripts/bts.pl:209 #, no-wrap msgid "" " % bts severity 69042 normal\n" @@ -340,7 +340,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:208 +#: ../scripts/bts.pl:213 msgid "" "A few additional commands have been added for your convenience, and this " "program is less strict about what constitutes a valid bug number. For " @@ -350,7 +350,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:214 +#: ../scripts/bts.pl:219 msgid "" "Also, for your convenience, this program allows you to abbreviate commands " "to the shortest unique substring (similar to how cvs lets you abbreviate " @@ -358,7 +358,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:218 +#: ../scripts/bts.pl:223 msgid "" "It is also possible to include a comment in the mail sent to the BTS. If " "your shell does not strip out the comment in a command like \"bts severity " @@ -370,7 +370,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:226 +#: ../scripts/bts.pl:231 msgid "" "You can specify multiple commands by separating them with a single dot, " "rather like B; a single comma may also be used; all the " @@ -380,7 +380,7 @@ msgstr "" #. type: verbatim -#: ../scripts/bts.pl:232 +#: ../scripts/bts.pl:237 #, no-wrap msgid "" " % bts severity 95672 normal , merge 95672 95673 \\#they are the same!\n" @@ -388,14 +388,14 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:234 +#: ../scripts/bts.pl:239 msgid "" "The abbreviation \"it\" may be used to refer to the last mentioned bug " "number, so you could write:" msgstr "" #. type: verbatim -#: ../scripts/bts.pl:237 +#: ../scripts/bts.pl:242 #, no-wrap msgid "" " % bts severity 95672 wishlist , retitle it \"bts: please add a --foo " @@ -404,26 +404,26 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:239 +#: ../scripts/bts.pl:244 msgid "" "Please use this program responsibly, and do take our users into " "consideration." msgstr "" #. type: textblock -#: ../scripts/bts.pl:244 +#: ../scripts/bts.pl:249 msgid "" "B examines the B configuration files as described below. " "Command line options override the configuration file settings, though." msgstr "" #. type: =item -#: ../scripts/bts.pl:250 +#: ../scripts/bts.pl:255 msgid "B<-o>, B<--offline>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:252 +#: ../scripts/bts.pl:257 msgid "" "Make B use cached bugs for the B and B commands, if a cache " "is available for the requested data. See the B command, below for " @@ -431,46 +431,46 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:256 +#: ../scripts/bts.pl:261 msgid "B<--online>, B<--no-offline>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:258 +#: ../scripts/bts.pl:263 msgid "" "Opposite of B<--offline>; overrides any configuration file directive to work " "offline." msgstr "" #. type: =item -#: ../scripts/bts.pl:261 +#: ../scripts/bts.pl:266 msgid "B<-n>, B<--no-action>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:263 +#: ../scripts/bts.pl:268 msgid "Do not send emails but print them to standard output." msgstr "不发送邮件而是打印到标准输出" #. type: =item -#: ../scripts/bts.pl:265 +#: ../scripts/bts.pl:270 msgid "B<--cache>, B<--no-cache>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:267 +#: ../scripts/bts.pl:272 msgid "" "Should we attempt to cache new versions of BTS pages when performing " "B/B commands? Default is to cache." msgstr "" #. type: =item -#: ../scripts/bts.pl:270 +#: ../scripts/bts.pl:275 msgid "B<--cache-mode=>{B|B|B}" msgstr "" #. type: textblock -#: ../scripts/bts.pl:272 +#: ../scripts/bts.pl:277 msgid "" "When running a B command, should we only mirror the basic bug " "(B), or should we also mirror the mbox version (B), or should we " @@ -479,36 +479,36 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:278 +#: ../scripts/bts.pl:283 msgid "B<--cache-delay=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:280 +#: ../scripts/bts.pl:285 msgid "" "Time in seconds to delay between each download, to avoid hammering the BTS " "web server. Default is 5 seconds." msgstr "" #. type: =item -#: ../scripts/bts.pl:283 +#: ../scripts/bts.pl:288 msgid "B<--mbox>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:285 +#: ../scripts/bts.pl:290 msgid "" "Open a mail reader to read the mbox corresponding to a given bug number for " "B and B commands." msgstr "" #. type: =item -#: ../scripts/bts.pl:288 +#: ../scripts/bts.pl:293 msgid "B<--mailreader=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:290 +#: ../scripts/bts.pl:295 msgid "" "Specify the command to read the mbox. Must contain a \"B<%s>\" string " "(unquoted!), which will be replaced by the name of the mbox file. The " @@ -518,24 +518,24 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:296 +#: ../scripts/bts.pl:301 msgid "B<--cc-addr=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:298 +#: ../scripts/bts.pl:303 msgid "" "Send carbon copies to a list of users. I should be a comma-" "separated list of email addresses." msgstr "" #. type: =item -#: ../scripts/bts.pl:301 +#: ../scripts/bts.pl:306 msgid "B<--use-default-cc>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:303 +#: ../scripts/bts.pl:308 msgid "" "Add the addresses specified in the configuration file option " "B to the list specified using B<--cc-addr>. This is the " @@ -543,23 +543,23 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:307 +#: ../scripts/bts.pl:312 msgid "B<--no-use-default-cc>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:309 +#: ../scripts/bts.pl:314 msgid "" "Do not add addresses specified in B to the carbon copy list." msgstr "" #. type: =item -#: ../scripts/bts.pl:312 ../scripts/mass-bug.pl:103 +#: ../scripts/bts.pl:317 ../scripts/mass-bug.pl:103 msgid "B<--sendmail=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:314 +#: ../scripts/bts.pl:319 msgid "" "Specify the B command. The command will be split on white space " "and will not be passed to a shell. Default is F. The " @@ -570,50 +570,50 @@ msgstr "" #. type: TP -#: ../scripts/bts.pl:321 ../scripts/nmudiff.1:31 +#: ../scripts/bts.pl:326 ../scripts/nmudiff.1:31 #, no-wrap msgid "B<--mutt>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:323 +#: ../scripts/bts.pl:328 msgid "" "Use B for sending of mails. Default is not to use B, except for " "some commands." msgstr "" #. type: textblock -#: ../scripts/bts.pl:326 +#: ../scripts/bts.pl:331 msgid "" "Note that one of B<$DEBEMAIL> or B<$EMAIL> must be set in the environment in " "order to use B to send emails." msgstr "" #. type: TP -#: ../scripts/bts.pl:329 ../scripts/nmudiff.1:36 +#: ../scripts/bts.pl:334 ../scripts/nmudiff.1:36 #, no-wrap msgid "B<--no-mutt>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:331 +#: ../scripts/bts.pl:336 msgid "Don't use B for sending of mails." msgstr "" #. type: =item -#: ../scripts/bts.pl:333 +#: ../scripts/bts.pl:342 msgid "B<--smtp-host=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:335 +#: ../scripts/bts.pl:344 msgid "" "Specify an SMTP host. If given, B will send mail by talking directly " "to this SMTP host rather than by invoking a B command." msgstr "" #. type: textblock -#: ../scripts/bts.pl:338 +#: ../scripts/bts.pl:347 msgid "" "The host name may be followed by a colon (\":\") and a port number in order " "to use a port other than the default. It may also begin with \"ssmtp://\" " @@ -621,14 +621,14 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:342 +#: ../scripts/bts.pl:351 msgid "" "Note that one of B<$DEBEMAIL> or B<$EMAIL> must be set in the environment in " "order to use direct SMTP connections to send emails." msgstr "" #. type: textblock -#: ../scripts/bts.pl:345 +#: ../scripts/bts.pl:354 msgid "" "Note that when sending directly via an SMTP host, specifying addresses in B<-" "-cc-addr> or B that the SMTP host will not relay will cause " @@ -636,7 +636,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:349 +#: ../scripts/bts.pl:358 msgid "" "Note also that the use of the B command may, when either B<--" "interactive> or B<--force-interactive> mode is enabled, lead to the " @@ -648,12 +648,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:356 +#: ../scripts/bts.pl:365 msgid "B<--smtp-username=>I, B<--smtp-password=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:358 +#: ../scripts/bts.pl:367 msgid "" "Specify the credentials to use when connecting to the SMTP server specified " "by B<--smtp-host>. If the server does not require authentication then these " @@ -661,48 +661,48 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:362 +#: ../scripts/bts.pl:371 msgid "" "If a username is specified but not a password, B will prompt for the " "password before sending the mail." msgstr "" #. type: =item -#: ../scripts/bts.pl:365 +#: ../scripts/bts.pl:374 msgid "B<--smtp-helo=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:367 +#: ../scripts/bts.pl:376 msgid "" "Specify the name to use in the I command when connecting to the SMTP " "server; defaults to the contents of the file F, if it exists." msgstr "" #. type: textblock -#: ../scripts/bts.pl:371 +#: ../scripts/bts.pl:380 msgid "" "Note that some SMTP servers may reject the use of a I which either " "does not resolve or does not appear to belong to the host using it." msgstr "" #. type: =item -#: ../scripts/bts.pl:374 +#: ../scripts/bts.pl:383 msgid "B<--bts-server>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:376 +#: ../scripts/bts.pl:375 msgid "Use a debbugs server other than bugs.debian.org." msgstr "" #. type: =item -#: ../scripts/bts.pl:378 +#: ../scripts/bts.pl:387 msgid "B<-f>, B<--force-refresh>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:380 +#: ../scripts/bts.pl:389 msgid "" "Download a bug report again, even if it does not appear to have changed " "since the last B command. Useful if a B<--cache-mode=full> is " @@ -711,116 +711,116 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:386 +#: ../scripts/bts.pl:395 msgid "B<--no-force-refresh>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:388 +#: ../scripts/bts.pl:397 msgid "Suppress any configuration file B<--force-refresh> option." msgstr "" #. type: =item -#: ../scripts/bts.pl:390 +#: ../scripts/bts.pl:399 msgid "B<--only-new>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:392 +#: ../scripts/bts.pl:401 msgid "" "Download only new bugs when caching. Do not check for updates in bugs we " "already have." msgstr "" #. type: =item -#: ../scripts/bts.pl:395 +#: ../scripts/bts.pl:404 msgid "B<--include-resolved>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:397 +#: ../scripts/bts.pl:406 msgid "" "When caching bug reports, include those that are marked as resolved. This " "is the default behaviour." msgstr "" #. type: =item -#: ../scripts/bts.pl:400 +#: ../scripts/bts.pl:409 msgid "B<--no-include-resolved>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:402 +#: ../scripts/bts.pl:411 msgid "" "Reverse the behaviour of the previous option. That is, do not cache bugs " "that are marked as resolved." msgstr "" #. type: =item -#: ../scripts/bts.pl:405 +#: ../scripts/bts.pl:414 msgid "B<--no-ack>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:407 +#: ../scripts/bts.pl:416 msgid "" "Suppress acknowledgment mails from the BTS. Note that this will only affect " "the copies of messages CCed to bugs, not those sent to the control bot." msgstr "" #. type: =item -#: ../scripts/bts.pl:411 +#: ../scripts/bts.pl:420 msgid "B<--ack>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:413 +#: ../scripts/bts.pl:422 msgid "" "Do not suppress acknowledgement mails. This is the default behaviour." msgstr "" #. type: =item -#: ../scripts/bts.pl:415 ../scripts/tagpending.pl:135 +#: ../scripts/bts.pl:424 ../scripts/tagpending.pl:133 msgid "B<-i>, B<--interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:417 +#: ../scripts/bts.pl:426 msgid "" "Before sending an e-mail to the control bot, display the content and allow " "it to be edited, or the sending cancelled." msgstr "" #. type: =item -#: ../scripts/bts.pl:420 +#: ../scripts/bts.pl:429 msgid "B<--force-interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:422 +#: ../scripts/bts.pl:431 msgid "" "Similar to B<--interactive>, with the exception that an editor is spawned " "before prompting for confirmation of the message to be sent." msgstr "" #. type: =item -#: ../scripts/bts.pl:425 +#: ../scripts/bts.pl:434 msgid "B<--no-interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:427 +#: ../scripts/bts.pl:436 msgid "" "Send control e-mails without confirmation. This is the default behaviour." msgstr "" #. type: =item -#: ../scripts/bts.pl:429 ../scripts/dget.pl:576 +#: ../scripts/bts.pl:438 ../scripts/dget.pl:607 msgid "B<-q>, B<--quiet>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:431 +#: ../scripts/bts.pl:440 msgid "" "When running B, only display information about newly cached " "pages, not messages saying already cached. If this option is specified " @@ -828,20 +828,20 @@ msgstr "" #. type: TP -#: ../scripts/bts.pl:435 ../scripts/cvs-debrelease.1:57 ../scripts/cvs-debuild.1:38 ../scripts/debc.1:85 ../scripts/debchange.1:377 ../scripts/debclean.1:77 ../scripts/debdiff.1:153 ../scripts/debi.1:102 ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:221 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:89 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:284 ../scripts/uscan.1:483 ../scripts/uupdate.1:78 ../scripts/who-uploads.1:40 +#: ../scripts/bts.pl:444 ../scripts/cvs-debrelease.1:57 ../scripts/cvs-debuild.1:38 ../scripts/debc.1:85 ../scripts/debchange.1:377 ../scripts/debclean.1:77 ../scripts/debdiff.1:154 ../scripts/debi.1:102 ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:221 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:15 ../scripts/licensecheck.pl:112 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:312 ../scripts/uscan.pl:1212 ../scripts/uupdate.1:56 ../scripts/who-uploads.1:40 #, no-wrap msgid "B<--no-conf>, B<--noconf>" msgstr "" #. type: Plain text -#: ../scripts/bts.pl:437 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:89 ../scripts/debchange.1:381 ../scripts/debclean.1:81 ../scripts/debdiff.1:157 ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/debuild.1:225 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uscan.1:487 ../scripts/uupdate.1:82 ../scripts/who-uploads.1:44 +#: ../scripts/bts.pl:446 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:89 ../scripts/debchange.1:381 ../scripts/debclean.1:81 ../scripts/debdiff.1:158 ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/debuild.1:225 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:19 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uupdate.1:60 ../scripts/who-uploads.1:44 msgid "" "Do not read any configuration files. This can only be used as the first " "option given on the command-line." msgstr "" #. type: =head1 -#: ../scripts/bts.pl:791 ../scripts/chdist.pl:55 +#: ../scripts/bts.pl:802 ../scripts/chdist.pl:55 msgid "COMMANDS" msgstr "" @@ -853,71 +853,71 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:798 +#: ../scripts/bts.pl:809 msgid "" "B [I] [I | I | I | B<:> ] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:800 +#: ../scripts/bts.pl:811 msgid "" "B [I] [BI | BI] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:802 +#: ../scripts/bts.pl:813 msgid "" "B [I] [BI | BI ] [IB<=>I " "...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:804 +#: ../scripts/bts.pl:815 msgid "B [B | B... | B]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:806 +#: ../scripts/bts.pl:817 msgid "This is a synonym for B." msgstr "" #. type: =item -#: ../scripts/bts.pl:814 +#: ../scripts/bts.pl:825 msgid "" "B [I] [I | I | I | B<:> ] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:816 +#: ../scripts/bts.pl:827 msgid "" "B [I] [BI | BI] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:818 +#: ../scripts/bts.pl:829 msgid "" "B [I] [BI | BI ] [IB<=>I " "...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:820 +#: ../scripts/bts.pl:831 msgid "B [B | B... | B]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:822 +#: ../scripts/bts.pl:833 msgid "" "Display the page listing the requested bugs in a web browser using sensible-" "browser(1)." msgstr "" #. type: textblock -#: ../scripts/bts.pl:825 +#: ../scripts/bts.pl:836 msgid "" "Options may be specified after the B command in addition to or instead " "of options at the start of the command line: recognised options at this " @@ -928,17 +928,17 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:832 +#: ../scripts/bts.pl:843 msgid "The meanings of the possible arguments are as follows:" msgstr "" #. type: =item -#: ../scripts/bts.pl:836 +#: ../scripts/bts.pl:847 msgid "(none)" msgstr "" #. type: textblock -#: ../scripts/bts.pl:838 +#: ../scripts/bts.pl:849 msgid "" "If nothing is specified, B will display your bugs, assuming that " "either B or B (examined in that order) is set to the " @@ -946,72 +946,72 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:842 +#: ../scripts/bts.pl:853 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:844 +#: ../scripts/bts.pl:855 msgid "Display bug number I." msgstr "" #. type: =item -#: ../scripts/bts.pl:846 +#: ../scripts/bts.pl:857 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:848 +#: ../scripts/bts.pl:859 msgid "Display the bugs for the package I." msgstr "" #. type: =item -#: ../scripts/bts.pl:850 +#: ../scripts/bts.pl:861 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:852 +#: ../scripts/bts.pl:863 msgid "Display the bugs for the source package I." msgstr "" #. type: =item -#: ../scripts/bts.pl:854 +#: ../scripts/bts.pl:865 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:856 +#: ../scripts/bts.pl:867 msgid "Display the bugs for the maintainer email address I." msgstr "" #. type: =item -#: ../scripts/bts.pl:858 +#: ../scripts/bts.pl:869 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:860 +#: ../scripts/bts.pl:871 msgid "Display the bugs for the submitter email address I." msgstr "" #. type: =item -#: ../scripts/bts.pl:862 +#: ../scripts/bts.pl:873 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:864 +#: ../scripts/bts.pl:875 msgid "Display the bugs which are tagged with I." msgstr "" #. type: =item -#: ../scripts/bts.pl:866 +#: ../scripts/bts.pl:877 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:868 +#: ../scripts/bts.pl:879 msgid "" "Display the bugs which are tagged with usertag I. See the BTS " "documentation for more information on usertags. This will require the use " @@ -1019,7 +1019,7 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:872 +#: ../scripts/bts.pl:883 msgid "B<:>" msgstr "" @@ -1032,7 +1032,7 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:879 +#: ../scripts/bts.pl:890 msgid "B, B" msgstr "" @@ -1046,7 +1046,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:888 +#: ../scripts/bts.pl:899 msgid "" "After the argument specifying what to display, you can optionally specify " "options to use to format the page or change what it displayed. These are " @@ -1057,7 +1057,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:895 +#: ../scripts/bts.pl:906 msgid "" "If caching has been enabled (that is, B<--no-cache> has not been used, and " "B has not been set to B), then any page requested by B commands following this on the command line will be " "executed after the browser has been exited." msgstr "" #. type: textblock -#: ../scripts/bts.pl:909 +#: ../scripts/bts.pl:920 msgid "" "The desired browser can be specified and configured by setting the " "B environment variable. The conventions follow those defined by " @@ -1088,7 +1088,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:914 +#: ../scripts/bts.pl:925 msgid "" "The value of B may consist of a colon-separated series of browser " "command parts. These should be tried in order until one succeeds. Each " @@ -1099,7 +1099,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:922 +#: ../scripts/bts.pl:933 msgid "" "Rationale: We need to be able to specify multiple browser commands so " "programs obeying this convention can do the right thing in either X or " @@ -1111,161 +1111,161 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:930 +#: ../scripts/bts.pl:941 msgid "For example, on most Linux systems a good thing to do would be:" msgstr "" #. type: textblock -#: ../scripts/bts.pl:932 +#: ../scripts/bts.pl:943 msgid "BROWSER='mozilla -raise -remote \"openURL(%s,new-window)\":links'" msgstr "" #. type: =item -#: ../scripts/bts.pl:1007 +#: ../scripts/bts.pl:1018 msgid "B