From 92fd2dbfb672d7b2b1cdfd5dd5cf89f7716b3e12 Mon Sep 17 00:00:00 2001 From: asteroide Date: Tue, 1 Sep 2015 16:03:26 +0200 Subject: Update Keystone code from official Github repository with branch Master on 09/01/2015. Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498 --- .../zh_CN/LC_MESSAGES/keystone-log-critical.po | 9 +- .../locale/zh_CN/LC_MESSAGES/keystone-log-error.po | 169 ++++++++----------- .../locale/zh_CN/LC_MESSAGES/keystone-log-info.po | 185 +++------------------ 3 files changed, 98 insertions(+), 265 deletions(-) (limited to 'keystone-moon/keystone/locale/zh_CN/LC_MESSAGES') diff --git a/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-critical.po b/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-critical.po index a3a728e9..cbdab8a4 100644 --- a/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-critical.po +++ b/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-critical.po @@ -1,5 +1,5 @@ # Translations template for keystone. -# Copyright (C) 2014 OpenStack Foundation +# Copyright (C) 2015 OpenStack Foundation # This file is distributed under the same license as the keystone project. # # Translators: @@ -7,19 +7,18 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2015-08-06 06:28+0000\n" "PO-Revision-Date: 2014-08-31 15:19+0000\n" "Last-Translator: openstackjenkins \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/keystone/" +"Language-Team: Chinese (China) (http://www.transifex.com/openstack/keystone/" "language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: keystone/catalog/backends/templated.py:106 #, python-format msgid "Unable to open template file %s" msgstr "无法打开模板文件 %s" diff --git a/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-error.po b/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-error.po index a48b9382..da273412 100644 --- a/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-error.po +++ b/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-error.po @@ -4,71 +4,57 @@ # # Translators: # Xiao Xi LIU , 2014 +# 刘俊朋 , 2015 msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2015-03-09 06:03+0000\n" -"PO-Revision-Date: 2015-03-07 04:31+0000\n" +"POT-Creation-Date: 2015-08-06 06:28+0000\n" +"PO-Revision-Date: 2015-06-26 17:13+0000\n" "Last-Translator: openstackjenkins \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/keystone/" +"Language-Team: Chinese (China) (http://www.transifex.com/openstack/keystone/" "language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: keystone/notifications.py:304 -msgid "Failed to construct notifier" -msgstr "" - -#: keystone/notifications.py:389 -#, python-format -msgid "Failed to send %(res_id)s %(event_type)s notification" -msgstr "" - -#: keystone/notifications.py:606 -#, python-format -msgid "Failed to send %(action)s %(event_type)s notification" -msgstr "" - -#: keystone/catalog/core.py:62 -#, python-format -msgid "Malformed endpoint - %(url)r is not a string" -msgstr "" +msgid "Cannot retrieve Authorization headers" +msgstr "无法获取认证头信息" -#: keystone/catalog/core.py:66 #, python-format -msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s" -msgstr "端点 %(url)s 的格式不正确 - 键 %(keyerror)s 未知" +msgid "" +"Circular reference or a repeated entry found in projects hierarchy - " +"%(project_id)s." +msgstr "在项目树-%(project_id)s 中发现循环引用或重复项。" -#: keystone/catalog/core.py:71 #, python-format msgid "" -"Malformed endpoint '%(url)s'. The following type error occurred during " -"string substitution: %(typeerror)s" -msgstr "" -"端点 '%(url)s' 的格式不正确。在字符串替换时发生以下类型错误：%(typeerror)s" +"Circular reference or a repeated entry found in region tree - %(region_id)s." +msgstr "在域树- %(region_id)s 中发现循环引用或重复项。" -#: keystone/catalog/core.py:77 #, python-format msgid "" -"Malformed endpoint %s - incomplete format (are you missing a type notifier ?)" -msgstr "端点 %s 的格式不完整 - (是否缺少了类型通告者?)" +"Circular reference or a repeated entry found projects hierarchy - " +"%(project_id)s." +msgstr "在项目树-%(project_id)s 中发现循环引用或重复项。" -#: keystone/common/openssl.py:93 #, python-format msgid "Command %(to_exec)s exited with %(retcode)s- %(output)s" msgstr "命令 %(to_exec)s 已退出，退出码及输出为 %(retcode)s- %(output)s" -#: keystone/common/openssl.py:121 #, python-format -msgid "Failed to remove file %(file_path)r: %(error)s" -msgstr "无法删除文件%(file_path)r: %(error)s" +msgid "Could not bind to %(host)s:%(port)s" +msgstr "无法绑定至 %(host)s:%(port)s" + +#, python-format +msgid "" +"Either [fernet_tokens] key_repository does not exist or Keystone does not " +"have sufficient permission to access it: %s" +msgstr "[fernet_tokens] 键仓库不存在或者ketystone没有足够的权限去访问它: %s。" -#: keystone/common/utils.py:239 msgid "" "Error setting up the debug environment. Verify that the option --debug-url " "has the format : and that a debugger processes is listening on " @@ -77,101 +63,82 @@ msgstr "" "设置调试环境出错。请确保选项--debug-url 的格式是这样的: ，和确保" "有一个调试进程正在监听那个端口" -#: keystone/common/cache/core.py:100 #, python-format -msgid "" -"Unable to build cache config-key. Expected format \":\". " -"Skipping unknown format: %s" -msgstr "" - -#: keystone/common/environment/eventlet_server.py:99 -#, python-format -msgid "Could not bind to %(host)s:%(port)s" -msgstr "无法绑定至 %(host)s:%(port)s" +msgid "Error when signing assertion, reason: %(reason)s" +msgstr "对断言进行签名时出错，原因：%(reason)s" -#: keystone/common/environment/eventlet_server.py:185 -msgid "Server error" -msgstr "服务器报错" +msgid "Failed to construct notifier" +msgstr "构造通知器失败" -#: keystone/contrib/endpoint_policy/core.py:129 -#: keystone/contrib/endpoint_policy/core.py:228 -#, python-format msgid "" -"Circular reference or a repeated entry found in region tree - %(region_id)s." -msgstr "在域树- %(region_id)s 中发现循环引用或重复项。" +"Failed to create [fernet_tokens] key_repository: either it already exists or " +"you don't have sufficient permissions to create it" +msgstr "创建[Fernet_tokens] 键仓库失败：它已存在或你没有足够的权限去创建它。" -#: keystone/contrib/federation/idp.py:410 #, python-format -msgid "Error when signing assertion, reason: %(reason)s" -msgstr "对断言进行签名时出错，原因：%(reason)s" - -#: keystone/contrib/oauth1/core.py:136 -msgid "Cannot retrieve Authorization headers" -msgstr "" +msgid "Failed to remove file %(file_path)r: %(error)s" +msgstr "无法删除文件%(file_path)r: %(error)s" -#: keystone/openstack/common/loopingcall.py:95 -msgid "in fixed duration looping call" -msgstr "在固定时段内循环调用" +#, python-format +msgid "Failed to send %(action)s %(event_type)s notification" +msgstr "发送 %(action)s %(event_type)s 通知失败" -#: keystone/openstack/common/loopingcall.py:138 -msgid "in dynamic looping call" -msgstr "在动态循环调用中" +#, python-format +msgid "Failed to send %(res_id)s %(event_type)s notification" +msgstr "发送%(res_id)s %(event_type)s 通知失败" -#: keystone/openstack/common/service.py:268 -msgid "Unhandled exception" -msgstr "存在未处理的异常" +msgid "Failed to validate token" +msgstr "token验证失败" -#: keystone/resource/core.py:477 #, python-format -msgid "" -"Circular reference or a repeated entry found projects hierarchy - " -"%(project_id)s." -msgstr "" +msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s" +msgstr "端点 %(url)s 的格式不正确 - 键 %(keyerror)s 未知" -#: keystone/resource/core.py:939 #, python-format msgid "" -"Unexpected results in response for domain config - %(count)s responses, " -"first option is %(option)s, expected option %(expected)s" -msgstr "" +"Malformed endpoint %s - incomplete format (are you missing a type notifier ?)" +msgstr "端点 %s 的格式不完整 - (是否缺少了类型通告者?)" -#: keystone/resource/backends/sql.py:102 keystone/resource/backends/sql.py:121 #, python-format msgid "" -"Circular reference or a repeated entry found in projects hierarchy - " -"%(project_id)s." +"Malformed endpoint '%(url)s'. The following type error occurred during " +"string substitution: %(typeerror)s" msgstr "" +"端点 '%(url)s' 的格式不正确。在字符串替换时发生以下类型错误：%(typeerror)s" -#: keystone/token/provider.py:292 #, python-format -msgid "Unexpected error or malformed token determining token expiry: %s" -msgstr "" +msgid "Malformed endpoint - %(url)r is not a string" +msgstr "端点 - %(url)r 不是一个字符串" -#: keystone/token/persistence/backends/kvs.py:226 #, python-format msgid "" "Reinitializing revocation list due to error in loading revocation list from " "backend. Expected `list` type got `%(type)s`. Old revocation list data: " "%(list)r" msgstr "" +"由于从后端加载撤销列表出现错误，重新初始化撤销列表。期望“列表”类型是 `" +"%(type)s`。旧的撤销列表数据是: %(list)r" -#: keystone/token/providers/common.py:611 -msgid "Failed to validate token" -msgstr "token验证失败" +msgid "Server error" +msgstr "服务器报错" + +#, python-format +msgid "" +"Unable to build cache config-key. Expected format \":\". " +"Skipping unknown format: %s" +msgstr "无法构建缓存配置键值对。期望格式“<参数>:<值>”。跳过未知的格式: %s" -#: keystone/token/providers/pki.py:47 msgid "Unable to sign token" -msgstr "" +msgstr "无法签名令牌" -#: keystone/token/providers/fernet/utils.py:38 #, python-format -msgid "" -"Either [fernet_tokens] key_repository does not exist or Keystone does not " -"have sufficient permission to access it: %s" -msgstr "" +msgid "Unexpected error or malformed token determining token expiry: %s" +msgstr "决策令牌预计超期时间 :%s 时，出现未知错误或变形的令牌" -#: keystone/token/providers/fernet/utils.py:79 +#, python-format msgid "" -"Failed to create [fernet_tokens] key_repository: either it already exists or " -"you don't have sufficient permissions to create it" +"Unexpected results in response for domain config - %(count)s responses, " +"first option is %(option)s, expected option %(expected)s" msgstr "" +"针对域配置- %(count)s 结果，响应中出现不是预期结果，第一参数是%(option)s，期" +"望参数是 %(expected)s 。" diff --git a/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po b/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po index 0e848ee1..92f06dcb 100644 --- a/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po +++ b/keystone-moon/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po @@ -8,33 +8,18 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2015-03-09 06:03+0000\n" -"PO-Revision-Date: 2015-03-07 08:47+0000\n" +"POT-Creation-Date: 2015-08-06 06:28+0000\n" +"PO-Revision-Date: 2015-08-01 06:26+0000\n" "Last-Translator: openstackjenkins \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/keystone/" +"Language-Team: Chinese (China) (http://www.transifex.com/openstack/keystone/" "language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: keystone/assignment/core.py:250 -#, python-format -msgid "Creating the default role %s because it does not exist." -msgstr "正在创建默认角色%s，因为它之前不存在。" - -#: keystone/assignment/core.py:258 -#, python-format -msgid "Creating the default role %s failed because it was already created" -msgstr "" - -#: keystone/auth/controllers.py:64 -msgid "Loading auth-plugins by class-name is deprecated." -msgstr "通过class-name（类名）加载auth-plugins（认证插件）的方式已被弃用。" - -#: keystone/auth/controllers.py:106 #, python-format msgid "" "\"expires_at\" has conflicting values %(existing)s and %(new)s. Will use " @@ -43,173 +28,55 @@ msgstr "" "\"expires_at\" 被赋予矛盾的值： %(existing)s 和 %(new)s。将采用时间上较早的那" "个值。" -#: keystone/common/openssl.py:81 -#, python-format -msgid "Running command - %s" -msgstr "正在运行命令 - %s" - -#: keystone/common/wsgi.py:79 -msgid "No bind information present in token" -msgstr "令牌中暂无绑定信息" - -#: keystone/common/wsgi.py:83 -#, python-format -msgid "Named bind mode %s not in bind information" -msgstr "在绑定信息中没有命名绑定模式%s" - -#: keystone/common/wsgi.py:90 -msgid "Kerberos credentials required and not present" -msgstr "没有所需的Kerberos凭证" - -#: keystone/common/wsgi.py:94 -msgid "Kerberos credentials do not match those in bind" -msgstr "在绑定中没有匹配的Kerberos凭证" - -#: keystone/common/wsgi.py:98 -msgid "Kerberos bind authentication successful" -msgstr "Kerberos绑定认证成功" - -#: keystone/common/wsgi.py:105 -#, python-format -msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}" -msgstr "不能验证未知绑定: {%(bind_type)s: %(identifier)s}" - -#: keystone/common/environment/eventlet_server.py:103 -#, python-format -msgid "Starting %(arg0)s on %(host)s:%(port)s" -msgstr "正在 %(host)s:%(port)s 上启动 %(arg0)s" - -#: keystone/common/kvs/core.py:138 #, python-format msgid "Adding proxy '%(proxy)s' to KVS %(name)s." msgstr "正在将代理'%(proxy)s'加入KVS %(name)s 中。" -#: keystone/common/kvs/core.py:188 #, python-format -msgid "Using %(func)s as KVS region %(name)s key_mangler" -msgstr "使用 %(func)s 作为KVS域 %(name)s 的key_mangler处理函数" +msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}" +msgstr "不能验证未知绑定: {%(bind_type)s: %(identifier)s}" -#: keystone/common/kvs/core.py:200 #, python-format -msgid "Using default dogpile sha1_mangle_key as KVS region %s key_mangler" -msgstr "" -"使用默认的dogpile sha1_mangle_key函数作为KVS域 %s 的key_mangler处理函数" +msgid "Creating the default role %s because it does not exist." +msgstr "正在创建默认角色%s，因为它之前不存在。" -#: keystone/common/kvs/core.py:210 #, python-format msgid "KVS region %s key_mangler disabled." msgstr "KVS域 %s 的key_mangler处理函数被禁用。" -#: keystone/contrib/example/core.py:64 keystone/contrib/example/core.py:73 -#, python-format -msgid "" -"Received the following notification: service %(service)s, resource_type: " -"%(resource_type)s, operation %(operation)s payload %(payload)s" -msgstr "" - -#: keystone/openstack/common/eventlet_backdoor.py:146 -#, python-format -msgid "Eventlet backdoor listening on %(port)s for process %(pid)d" -msgstr "携程为进程 %(pid)d 在后台监听 %(port)s " - -#: keystone/openstack/common/service.py:173 -#, python-format -msgid "Caught %s, exiting" -msgstr "捕获到 %s，正在退出" - -#: keystone/openstack/common/service.py:231 -msgid "Parent process has died unexpectedly, exiting" -msgstr "父进程已意外终止，正在退出" - -#: keystone/openstack/common/service.py:262 -#, python-format -msgid "Child caught %s, exiting" -msgstr "子代捕获 %s，正在退出" - -#: keystone/openstack/common/service.py:301 -msgid "Forking too fast, sleeping" -msgstr "派生速度太快，正在休眠" +msgid "Kerberos bind authentication successful" +msgstr "Kerberos绑定认证成功" -#: keystone/openstack/common/service.py:320 -#, python-format -msgid "Started child %d" -msgstr "已启动子代 %d" +msgid "Kerberos credentials do not match those in bind" +msgstr "在绑定中没有匹配的Kerberos凭证" -#: keystone/openstack/common/service.py:330 -#, python-format -msgid "Starting %d workers" -msgstr "正在启动 %d 工作程序" +msgid "Kerberos credentials required and not present" +msgstr "没有所需的Kerberos凭证" -#: keystone/openstack/common/service.py:347 #, python-format -msgid "Child %(pid)d killed by signal %(sig)d" -msgstr "信号 %(sig)d 已终止子代 %(pid)d" +msgid "Named bind mode %s not in bind information" +msgstr "在绑定信息中没有命名绑定模式%s" -#: keystone/openstack/common/service.py:351 -#, python-format -msgid "Child %(pid)s exited with status %(code)d" -msgstr "子代 %(pid)s 已退出，状态为 %(code)d" +msgid "No bind information present in token" +msgstr "令牌中暂无绑定信息" -#: keystone/openstack/common/service.py:390 #, python-format -msgid "Caught %s, stopping children" -msgstr "捕获到 %s，正在停止子代" - -#: keystone/openstack/common/service.py:399 -msgid "Wait called after thread killed. Cleaning up." -msgstr "线程结束，正在清理" +msgid "Running command - %s" +msgstr "正在运行命令 - %s" -#: keystone/openstack/common/service.py:415 #, python-format -msgid "Waiting on %d children to exit" -msgstr "正在等待 %d 个子代退出" +msgid "Starting %(arg0)s on %(host)s:%(port)s" +msgstr "正在 %(host)s:%(port)s 上启动 %(arg0)s" -#: keystone/token/persistence/backends/sql.py:279 #, python-format msgid "Total expired tokens removed: %d" msgstr "被移除的失效令牌总数：%d" -#: keystone/token/providers/fernet/utils.py:72 -msgid "" -"[fernet_tokens] key_repository does not appear to exist; attempting to " -"create it" -msgstr "" - -#: keystone/token/providers/fernet/utils.py:130 -#, python-format -msgid "Created a new key: %s" -msgstr "" - -#: keystone/token/providers/fernet/utils.py:143 -msgid "Key repository is already initialized; aborting." -msgstr "" - -#: keystone/token/providers/fernet/utils.py:179 -#, python-format -msgid "Starting key rotation with %(count)s key files: %(list)s" -msgstr "" - -#: keystone/token/providers/fernet/utils.py:185 -#, python-format -msgid "Current primary key is: %s" -msgstr "" - -#: keystone/token/providers/fernet/utils.py:187 -#, python-format -msgid "Next primary key will be: %s" -msgstr "" - -#: keystone/token/providers/fernet/utils.py:197 -#, python-format -msgid "Promoted key 0 to be the primary: %s" -msgstr "" - -#: keystone/token/providers/fernet/utils.py:213 #, python-format -msgid "Excess keys to purge: %s" -msgstr "" +msgid "Using %(func)s as KVS region %(name)s key_mangler" +msgstr "使用 %(func)s 作为KVS域 %(name)s 的key_mangler处理函数" -#: keystone/token/providers/fernet/utils.py:237 #, python-format -msgid "Loaded %(count)s encryption keys from: %(dir)s" +msgid "Using default dogpile sha1_mangle_key as KVS region %s key_mangler" msgstr "" +"使用默认的dogpile sha1_mangle_key函数作为KVS域 %s 的key_mangler处理函数" -- cgit 1.2.3-korg