Binary files /tmp/G2rwNhauRw/language-pack-zh-hans-base-14.04+20150219/data/extra.tar and /tmp/X4rMYBlx0a/language-pack-zh-hans-base-14.04+20150804/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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/acl.po 2015-08-14 07:52:27.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: 2015-08-04 06:20+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/adduser.po 2015-08-14 07:52:19.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: 2015-08-04 05:27+0000\n" +"X-Generator: Launchpad (build 17656)\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" @@ -369,44 +369,44 @@ "option to relax this check or reconfigure NAME_REGEX.\n" msgstr "" -#: ../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 +415,7 @@ "adduser 版本 %s\n" "\n" -#: ../adduser:1004 +#: ../adduser:1050 msgid "" "Adds a user or group to the system.\n" " \n" @@ -431,7 +431,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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/alsa-utils.po 2015-08-14 07:52:19.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: 2015-08-04 05:28+0000\n" +"X-Generator: Launchpad (build 17656)\n" #: alsamixer/card_select.c:126 alsamixer/device_name.c:126 msgid "Sound Card" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apparmorapplet.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2015-08-14 07:52:39.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: 2015-08-04 07:36+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/apparmor-parser.po 2015-08-14 07:52:39.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: 2015-08-04 07:36+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/app-install-data.po 2015-08-14 07:52:39.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: 2015-08-04 07:41+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: zh_CN\n" #: ../menu-data-additional/7zip.desktop.in.h:1 diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apport.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/apport.po 2015-08-14 07:52:37.000000000 +0000 @@ -7,233 +7,431 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-07 15:59+0000\n" +"POT-Creation-Date: 2015-05-15 17:56+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: 2015-08-04 07:25+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: zh_CN\n" -#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/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 -msgid "specify the log file name produced by valgrind" -msgstr "请指定 valgrind 生成的日志文件名" - -#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/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 -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 -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 -msgid "" -"report download/install progress when installing packages into sandbox" -msgstr "安装包进入沙盒时报告下载/安装进度" - -#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/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 -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 -#, 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 "请输入您的密码以查看系统程序问题报告。" - -#: ../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 +#: ../gtk/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-kde.py:468 +#: ../debian/tmp/usr/share/apport/apport-kde.py:503 +#: ../debian/tmp/usr/share/apport/apport-kde.py:522 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 msgid "Apport" msgstr "Apport" -#: ../gtk/apport-gtk.ui.h:2 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 +#: ../gtk/apport-gtk.ui.h:4 ../debian/tmp/usr/share/apport/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 +#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/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 +#: ../gtk/apport-gtk.ui.h:6 ../kde/apport-kde.py:240 ../gtk/apport-gtk.py:300 +#: ../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 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 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 +#: ../gtk/apport-gtk.ui.h:7 ../debian/tmp/usr/share/apport/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 +#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/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 +#: ../gtk/apport-gtk.ui.h:9 ../kde/apport-kde.py:291 ../gtk/apport-gtk.py:204 +#: ../gtk/apport-gtk.py:573 ../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 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 msgid "Show Details" msgstr "显示详细信息" -#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 +#: ../gtk/apport-gtk.ui.h:10 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 msgid "_Examine locally" msgstr "本地检查(_E)" -#: ../gtk/apport-gtk.ui.h:9 ../kde/apport-kde.py:220 +#: ../gtk/apport-gtk.ui.h:11 ../kde/apport-kde.py:233 ../gtk/apport-gtk.py:287 +#: ../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 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 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 +#: ../gtk/apport-gtk.ui.h:12 ../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-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 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 msgid "Continue" msgstr "继续" -#: ../gtk/apport-gtk.ui.h:11 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 +#: ../gtk/apport-gtk.ui.h:13 ../debian/tmp/usr/share/apport/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 +#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/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 +#: ../gtk/apport-gtk.ui.h:15 ../debian/tmp/usr/bin/apport-cli.py:251 +#: ../kde/apport-kde.py:434 ../bin/apport-cli.py:251 +#: ../debian/tmp/usr/share/apport/apport-kde.py:434 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 msgid "Uploading problem information" msgstr "上传问题信息" -#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 +#: ../gtk/apport-gtk.ui.h:16 ../debian/tmp/usr/share/apport/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 +#: ../gtk/apport-gtk.ui.h:17 ../kde/apport-kde.py:435 +#: ../debian/tmp/usr/share/apport/apport-kde.py:435 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 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 +#: ../data/apportcheckresume.py:73 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:73 +msgid "" +"This occured during a previous suspend and prevented it from resuming " +"properly." +msgstr "这是在上一个挂起中发生的，并阻止了它正确地恢复。" + +#: ../data/apportcheckresume.py:75 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75 +msgid "" +"This occured during a previous hibernate and prevented it from resuming " +"properly." +msgstr "这是在上一个休眠中发生的，并阻止了它正确地恢复。" + +#: ../data/apportcheckresume.py:80 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:80 +msgid "" +"The resume processing hung very near the end and will have appeared to have " +"completed normally." +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:" +msgstr "您想做什么？您的选择是：" + +#: ../debian/tmp/usr/bin/apport-cli.py:85 ../bin/apport-cli.py:85 #, python-format -msgid "Usage: %s " -msgstr "用法：%s <报告> <目标目录>" +msgid "Please choose (%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/bin/apport-cli.py:148 ../bin/apport-cli.py:148 +#, python-format +msgid "(%i bytes)" +msgstr "(%i 字节)" + +#: ../debian/tmp/usr/bin/apport-cli.py:150 ../kde/apport-kde.py:362 +#: ../bin/apport-cli.py:150 ../gtk/apport-gtk.py:142 +#: ../debian/tmp/usr/share/apport/apport-kde.py:362 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:142 +msgid "(binary data)" +msgstr "(二进制数据)" + +#: ../debian/tmp/usr/bin/apport-cli.py:178 ../kde/apport-kde.py:185 +#: ../bin/apport-cli.py:178 ../gtk/apport-gtk.py:177 +#: ../debian/tmp/usr/share/apport/apport-kde.py:185 +#: ../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" +"automatically opened web browser." +msgstr "" +"当问题报告被发出之后，请填写\n" +"自动弹出窗口的表格。" + +#: ../debian/tmp/usr/bin/apport-cli.py:182 ../bin/apport-cli.py:182 +#, python-format +msgid "&Send report (%s)" +msgstr "发送报告(&S)(%s)" + +#: ../debian/tmp/usr/bin/apport-cli.py:186 ../bin/apport-cli.py:186 +msgid "&Examine locally" +msgstr "本地检查(&E)" + +#: ../debian/tmp/usr/bin/apport-cli.py:190 ../bin/apport-cli.py:190 +msgid "&View report" +msgstr "查看报告(&V)" + +#: ../debian/tmp/usr/bin/apport-cli.py:191 ../bin/apport-cli.py:191 +msgid "&Keep report file for sending later or copying to somewhere else" +msgstr "保存报告文件以便稍后发送或者复制到其他地方(&K)" + +#: ../debian/tmp/usr/bin/apport-cli.py:192 ../bin/apport-cli.py:192 +msgid "Cancel and &ignore future crashes of this program version" +msgstr "终止并忽略这个版本软件以后出现的崩溃(&I)" + +#: ../debian/tmp/usr/bin/apport-cli.py:194 +#: ../debian/tmp/usr/bin/apport-cli.py:271 +#: ../debian/tmp/usr/bin/apport-cli.py:303 +#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:194 +#: ../bin/apport-cli.py:271 ../bin/apport-cli.py:303 ../bin/apport-cli.py:324 +msgid "&Cancel" +msgstr "取消(&C)" + +#: ../debian/tmp/usr/bin/apport-cli.py:222 ../bin/apport-cli.py:222 +msgid "Problem report file:" +msgstr "问题报告文件：" + +#: ../debian/tmp/usr/bin/apport-cli.py:228 +#: ../debian/tmp/usr/bin/apport-cli.py:233 ../bin/apport-cli.py:228 +#: ../bin/apport-cli.py:233 +msgid "&Confirm" +msgstr "确认(&C)" + +#: ../debian/tmp/usr/bin/apport-cli.py:232 ../bin/apport-cli.py:232 +#, python-format +msgid "Error: %s" +msgstr "错误：%s" + +#: ../debian/tmp/usr/bin/apport-cli.py:238 ../kde/apport-kde.py:406 +#: ../bin/apport-cli.py:238 ../debian/tmp/usr/share/apport/apport-kde.py:406 +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" +"application. This might take a few minutes." +msgstr "" +"收集到的信息将会传送到开发人员处以改进软件。\n" +"这可能会花费几分钟时间，" + +#: ../debian/tmp/usr/bin/apport-cli.py:252 ../bin/apport-cli.py:252 +msgid "" +"The collected information is being sent to the bug tracking system.\n" +"This might take a few minutes." +msgstr "" +"收集到的信息正在被发送到错误跟踪系统。\n" +"这可能要花费几分钟时间。" + +#: ../debian/tmp/usr/bin/apport-cli.py:302 ../bin/apport-cli.py:302 +msgid "&Done" +msgstr "完成(&D)" + +#: ../debian/tmp/usr/bin/apport-cli.py:308 ../bin/apport-cli.py:308 +msgid "none" +msgstr "无" + +#: ../debian/tmp/usr/bin/apport-cli.py:309 ../bin/apport-cli.py:309 +#, python-format +msgid "Selected: %s. Multiple choices:" +msgstr "已选择：%s。 多重选择：" + +#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325 +msgid "Choices:" +msgstr "选择：" + +#: ../debian/tmp/usr/bin/apport-cli.py:339 ../bin/apport-cli.py:339 +msgid "Path to file (Enter to cancel):" +msgstr "文件的路径(回车取消)：" + +#: ../debian/tmp/usr/bin/apport-cli.py:345 ../bin/apport-cli.py:345 +msgid "File does not exist." +msgstr "文件不存在。" + +#: ../debian/tmp/usr/bin/apport-cli.py:347 ../bin/apport-cli.py:347 +msgid "This is a directory." +msgstr "这是一个目录。" + +#: ../debian/tmp/usr/bin/apport-cli.py:353 ../bin/apport-cli.py:353 +msgid "To continue, you must visit the following URL:" +msgstr "要继续，您必须访问下面这个网址：" + +#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355 +msgid "" +"You can launch a browser now, or copy this URL into a browser on another " +"computer." +msgstr "您现在可以启动一个浏览器，或者复制这个网址到另外一个电脑的浏览器。" + +#: ../debian/tmp/usr/bin/apport-cli.py:357 ../bin/apport-cli.py:357 +msgid "Launch a browser now" +msgstr "现在启动一个浏览器" + +#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371 +msgid "No pending crash reports. Try --help for more information." +msgstr "没有已知的崩溃报告，尝试 --help 以获得更多信息。" + +#: ../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 "发送" + +#: ../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: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" -#: ../debian/tmp/usr/share/apport/kernel_oops.py:30 ../data/kernel_oops.py:30 +#: ../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 "对不起，安装软件时出现问题。" + +#: ../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: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 "重新启动程序" + +#: ../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 "上传问题信息" + +#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/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 +msgid "specify the log file name produced by valgrind" +msgstr "请指定 valgrind 生成的日志文件名" + +#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/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 +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 +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 +msgid "" +"report download/install progress when installing packages into sandbox" +msgstr "安装包进入沙盒时报告下载/安装进度" + +#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/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 ../bin/apport-retrace.py:61 +#: ../debian/tmp/usr/bin/apport-retrace.py:61 +#: ../debian/tmp/usr/bin/apport-valgrind.py:66 +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 +#, python-format +msgid "Error: %s is not an executable. Stopping." +msgstr "错误：%s 不是可执行文件，停止。" + +#: ../kde/apport-kde-mimelnk.desktop.in.h:1 +msgid "Apport crash file" +msgstr "Apport 崩溃文件" + +#: ../data/kernel_oops.py:30 ../debian/tmp/usr/share/apport/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 +#: ../kde/apport-kde-mime.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 +#: ../gtk/apport-gtk.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 +#: ../kde/apport-kde-mime.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2 +#: ../gtk/apport-gtk.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 msgid "This package does not seem to be installed correctly" @@ -271,9 +469,9 @@ msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "对不起，%s 程序异常退出" -#: ../apport/ui.py:272 ../apport/ui.py:1303 +#: ../apport/ui.py:272 ../apport/ui.py:1308 #: ../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:1308 #, python-format msgid "Problem in %s" msgstr "%s 中的问题" @@ -286,18 +484,16 @@ 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 +#: ../apport/ui.py:459 ../apport/ui.py:660 ../apport/ui.py:1114 +#: ../apport/ui.py:1280 ../apport/ui.py:1284 #: ../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:1114 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1280 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1284 msgid "Invalid problem report" msgstr "无效的问题报告" @@ -526,367 +722,176 @@ 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:888 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:888 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:889 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:889 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:890 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:890 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:892 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:892 #, 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:968 ../apport/ui.py:978 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:968 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:978 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:993 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:993 #, 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 +#: ../apport/ui.py:1040 ../apport/ui.py:1071 ../apport/ui.py:1286 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1040 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1071 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1286 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 +#: ../apport/ui.py:1043 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1043 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 +#: ../apport/ui.py:1046 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1046 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 +#: ../apport/ui.py:1115 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1115 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 +#: ../apport/ui.py:1133 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1133 msgid "Unable to start web browser" msgstr "无法打开浏览器" -#: ../apport/ui.py:1129 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1129 +#: ../apport/ui.py:1134 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1134 #, 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 +#: ../apport/ui.py:1234 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1234 #, 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 +#: ../apport/ui.py:1246 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1246 msgid "Network problem" msgstr "网络问题" -#: ../apport/ui.py:1243 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1243 -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 -msgid "Memory exhaustion" -msgstr "内存耗尽" - -#: ../apport/ui.py:1271 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1271 -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 -#, python-format -msgid "" -"The problem cannot be reported:\n" -"\n" -"%s" -msgstr "" -"无法报告问题：\n" -"\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 -msgid "Problem already known" -msgstr "该问题为已知问题" - -#: ../apport/ui.py:1363 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1363 +#: ../apport/ui.py:1248 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1248 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 -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 "您可以等待看它醒来，或关闭或重启它。" +"Cannot connect to crash database, please check your Internet connection." +msgstr "无法连接到崩溃数据库，请检查您的 Internet 连接。" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340 -msgid "Sorry, the application apport has stopped unexpectedly." -msgstr "对不起，应用程序已经意外停止。" +#: ../apport/ui.py:1275 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1275 +msgid "Memory exhaustion" +msgstr "内存耗尽" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357 -msgid "Sorry, apport has closed unexpectedly." -msgstr "对不起，Apport 意外关闭。" +#: ../apport/ui.py:1276 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1276 +msgid "Your system does not have enough memory to process this crash report." +msgstr "您的系统没有足够的内存来处理此崩溃报告。" -#: ../data/apportcheckresume.py:73 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:73 +#: ../apport/ui.py:1311 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1311 +#, python-format msgid "" -"This occured during a previous suspend and prevented it from resuming " -"properly." -msgstr "这是在上一个挂起中发生的，并阻止了它正确地恢复。" +"The problem cannot be reported:\n" +"\n" +"%s" +msgstr "" +"无法报告问题：\n" +"\n" +"%s" -#: ../data/apportcheckresume.py:75 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75 -msgid "" -"This occured during a previous hibernate and prevented it from resuming " -"properly." -msgstr "这是在上一个休眠中发生的，并阻止了它正确地恢复。" +#: ../apport/ui.py:1367 ../apport/ui.py:1374 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1367 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1374 +msgid "Problem already known" +msgstr "该问题为已知问题" -#: ../data/apportcheckresume.py:80 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:80 +#: ../apport/ui.py:1368 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1368 msgid "" -"The resume processing hung very near the end and will have appeared to have " -"completed normally." -msgstr "这个恢复过程已经非常接近尾声，将正常结束。" +"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:1375 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1375 +msgid "This problem was already reported to developers. Thank you!" +msgstr "已将此问题报告给开发人员。谢谢！" #: ../bin/apport-retrace.py:31 ../debian/tmp/usr/bin/apport-retrace.py:31 msgid "%prog [options] " msgstr "%prog [选项] " -#: ../bin/apport-retrace.py:33 ../debian/tmp/usr/bin/apport-retrace.py:33 +#: ../bin/apport-retrace.py:34 ../debian/tmp/usr/bin/apport-retrace.py:34 msgid "Do not put the new traces into the report, but write them to stdout." msgstr "不把新的痕迹写入到报告，但是把它们写入到标准输出。" -#: ../bin/apport-retrace.py:35 ../debian/tmp/usr/bin/apport-retrace.py:35 +#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/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 不重新生成报告)" -#: ../bin/apport-retrace.py:37 ../debian/tmp/usr/bin/apport-retrace.py:37 +#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38 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 +#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41 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 +#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 msgid "Override report's CoreFile" msgstr "覆盖报告核心文件" -#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 +#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 msgid "Override report's ExecutablePath" msgstr "覆盖报告执行路径" -#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 +#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 msgid "Override report's ProcMaps" msgstr "覆盖报告的进程表" -#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 +#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 msgid "Rebuild report's Package information" msgstr "重建报告的包信息" -#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 +#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/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 " @@ -898,39 +903,39 @@ "构建临时沙盒，以及下载/安装必要的软件包和调试符号；如果没有该选项，则会假设该系统中已安装了必要的软件包和调试符号。此参数指向该打包系统配置库目录；如果指" "定 \"system\"，则其将使用系统配置文件，但之后，其将只能够追溯当前正在运行的版本上发生的崩溃。" -#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51 +#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 msgid "" "Report download/install progress when installing packages into sandbox" msgstr "在将软件包安装到沙盒中时，报告下载和安装的进度" -#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 +#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 msgid "Prepend timestamps to log messages, for batch operation" msgstr "为进行批量操作，请预先设置时间戳，以记录消息" -#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 +#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57 msgid "Cache directory for packages downloaded in the sandbox" msgstr "下载到沙盒中软件包的缓存目录" -#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57 +#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59 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 +#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63 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 +#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-retrace.py:65 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 +#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67 msgid "" "Path to the duplicate sqlite database (default: no duplicate checking)" msgstr "SQLite 数据库路径重复(默认：不重复检查)" @@ -950,145 +955,113 @@ 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 +#: ../bin/apport-retrace.py:109 ../debian/tmp/usr/bin/apport-retrace.py:109 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:81 ../bin/apport-cli.py:81 -msgid "What would you like to do? Your options are:" -msgstr "您想做什么？您的选择是：" - -#: ../debian/tmp/usr/bin/apport-cli.py:85 ../bin/apport-cli.py:85 -#, python-format -msgid "Please choose (%s):" -msgstr "请选择(%s)：" - -#: ../debian/tmp/usr/bin/apport-cli.py:148 ../bin/apport-cli.py:148 -#, python-format -msgid "(%i bytes)" -msgstr "(%i 字节)" +#: ../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/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" -"automatically opened web browser." -msgstr "" -"当问题报告被发出之后，请填写\n" -"自动弹出窗口的表格。" +#: ../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 意外关闭。" -#: ../debian/tmp/usr/bin/apport-cli.py:182 ../bin/apport-cli.py:182 +#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22 #, python-format -msgid "&Send report (%s)" -msgstr "发送报告(&S)(%s)" - -#: ../debian/tmp/usr/bin/apport-cli.py:186 ../bin/apport-cli.py:186 -msgid "&Examine locally" -msgstr "本地检查(&E)" - -#: ../debian/tmp/usr/bin/apport-cli.py:190 ../bin/apport-cli.py:190 -msgid "&View report" -msgstr "查看报告(&V)" +msgid "Usage: %s " +msgstr "用法：%s <报告> <目标目录>" -#: ../debian/tmp/usr/bin/apport-cli.py:191 ../bin/apport-cli.py:191 -msgid "&Keep report file for sending later or copying to somewhere else" -msgstr "保存报告文件以便稍后发送或者复制到其他地方(&K)" +#: ../debian/tmp/usr/bin/apport-unpack.py:46 ../bin/apport-unpack.py:46 +msgid "Destination directory exists and is not empty." +msgstr "目标目录存在且不为空。" -#: ../debian/tmp/usr/bin/apport-cli.py:192 ../bin/apport-cli.py:192 -msgid "Cancel and &ignore future crashes of this program version" -msgstr "终止并忽略这个版本软件以后出现的崩溃(&I)" +#: ../apport/com.ubuntu.apport.policy.in.h:1 +msgid "Collect system information" +msgstr "收集系统信息" -#: ../debian/tmp/usr/bin/apport-cli.py:194 -#: ../debian/tmp/usr/bin/apport-cli.py:271 -#: ../debian/tmp/usr/bin/apport-cli.py:303 -#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:194 -#: ../bin/apport-cli.py:271 ../bin/apport-cli.py:303 ../bin/apport-cli.py:324 -msgid "&Cancel" -msgstr "取消(&C)" +#: ../apport/com.ubuntu.apport.policy.in.h:2 +msgid "" +"Authentication is required to collect system information for this problem " +"report" +msgstr "为此问题报告收集系统信息需要授权" -#: ../debian/tmp/usr/bin/apport-cli.py:222 ../bin/apport-cli.py:222 -msgid "Problem report file:" -msgstr "问题报告文件：" +#: ../apport/com.ubuntu.apport.policy.in.h:3 +msgid "System problem reports" +msgstr "系统问题报告" -#: ../debian/tmp/usr/bin/apport-cli.py:228 -#: ../debian/tmp/usr/bin/apport-cli.py:233 ../bin/apport-cli.py:228 -#: ../bin/apport-cli.py:233 -msgid "&Confirm" -msgstr "确认(&C)" +#: ../apport/com.ubuntu.apport.policy.in.h:4 +msgid "" +"Please enter your password to access problem reports of system programs" +msgstr "请输入您的密码以查看系统程序问题报告。" -#: ../debian/tmp/usr/bin/apport-cli.py:232 ../bin/apport-cli.py:232 +#: ../gtk/apport-gtk.py:157 ../debian/tmp/usr/share/apport/apport-gtk.py:157 #, python-format -msgid "Error: %s" -msgstr "错误：%s" - -#: ../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" -"application. This might take a few minutes." -msgstr "" -"收集到的信息将会传送到开发人员处以改进软件。\n" -"这可能会花费几分钟时间，" +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "对不起，应用程序 %s 意外停止。" -#: ../debian/tmp/usr/bin/apport-cli.py:252 ../bin/apport-cli.py:252 -msgid "" -"The collected information is being sent to the bug tracking system.\n" -"This might take a few minutes." -msgstr "" -"收集到的信息正在被发送到错误跟踪系统。\n" -"这可能要花费几分钟时间。" +#: ../gtk/apport-gtk.py:160 ../debian/tmp/usr/share/apport/apport-gtk.py:160 +#, python-format +msgid "Sorry, %s has closed unexpectedly." +msgstr "对不起，%s 已意外关闭。" -#: ../debian/tmp/usr/bin/apport-cli.py:302 ../bin/apport-cli.py:302 -msgid "&Done" -msgstr "完成(&D)" +#: ../gtk/apport-gtk.py:228 ../debian/tmp/usr/share/apport/apport-gtk.py:228 +msgid "Force Closed" +msgstr "强制关闭" -#: ../debian/tmp/usr/bin/apport-cli.py:308 ../bin/apport-cli.py:308 -msgid "none" -msgstr "无" +#: ../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 停止响应。" -#: ../debian/tmp/usr/bin/apport-cli.py:309 ../bin/apport-cli.py:309 +#: ../gtk/apport-gtk.py:242 ../debian/tmp/usr/share/apport/apport-gtk.py:242 #, python-format -msgid "Selected: %s. Multiple choices:" -msgstr "已选择：%s。 多重选择：" +msgid "The program \"%s\" has stopped responding." +msgstr "程序 %s 停止响应。" -#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325 -msgid "Choices:" -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 中的问题" -#: ../debian/tmp/usr/bin/apport-cli.py:339 ../bin/apport-cli.py:339 -msgid "Path to file (Enter to cancel):" -msgstr "文件的路径(回车取消)：" +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263 +msgid "The application Apport has stopped responding." +msgstr "应用程序 Apport 停止响应。" -#: ../debian/tmp/usr/bin/apport-cli.py:345 ../bin/apport-cli.py:345 -msgid "File does not exist." -msgstr "文件不存在。" +#: ../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/bin/apport-cli.py:347 ../bin/apport-cli.py:347 -msgid "This is a directory." -msgstr "这是一个目录。" +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340 +msgid "Sorry, the application apport has stopped unexpectedly." +msgstr "对不起，应用程序已经意外停止。" -#: ../debian/tmp/usr/bin/apport-cli.py:353 ../bin/apport-cli.py:353 -msgid "To continue, you must visit the following URL:" -msgstr "要继续，您必须访问下面这个网址：" +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357 +msgid "Sorry, apport has closed unexpectedly." +msgstr "对不起，Apport 意外关闭。" -#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:133 +#: ../data/general-hooks/ubuntu.py:133 msgid "" -"You can launch a browser now, or copy this URL into a browser on another " -"computer." -msgstr "您现在可以启动一个浏览器，或者复制这个网址到另外一个电脑的浏览器。" - -#: ../debian/tmp/usr/bin/apport-cli.py:357 ../bin/apport-cli.py:357 -msgid "Launch a browser now" -msgstr "现在启动一个浏览器" - -#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371 -msgid "No pending crash reports. Try --help for more information." -msgstr "没有已知的崩溃报告，尝试 --help 以获得更多信息。" +"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/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 中的问题" +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:150 +#: ../data/general-hooks/ubuntu.py:150 +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" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/aptitude.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/aptitude.po 2015-08-14 07:52:19.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: 2015-08-04 05:29+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: zh_CN\n" #. TRANSLATORS: These strings describing config items 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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2015-08-14 07:52:19.000000000 +0000 @@ -13,8 +13,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: 2015-08-04 05:29+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Generated-By: pygettext.py 1.4\n" #: ../apt-listchanges.py:85 diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apt.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/apt.po 2015-08-14 07:52:19.000000000 +0000 @@ -10,15 +10,15 @@ "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: 2015-08-02 01:34+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: 2015-08-04 05:28+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: \n" #: cmdline/apt-cache.cc:141 @@ -109,7 +109,7 @@ #: cmdline/apt-cache.cc:1353 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 @@ -201,6 +201,39 @@ " -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 是一个底层的工具，可以用来\n" +"在 APT 的二进制缓存文件中查询信息\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 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" @@ -247,7 +280,7 @@ " dump - 显示配置文件\n" "\n" "选项：\n" -" -h 本帮助文本。\n" +" -h 显示本帮助文本。\n" " -c=? 读取指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n" @@ -533,17 +566,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 @@ -605,7 +638,7 @@ #: cmdline/apt-get.cc:140 msgid "N" -msgstr "" +msgstr "N" #: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1763 #, c-format @@ -783,7 +816,7 @@ #: 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 #, c-format @@ -798,7 +831,7 @@ #: cmdline/apt-get.cc:849 #, 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 @@ -1093,7 +1126,7 @@ 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... " @@ -1145,11 +1178,14 @@ "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 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "忽略已下载过的文件“%s”\n" +msgstr "忽略已下载的文件“%s”\n" #: cmdline/apt-get.cc:2332 #, c-format @@ -1208,7 +1244,7 @@ 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 #, c-format @@ -1225,7 +1261,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 +1281,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 @@ -1271,7 +1307,7 @@ #: 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 msgid "Supported modules:" @@ -1322,6 +1358,47 @@ "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 msgid "" @@ -1390,41 +1467,41 @@ #: cmdline/apt-mark.cc:46 #, c-format msgid "%s can not be marked as it is not installed.\n" -msgstr "" +msgstr "%s 还没有安装，因此无法标记。\n" #: cmdline/apt-mark.cc:52 #, c-format msgid "%s was already set to manually installed.\n" -msgstr "" +msgstr "%s 已经被设置为手动安装。\n" #: cmdline/apt-mark.cc:54 #, c-format msgid "%s was already set to automatically installed.\n" -msgstr "" +msgstr "%s 已经被设置为自动安装。\n" #: cmdline/apt-mark.cc:169 #, c-format msgid "%s was already set on hold.\n" -msgstr "" +msgstr "%s 已经设置为保留。\n" #: cmdline/apt-mark.cc:171 #, c-format msgid "%s was already not hold.\n" -msgstr "" +msgstr "%s 已经设置为不保留。\n" #: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 #, c-format msgid "%s set on hold.\n" -msgstr "" +msgstr "%s 设置为保留。\n" #: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 #, c-format msgid "Canceled hold on %s.\n" -msgstr "" +msgstr "取消保留 %s 的设置。\n" #: cmdline/apt-mark.cc:220 msgid "Executing dpkg failed. Are you root?" -msgstr "" +msgstr "执行 dpkg 失败。您是 root 吗？" #: cmdline/apt-mark.cc:268 msgid "" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/apturl.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/apturl.po 2015-08-14 07:52:40.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: 2015-08-04 07:51+0000\n" +"X-Generator: Launchpad (build 17656)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." @@ -125,20 +125,20 @@ 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:103 ../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:104 ../AptUrl/kde/KdeUI.py:81 #, python-format msgid "Do you want to enable the following software channel: '%s'?" msgstr "您想启用“%s”软件频道吗？" -#: ../AptUrl/gtk/GtkUI.py:154 ../AptUrl/kde/KdeUI.py:133 +#: ../AptUrl/gtk/GtkUI.py:168 ../AptUrl/kde/KdeUI.py:133 msgid "Install additional software?" msgstr "安装附加软件？" -#: ../AptUrl/gtk/GtkUI.py:155 ../AptUrl/kde/KdeUI.py:134 +#: ../AptUrl/gtk/GtkUI.py:169 ../AptUrl/kde/KdeUI.py:134 #, python-format msgid "Do you want to install package '%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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/aspell.po 2015-08-14 07:52:19.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: 2015-08-04 05:30+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/attr.po 2015-08-14 07:52:19.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: 2015-08-04 05:30+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/avahi.po 2015-08-14 07:52:35.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:58+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2015-08-04 07:05+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: \n" #: ../avahi-common/error.c:30 diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bacula.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/bacula.po 2015-08-14 07:52:32.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: 2015-08-04 06:52+0000\n" +"X-Generator: Launchpad (build 17656)\n" #: src/dird/jobq.c:74 #, c-format diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bash.po language-pack-zh-hans-base-14.04+20150804/data/zh_CN/LC_MESSAGES/bash.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bash.po 2015-02-19 15:26:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20150804/data/zh_CN/LC_MESSAGES/bash.po 2015-08-14 07:52:19.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:33+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2015-08-04 05:30+0000\n" +"X-Generator: Launchpad (build 17656)\n" #: arrayfunc.c:51 msgid "bad array subscript" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bfd.po language-pack-zh-hans-base-14.04+20150804/data/zh_CN/LC_MESSAGES/bfd.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bfd.po 2015-02-19 15:26:00.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20150804/data/zh_CN/LC_MESSAGES/bfd.po 2015-08-14 07:52:20.000000000 +0000 @@ -7,14 +7,14 @@ "Project-Id-Version: bfd 2.12.91\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-10-25 11:58+0100\n" -"PO-Revision-Date: 2015-02-10 17:42+0000\n" +"PO-Revision-Date: 2015-06-18 12:35+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: 2015-08-04 05:31+0000\n" +"X-Generator: Launchpad (build 17656)\n" #: aout-adobe.c:127 msgid "%B: Unknown section type in a.out.adobe file: %x\n" @@ -539,7 +539,7 @@ msgid "Dwarf Error: Offset (%lu) greater than or equal to %s size (%lu)." msgstr "Dwarf 错误：偏移(%lu) 大于或等于 %s 大小 (%lu)。" -#: dwarf2.c:940 +#: dwarf2.c:949 #, c-format msgid "Dwarf Error: Invalid or unhandled FORM value: %u." msgstr "小错误：无效或未处理的表单值：%u。" @@ -964,7 +964,7 @@ msgid "Invalid TARGET2 relocation type '%s'." msgstr "TARGET2 重定向类型\"%s\" 无效." -#: elf32-arm.c:6890 +#: elf32-arm.c:6933 msgid "" "%B(%s): warning: interworking not enabled.\n" " first occurrence: %B: thumb call to arm" @@ -1111,7 +1111,7 @@ msgid "error: fp16 format mismatch between %B and %B" msgstr "" -#: elf32-arm.c:11621 +#: elf32-arm.c:11675 msgid "DIV usage mismatch between %B and %B" msgstr "" @@ -2156,12 +2156,12 @@ msgid "%B(%A): internal error: unknown error" msgstr "" -#: elf32-rx.c:2940 +#: elf32-rx.c:3004 #, c-format msgid " [64-bit doubles]" msgstr "" -#: elf32-rx.c:2942 +#: elf32-rx.c:3006 #, c-format msgid " [dsp]" msgstr "" @@ -2911,7 +2911,7 @@ msgid "%P: stubs don't match calculated size\n" msgstr "" -#: elf64-ppc.c:11469 +#: elf64-ppc.c:11756 #, c-format msgid "" "linker stubs in %u group%s\n" @@ -3108,7 +3108,7 @@ msgid "%B: undefined reference to symbol '%s'" msgstr "" -#: elflink.c:4492 +#: elflink.c:4466 msgid "" "note: '%s' is defined in DSO %B so try adding it to the linker command line" msgstr "" @@ -3246,7 +3246,7 @@ msgid "MIPS16 and microMIPS functions cannot call each other" msgstr "" -#: elfxx-mips.c:5628 +#: elfxx-mips.c:5856 msgid "" "%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider " "recompiling with interlinking enabled." @@ -3298,15 +3298,15 @@ msgid "%s: illegal section name `%s'" msgstr "%s：非法的节名“%s”" -#: elfxx-mips.c:12417 elfxx-mips.c:12443 +#: elfxx-mips.c:13645 elfxx-mips.c:13671 msgid "Warning: %B uses -msingle-float, %B uses -mdouble-float" msgstr "" -#: elfxx-mips.c:12429 elfxx-mips.c:12485 +#: elfxx-mips.c:13657 elfxx-mips.c:13713 msgid "Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64" msgstr "" -#: elfxx-mips.c:12455 elfxx-mips.c:12491 +#: elfxx-mips.c:13683 elfxx-mips.c:13719 msgid "Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64" msgstr "" @@ -3553,7 +3553,7 @@ "(max %lu): setting to undefined" msgstr "" -#: mach-o.c:1764 +#: mach-o.c:1900 #, c-format msgid "" "bfd_mach_o_read_symtab_symbol: symbol \"%s\" is unsupported 'indirect' " @@ -3571,12 +3571,12 @@ msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols" msgstr "" -#: mach-o.c:1874 +#: mach-o.c:2014 #, c-format msgid "bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu" msgstr "" -#: mach-o.c:2556 +#: mach-o.c:2734 #, c-format msgid "unable to read unknown load command 0x%lx" msgstr "" @@ -3591,41 +3591,41 @@ msgid "unknown header byte-order value 0x%lx" msgstr "" -#: mach-o.c:3402 +#: mach-o.c:3577 msgid "Mach-O header:\n" msgstr "" -#: mach-o.c:3403 +#: mach-o.c:3578 #, c-format msgid " magic : %08lx\n" msgstr "" -#: mach-o.c:3404 +#: mach-o.c:3579 #, c-format msgid " cputype : %08lx (%s)\n" msgstr "" -#: mach-o.c:3406 +#: mach-o.c:3581 #, c-format msgid " cpusubtype: %08lx\n" msgstr "" -#: mach-o.c:3407 +#: mach-o.c:3582 #, c-format msgid " filetype : %08lx (%s)\n" msgstr "" -#: mach-o.c:3410 +#: mach-o.c:3585 #, c-format msgid " ncmds : %08lx (%lu)\n" msgstr "" -#: mach-o.c:3411 +#: mach-o.c:3586 #, c-format msgid " sizeofcmds: %08lx\n" msgstr "" -#: mach-o.c:3412 +#: mach-o.c:3587 #, c-format msgid " flags : %08lx (" msgstr "" @@ -3634,16 +3634,16 @@ msgid ")\n" msgstr "" -#: mach-o.c:3415 +#: mach-o.c:3590 #, c-format msgid " reserved : %08x\n" msgstr "" -#: mach-o.c:3425 +#: mach-o.c:3600 msgid "Segments and Sections:\n" msgstr "" -#: mach-o.c:3426 +#: mach-o.c:3601 msgid " #: Segment name Section name Address\n" msgstr "" @@ -5828,7 +5828,7 @@ msgid " Code Address Reference Fixups:\n" msgstr "" -#: vms-alpha.c:7849 +#: vms-alpha.c:7852 #, c-format msgid " Linkage Pairs Referece Fixups:\n" msgstr "" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/binutils.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/binutils.po 2015-08-14 07:52:20.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: 2015-06-18 12:41+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: 2015-08-04 05:32+0000\n" +"X-Generator: Launchpad (build 17656)\n" #: addr2line.c:81 #, c-format diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bison.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/bison.po 2015-08-14 07:52:20.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: 2015-08-04 05:34+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: zh_CN\n" #: src/complain.c:322 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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/bison-runtime.po 2015-08-14 07:52:20.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:37+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2015-08-04 05:34+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: zh_CN\n" #: data/glr.c:770 data/yacc.c:643 diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/bootloader.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/bootloader.po 2015-08-14 07:52:36.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: 2015-08-04 07:16+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/byobu.po 2015-08-14 07:52:42.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: 2015-08-04 08:08+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/bzr.po 2015-08-14 07:52:35.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 11:59+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2015-08-04 07:07+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/cinder.po 2015-08-14 07:52:49.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: 2015-08-04 08:59+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Generated-By: Babel 1.3\n" #: cinder/context.py:63 @@ -23,707 +23,707 @@ msgid "Arguments dropped when creating context: %s" msgstr "" -#: cinder/context.py:102 +#: cinder/context.py:99 #, python-format msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r" msgstr "" -#: cinder/exception.py:67 cinder/brick/exception.py:31 +#: cinder/exception.py:67 cinder/brick/exception.py:32 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:119 #, python-format msgid "" "Bad or unexpected response from the storage volume backend API: %(data)s" msgstr "" -#: cinder/exception.py:123 +#: cinder/exception.py:124 #, python-format msgid "Volume driver reported an error: %(message)s" msgstr "" -#: cinder/exception.py:127 +#: cinder/exception.py:128 #, python-format msgid "Backup driver reported an error: %(message)s" msgstr "" -#: cinder/exception.py:131 +#: cinder/exception.py:132 #, python-format msgid "Connection to glance failed: %(reason)s" msgstr "" -#: cinder/exception.py:135 +#: cinder/exception.py:136 msgid "Not authorized." msgstr "未授权。" -#: cinder/exception.py:140 +#: cinder/exception.py:141 msgid "User does not have admin privileges" msgstr "用户没有管理员权限" -#: cinder/exception.py:144 +#: cinder/exception.py:145 #, python-format msgid "Policy doesn't allow %(action)s to be performed." msgstr "政策不允许 %(action)s 被执行。" -#: cinder/exception.py:148 +#: cinder/exception.py:149 #, python-format msgid "Not authorized for image %(image_id)s." msgstr "" -#: cinder/exception.py:152 +#: cinder/exception.py:153 msgid "Volume driver not ready." msgstr "" -#: cinder/exception.py:156 cinder/brick/exception.py:77 +#: cinder/exception.py:157 cinder/brick/exception.py:78 msgid "Unacceptable parameters." msgstr "无法接受的参数。" -#: cinder/exception.py:161 +#: cinder/exception.py:162 #, python-format msgid "Invalid snapshot: %(reason)s" msgstr "" -#: cinder/exception.py:165 +#: cinder/exception.py:166 #, python-format msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s." msgstr "" -#: cinder/exception.py:170 +#: cinder/exception.py:171 #, python-format msgid "Volume %(volume_id)s is still attached, detach volume first." msgstr "" -#: 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:179 msgid "The results are invalid." msgstr "" -#: cinder/exception.py:182 +#: cinder/exception.py:183 #, python-format msgid "Invalid input received: %(reason)s" msgstr "" -#: cinder/exception.py:186 +#: cinder/exception.py:187 #, python-format msgid "Invalid volume type: %(reason)s" msgstr "" -#: cinder/exception.py:190 +#: cinder/exception.py:191 #, python-format msgid "Invalid volume: %(reason)s" msgstr "" -#: cinder/exception.py:194 +#: cinder/exception.py:195 #, python-format msgid "Invalid content type %(content_type)s." msgstr "无效的内容类型 %(content_type)s。" -#: cinder/exception.py:198 +#: cinder/exception.py:199 #, python-format msgid "Invalid host: %(reason)s" msgstr "" -#: cinder/exception.py:204 cinder/brick/exception.py:84 +#: cinder/exception.py:205 cinder/brick/exception.py:85 #, python-format msgid "%(err)s" msgstr "%(err)s" -#: cinder/exception.py:208 +#: cinder/exception.py:209 #, python-format msgid "Invalid auth key: %(reason)s" msgstr "" -#: cinder/exception.py:212 +#: cinder/exception.py:213 #, python-format msgid "" "Value \"%(value)s\" is not valid for configuration option \"%(option)s\"" msgstr "" -#: cinder/exception.py:217 +#: cinder/exception.py:218 msgid "Service is unavailable at this time." msgstr "该时刻服务无法使用。" -#: cinder/exception.py:221 +#: cinder/exception.py:222 #, python-format msgid "Image %(image_id)s is unacceptable: %(reason)s" msgstr "镜像 %(image_id)s 无法接受，原因是： %(reason)s" -#: cinder/exception.py:225 +#: cinder/exception.py:226 #, python-format msgid "The device in the path %(path)s is unavailable: %(reason)s" msgstr "" -#: cinder/exception.py:229 +#: cinder/exception.py:230 #, python-format msgid "Expected a uuid but received %(uuid)s." msgstr "" -#: cinder/exception.py:246 cinder/brick/exception.py:71 +#: cinder/exception.py:247 cinder/brick/exception.py:72 msgid "Resource could not be found." msgstr "资源没有找到。" -#: cinder/exception.py:252 +#: cinder/exception.py:253 #, python-format msgid "Volume %(volume_id)s could not be found." msgstr "卷 %(volume_id)s 没有找到。" -#: cinder/exception.py:256 +#: cinder/exception.py:262 #, 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:267 #, python-format msgid "" "Volume %(volume_id)s has no administration metadata with key " "%(metadata_key)s." msgstr "" -#: cinder/exception.py:266 +#: cinder/exception.py:272 #, python-format msgid "Invalid metadata: %(reason)s" msgstr "" -#: cinder/exception.py:270 +#: cinder/exception.py:276 #, python-format msgid "Invalid metadata size: %(reason)s" msgstr "" -#: cinder/exception.py:274 +#: cinder/exception.py:280 #, python-format msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s." msgstr "" -#: cinder/exception.py:279 +#: cinder/exception.py:285 #, 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:289 #, 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:299 #, 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:304 #, python-format msgid "" "Volume Type %(volume_type_id)s deletion is not allowed with volumes present " "with the type." msgstr "" -#: cinder/exception.py:303 +#: cinder/exception.py:309 #, python-format msgid "Snapshot %(snapshot_id)s could not be found." msgstr "快照 %(snapshot_id)s 没有找到。" -#: cinder/exception.py:311 +#: cinder/exception.py:317 #, python-format msgid "deleting volume %(volume_name)s that has snapshot" msgstr "正在删除有快照的卷 %(volume_name)s" -#: cinder/exception.py:315 +#: cinder/exception.py:321 #, python-format msgid "deleting snapshot %(snapshot_name)s that has dependent volumes" msgstr "" -#: cinder/exception.py:320 +#: cinder/exception.py:326 #, python-format msgid "No target id found for volume %(volume_id)s." msgstr "没有为卷 %(volume_id)s 找到目标id。" -#: cinder/exception.py:324 +#: cinder/exception.py:330 #, python-format msgid "Invalid image href %(image_href)s." msgstr "无效的镜像href %(image_href)s。" -#: cinder/exception.py:328 +#: cinder/exception.py:334 #, python-format msgid "Image %(image_id)s could not be found." msgstr "镜像 %(image_id)s 没有找到。" -#: cinder/exception.py:332 +#: cinder/exception.py:338 #, python-format msgid "Service %(service_id)s could not be found." msgstr "服务 %(service_id)s 没有找到。" -#: cinder/exception.py:336 +#: cinder/exception.py:342 #, python-format msgid "Host %(host)s could not be found." msgstr "主机 %(host)s 没有找到。" -#: cinder/exception.py:340 +#: cinder/exception.py:346 #, python-format msgid "Scheduler Host Filter %(filter_name)s could not be found." msgstr "调度器主机过滤器 %(filter_name)s 没有找到。" -#: cinder/exception.py:344 +#: cinder/exception.py:350 #, python-format msgid "Scheduler Host Weigher %(weigher_name)s could not be found." msgstr "" -#: cinder/exception.py:348 +#: cinder/exception.py:354 #, 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:358 #, python-format msgid "Invalid reservation expiration %(expire)s." msgstr "" -#: cinder/exception.py:356 +#: cinder/exception.py:362 #, python-format msgid "" "Change would make usage less than 0 for the following resources: %(unders)s" msgstr "" -#: cinder/exception.py:361 +#: cinder/exception.py:367 msgid "Quota could not be found" msgstr "配额没有找到。" -#: cinder/exception.py:365 +#: cinder/exception.py:371 #, python-format msgid "Unknown quota resources %(unknown)s." msgstr "" -#: cinder/exception.py:369 +#: cinder/exception.py:375 #, python-format msgid "Quota for project %(project_id)s could not be found." msgstr "没有为项目 %(project_id)s 找到配额。" -#: cinder/exception.py:373 +#: cinder/exception.py:379 #, python-format msgid "Quota class %(class_name)s could not be found." msgstr "" -#: cinder/exception.py:377 +#: cinder/exception.py:383 #, python-format msgid "Quota usage for project %(project_id)s could not be found." msgstr "" -#: cinder/exception.py:381 +#: cinder/exception.py:387 #, python-format msgid "Quota reservation %(uuid)s could not be found." msgstr "" -#: cinder/exception.py:385 +#: cinder/exception.py:391 #, python-format msgid "Quota exceeded for resources: %(overs)s" msgstr "" -#: cinder/exception.py:389 +#: cinder/exception.py:395 #, python-format msgid "File %(file_path)s could not be found." msgstr "找不到文件 %(file_path)s。" -#: cinder/exception.py:398 +#: cinder/exception.py:403 #, python-format msgid "Volume Type %(id)s already exists." msgstr "" -#: cinder/exception.py:407 +#: cinder/exception.py:412 #, python-format msgid "Volume type encryption for type %(type_id)s already exists." msgstr "" -#: cinder/exception.py:411 +#: cinder/exception.py:416 #, python-format msgid "Volume type encryption for type %(type_id)s does not exist." msgstr "" -#: cinder/exception.py:415 +#: cinder/exception.py:420 #, python-format msgid "Malformed message body: %(reason)s" msgstr "错误格式的消息体： %(reason)s" -#: cinder/exception.py:419 +#: cinder/exception.py:424 #, python-format msgid "Could not find config at %(path)s" msgstr "在 %(path)s 找不到配置文件。" -#: cinder/exception.py:423 +#: cinder/exception.py:428 #, python-format msgid "Could not find parameter %(param)s" msgstr "" -#: cinder/exception.py:427 +#: cinder/exception.py:432 #, 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:436 #, python-format msgid "No valid host was found. %(reason)s" msgstr "找不到有效主机，原因是 %(reason)s。" -#: cinder/exception.py:440 +#: cinder/exception.py:445 #, python-format msgid "Quota exceeded: code=%(code)s" msgstr "" -#: 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:468 #, python-format msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded" msgstr "" -#: cinder/exception.py:471 +#: cinder/exception.py:476 #, python-format msgid "Detected more than one volume with name %(vol_name)s" msgstr "" -#: cinder/exception.py:475 +#: cinder/exception.py:480 #, 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:489 #, python-format msgid "Unknown or unsupported command %(cmd)s" msgstr "" -#: cinder/exception.py:488 +#: cinder/exception.py:493 #, python-format msgid "Malformed response to command %(cmd)s: %(reason)s" msgstr "" -#: cinder/exception.py:492 +#: cinder/exception.py:497 #, python-format msgid "Operation failed with status=%(status)s. Full dump: %(data)s" msgstr "" -#: cinder/exception.py:500 +#: cinder/exception.py:505 #, python-format msgid "" "Glance metadata cannot be updated, key %(key)s exists for volume id " "%(volume_id)s" msgstr "" -#: cinder/exception.py:505 +#: cinder/exception.py:510 #, python-format msgid "Glance metadata for volume/snapshot %(id)s cannot be found." msgstr "" -#: cinder/exception.py:509 +#: cinder/exception.py:514 #, python-format msgid "Failed to export for volume: %(reason)s" msgstr "" -#: cinder/exception.py:517 +#: cinder/exception.py:522 #, python-format msgid "Failed to create metadata for volume: %(reason)s" msgstr "" -#: cinder/exception.py:521 +#: cinder/exception.py:526 #, python-format msgid "Failed to update metadata for volume: %(reason)s" msgstr "" -#: cinder/exception.py:525 +#: cinder/exception.py:530 #, python-format msgid "Failed to copy metadata to volume: %(reason)s" msgstr "" -#: cinder/exception.py:529 +#: cinder/exception.py:534 #, python-format msgid "Failed to copy image to volume: %(reason)s" msgstr "" -#: cinder/exception.py:533 +#: cinder/exception.py:538 msgid "Invalid Ceph args provided for backup rbd operation" msgstr "" -#: cinder/exception.py:537 +#: cinder/exception.py:542 msgid "An error has occurred during backup operation" msgstr "" -#: cinder/exception.py:541 +#: cinder/exception.py:546 msgid "Unsupported backup metadata version requested" msgstr "" -#: cinder/exception.py:549 +#: cinder/exception.py:554 msgid "Metadata backup already exists for this volume" msgstr "" -#: cinder/exception.py:553 +#: cinder/exception.py:558 msgid "Backup RBD operation failed" msgstr "" -#: cinder/exception.py:561 +#: cinder/exception.py:566 #, python-format msgid "Backup %(backup_id)s could not be found." msgstr "" -#: cinder/exception.py:565 +#: cinder/exception.py:570 msgid "Failed to identify volume backend." msgstr "" -#: cinder/exception.py:569 +#: cinder/exception.py:574 #, python-format msgid "Invalid backup: %(reason)s" msgstr "" -#: cinder/exception.py:573 +#: cinder/exception.py:578 #, python-format msgid "Connection to swift failed: %(reason)s" msgstr "" -#: cinder/exception.py:577 +#: cinder/exception.py:582 #, python-format msgid "Transfer %(transfer_id)s could not be found." msgstr "" -#: cinder/exception.py:581 +#: cinder/exception.py:586 #, python-format msgid "Volume migration failed: %(reason)s" msgstr "" -#: cinder/exception.py:585 +#: cinder/exception.py:590 #, python-format msgid "SSH command injection detected: %(command)s" msgstr "" -#: cinder/exception.py:589 +#: cinder/exception.py:594 #, python-format msgid "QoS Specs %(specs_id)s already exists." msgstr "" -#: cinder/exception.py:593 +#: cinder/exception.py:598 #, python-format msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s." msgstr "" -#: cinder/exception.py:598 +#: cinder/exception.py:603 #, python-format msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s." msgstr "" -#: cinder/exception.py:603 +#: cinder/exception.py:608 #, python-format msgid "No such QoS spec %(specs_id)s." msgstr "" -#: cinder/exception.py:607 +#: cinder/exception.py:612 #, python-format msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s." msgstr "" -#: cinder/exception.py:612 +#: cinder/exception.py:617 #, python-format msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s." msgstr "" -#: cinder/exception.py:617 +#: cinder/exception.py:622 #, python-format msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s." msgstr "" -#: cinder/exception.py:622 +#: cinder/exception.py:627 #, python-format msgid "Invalid qos specs: %(reason)s" msgstr "" -#: cinder/exception.py:626 +#: cinder/exception.py:631 #, python-format msgid "QoS Specs %(specs_id)s is still associated with entities." msgstr "" -#: cinder/exception.py:630 +#: cinder/exception.py:635 #, python-format msgid "key manager error: %(reason)s" msgstr "" -#: cinder/exception.py:634 +#: cinder/exception.py:639 #, python-format msgid "" "Manage existing volume failed due to invalid backend reference " "%(existing_ref)s: %(reason)s" msgstr "" -#: cinder/exception.py:649 +#: cinder/exception.py:654 #, python-format msgid "Manage existing volume failed due to volume type mismatch: %(reason)s" msgstr "" -#: 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:756 msgid "Bad response from SolidFire API" msgstr "来自SolidFire API的错误响应" -#: cinder/exception.py:731 +#: cinder/exception.py:760 msgid "SolidFire Cinder Driver exception" msgstr "" -#: cinder/exception.py:735 +#: cinder/exception.py:764 #, python-format msgid "Error in SolidFire API response: data=%(data)s" msgstr "SolidFire API响应里发生错误：data=%(data)s" -#: cinder/exception.py:739 +#: cinder/exception.py:768 #, python-format msgid "Unable to locate account %(account_name)s on Solidfire device" msgstr "" -#: cinder/exception.py:749 +#: cinder/exception.py:778 #, python-format msgid "Invalid 3PAR Domain: %(err)s" msgstr "" -#: cinder/exception.py:767 +#: cinder/exception.py:796 msgid "Unknown NFS exception" msgstr "" -#: cinder/exception.py:771 +#: cinder/exception.py:800 msgid "No mounted NFS shares found" msgstr "" -#: cinder/exception.py:762 cinder/exception.py:775 cinder/exception.py:801 +#: cinder/exception.py:791 cinder/exception.py:804 cinder/exception.py:830 #, python-format msgid "There is no share which can host %(volume_size)sG" msgstr "" -#: cinder/exception.py:793 +#: cinder/exception.py:822 msgid "Unknown Gluster exception" msgstr "" -#: cinder/exception.py:797 +#: cinder/exception.py:826 msgid "No mounted Gluster shares found" msgstr "" -#: cinder/exception.py:513 +#: cinder/exception.py:518 #, python-format msgid "Failed to remove export for volume %(volume)s: %(reason)s" msgstr "" -#: 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:852 #, python-format msgid "Fibre Channel connection control failure: %(reason)s" msgstr "" -#: cinder/exception.py:827 +#: cinder/exception.py:856 #, python-format msgid "Fibre Channel Zone operation failed: %(reason)s" msgstr "" -#: cinder/exception.py:831 +#: cinder/exception.py:860 #, python-format msgid "Fibre Channel SAN Lookup failure: %(reason)s" msgstr "" -#: cinder/exception.py:835 cinder/exception.py:839 +#: cinder/exception.py:864 cinder/exception.py:868 #, python-format msgid "Fibre Channel Zoning CLI error: %(reason)s" msgstr "" -#: cinder/exception.py:843 +#: cinder/exception.py:872 msgid "NetApp Cinder Driver exception." msgstr "" @@ -752,40 +752,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:893 cinder/quota.py:917 msgid "Cannot register resource" msgstr "" -#: cinder/quota.py:894 cinder/quota.py:918 +#: cinder/quota.py:896 cinder/quota.py:920 msgid "Cannot register resources" 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 +794,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 +803,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 +811,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,7 +826,7 @@ "Input value ignored." msgstr "" -#: cinder/service.py:420 +#: cinder/service.py:426 msgid "serve() can only be called once" msgstr "" @@ -851,16 +850,16 @@ msgid "May specify only one of %s" msgstr "" -#: cinder/ssh_utils.py:135 +#: cinder/ssh_utils.py:136 msgid "Specify a password or private_key" msgstr "" -#: cinder/ssh_utils.py:151 +#: cinder/ssh_utils.py:152 #, python-format msgid "Error connecting via ssh: %s" msgstr "" -#: cinder/utils.py:292 +#: cinder/utils.py:413 #, python-format msgid "Invalid backend: %s" msgstr "无效的后台：%s" @@ -875,48 +874,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:671 #, python-format msgid "%s is not a string or unicode" msgstr "" -#: cinder/utils.py:691 +#: cinder/utils.py:675 #, python-format msgid "%(name)s has a minimum character requirement of %(min_length)s." msgstr "" -#: cinder/utils.py:696 +#: cinder/utils.py:680 #, python-format msgid "%(name)s has more than %(max_length)s characters." msgstr "" -#: cinder/wsgi.py:157 +#: cinder/wsgi.py:158 #, python-format msgid "Unable to find cert_file : %s" msgstr "" -#: cinder/wsgi.py:161 +#: cinder/wsgi.py:162 #, python-format msgid "Unable to find ca_file : %s" msgstr "" -#: cinder/wsgi.py:164 +#: cinder/wsgi.py:165 #, 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.py:185 #, python-format msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds" msgstr "" @@ -926,37 +925,37 @@ 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.py:365 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/consistencygroup/api.py:599 cinder/volume/api.py:410 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/consistencygroup/api.py:596 cinder/volume/api.py:407 msgid "limit param must be positive" msgstr "limit参数必须是正数" @@ -978,11 +977,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 +1011,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,34 +1026,34 @@ 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" @@ -1078,7 +1077,7 @@ 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 +1092,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 +1102,15 @@ 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:252 cinder/api/contrib/backups.py:286 +#: cinder/api/contrib/cgsnapshots.py:167 +#: cinder/api/contrib/consistencygroups.py:212 +#: cinder/api/contrib/volume_transfer.py:161 +#: cinder/api/contrib/volume_transfer.py:197 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 +1120,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,7 +1140,9 @@ msgid "Importing record from %s." msgstr "" -#: cinder/api/contrib/backups.py:340 cinder/api/contrib/backups.py:349 +#: cinder/api/contrib/backups.py:348 cinder/api/contrib/backups.py:357 +#: cinder/api/contrib/consistencygroups.py:263 +#: cinder/api/contrib/consistencygroups.py:316 msgid "Incorrect request body format." msgstr "" @@ -1178,7 +1179,7 @@ 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。" @@ -1241,13 +1242,13 @@ msgid "Malformed scheduler_hints attribute" msgstr "" -#: 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 "" -#: cinder/api/contrib/services.py:162 +#: cinder/api/contrib/services.py:164 msgid "Disabled reason contains invalid characters or is too long" msgstr "" @@ -1293,7 +1294,7 @@ "colons and hyphens." msgstr "" -#: cinder/api/contrib/types_manage.py:148 +#: cinder/api/contrib/types_manage.py:153 msgid "Target volume type is still in use." msgstr "" @@ -1314,49 +1315,49 @@ "be 'rw' or 'ro'" msgstr "" -#: cinder/api/contrib/volume_actions.py:202 +#: cinder/api/contrib/volume_actions.py:206 msgid "Unable to fetch connection information from backend." msgstr "" -#: cinder/api/contrib/volume_actions.py:223 +#: cinder/api/contrib/volume_actions.py:227 msgid "Unable to terminate volume connection from backend." msgstr "" -#: cinder/api/contrib/volume_actions.py:236 +#: cinder/api/contrib/volume_actions.py:240 msgid "No image_name was specified in request." msgstr "" -#: cinder/api/contrib/volume_actions.py:244 +#: cinder/api/contrib/volume_actions.py:248 msgid "Bad value for 'force' parameter." msgstr "" -#: cinder/api/contrib/volume_actions.py:247 +#: cinder/api/contrib/volume_actions.py:251 msgid "'force' is not string or bool." msgstr "" -#: cinder/api/contrib/volume_actions.py:289 +#: cinder/api/contrib/volume_actions.py:293 msgid "New volume size must be specified as an integer." msgstr "" -#: cinder/api/contrib/volume_actions.py:308 +#: cinder/api/contrib/volume_actions.py:312 msgid "Must specify readonly in request." msgstr "" -#: cinder/api/contrib/volume_actions.py:316 +#: cinder/api/contrib/volume_actions.py:320 msgid "Bad value for 'readonly'" msgstr "" -#: cinder/api/contrib/volume_actions.py:320 +#: cinder/api/contrib/volume_actions.py:324 msgid "'readonly' not string or bool" msgstr "" -#: cinder/api/contrib/volume_actions.py:334 +#: cinder/api/contrib/volume_actions.py:338 msgid "New volume type must be specified." 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/contrib/volume_manage.py:100 cinder/api/v2/snapshots.py:172 +#: cinder/api/v2/snapshots.py:233 cinder/api/v2/volumes.py:309 +#: cinder/api/v2/volumes.py:451 #, python-format msgid "Missing required element '%s' in request body" msgstr "" @@ -1367,7 +1368,7 @@ msgstr "" #: 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 "" @@ -1384,7 +1385,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 +1395,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 "" @@ -1453,20 +1454,20 @@ msgid "Cannot delete encryption specs. Volume type in use." 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_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:63 cinder/api/v2/volumes.py:199 msgid "Volume cannot be deleted while in attached state" msgstr "" @@ -1474,12 +1475,12 @@ msgid "Invalid service catalog json." msgstr "" -#: 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返回" @@ -1489,8 +1490,8 @@ msgid "%(exception)s: %(explanation)s" msgstr "" -#: 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 +1504,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,13 +1516,13 @@ 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." @@ -1535,17 +1536,17 @@ 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,12 +1563,12 @@ msgid "No Content-Type provided in request" msgstr "请求中没有提供 Content-Type" -#: cinder/api/openstack/wsgi.py:991 +#: cinder/api/openstack/wsgi.py:992 #, 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:995 cinder/api/openstack/wsgi.py:1008 #: 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 @@ -1579,26 +1580,26 @@ msgid "Malformed request body" msgstr "错误格式的请求主体" -#: cinder/api/openstack/wsgi.py:1004 +#: cinder/api/openstack/wsgi.py:1005 msgid "Unsupported Content-Type" msgstr "不支持的Content-Type" -#: cinder/api/openstack/wsgi.py:1016 +#: cinder/api/openstack/wsgi.py:1017 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." @@ -1630,21 +1631,21 @@ 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:182 msgid "'volume_id' must be specified" msgstr "" -#: 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 cinder/api/v2/snapshots.py:200 #, python-format msgid "Invalid value '%s' for force. " msgstr "" @@ -1655,32 +1656,32 @@ msgid "volume does not exist" 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:270 msgid "Invalid imageRef provided." msgstr "提供了无效的imageRef。" -#: cinder/api/v1/volumes.py:350 cinder/api/v2/volumes.py:349 +#: cinder/api/v1/volumes.py:356 cinder/api/v2/volumes.py:355 #, python-format msgid "snapshot id:%s not found" msgstr "" -#: cinder/api/v1/volumes.py:363 +#: cinder/api/v1/volumes.py:369 #, python-format msgid "source vol id:%s not found" msgstr "" -#: 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,12 +1691,12 @@ 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:229 cinder/api/v2/volumes.py:447 msgid "Missing request body" msgstr "" @@ -1703,7 +1704,7 @@ 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 +1714,48 @@ msgid "Removing options '%s' from query" msgstr "" -#: cinder/backup/api.py:69 +#: cinder/backup/api.py:71 msgid "Backup status must be available or error" 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:230 msgid "Backup status must be available" msgstr "" -#: cinder/backup/api.py:203 +#: cinder/backup/api.py:235 msgid "Backup to be restored has invalid size" 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:260 msgid "Volume to be restored to must be available" msgstr "" -#: cinder/backup/api.py:234 +#: cinder/backup/api.py:266 #, python-format msgid "" "volume size %(volume_size)d is too small to restore backup of size %(size)d." msgstr "" -#: 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:322 #, python-format msgid "Backup status must be available and not %s." msgstr "" -#: cinder/backup/driver.py:58 +#: cinder/backup/driver.py:53 #, python-format msgid "Value with type=%s is not serializable" msgstr "" @@ -1765,8 +1766,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 "" @@ -1819,7 +1820,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 "" @@ -1855,89 +1856,89 @@ 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:263 #, python-format msgid "" "Create backup aborted, expected volume status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:265 +#: cinder/backup/manager.py:275 #, python-format msgid "" "Create backup aborted, expected backup status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: 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:328 #, python-format msgid "" "Restore backup aborted, expected volume status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:328 +#: cinder/backup/manager.py:338 #, python-format msgid "" "Restore backup aborted: expected backup status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:349 +#: cinder/backup/manager.py:359 #, python-format msgid "" "Restore backup aborted, the backup service currently configured " @@ -1945,26 +1946,26 @@ "this backup [%(backup_service)s]." msgstr "" -#: 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:419 #, python-format msgid "" "Delete_backup aborted, expected backup status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:421 +#: cinder/backup/manager.py:431 #, python-format msgid "" "Delete backup aborted, the backup service currently configured " @@ -1972,24 +1973,24 @@ "this backup [%(backup_service)s]." msgstr "" -#: 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:505 #, python-format msgid "" "Export backup aborted, expected backup status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:506 +#: cinder/backup/manager.py:516 #, python-format msgid "" "Export record aborted, the backup service currently configured " @@ -1997,41 +1998,41 @@ "this backup [%(backup_service)s]." msgstr "" -#: 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:569 #, python-format msgid "" "Import record failed, cannot find backup service to perform the import. " "Request service %(service)s" msgstr "" -#: 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/test_backup_ceph.py:944 #, python-format msgid "Metadata backup object '%s' already exists" msgstr "" @@ -2046,7 +2047,7 @@ 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 "" @@ -2260,7 +2261,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,8 +2297,7 @@ 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:1145 cinder/tests/test_backup_ceph.py:933 msgid "Metadata restore failed due to incompatible version" msgstr "" @@ -2340,12 +2340,12 @@ msgid "Delete '%s' finished" msgstr "" -#: cinder/backup/drivers/swift.py:130 +#: cinder/backup/chunkeddriver.py:82 #, python-format msgid "unsupported compression algorithm: %s" msgstr "" -#: 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,7 +2396,7 @@ msgid "_read_metadata finished (%s)" msgstr "" -#: cinder/backup/drivers/swift.py:274 +#: cinder/backup/chunkeddriver.py:257 #, python-format msgid "volume size %d is invalid." msgstr "" @@ -2438,7 +2438,7 @@ msgid "backup MD5 for %(object_name)s: %(md5)s" msgstr "" -#: cinder/backup/drivers/swift.py:345 +#: cinder/backup/drivers/swift.py:200 #, python-format msgid "" "error writing object to swift, MD5 of object in swift %(etag)s is not the " @@ -2454,7 +2454,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 +2469,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 +2504,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 +2514,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 "" @@ -2534,7 +2534,7 @@ msgid "delete %s finished" msgstr "" -#: cinder/backup/drivers/tsm.py:79 +#: cinder/backup/drivers/tsm.py:80 #, python-format msgid "" "%(op)s: backup %(bck_id)s, volume %(vol_id)s failed. Backup object has " @@ -2542,7 +2542,7 @@ "%(vol_mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:114 +#: cinder/backup/drivers/tsm.py:115 #, python-format msgid "" "backup: %(vol_id)s failed to create device hardlink from %(vpath)s to " @@ -2551,25 +2551,25 @@ " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:212 +#: cinder/backup/drivers/tsm.py:213 #, 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 "" -#: cinder/backup/drivers/tsm.py:222 +#: cinder/backup/drivers/tsm.py:223 #, python-format msgid "" "backup: %(vol_id)s failed. Cannot obtain real path to volume at %(path)s." msgstr "" -#: cinder/backup/drivers/tsm.py:229 +#: cinder/backup/drivers/tsm.py:230 #, python-format msgid "backup: %(vol_id)s failed. %(path)s is not a file." msgstr "" -#: 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 +2578,7 @@ " stderr: %(err)s." msgstr "" -#: cinder/backup/drivers/tsm.py:299 +#: cinder/backup/drivers/tsm.py:300 #, python-format msgid "" "backup: %(vol_id)s failed to obtain backup success notification from " @@ -2587,7 +2587,7 @@ " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:340 +#: cinder/backup/drivers/tsm.py:341 #, python-format msgid "" "restore: %(vol_id)s failed.\n" @@ -2595,7 +2595,7 @@ " stderr: %(err)s." msgstr "" -#: cinder/backup/drivers/tsm.py:363 +#: cinder/backup/drivers/tsm.py:364 msgid "" "Volume metadata backup requested but this driver does not yet support this " "feature." @@ -2608,7 +2608,7 @@ "%(volume_path)s, mode: %(mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:392 +#: cinder/backup/drivers/tsm.py:393 #, python-format msgid "" "backup: %(vol_id)s failed to run dsmc on %(bpath)s.\n" @@ -2616,7 +2616,7 @@ " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:402 +#: cinder/backup/drivers/tsm.py:403 #, python-format msgid "" "backup: %(vol_id)s failed to run dsmc due to invalid arguments on " @@ -2637,7 +2637,7 @@ "%(backup_id)s, mode: %(mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:453 +#: cinder/backup/drivers/tsm.py:454 #, python-format msgid "" "restore: %(vol_id)s failed to run dsmc on %(bpath)s.\n" @@ -2645,7 +2645,7 @@ " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:463 +#: cinder/backup/drivers/tsm.py:464 #, python-format msgid "" "restore: %(vol_id)s failed to run dsmc due to invalid arguments on " @@ -2664,14 +2664,14 @@ msgid "Delete started for backup: %(backup)s, mode: %(mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:509 +#: cinder/backup/drivers/tsm.py:510 #, python-format msgid "" "delete: %(vol_id)s failed to run dsmc with stdout: %(out)s\n" " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:517 +#: cinder/backup/drivers/tsm.py:518 #, python-format msgid "" "delete: %(vol_id)s failed to run dsmc due to invalid arguments with stdout: " @@ -2679,7 +2679,7 @@ " stderr: %(err)s" msgstr "" -#: 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 +2691,55 @@ msgid "Delete %s finished." msgstr "" -#: cinder/brick/exception.py:52 +#: cinder/brick/exception.py:53 #, python-format msgid "Exception in string format operation. msg='%s'" msgstr "" -#: cinder/brick/exception.py:88 +#: cinder/brick/exception.py:89 msgid "We are unable to locate any Fibre Channel devices." msgstr "" -#: cinder/brick/exception.py:92 +#: cinder/brick/exception.py:93 msgid "Unable to find a Fibre Channel volume device." msgstr "" -#: cinder/brick/exception.py:96 +#: cinder/brick/exception.py:97 #, python-format msgid "Volume device not found at %(device)s." msgstr "" -#: cinder/brick/exception.py:100 +#: cinder/brick/exception.py:101 #, python-format msgid "Unable to find Volume Group: %(vg_name)s" msgstr "" -#: cinder/brick/exception.py:104 +#: cinder/brick/exception.py:105 #, python-format msgid "Failed to create Volume Group: %(vg_name)s" msgstr "" -#: cinder/exception.py:913 cinder/brick/exception.py:108 +#: cinder/exception.py:931 cinder/brick/exception.py:109 #, python-format msgid "Failed to create iscsi target for volume %(volume_id)s." msgstr "" -#: cinder/exception.py:917 cinder/brick/exception.py:112 +#: cinder/exception.py:935 cinder/brick/exception.py:113 #, python-format msgid "Failed to remove iscsi target for volume %(volume_id)s." msgstr "" -#: cinder/exception.py:921 cinder/brick/exception.py:116 +#: cinder/exception.py:939 cinder/brick/exception.py:117 #, python-format msgid "Failed to attach iSCSI target for volume %(volume_id)s." msgstr "" -#: cinder/brick/exception.py:120 +#: cinder/brick/exception.py:121 #, 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 +2761,12 @@ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)" msgstr "" -#: cinder/brick/initiator/connector.py:326 +#: cinder/brick/initiator/connector.py:433 #, python-format msgid "Could not find the iSCSI Initiator File %s" msgstr "" -#: cinder/brick/initiator/connector.py:620 +#: cinder/brick/initiator/connector.py:702 msgid "We are unable to locate any Fibre Channel devices" msgstr "" @@ -2775,11 +2775,11 @@ msgid "Looking for Fibre Channel dev %(device)s" msgstr "" -#: cinder/brick/initiator/connector.py:640 +#: cinder/brick/initiator/connector.py:722 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 +2795,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 +2820,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:1119 msgid "Invalid connection_properties specified no device_path attribute" msgstr "" @@ -2833,14 +2833,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 +2850,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 +2873,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:311 cinder/volume/targets/scst.py:390 msgid "valid iqn needed for show_target" msgstr "" -#: 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 +2991,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 +3013,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 +3023,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 +3039,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,11 +3063,12 @@ msgid "Deploy v1 of the Cinder API." msgstr "" -#: cinder/common/config.py:125 +#: cinder/common/config.py:108 msgid "Deploy v2 of the Cinder API." msgstr "" -#: 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 "" @@ -3080,77 +3081,77 @@ msgid "Novaclient connection created using URL: %s" msgstr "" -#: cinder/db/sqlalchemy/api.py:102 +#: cinder/db/sqlalchemy/api.py:109 msgid "Use of empty request context is deprecated" msgstr "使用空的请求上下文是不推荐的" -#: cinder/db/sqlalchemy/api.py:247 +#: cinder/db/sqlalchemy/api.py:254 #, 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:2425 #, python-format msgid "VolumeType %s deletion failed, VolumeType in use." msgstr "" -#: cinder/db/sqlalchemy/api.py:2896 +#: cinder/db/sqlalchemy/api.py:3207 #, python-format msgid "No backup with id %s" msgstr "" -#: cinder/db/sqlalchemy/api.py:2980 +#: cinder/db/sqlalchemy/api.py:3291 msgid "Volume must be available" msgstr "" -#: cinder/db/sqlalchemy/api.py:3006 +#: cinder/db/sqlalchemy/api.py:3317 #, python-format msgid "Volume in unexpected state %s, expected awaiting-transfer" msgstr "" -#: cinder/db/sqlalchemy/api.py:3028 +#: cinder/db/sqlalchemy/api.py:3339 #, python-format msgid "" "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state " "%(status)s, expected awaiting-transfer" msgstr "" -#: 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 +3167,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 +3203,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,50 +3270,50 @@ 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:298 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 "" -#: cinder/image/image_utils.py:171 cinder/image/image_utils.py:254 +#: cinder/image/image_utils.py:208 cinder/image/image_utils.py:291 #, python-format msgid "" "Size is %(image_size)dGB and doesn't fit in a volume of size " "%(volume_size)dGB." msgstr "" -#: 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 "" -#: 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." @@ -3323,17 +3324,17 @@ 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:305 #, python-format msgid "fmt=%(fmt)s backed by:%(backing_file)s" msgstr "" -#: cinder/image/image_utils.py:288 +#: cinder/image/image_utils.py:324 #, python-format msgid "Converted to %(vol_format)s, but format is now %(file_format)s" msgstr "" -#: cinder/image/image_utils.py:320 +#: cinder/image/image_utils.py:355 #, python-format msgid "Converted to %(f1)s, but format is now %(f2)s" msgstr "" @@ -3344,7 +3345,7 @@ "fail unexpectedly" msgstr "" -#: cinder/keymgr/conf_key_mgr.py:80 +#: cinder/keymgr/conf_key_mgr.py:81 msgid "keymgr.fixed_key not defined" msgstr "" @@ -3419,22 +3420,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:232 #, 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:250 #, python-format msgid "Fatal call to deprecated config: %(msg)s" msgstr "" @@ -3444,7 +3445,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 +3510,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 +3522,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 +3532,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 +3619,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:99 #, 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:103 #, python-format msgid "" "%(what)s is deprecated as of %(as_of)s and may be removed in %(remove_in)s. " @@ -3701,19 +3703,19 @@ msgid "Host %(host)s %(pass_msg)s. Previously tried hosts: %(hosts)s" msgstr "" -#: cinder/scheduler/driver.py:80 +#: cinder/scheduler/driver.py:89 msgid "Must implement host_passes_filters" msgstr "" -#: cinder/scheduler/driver.py:85 +#: cinder/scheduler/driver.py:94 msgid "Must implement find_retype_host" msgstr "" -#: cinder/scheduler/driver.py:89 +#: cinder/scheduler/driver.py:98 msgid "Must implement a fallback schedule" msgstr "必须实现一个回滚 schedule" -#: cinder/scheduler/driver.py:93 +#: cinder/scheduler/driver.py:102 msgid "Must implement schedule_create_volume" msgstr "" @@ -3775,12 +3777,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 +3790,35 @@ "certain combination of filters and weighers." msgstr "" -#: cinder/scheduler/manager.py:130 +#: cinder/scheduler/manager.py:146 msgid "Failed to create scheduler manager volume flow" msgstr "" -#: cinder/scheduler/manager.py:191 +#: cinder/scheduler/manager.py:212 msgid "New volume type not specified in request_spec." msgstr "" -#: cinder/scheduler/manager.py:206 +#: cinder/scheduler/manager.py:227 #, python-format msgid "Could not find a host for volume %(volume_id)s with type %(type_id)s." msgstr "" -#: 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 "" @@ -3836,7 +3838,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 +3853,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,14 +3882,14 @@ 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/test_backup_ceph.py:957 #, python-format msgid "" "Failed to backup volume metadata - Metadata backup object 'backup.%s.meta' " "already exists" msgstr "" -#: cinder/tests/test_ibm_xiv_ds8k.py:133 +#: cinder/tests/test_ibm_xiv_ds8k.py:144 #, python-format msgid "Volume not found for instance %(instance_id)s." msgstr "没有为实例 %(instance_id)s 找到卷。" @@ -3909,16 +3911,16 @@ msgid "Error not a KeyError." msgstr "" -#: 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/test_rbd.py:986 msgid "flush() not supported in this version of librbd" msgstr "" -#: cinder/tests/test_storwize_svc.py:257 +#: cinder/tests/test_storwize_svc.py:295 #, python-format msgid "unrecognized argument %s" msgstr "" @@ -3954,7 +3956,7 @@ msgid "Result data: %s" msgstr "结果数据：%s" -#: cinder/tests/api/contrib/test_backups.py:777 +#: cinder/tests/api/contrib/test_backups.py:975 msgid "Invalid input" msgstr "" @@ -4028,22 +4030,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 +4059,21 @@ msgid "Volume in unexpected state" msgstr "" -#: cinder/transfer/api.py:107 +#: cinder/transfer/api.py:106 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:141 #, python-format msgid "Attempt to transfer %s with invalid auth key." msgstr "" -#: 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 +4085,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 +4107,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:322 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 +4143,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:285 msgid "Metadata property key blank" 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:1015 msgid "Volume status is in-use." msgstr "" -#: 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:1158 #, python-format msgid "No available service named %s" msgstr "" -#: 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:1195 msgid "Source volume not mid-migration." msgstr "" -#: cinder/volume/api.py:1143 +#: cinder/volume/api.py:1199 msgid "Destination volume not mid-migration." msgstr "" -#: cinder/volume/api.py:1148 +#: cinder/volume/api.py:1204 #, python-format msgid "Destination has migration_status %(stat)s, expected %(exp)s." msgstr "" -#: 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:1120 cinder/volume/api.py:1236 #, python-format msgid "Volume %s is already part of an active migration." msgstr "" -#: cinder/volume/api.py:1180 +#: cinder/volume/api.py:1242 #, python-format msgid "migration_policy must be 'on-demand' or 'never', passed: %s" msgstr "" -#: 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 +4292,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,29 +4317,29 @@ 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:668 cinder/volume/manager.py:1070 #, python-format msgid "Unable to fetch connection information from backend: %(err)s" msgstr "" -#: cinder/volume/driver.py:503 +#: cinder/volume/driver.py:674 #, python-format msgid "Error encountered during cleanup of a failed attach: %(ex)s" msgstr "" -#: cinder/volume/driver.py:528 cinder/volume/drivers/ibm/flashsystem.py:881 +#: cinder/volume/driver.py:699 cinder/volume/drivers/ibm/flashsystem.py:881 #, python-format msgid "Unable to access the backend storage via the path %(path)s." msgstr "" -#: cinder/volume/driver.py:268 cinder/volume/manager.py:978 +#: cinder/volume/driver.py:353 cinder/volume/manager.py:1127 #, python-format msgid "Unable to terminate volume connection: %(err)s" msgstr "" @@ -4349,7 +4350,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 +4365,19 @@ msgid "Restoring backup %(backup)s to volume %(volume)s." msgstr "" -#: cinder/volume/driver.py:614 +#: cinder/volume/driver.py:1203 msgid "Extend volume not implemented" msgstr "" -#: cinder/volume/driver.py:695 cinder/volume/driver.py:703 +#: cinder/volume/driver.py:1207 cinder/volume/driver.py:1211 msgid "Manage existing volume not implemented." 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,7 +4387,7 @@ msgid "Error from iscsiadm -m discovery: %s" msgstr "" -#: cinder/volume/driver.py:981 cinder/volume/targets/iscsi.py:79 +#: cinder/volume/driver.py:1451 cinder/volume/targets/iscsi.py:103 #, python-format msgid "Could not find iSCSI export for volume %s" msgstr "" @@ -4398,7 +4398,7 @@ 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 "" @@ -4416,27 +4416,27 @@ msgid "Updating volume stats" msgstr "" -#: cinder/volume/driver.py:1352 +#: cinder/volume/driver.py:1803 msgid "Driver must implement initialize_connection" msgstr "" -#: 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:389 #, python-format msgid "%s" msgstr "" @@ -4451,12 +4451,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 +4474,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 +4489,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 +4515,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:510 msgid "volume is not local to this node" 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 +4557,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:652 #, python-format msgid "snapshot %s: created successfully" msgstr "快照 %s：创建成功" -#: cinder/volume/manager.py:570 +#: cinder/volume/manager.py:662 #, 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:732 msgid "being attached by different mode" 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 +4619,34 @@ msgid "Zoning Mode: %s" msgstr "" -#: cinder/volume/manager.py:1055 +#: cinder/volume/manager.py:1204 msgid "failed to create new_volume on destination host" msgstr "" -#: cinder/volume/manager.py:1058 +#: cinder/volume/manager.py:1207 msgid "timeout creating new_volume on destination host" msgstr "" -#: cinder/volume/manager.py:1082 +#: cinder/volume/manager.py:1234 #, python-format msgid "Failed to copy volume %(vol1)s to %(vol2)s" msgstr "" -#: cinder/volume/manager.py:1111 +#: cinder/volume/manager.py:1282 #, 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:1292 #, 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:1310 #, python-format msgid "Failed to delete migration source vol %(vol)s: %(err)s" msgstr "" @@ -4656,75 +4656,76 @@ 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:1540 #, python-format msgid "Volume %s: Error trying to extend volume" msgstr "" -#: 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:1615 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:1660 msgid "Retype requires migration but is not allowed." msgstr "" -#: cinder/volume/manager.py:1481 +#: cinder/volume/manager.py:1668 msgid "Volume must not have snapshots." msgstr "" -#: cinder/volume/manager.py:1489 +#: cinder/volume/manager.py:1292 msgid "Failed to create manage_existing flow." msgstr "" -#: cinder/volume/manager.py:1531 +#: cinder/volume/manager.py:1718 msgid "Failed to create manage existing flow." msgstr "" @@ -4743,17 +4744,17 @@ msgid "Valid consumer of QoS specs are: %s" msgstr "" -#: 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/volume_types.py:80 cinder/volume/volume_types.py:134 msgid "id cannot be None" msgstr "id不能是None" @@ -4769,45 +4770,45 @@ "%(qos_specs_id)s" msgstr "" -#: 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 "" @@ -4820,16 +4821,16 @@ msgid "No big enough free disk" 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 +4839,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 +4877,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,7 +4907,7 @@ msgid "Sending CLI command: '%s'" msgstr "" -#: cinder/volume/drivers/eqlx.py:183 +#: cinder/volume/drivers/eqlx.py:209 msgid "Error executing EQL command" msgstr "" @@ -4915,16 +4916,14 @@ msgid "EQL-driver: executing \"%s\"" msgstr "" -#: cinder/volume/drivers/eqlx.py:227 +#: cinder/volume/drivers/eqlx.py:253 #, python-format msgid "" "SSH Command failed after '%(total_attempts)r' attempts : '%(command)s'" msgstr "" -#: 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 "" @@ -5019,22 +5018,22 @@ msgid "mount.glusterfs is not installed" msgstr "" -#: 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:827 msgid "Volume status must be 'available'." 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:1060 msgid "Snapshot status must be \"available\" to clone." msgstr "" @@ -5048,12 +5047,12 @@ 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:1190 #, python-format msgid "" "Volume status must be \"available\" or \"in-use\" for snapshot. (is %s)" @@ -5064,11 +5063,11 @@ 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:1257 msgid "Nova returned \"error\" status while creating snapshot." msgstr "" @@ -5077,7 +5076,7 @@ msgid "Status of snapshot %(id)s is now %(status)s" msgstr "" -#: cinder/volume/drivers/remotefs.py:1239 +#: cinder/volume/drivers/remotefs.py:1274 #, python-format msgid "Timed out while waiting for Nova update for creation of snapshot %s." msgstr "" @@ -5092,7 +5091,7 @@ msgid "volume id: %s" msgstr "" -#: cinder/volume/drivers/remotefs.py:591 +#: cinder/volume/drivers/remotefs.py:626 msgid "'active' must be present when writing snap_info." msgstr "" @@ -5101,11 +5100,11 @@ msgid "deleting snapshot %s" msgstr "" -#: cinder/volume/drivers/remotefs.py:855 +#: cinder/volume/drivers/remotefs.py:890 msgid "Volume status must be \"available\" or \"in-use\"." msgstr "" -#: 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,12 +5125,12 @@ msgid "No %(base_id)s found for %(file)s" msgstr "" -#: cinder/volume/drivers/remotefs.py:972 +#: cinder/volume/drivers/remotefs.py:1007 #, python-format msgid "No file found with %s as backing file." msgstr "" -#: cinder/volume/drivers/remotefs.py:981 +#: cinder/volume/drivers/remotefs.py:1016 #, python-format msgid "No snap found with %s as backing file." msgstr "" @@ -5141,12 +5140,12 @@ 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,29 +5154,29 @@ msgid "status of snapshot %s is still \"deleting\"... waiting" msgstr "" -#: cinder/volume/drivers/remotefs.py:1311 +#: cinder/volume/drivers/remotefs.py:1346 #, python-format msgid "Unable to delete snapshot %(id)s, status: %(status)s." msgstr "" -#: cinder/volume/drivers/remotefs.py:1324 +#: cinder/volume/drivers/remotefs.py:1359 #, python-format msgid "" "Timed out while waiting for Nova update for deletion of snapshot %(id)s." msgstr "" -#: cinder/volume/drivers/glusterfs.py:345 cinder/volume/drivers/quobyte.py:242 +#: cinder/volume/drivers/glusterfs.py:345 cinder/volume/drivers/quobyte.py:241 #, python-format msgid "%s must be a valid raw or qcow2 image." msgstr "" -#: cinder/volume/drivers/glusterfs.py:388 cinder/volume/drivers/quobyte.py:264 -#: cinder/volume/drivers/smbfs.py:446 +#: cinder/volume/drivers/glusterfs.py:388 cinder/volume/drivers/quobyte.py:263 +#: cinder/volume/drivers/smbfs.py:465 msgid "" "Extend volume is only supported for this driver when no snapshots exist." msgstr "" -#: cinder/volume/drivers/glusterfs.py:396 cinder/volume/drivers/quobyte.py:272 +#: cinder/volume/drivers/glusterfs.py:396 cinder/volume/drivers/quobyte.py:271 #, python-format msgid "Unrecognized backing format: %s" msgstr "" @@ -5192,7 +5191,7 @@ msgid "file already exists at %s" msgstr "" -#: 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 "" @@ -5224,32 +5223,32 @@ msgid "Backup is only supported for raw-formatted GlusterFS volumes." msgstr "" -#: cinder/volume/drivers/lvm.py:153 +#: cinder/volume/drivers/lvm.py:152 #, python-format msgid "Volume device file path %s does not exist." msgstr "" -#: cinder/volume/drivers/lvm.py:160 +#: cinder/volume/drivers/lvm.py:159 #, python-format msgid "Size for volume: %s not found, cannot secure delete." msgstr "" -#: 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:474 #, python-format msgid "" "Failed to rename logical volume %(name)s, error message was: %(err_msg)s" @@ -5259,14 +5258,14 @@ msgid "Reference must contain lv_name element." msgstr "" -#: cinder/volume/drivers/lvm.py:479 cinder/volume/drivers/rbd.py:979 +#: cinder/volume/drivers/lvm.py:507 cinder/volume/drivers/rbd.py:975 #, python-format msgid "" "Failed to manage existing volume %(name)s, because reported size %(size)s " "was not a floating-point number." msgstr "" -#: 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 +5274,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:357 cinder/volume/drivers/smbfs.py:548 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/remotefs.py:347 +#: cinder/volume/drivers/remotefs.py:358 #, python-format msgid " but size is now %d" msgstr "" -#: 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:122 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:118 +#: cinder/volume/drivers/nfs.py:127 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: 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 "" @@ -5343,24 +5342,24 @@ msgid "fileno() not supported by RBD()" msgstr "" -#: 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:281 msgid "rados and rbd python libraries not found" msgstr "" -#: 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:407 #, python-format msgid "clone depth exceeds limit of %s" msgstr "" @@ -5423,7 +5422,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,7 +5436,7 @@ msgid "deleting rbd volume %s" msgstr "" -#: cinder/volume/drivers/rbd.py:660 +#: cinder/volume/drivers/rbd.py:659 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 " @@ -5453,15 +5452,15 @@ msgid "connection data: %s" msgstr "" -#: cinder/volume/drivers/rbd.py:769 +#: cinder/volume/drivers/rbd.py:766 msgid "Not stored in rbd" msgstr "" -#: cinder/volume/drivers/rbd.py:773 +#: cinder/volume/drivers/rbd.py:770 msgid "Blank components" msgstr "" -#: cinder/volume/drivers/rbd.py:776 +#: cinder/volume/drivers/rbd.py:773 msgid "Not an rbd snapshot" msgstr "" @@ -5493,7 +5492,7 @@ msgid "volume restore complete." msgstr "" -#: cinder/volume/drivers/rbd.py:916 cinder/volume/drivers/sheepdog.py:188 +#: cinder/volume/drivers/rbd.py:912 cinder/volume/drivers/sheepdog.py:188 #, python-format msgid "Failed to Extend Volume %(volname)s" msgstr "" @@ -5504,24 +5503,24 @@ 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:74 msgid "Value required for 'scality_sofs_config'" msgstr "" -#: 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:91 msgid "Cannot execute /sbin/mount.sofs" msgstr "" -#: cinder/volume/drivers/scality.py:114 +#: cinder/volume/drivers/scality.py:106 msgid "Cannot mount Scality SOFS, check syslog for errors" msgstr "" -#: 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 "" @@ -5540,31 +5539,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,24 +5573,24 @@ 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:211 +#: cinder/volume/drivers/solidfire.py:284 +#: cinder/volume/drivers/solidfire.py:380 #, python-format msgid "API response: %s" msgstr "" @@ -5606,27 +5605,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:412 msgid "Failed to get model update from clone" 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 +5634,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 +5653,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 +5694,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 +5722,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 +5732,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 +5743,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 +5758,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 +5773,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 +5801,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 +5811,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 +5827,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 +5847,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 +5865,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 +5887,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 +5904,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 +5953,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 +5967,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 +5982,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 +6031,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 +6059,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 +6075,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 +6087,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 +6109,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 +6127,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 +6140,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 +6162,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 +6243,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 +6270,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 +6311,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 +6335,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 +6356,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 +6391,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 +6415,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,9 +6463,7 @@ "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:1394 #, python-format msgid "Error finding %s." msgstr "" @@ -6494,8 +6487,7 @@ "%(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:2224 #, python-format msgid "" "Volume %(name)s not found on the array. Cannot determine if there are " @@ -6528,7 +6520,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,7 +6564,7 @@ "%(hardwareids)s." msgstr "" -#: cinder/volume/drivers/emc/emc_vmax_provision.py:655 +#: cinder/volume/drivers/emc/emc_vmax_provision.py:860 msgid "Error finding Target WWNs." msgstr "" @@ -6897,15 +6889,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 +6904,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 +6929,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 +6954,7 @@ msgid "LUN %s is deleted." msgstr "" -#: cinder/volume/drivers/huawei/__init__.py:61 +#: cinder/volume/drivers/huawei/__init__.py:58 msgid "_instantiate_driver: configuration not found." msgstr "" @@ -6977,7 +6965,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 +6992,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 +7010,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 +7025,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 +7041,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 +7092,7 @@ "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:143 +#: cinder/volume/drivers/huawei/rest_common.py:145 #, python-format msgid "%s \"data\" was not in result." msgstr "" @@ -7230,14 +7217,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 +7239,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 +7253,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 +7277,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 +7285,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 +7296,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 +7325,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 +7337,12 @@ "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:546 -#: cinder/volume/drivers/huawei/ssh_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: 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 +7352,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 +7364,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 +7374,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 +7388,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 +7440,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 +7451,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 +7460,144 @@ "_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:139 #, python-format msgid "GPFS is not running, state: %s." msgstr "" -#: 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:187 #, python-format msgid "Failed to find fileset for path %(path)s, command output: %(cmdout)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:205 +#: cinder/volume/drivers/ibm/gpfs.py:209 #, python-format msgid "Invalid storage pool %s requested. Retype failed." msgstr "" -#: 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:324 #, python-format msgid "Could not find GPFS cluster id: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:328 +#: cinder/volume/drivers/ibm/gpfs.py:332 #, python-format msgid "Could not find GPFS file system device: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:336 +#: cinder/volume/drivers/ibm/gpfs.py:340 #, python-format msgid "Invalid storage pool %s specificed." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:346 +#: cinder/volume/drivers/ibm/gpfs.py:350 msgid "Option gpfs_mount_point_base is not set correctly." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:353 +#: cinder/volume/drivers/ibm/gpfs.py:357 msgid "Option gpfs_images_share_mode is not set correctly." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:359 +#: cinder/volume/drivers/ibm/gpfs.py:363 msgid "Option gpfs_images_dir is not set correctly." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:366 +#: cinder/volume/drivers/ibm/gpfs.py:370 #, 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 "" -#: cinder/volume/drivers/ibm/gpfs.py:377 +#: cinder/volume/drivers/ibm/gpfs.py:381 #, python-format msgid "" "gpfs_images_share_mode is set to copy_on_write, but %(vol)s and %(img)s " "belong to different filesets." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:386 +#: cinder/volume/drivers/ibm/gpfs.py:390 #, 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 "" -#: cinder/volume/drivers/ibm/gpfs.py:400 +#: cinder/volume/drivers/ibm/gpfs.py:404 #, python-format msgid "%s must be an absolute path." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:405 +#: cinder/volume/drivers/ibm/gpfs.py:409 #, python-format msgid "%s is not a directory." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:415 +#: cinder/volume/drivers/ibm/gpfs.py:419 #, 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 "" -#: 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,33 +7612,32 @@ 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:1003 #, python-format msgid "mkfs failed on volume %(vol)s, error message was: %(err)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:988 +#: cinder/volume/drivers/ibm/gpfs.py:1036 #, python-format msgid "" "%s cannot be accessed. Verify that GPFS is active and file system is mounted." msgstr "" -#: 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/ibm/ibmnas.py:111 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:261 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:226 #, python-format msgid "%s is not set" msgstr "" -#: cinder/volume/drivers/ibm/ibmnas.py:116 +#: cinder/volume/drivers/ibm/ibmnas.py:117 msgid "" "Password or SSH private key is required for authentication: set either " "nas_password or nas_private_key option" @@ -7698,18 +7683,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,12 +7706,12 @@ "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/ibm/ibmnas.py:246 #, python-format msgid "Volume %s does not have provider_location specified, skipping." msgstr "" @@ -7734,12 +7720,12 @@ 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:218 msgid "do_setup: No configured nodes." msgstr "" @@ -7751,21 +7737,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 +7762,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 +7776,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:452 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,7 +7833,7 @@ 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:543 msgid "terminate_connection: Failed to get host name from connector." msgstr "" @@ -7856,17 +7842,17 @@ 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:598 msgid "create_snapshot: get source volume failed." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:604 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:611 msgid "create_volume_from_snapshot: Source and destination size differ." msgstr "" #: 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/storwize_svc/__init__.py:633 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:756 msgid "create_cloned_volume: Source and destination size differ." msgstr "" @@ -7875,7 +7861,7 @@ msgid "enter: extend_volume: volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:651 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:658 msgid "extend_volume: Extending a volume with snapshots is not supported." msgstr "" @@ -7884,28 +7870,28 @@ 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 +7902,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 +7945,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:999 msgid "The specified vdisk is mapped to a host." msgstr "" -#: 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 "" -#: 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,11 +7997,11 @@ 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:265 msgid "create_host: No initiators or wwpns supplied." msgstr "" @@ -8042,20 +8028,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 +8054,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,13 +8107,13 @@ 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:726 #, python-format msgid "" "Mapping %(id)s prepare failed to complete within theallotted %(to)d seconds " @@ -8151,7 +8137,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 +8152,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 +8167,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,7 +8177,7 @@ 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:998 msgid "add_vdisk_copy started without a vdisk copy in the expected pool." msgstr "" @@ -8202,7 +8188,7 @@ "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." @@ -8210,8 +8196,8 @@ #: 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/storwize_svc/ssh.py:216 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:255 #, python-format msgid "" "CLI Exception output:\n" @@ -8226,7 +8212,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,27 +8221,27 @@ " stderr: %(err)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:146 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:147 msgid "Must pass wwpn or host to lsfabric." msgstr "" -#: 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: " @@ -8279,52 +8265,52 @@ msgid "Type cannot be converted into NaElement." msgstr "" -#: cinder/volume/drivers/netapp/common.py:70 +#: cinder/volume/drivers/netapp/common.py:68 msgid "Required configuration not found" 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 +8329,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,30 +8339,30 @@ msgid "Destroyed LUN %s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:519 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:611 #, 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/dataontap/block_base.py:615 #, 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:621 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:727 #, python-format msgid "Failed to get LUN target details for the LUN %s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:542 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:634 #, python-format msgid "Failed to get target portal for the LUN %s" msgstr "" -#: cinder/volume/drivers/netapp/dataontap/block_base.py:547 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:639 #, python-format msgid "Failed to get target IQN for the LUN %s" msgstr "" @@ -8386,54 +8372,54 @@ 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:660 #, 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:329 msgid "Object is not a NetApp LUN." msgstr "" -#: 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 +8429,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 +8478,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 +8503,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 +8512,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 +8529,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 +8544,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 +8558,23 @@ 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:113 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:218 #, python-format msgid "NFS file %s not discovered." msgstr "" -#: 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 +8585,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 +8598,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 +8608,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 +8632,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 +8652,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,22 +8672,22 @@ 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/netapp/dataontap/nfs_base.py:464 #, 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:481 msgid "NFS file could not be discovered." msgstr "" @@ -8709,12 +8695,12 @@ 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/hds/nfs.py:243 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:496 msgid "Resizing image file failed." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:522 +#: cinder/volume/drivers/netapp/nfs.py:513 msgid "Discover file retries exhausted." msgstr "" @@ -8728,39 +8714,39 @@ 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/netapp/dataontap/nfs_base.py:593 msgid "Image location not present." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:628 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:631 msgid "Container size smaller than required file size." 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 "" @@ -8771,12 +8757,12 @@ msgid "Volume %s could not be created on shares." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:321 +#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:330 #, python-format msgid "No interface found on cluster for ip %s" msgstr "" -#: 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 +8771,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 +8782,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 +8821,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 +8830,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 +8859,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,7 +8868,7 @@ 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:474 msgid "Source host details not found." msgstr "" @@ -8906,7 +8892,7 @@ 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:527 #, python-format msgid "Converted to raw, but format is now %s." msgstr "" @@ -8951,28 +8937,28 @@ 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 "" @@ -8980,11 +8966,11 @@ msgid "Backend server not NaServer." msgstr "" -#: 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 "" @@ -8992,7 +8978,7 @@ msgid "Fatal error: User not permitted to query NetApp volumes." msgstr "" -#: 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,12 +8989,12 @@ 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." @@ -9018,28 +9004,28 @@ msgid "Requires an NaServer instance." msgstr "" -#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:448 +#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:457 msgid "Unsupported Clustered Data ONTAP version." msgstr "" -#: 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:53 msgid "Invalid transport type." 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:80 msgid "Invoking web service failed." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:111 +#: cinder/volume/drivers/netapp/eseries/client.py:113 msgid "Storage system id not set." msgstr "" @@ -9050,16 +9036,16 @@ "%(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:146 msgid "Content type not supported." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:154 +#: cinder/volume/drivers/netapp/eseries/client.py:156 #, python-format msgid "Response error - %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:156 +#: cinder/volume/drivers/netapp/eseries/client.py:158 #, python-format msgid "Response error code - %s." msgstr "" @@ -9070,51 +9056,51 @@ msgid "%s is not set." msgstr "" -#: 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/iscsi.py:217 #, 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/iscsi.py:227 #, python-format msgid "System %(id)s found with bad status - %(status)s." msgstr "" -#: 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 +9120,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/iscsi.py:440 #, python-format msgid "Failure creating volume %s." msgstr "" -#: 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 +9160,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/iscsi.py:494 #, python-format msgid "Vol copy job for dest %s failed." msgstr "" -#: 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 +9232,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/iscsi.py:710 #, python-format msgid "Host type %s not supported." msgstr "" -#: 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 +9265,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 +9279,22 @@ msgid "Error deleting vol with label %s." msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:106 +#: cinder/volume/drivers/nexenta/iscsi.py:105 #, python-format msgid "Volume %s does not exist in Nexenta SA" msgstr "" -#: 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 +9305,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 +9323,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 +9405,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,12 +9423,12 @@ msgid "Got response: %s" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:88 +#: cinder/volume/drivers/nexenta/nfs.py:85 #, python-format msgid "Volume %s does not exist in Nexenta Store appliance" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:92 +#: cinder/volume/drivers/nexenta/nfs.py:89 #, python-format msgid "Folder %s does not exist in Nexenta Store appliance" msgstr "" @@ -9454,33 +9438,33 @@ 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,16 +9479,16 @@ 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 "" -#: cinder/volume/drivers/san/san.py:171 +#: cinder/volume/drivers/san/san.py:170 msgid "Specify san_password or san_private_key" msgstr "指定san_password或者san_private_key" -#: cinder/volume/drivers/san/san.py:175 +#: cinder/volume/drivers/san/san.py:174 msgid "san_ip must be set" msgstr "san_ip必须设置" @@ -9513,35 +9497,35 @@ 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:235 #, 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:250 #, python-format msgid "Failed to Login to 3PAR (%(url)s) because %(err)s" msgstr "" -#: 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:304 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:724 #, python-format msgid "CPG (%s) doesn't exist on array" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:299 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:312 #, python-format msgid "Failed to get domain because CPG (%s) doesn't exist on array." msgstr "" @@ -9555,22 +9539,22 @@ 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:965 #, python-format msgid "VV Set %s does not exist." msgstr "" @@ -9581,14 +9565,14 @@ "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:1100 #, python-format msgid "" "Must specify a valid provisioning type %(valid)s, value '%(prov)s' is " "invalid." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1113 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1216 #, python-format msgid "Volume (%s) already exists on array" msgstr "" @@ -9603,7 +9587,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 +9602,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:1530 #, python-format msgid "Failure in update_volume_key_value_pair:%s" msgstr "" -#: 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,7 +9662,7 @@ 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:1655 #, python-format msgid "" "Copy volume task failed: convert_to_base_volume: id=%(id)s, " @@ -9700,39 +9684,39 @@ 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:1679 #, python-format msgid "Volume (%s) already exists on array." msgstr "" -#: 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:161 #, 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:195 #, 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/san/hp/hp_3par_iscsi.py:201 msgid "At least one valid iSCSI IP address must be set." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:289 +#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:313 msgid "Least busy iSCSI port not found, using first iSCSI port in list." msgstr "" @@ -9774,13 +9758,13 @@ 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 "" @@ -9788,7 +9772,7 @@ 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 +9781,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:118 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:156 msgid "LeftHand cluster not found" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:155 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:178 #, 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 +9824,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 +9844,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 +9856,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 +9874,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 +9887,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 +9897,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 +9916,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 +9942,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 +9983,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 +9997,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 +10031,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 +10047,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 +10079,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 +10089,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,25 +10134,25 @@ 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:260 #, python-format msgid "%s not set." msgstr "" -#: 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:310 #, python-format msgid "Not able to find a suitable datastore for the volume: %s." msgstr "" @@ -10178,11 +10162,11 @@ 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:402 #, python-format msgid "" "Unable to pick datastore to accommodate %(size)s bytes from the datastores: " @@ -10201,7 +10185,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:442 #, python-format msgid "No such storage profile '%s; is defined in vCenter." msgstr "" @@ -10211,40 +10195,40 @@ msgid "Storage profile required for this volume: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:467 +#: cinder/volume/drivers/vmware/vmdk.py:470 #, 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 +10238,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,77 +10248,77 @@ "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:688 #, python-format msgid "Snapshot of volume not supported in state: %s." msgstr "" -#: 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:720 #, python-format msgid "Delete snapshot of volume not supported in state: %s." msgstr "" -#: 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:863 #, python-format msgid "" "Cannot create image of disk format: %s. Only vmdk disk format is accepted." @@ -10346,7 +10330,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,7 +10342,7 @@ "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:1129 #, python-format msgid "Exception in _select_ds_for_volume: %s." msgstr "" @@ -10367,24 +10352,24 @@ 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,12 +10379,12 @@ 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:1313 msgid "Upload to glance of attached volume is not supported." msgstr "" @@ -10408,102 +10393,102 @@ 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:2048 #, python-format msgid "Linked clone of source volume not supported in state: %s." msgstr "" @@ -10513,8 +10498,8 @@ 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 +10514,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 +10534,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,7 +10544,7 @@ msgid "Datastores attached to host %(host)s are: %(ds)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:463 +#: cinder/volume/drivers/vmware/volumeops.py:475 #, python-format msgid "There are no valid datastores attached to %s." msgstr "" @@ -10591,7 +10576,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 +10599,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 +10621,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 +10639,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 +10655,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 +10666,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 +10678,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 +10710,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 +10724,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 +10739,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 "" @@ -10889,14 +10874,14 @@ "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:346 #, python-format msgid "" "extend: error when extending the volume: %(vol_name)s .WMI exception: " @@ -10908,7 +10893,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 +10905,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:263 #, python-format msgid "" "Size of specified image %(image_size)sGB is larger than volume size " "%(volume_size)sGB." msgstr "" -#: cinder/volume/flows/api/create_volume.py:252 +#: cinder/volume/flows/api/create_volume.py:271 #, python-format msgid "" "Volume size %(volume_size)sGB cannot be smaller than the image minDisk size " "%(min_disk)sGB." msgstr "" -#: cinder/volume/flows/api/create_volume.py:270 +#: cinder/volume/flows/api/create_volume.py:289 #, python-format msgid "Metadata property key %s greater than 255 characters" msgstr "" -#: cinder/volume/flows/api/create_volume.py:275 +#: cinder/volume/flows/api/create_volume.py:294 #, python-format msgid "Metadata property key %s value greater than 255 characters" msgstr "" -#: 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:344 msgid "Volume must be in the same availability zone as the snapshot" msgstr "" -#: cinder/volume/flows/api/create_volume.py:334 +#: cinder/volume/flows/api/create_volume.py:353 msgid "Volume must be in the same availability zone as the source volume" 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 +11026,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:356 #, python-format msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:349 +#: cinder/volume/flows/manager/create_volume.py:358 #, python-format msgid "" "Failed updating volume %(vol_id)s metadata using the provided %(src_type)s " "%(src_id)s metadata" msgstr "" -#: 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 +11066,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 +11078,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 +11111,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,20 +11128,20 @@ "%(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:717 #, 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 "" @@ -11172,7 +11156,7 @@ 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 +11177,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 +11201,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 +11210,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 +11220,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,7 +11234,7 @@ 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:105 #: cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py:104 msgid "Missing Fibre Channel SAN configuration param - fc_fabric_names" msgstr "" @@ -11265,12 +11249,12 @@ 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:142 #, python-format msgid "SSH connection failed for %(fabric)s with error: %(err)s" msgstr "" @@ -11311,11 +11295,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 +11308,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_san_lookup_service.py:249 #: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:370 #, python-format msgid "Malformed nameserver string: %s" msgstr "" -#: 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 "" @@ -11364,8 +11347,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 "" @@ -11411,7 +11393,7 @@ msgid "Deleting zones failed: (command=%(cmd)s error=%(err)s)." msgstr "" -#: 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 "" @@ -11442,7 +11424,7 @@ 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 "" @@ -11475,45 +11457,42 @@ 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:354 +#: 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 "" -#: 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:182 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:197 #, python-format msgid "Zoning Policy: %s, not recognized" msgstr "" -#: 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 +11507,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,8 +11557,8 @@ 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:376 msgid "Failed to update or delete zoning configuration" msgstr "" @@ -11609,18 +11587,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 +11612,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/colord.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/colord.po 2015-08-14 07:52:46.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: 2015-08-04 08:35+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/command-not-found.po 2015-08-14 07:52:37.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: 2015-08-04 07:25+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/coreutils.po 2015-08-14 07:52:21.000000000 +0000 @@ -20,8 +20,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:39+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2015-08-04 05:37+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: zh_CN\n" #: lib/argmatch.c:133 diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cpio.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/cpio.po 2015-08-14 07:52:21.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: 2015-08-04 05:37+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/cpplib-4.7.po 2015-08-14 07:52: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 13:24+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2015-08-04 08:39+0000\n" +"X-Generator: Launchpad (build 17656)\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/cracklib.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/cracklib.po 2015-08-14 07:52:21.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: 2015-08-04 05:37+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2015-08-14 07:52:32.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: 2015-08-04 06:53+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/cryptsetup.po 2015-08-14 07:52:32.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: 2015-08-04 06:53+0000\n" +"X-Generator: Launchpad (build 17656)\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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/cups.po 2015-08-14 07:52:42.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: 2015-08-04 08:02+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: \n" #: systemv/lpstat.c:1867 systemv/lpstat.c:1990 @@ -1259,7 +1259,7 @@ msgid " -l List attributes." msgstr "" -#: scheduler/main.c:2008 +#: scheduler/main.c:2065 msgid " -l Run cupsd from launchd(8)." msgstr "" @@ -1732,7 +1732,7 @@ "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)." msgstr "" -#: berkeley/lpq.c:565 +#: berkeley/lpq.c:560 #, c-format msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes" msgstr "" @@ -2861,7 +2861,7 @@ msgid "70" msgstr "70" -#: ppdc/sample.c:252 +#: ppdc/sample.c:261 msgid "720dpi" msgstr "720dpi" @@ -4553,11 +4553,11 @@ msgid "Never" msgstr "永不" -#: ppdc/sample.c:256 +#: ppdc/sample.c:265 msgid "New Stylus Color Series" msgstr "新 Stylus Color 系列" -#: ppdc/sample.c:258 +#: ppdc/sample.c:267 msgid "New Stylus Photo Series" msgstr "新 Stylus Photo 系列" @@ -4783,22 +4783,22 @@ msgid "Output Mode" msgstr "输出模式" -#: systemv/lpstat.c:1239 systemv/lpstat.c:1243 +#: systemv/lpstat.c:1191 systemv/lpstat.c:1195 #, c-format msgid "Output for printer %s is sent to %s" msgstr "" -#: systemv/lpstat.c:1233 +#: systemv/lpstat.c:1185 #, c-format msgid "Output for printer %s is sent to remote printer %s on %s" msgstr "" -#: systemv/lpstat.c:1257 systemv/lpstat.c:1261 +#: systemv/lpstat.c:1209 systemv/lpstat.c:1213 #, c-format msgid "Output for printer %s/%s is sent to %s" msgstr "" -#: systemv/lpstat.c:1251 +#: systemv/lpstat.c:1203 #, c-format msgid "Output for printer %s/%s is sent to remote printer %s on %s" msgstr "" @@ -5009,8 +5009,9 @@ msgid "Printers" msgstr "打印机" +#: driver/rastertoescpx.c:1882 driver/rastertopclx.c:1904 #: filter/rastertoepson.c:1093 filter/rastertohp.c:817 -#: filter/rastertolabel.c:1243 +#: filter/rastertolabel.c:1249 #, c-format msgid "Printing page %d, %d%% complete." msgstr "" @@ -5032,7 +5033,7 @@ msgstr "" #. TRANSLATORS: Pri is job priority. -#: berkeley/lpq.c:516 +#: berkeley/lpq.c:511 msgid "" "Rank Owner Pri Job Files Total Size" msgstr "" @@ -5177,11 +5178,11 @@ msgid "Statement" msgstr "报表" -#: ppdc/sample.c:251 +#: ppdc/sample.c:260 msgid "Stylus Color Series" msgstr "Stylus Color 系列" -#: ppdc/sample.c:257 +#: ppdc/sample.c:266 msgid "Stylus Photo Series" msgstr "Stylus Photo 系列" @@ -6108,7 +6109,7 @@ msgid "Usage: cupsd [options]" msgstr "" -#: scheduler/cupsfilter.c:1456 +#: scheduler/cupsfilter.c:1436 msgid "Usage: cupsfilter [ options ] filename" msgstr "" @@ -6325,7 +6326,7 @@ msgid "cupsd: Unknown option \"%c\" - aborting." msgstr "" -#: scheduler/main.c:236 +#: scheduler/main.c:256 msgid "cupsd: launchd(8) support not compiled in, running in normal mode." msgstr "" @@ -6485,7 +6486,7 @@ msgid "ippfind: Unknown variable \"{%s}\"." msgstr "" -#: test/ipptool.c:372 test/ipptool.c:521 test/ipptool.c:545 +#: test/ipptool.c:373 msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"." msgstr "" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cwidget.po language-pack-zh-hans-base-14.04+20150804/data/zh_CN/LC_MESSAGES/cwidget.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/cwidget.po 2015-02-19 15:26:21.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20150804/data/zh_CN/LC_MESSAGES/cwidget.po 2015-08-14 07:52:41.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:42+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2015-08-04 07:54+0000\n" +"X-Generator: Launchpad (build 17656)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/dctrl-tools.po language-pack-zh-hans-base-14.04+20150804/data/zh_CN/LC_MESSAGES/dctrl-tools.po --- language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2015-02-19 15:26:17.000000000 +0000 +++ language-pack-zh-hans-base-14.04+20150804/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2015-08-14 07:52:37.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:15+0000\n" -"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2015-08-04 07:24+0000\n" +"X-Generator: Launchpad (build 17656)\n" #: lib/ifile.c:58 #, c-format @@ -87,226 +87,226 @@ msgid "FILTER [FILENAME...]" msgstr "" -#: grep-dctrl/grep-dctrl.c:70 sort-dctrl/sort-dctrl.c:39 +#: grep-dctrl/grep-dctrl.c:71 sort-dctrl/sort-dctrl.c:39 #: tbl-dctrl/tbl-dctrl.c:43 join-dctrl/join-dctrl.c:45 msgid "LEVEL" msgstr "级别" -#: grep-dctrl/grep-dctrl.c:70 +#: grep-dctrl/grep-dctrl.c:71 msgid "Set log level to LEVEL." msgstr "" -#: grep-dctrl/grep-dctrl.c:71 grep-dctrl/grep-dctrl.c:74 +#: grep-dctrl/grep-dctrl.c:72 grep-dctrl/grep-dctrl.c:75 msgid "FIELD,FIELD,..." msgstr "字段，字段，..." -#: grep-dctrl/grep-dctrl.c:71 +#: grep-dctrl/grep-dctrl.c:72 msgid "Restrict pattern matching to the FIELDs given." msgstr "限制模式匹配到给出字段。" -#: grep-dctrl/grep-dctrl.c:72 +#: grep-dctrl/grep-dctrl.c:73 msgid "This is a shorthand for -FPackage." msgstr "这是一个简写的FPackage" -#: grep-dctrl/grep-dctrl.c:73 +#: grep-dctrl/grep-dctrl.c:74 msgid "This is a shorthand for -FSource:Package." msgstr "这是一个简写的FSource:Package" -#: grep-dctrl/grep-dctrl.c:74 +#: grep-dctrl/grep-dctrl.c:75 msgid "Show only the body of these fields from the matching paragraphs." msgstr "仅显示匹配段落中这些字段的正文部分。" -#: grep-dctrl/grep-dctrl.c:75 +#: grep-dctrl/grep-dctrl.c:76 msgid "" "Show only the first line of the \"Description\" field from the matching " "paragraphs." msgstr "仅显示匹配段落中“描述”的第一行。" -#: grep-dctrl/grep-dctrl.c:76 +#: grep-dctrl/grep-dctrl.c:77 msgid "Suppress field names when showing specified fields." msgstr "当显示指定的字段，压缩字段名。" -#: grep-dctrl/grep-dctrl.c:77 +#: grep-dctrl/grep-dctrl.c:80 msgid "Regard the pattern as an extended POSIX regular expression." msgstr "把模型作为一个扩展的POSIX常规表达式。" -#: grep-dctrl/grep-dctrl.c:78 +#: grep-dctrl/grep-dctrl.c:81 msgid "Regard the pattern as a standard POSIX regular expression." msgstr "" -#: grep-dctrl/grep-dctrl.c:79 +#: grep-dctrl/grep-dctrl.c:82 msgid "Ignore case when looking for a match." msgstr "在搜索匹配时忽略大小写" -#: grep-dctrl/grep-dctrl.c:80 +#: grep-dctrl/grep-dctrl.c:83 msgid "Show only paragraphs that do not match." msgstr "只显示不匹配的段落。" -#: grep-dctrl/grep-dctrl.c:81 +#: grep-dctrl/grep-dctrl.c:84 msgid "Show those fields that have NOT been selected with -s" msgstr "使用参数-s显示没有被选中的文件" -#: grep-dctrl/grep-dctrl.c:82 +#: grep-dctrl/grep-dctrl.c:85 msgid "Show only the count of matching paragraphs." msgstr "仅显示匹配段落的数量。" -#: grep-dctrl/grep-dctrl.c:83 +#: grep-dctrl/grep-dctrl.c:86 msgid "Do an exact match." msgstr "进行一次精确匹配。" -#: grep-dctrl/grep-dctrl.c:84 sort-dctrl/sort-dctrl.c:38 +#: grep-dctrl/grep-dctrl.c:87 sort-dctrl/sort-dctrl.c:38 #: tbl-dctrl/tbl-dctrl.c:42 join-dctrl/join-dctrl.c:44 msgid "Print out the copyright license." msgstr "打印版权许可。" -#: grep-dctrl/grep-dctrl.c:85 +#: grep-dctrl/grep-dctrl.c:88 msgid "Conjunct filters." msgstr "" -#: grep-dctrl/grep-dctrl.c:86 +#: grep-dctrl/grep-dctrl.c:89 msgid "Disjunct filters." msgstr "" -#: grep-dctrl/grep-dctrl.c:87 +#: grep-dctrl/grep-dctrl.c:90 msgid "Negate the following filters." msgstr "" -#: grep-dctrl/grep-dctrl.c:88 +#: grep-dctrl/grep-dctrl.c:91 msgid "Test for version number equality." msgstr "测试版本号数字是否相等。" -#: grep-dctrl/grep-dctrl.c:89 +#: grep-dctrl/grep-dctrl.c:92 msgid "Version number comparison: <<." msgstr "" -#: grep-dctrl/grep-dctrl.c:90 +#: grep-dctrl/grep-dctrl.c:93 msgid "Version number comparison: <=." msgstr "版本号比较：<=。" -#: grep-dctrl/grep-dctrl.c:91 +#: grep-dctrl/grep-dctrl.c:94 msgid "Version number comparison: >>." 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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/debconf.po 2015-08-14 07:52:21.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: 2015-08-04 05:37+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: zh_CN\n" #: ../Debconf/AutoSelect.pm:76 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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/debian-tasks.po 2015-08-14 07:52:34.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: 2015-08-04 07:04+0000\n" +"X-Generator: Launchpad (build 17656)\n" "Language: \n" #. Description diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/debianutils.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/debianutils.po 2015-08-14 07:52:21.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: 2015-08-04 05:37+0000\n" +"X-Generator: Launchpad (build 17656)\n" #. type: TH #: ../add-shell.8:1 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+20150804/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+20150804/data/zh_CN/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2015-08-14 07:52: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: 2015-08-04 08:18+0000\n" +"X-Generator: Launchpad (build 17656)\n" #: src/daemon/notificationhelper.desktop:2 msgctxt "Name" diff -Nru language-pack-zh-hans-base-14.04+20150219/data/zh_CN/LC_MESSAGES/devscripts.po language-pack-zh-hans-base-14.04+20150804/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+20150804/data/zh_CN/LC_MESSAGES/devscripts.po 2015-08-14 07:52:21.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: 2015-08-04 05:38+0000\n" +"X-Generator: Launchpad (build 17656)\n" #. type: TH #: ../scripts/annotate-output.1:1 @@ -36,7 +36,7 @@ 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: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: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:538 ../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.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 #, 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: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: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:542 ../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.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 #, 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: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: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:552 ../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:8 ../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.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 #, 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: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: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:593 ../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:14 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/mk-origtargz.pl:53 ../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/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:35 #, no-wrap msgid "OPTIONS" msgstr "选项" @@ -89,7 +89,7 @@ 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:93 ../scripts/debsnap.1:57 ../scripts/dget.pl:653 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../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>" @@ -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:4140 ../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:228 ../scripts/debclean.1:107 ../scripts/debcommit.pl:912 ../scripts/debdiff.1:233 ../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:715 ../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:148 ../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.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: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: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:282 ../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:240 ../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:707 ../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:47 ../scripts/licensecheck.pl:130 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:523 ../scripts/mergechanges.1:25 ../scripts/mk-build-deps.pl:94 ../scripts/mk-origtargz.pl:152 ../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.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: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:338 msgid "B<--smtp-host=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:335 +#: ../scripts/bts.pl:340 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:343 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:347 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:350 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:354 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:361 msgid "B<--smtp-username=>I, B<--smtp-password=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:358 +#: ../scripts/bts.pl:363 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:367 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:370 msgid "B<--smtp-helo=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:367 +#: ../scripts/bts.pl:372 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:376 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:379 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:383 msgid "B<-f>, B<--force-refresh>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:380 +#: ../scripts/bts.pl:385 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:391 msgid "B<--no-force-refresh>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:388 +#: ../scripts/bts.pl:393 msgid "Suppress any configuration file B<--force-refresh> option." msgstr "" #. type: =item -#: ../scripts/bts.pl:390 +#: ../scripts/bts.pl:395 msgid "B<--only-new>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:392 +#: ../scripts/bts.pl:397 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:400 msgid "B<--include-resolved>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:397 +#: ../scripts/bts.pl:402 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:405 msgid "B<--no-include-resolved>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:402 +#: ../scripts/bts.pl:407 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:410 msgid "B<--no-ack>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:407 +#: ../scripts/bts.pl:412 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:416 msgid "B<--ack>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:413 +#: ../scripts/bts.pl:418 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:420 ../scripts/tagpending.pl:133 msgid "B<-i>, B<--interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:417 +#: ../scripts/bts.pl:422 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:425 msgid "B<--force-interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:422 +#: ../scripts/bts.pl:427 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:430 msgid "B<--no-interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:427 +#: ../scripts/bts.pl:432 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:434 ../scripts/dget.pl:608 msgid "B<-q>, B<--quiet>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:431 +#: ../scripts/bts.pl:436 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:440 ../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:15 ../scripts/licensecheck.pl:90 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:312 ../scripts/uscan.1:483 ../scripts/uupdate.1:78 ../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:442 ../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:19 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uscan.1:487 ../scripts/uupdate.1:82 ../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:796 ../scripts/chdist.pl:55 msgid "COMMANDS" msgstr "" @@ -853,71 +853,71 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:798 +#: ../scripts/bts.pl:803 msgid "" "B [I] [I | I | I | B<:> ] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:800 +#: ../scripts/bts.pl:805 msgid "" "B [I] [BI | BI] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:802 +#: ../scripts/bts.pl:807 msgid "" "B [I] [BI | BI ] [IB<=>I " "...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:804 +#: ../scripts/bts.pl:809 msgid "B [B | B... | B]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:806 +#: ../scripts/bts.pl:811 msgid "This is a synonym for B." msgstr "" #. type: =item -#: ../scripts/bts.pl:814 +#: ../scripts/bts.pl:819 msgid "" "B [I] [I | I | I | B<:> ] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:816 +#: ../scripts/bts.pl:821 msgid "" "B [I] [BI | BI] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:818 +#: ../scripts/bts.pl:823 msgid "" "B [I] [BI | BI ] [IB<=>I " "...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:820 +#: ../scripts/bts.pl:825 msgid "B [B | B... | B]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:822 +#: ../scripts/bts.pl:827 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:830 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:837 msgid "The meanings of the possible arguments are as follows:" msgstr "" #. type: =item -#: ../scripts/bts.pl:836 +#: ../scripts/bts.pl:841 msgid "(none)" msgstr "" #. type: textblock -#: ../scripts/bts.pl:838 +#: ../scripts/bts.pl:843 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:847 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:844 +#: ../scripts/bts.pl:849 msgid "Display bug number I." msgstr "" #. type: =item -#: ../scripts/bts.pl:846 +#: ../scripts/bts.pl:851 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:848 +#: ../scripts/bts.pl:853 msgid "Display the bugs for the package I." msgstr "" #. type: =item -#: ../scripts/bts.pl:850 +#: ../scripts/bts.pl:855 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:852 +#: ../scripts/bts.pl:857 msgid "Display the bugs for the source package I." msgstr "" #. type: =item -#: ../scripts/bts.pl:854 +#: ../scripts/bts.pl:859 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:856 +#: ../scripts/bts.pl:861 msgid "Display the bugs for the maintainer email address I." msgstr "" #. type: =item -#: ../scripts/bts.pl:858 +#: ../scripts/bts.pl:863 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:860 +#: ../scripts/bts.pl:865 msgid "Display the bugs for the submitter email address I." msgstr "" #. type: =item -#: ../scripts/bts.pl:862 +#: ../scripts/bts.pl:867 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:864 +#: ../scripts/bts.pl:869 msgid "Display the bugs which are tagged with I." msgstr "" #. type: =item -#: ../scripts/bts.pl:866 +#: ../scripts/bts.pl:871 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:868 +#: ../scripts/bts.pl:873 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:877 msgid "B<:>" msgstr "" @@ -1032,7 +1032,7 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:879 +#: ../scripts/bts.pl:884 msgid "B, B" msgstr "" @@ -1046,7 +1046,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:888 +#: ../scripts/bts.pl:893 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:900 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:914 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:919 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:927 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:935 msgid "For example, on most Linux systems a good thing to do would be:" msgstr "" #. type: textblock -#: ../scripts/bts.pl:932 +#: ../scripts/bts.pl:937 msgid "BROWSER='mozilla -raise -remote \"openURL(%s,new-window)\":links'" msgstr "" #. type: =item -#: ../scripts/bts.pl:1007 +#: ../scripts/bts.pl:1012 msgid "B