summaryrefslogtreecommitdiffstats
path: root/keystone/locale
diff options
context:
space:
mode:
authorOpenStack Jenkins <jenkins@openstack.org>2013-05-30 17:05:50 +0000
committerOpenStack Jenkins <jenkins@openstack.org>2013-05-30 17:05:50 +0000
commit4f87f155db549123782075e2a5749fab65d4a082 (patch)
tree53d371d88dbca2fe20c15553bfef8273a3c3a633 /keystone/locale
parent6d33805d0fe7fd7bd75765ee4167eb64fbdd324b (diff)
downloadkeystone-4f87f155db549123782075e2a5749fab65d4a082.tar.gz
keystone-4f87f155db549123782075e2a5749fab65d4a082.tar.xz
keystone-4f87f155db549123782075e2a5749fab65d4a082.zip
Imported Translations from Transifex
Change-Id: Icfaf58f9c2b503f3c664dc67c512de2b96ebb3ee
Diffstat (limited to 'keystone/locale')
-rw-r--r--keystone/locale/bg_BG/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/ca/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/cs/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/da/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/de/LC_MESSAGES/keystone.po247
-rw-r--r--keystone/locale/es/LC_MESSAGES/keystone.po247
-rw-r--r--keystone/locale/fi_FI/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/fr/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/hu/LC_MESSAGES/keystone.po233
-rw-r--r--keystone/locale/it/LC_MESSAGES/keystone.po247
-rw-r--r--keystone/locale/ja/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/ka_GE/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/keystone.pot199
-rw-r--r--keystone/locale/ko_KR/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/pt_BR/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/ru/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/vi_VN/LC_MESSAGES/keystone.po254
-rw-r--r--keystone/locale/zh_CN/LC_MESSAGES/keystone.po247
-rw-r--r--keystone/locale/zh_TW/LC_MESSAGES/keystone.po247
19 files changed, 2824 insertions, 1891 deletions
diff --git a/keystone/locale/bg_BG/LC_MESSAGES/keystone.po b/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
index e0cbafba..73f37573 100644
--- a/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
+++ b/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Bulgarian (Bulgaria) "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -120,97 +120,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -218,60 +225,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -368,71 +377,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -458,27 +467,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -556,3 +565,60 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/ca/LC_MESSAGES/keystone.po b/keystone/locale/ca/LC_MESSAGES/keystone.po
index f6168492..cde8f569 100644
--- a/keystone/locale/ca/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ca/LC_MESSAGES/keystone.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2012-11-03 03:08+0000\n"
"Last-Translator: Sergi Almacellas <pokoli@gmail.com>\n"
"Language-Team: ca <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -121,97 +121,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr "Fitxer syslog invàlid"
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -219,60 +226,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -282,64 +289,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -369,71 +378,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -459,27 +468,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -496,21 +505,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -534,18 +543,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -557,3 +566,60 @@ msgstr "No es pot afegir el token a la llista d'usuaris."
msgid "Unable to add token to revocation list."
msgstr "No es pot afegir el token a la llista de revocats."
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/cs/LC_MESSAGES/keystone.po b/keystone/locale/cs/LC_MESSAGES/keystone.po
index 2922672e..2c98efe8 100644
--- a/keystone/locale/cs/LC_MESSAGES/keystone.po
+++ b/keystone/locale/cs/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Czech "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -120,97 +120,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -218,60 +225,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -368,71 +377,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -458,27 +467,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -556,3 +565,60 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/da/LC_MESSAGES/keystone.po b/keystone/locale/da/LC_MESSAGES/keystone.po
index 31303513..aab5ee02 100644
--- a/keystone/locale/da/LC_MESSAGES/keystone.po
+++ b/keystone/locale/da/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Danish "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -120,97 +120,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -218,60 +225,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -368,71 +377,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -458,27 +467,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -556,3 +565,60 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/de/LC_MESSAGES/keystone.po b/keystone/locale/de/LC_MESSAGES/keystone.po
index d25fea7f..e7f10483 100644
--- a/keystone/locale/de/LC_MESSAGES/keystone.po
+++ b/keystone/locale/de/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-22 03:45+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: German "
@@ -38,7 +38,7 @@ msgstr "%(property_name)s sollte nicht größer als %(max_length)s Zeichen sein.
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr "%s wurde nicht ausgecheckt"
@@ -48,12 +48,12 @@ msgstr "%s wurde nicht ausgecheckt"
msgid "Project is disabled: %s"
msgstr "Projekt ist inaktiviert: %s"
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr "Domäne ist inaktiviert: %s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr "Benutzer ist inaktiviert: %s"
@@ -126,17 +126,17 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr "Vorlagendatei %s kann nicht geöffnet werden"
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr "HTTP PERF: %(time).5f Sekunden für %(method)s %(host)s:%(port)s %(path)s)"
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr "Fehler überprüfen: %s"
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
@@ -144,144 +144,151 @@ msgstr ""
"Unterzeichnungsfehler: Zertifikat kann nicht geladen werden - stellen Sie"
" sicher, dass Sie PKI mit 'keystone-manage pki_setup' konfiguriert haben"
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr "Unterzeichnungsfehler: %s"
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr "Angegebene Protokollkonfigurationsdatei kann nicht gefunden werden: %s"
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr "Ungültige 'syslog'-Funktion"
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
-msgstr "Rollenbasierte Zugriffssteuerung: Autorisierung von %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
+msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr "Rollenbasierte Zugriffssteuerung: Ungültiges Token"
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr "Rollenbasierte Zugriffssteuerung: Ungültiger Benutzer"
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr "Rollenbasierte Zugriffssteuerung: Fortfahren ohne Projekt"
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr "Rollenbasierte Zugriffssteuerung: Fortsetzung ohne Nutzer"
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr "Rollenbasierte Zugriffssteuerung: Umgehen von Autorisierung"
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr "Rollenbasierte Zugriffssteuerung: Autorisierung erteilt"
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
"Rollenbasierte Zugriffssteuerung: Hinzufügen von Abfragefilterparametern "
"(%s)"
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr "Ungültiges Token in 'normalize_domain_id'"
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr "Starten von %(arg0)s auf %(host)s:%(port)s"
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
-msgstr "Serverfehler"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
+msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr "arg_dict: %s"
-#: keystone/common/wsgi.py:267
-#, python-format
-msgid "Authorization failed. %s from %s"
+#: keystone/common/wsgi.py:185
+#, fuzzy, python-format
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "Autorisierung fehlgeschlagen. %s von %s"
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr "Die Ressource konnte nicht gefunden werden."
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr "Starten von %(arg0)s auf %(host)s:%(port)s"
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr "Serverfehler"
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
msgstr "Ungültige LDAP-deref-Option: %s. Wählen Sie aus: "
#: keystone/common/ldap/core.py:87
-#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-msgstr ""
+#, fuzzy, python-format
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
+msgstr "Ungültige LDAP-deref-Option: %s. Wählen Sie aus: "
-#: keystone/common/ldap/core.py:96
-#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+#: keystone/common/ldap/core.py:99
+#, fuzzy, python-format
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr "Ungültiger LDAP-Umfang: %s. Wählen Sie aus: "
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr "Doppelter Name, %s."
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr "Doppelte ID, %s."
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr "LDAP %s erstellen"
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr "LDAP %s aktualisieren"
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr "LDAP %s löschen"
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr "LDAP starten: url=%s"
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -291,46 +298,48 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr "LDAP binden: dn=%s"
-#: keystone/common/ldap/core.py:503
-#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+#: keystone/common/ldap/core.py:508
+#, fuzzy, python-format
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr "LDAP hinzufügen: dn=%s, attrs=%s"
-#: keystone/common/ldap/core.py:508
-#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#: keystone/common/ldap/core.py:514
+#, fuzzy, python-format
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr "LDAP-Suche: dn=%s, scope=%s, query=%s, attrs=%s"
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
@@ -338,19 +347,19 @@ msgstr ""
"LDAP-Server unterstützt Paging nicht. Inaktivieren Sie das Paging in "
"keystone.conf, um diese Nachricht zu verhindern."
-#: keystone/common/ldap/core.py:576
-#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+#: keystone/common/ldap/core.py:584
+#, fuzzy, python-format
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr "LDAP ändern: dn=%s, modlist=%s"
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr "LDAP löschen: dn=%s"
-#: keystone/common/ldap/core.py:585
-#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#: keystone/common/ldap/core.py:595
+#, fuzzy, python-format
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr "LDAP-'delete_ext': dn=%s, serverctrls=%s"
#: keystone/common/ldap/fakeldap.py:146
@@ -379,76 +388,76 @@ msgid "FakeLdap bind fail: password for dn=%s does not match"
msgstr "FakeLdap binden fehlgeschlagen: Kennwort für dn=%s stimmt nicht überein"
#: keystone/common/ldap/fakeldap.py:190
-#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+#, fuzzy, python-format
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr "FakeLdap-Element hinzufügen: dn=%s, attrs=%s"
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr "FakeLdap-Element hinzufügen fehlgeschlagen: dn=%s ist bereits im Speicher."
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr "FakeLdap-Element löschen: dn=%s"
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr "FakeLdap-Element löschen fehlgeschlagen: dn=%s nicht gefunden."
-#: keystone/common/ldap/fakeldap.py:239
-#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+#: keystone/common/ldap/fakeldap.py:240
+#, fuzzy, python-format
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr "FakeLdap-Element ändern: dn=%s attrs=%s"
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr "FakeLdap-Element ändern fehlgeschlagen: dn=%s nicht gefunden."
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
"FakeLdap-Element ändern fehlgeschlagen: Element hat kein zu löschendes "
"Attribut \"%s\""
-#: keystone/common/ldap/fakeldap.py:271
-#, python-format
+#: keystone/common/ldap/fakeldap.py:273
+#, fuzzy, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
"FakeLdap-Element ändern fehlgeschlagen: Element hat kein zu löschendes "
"Attribut \"%s\" mit Wert \"%s\""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr "FakeLdap-Element ändern fehlgeschlagen: unbekannter Befehl %s"
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr "'modify_s'-Aktion %s nicht implementiert"
-#: keystone/common/ldap/fakeldap.py:296
-#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#: keystone/common/ldap/fakeldap.py:300
+#, fuzzy, python-format
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr "FakeLdap-Suche unter dn=%s scope=%s query=%s"
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr "FakeLdap-Suche fehlgeschlagen: dn für 'SCOPE_BASE' nicht gefunden"
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr "Suchbereich %s nicht implementiert."
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -475,28 +484,28 @@ msgid "Create user %s"
msgstr "Benutzer %s erstellen"
#: keystone/common/sql/nova.py:88
-#, python-format
-msgid "Add user %s to tenant %s"
+#, fuzzy, python-format
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr "Benutzer %s zu Nutzer %s hinzufügen"
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr "Vorhandene Rolle %s ignorieren"
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr "Rolle %s erstellen"
-#: keystone/common/sql/nova.py:113
-#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+#: keystone/common/sql/nova.py:114
+#, fuzzy, python-format
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr "Rolle %s Benutzer %s auf Nutzer %s zuweisen"
-#: keystone/common/sql/nova.py:128
-#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+#: keystone/common/sql/nova.py:133
+#, fuzzy, python-format
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "Erstellen von EC2-Berechtigungsnachweis für Benutzer %s und Nutzer %s"
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -513,21 +522,21 @@ msgstr "Nicht gewährte Rolle kann nicht entfernt werden, %s"
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr "Rolle %s nicht gefunden"
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr "Änderung von Namen wird von LDAP nicht unterstützt"
-#: keystone/identity/backends/ldap/core.py:926
-#, python-format
-msgid "User %s is already a member of group %s"
+#: keystone/identity/backends/ldap/core.py:920
+#, fuzzy, python-format
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "Benutzer %s ist bereits Mitglied der Gruppe %s."
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -551,18 +560,18 @@ msgstr "Regel '%(rule)r' konnte nicht verstanden werden"
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
-msgstr "%s erzwingen: %s"
+msgid "enforce %(action)s: %(credentials)s"
+msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr "Token gehört nicht zu angegebenem Nutzer."
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr "Nicht-Standard-Domäne wird nicht unterstützt"
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr "Bereichsorientiertes Token der Domäne wird nicht unterstützt"
@@ -574,3 +583,15 @@ msgstr "Token kann nicht zu Benutzerliste hinzugefügt werden."
msgid "Unable to add token to revocation list."
msgstr "Token kann nicht zu Widerrufsliste hinzugefügt werden."
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr "Rollenbasierte Zugriffssteuerung: Autorisierung von %s(%s)"
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr "%s erzwingen: %s"
+
diff --git a/keystone/locale/es/LC_MESSAGES/keystone.po b/keystone/locale/es/LC_MESSAGES/keystone.po
index 090c21e7..09e28462 100644
--- a/keystone/locale/es/LC_MESSAGES/keystone.po
+++ b/keystone/locale/es/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-21 09:13+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Spanish "
@@ -38,7 +38,7 @@ msgstr "%(property_name)s no debe tener más de %(max_length)s caracteres."
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr "No se ha podido extraer %s"
@@ -48,12 +48,12 @@ msgstr "No se ha podido extraer %s"
msgid "Project is disabled: %s"
msgstr "El proyecto está inhabilitado: %s"
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr "El dominio está inhabilitado: %s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr "El usuario está inhabilitado: %s"
@@ -128,17 +128,17 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr "No se puede abrir el archivo de plantilla %s"
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr "PERF HTTP: %(time).5f segundos en %(method)s %(host)s:%(port)s %(path)s)"
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr "Verificar error: %s"
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
@@ -146,144 +146,151 @@ msgstr ""
"Error de firma: no se ha podido cargar el certificado; asegúrese de haber"
" configurado la PKI con 'keystone-manage pki_setup'"
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr "Error de firma: %s"
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
"No se puede localizar el archivo de configuración de registro "
"especificado: %s"
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr "Recurso syslog no válido"
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
-msgstr "RBAC: Autorizando %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
+msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr "RBAC: Señal no válida"
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr "RBAC: Usuario no válido"
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr "RBAC: continuando sin proyecto"
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr "RBAC: Continuando sin arrendatario"
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr "RBAC: Eludiendo autorización"
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr "RBAC: Autorización otorgada"
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC: añadiendo parámetros de filtro de consultas (%s)"
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr "Señal no válida en normalize_domain_id"
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr "Iniciando %(arg0)s en %(host)s:%(port)s"
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
-msgstr "Error de servidor"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
+msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr "arg_dict: %s"
-#: keystone/common/wsgi.py:267
-#, python-format
-msgid "Authorization failed. %s from %s"
+#: keystone/common/wsgi.py:185
+#, fuzzy, python-format
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "Ha fallado la autorización. %s de %s"
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr "El recurso no se ha podido encontrar."
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr "Iniciando %(arg0)s en %(host)s:%(port)s"
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr "Error de servidor"
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
msgstr "Opción deref de LDAP no válida: %s. Elija una de las siguientes: "
#: keystone/common/ldap/core.py:87
-#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-msgstr ""
+#, fuzzy, python-format
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
+msgstr "Opción deref de LDAP no válida: %s. Elija una de las siguientes: "
-#: keystone/common/ldap/core.py:96
-#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+#: keystone/common/ldap/core.py:99
+#, fuzzy, python-format
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr "Ámbito de LDAP no válido: %s. Elija uno de los siguientes: "
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr "Nombre duplicado, %s."
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr "ID duplicado, %s."
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr "Creación de LDAP %s"
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr "Actualización de LDAP %s"
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr "Supresión de LDAP %s"
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr "Inicialización de LDAP: url=%s"
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -293,46 +300,48 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr "Enlace de LDAP: dn=%s"
-#: keystone/common/ldap/core.py:503
-#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+#: keystone/common/ldap/core.py:508
+#, fuzzy, python-format
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr "Adición de LDAP: dn=%s, attrs=%s"
-#: keystone/common/ldap/core.py:508
-#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#: keystone/common/ldap/core.py:514
+#, fuzzy, python-format
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr "Búsqueda LDAP: dn=%s, scope=%s, query=%s, attrs=%s"
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
@@ -340,19 +349,19 @@ msgstr ""
"El servidor LDAP no soporta la paginación. Inhabilite la paginación en "
"keystone.conf para evitar este mensaje."
-#: keystone/common/ldap/core.py:576
-#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+#: keystone/common/ldap/core.py:584
+#, fuzzy, python-format
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr "Modificación de LDAP: dn=%s, modlist=%s"
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr "Supresión de LDAP: dn=%s"
-#: keystone/common/ldap/core.py:585
-#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#: keystone/common/ldap/core.py:595
+#, fuzzy, python-format
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr "LDAP delete_ext: dn=%s, serverctrls=%s"
#: keystone/common/ldap/fakeldap.py:146
@@ -381,83 +390,83 @@ msgid "FakeLdap bind fail: password for dn=%s does not match"
msgstr "Error de enlace FakeLDAP: contraseña de dn=%s no coincide"
#: keystone/common/ldap/fakeldap.py:190
-#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+#, fuzzy, python-format
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr "Añadir elemento de FakeLDAP: dn=%s, attrs=%s"
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
"Ha fallado la adición de elemento de FakeLDAP: dn=%s ya está en el "
"almacén."
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr "Supresión de elemento de FakeLDAP: dn=%s"
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr "Ha fallado la supresión de elemento de FakeLDAP: dn=%s no encontrado."
-#: keystone/common/ldap/fakeldap.py:239
-#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+#: keystone/common/ldap/fakeldap.py:240
+#, fuzzy, python-format
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr "Modificación de elemento de FakeLDAP: dn=%s attrs=%s"
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr "Ha fallado la modificación de elemento de FakeLDAP: dn=%s no encontrado."
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
"Ha fallado la modificación de elemento de FakeLDAP: el elemento no tiene "
"atributos \"%s\" a suprimir"
-#: keystone/common/ldap/fakeldap.py:271
-#, python-format
+#: keystone/common/ldap/fakeldap.py:273
+#, fuzzy, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
"Se ha encontrado un error en la modificación de elemento de FakeLdap: el "
"elemento no tiene ningún atributo \"%s\" con el valor \"%s\" para "
"suprimir"
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
"Ha fallado la modificación de elemento de FakeLDAP: mandato desconocido "
"%s "
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr "Acción modify_s %s no implementada"
-#: keystone/common/ldap/fakeldap.py:296
-#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#: keystone/common/ldap/fakeldap.py:300
+#, fuzzy, python-format
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr "Búsqueda de FakeLDAP en dn=%s scope=%s query=%s"
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
"Error de búsqueda de FakeLDAP: nombre distinguido no encontrado para "
"SCOPE_BASE"
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr "Ámbito de búsqueda %s no implementado."
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "Se ha notificado que mysql server ha desaparecido: %s"
@@ -482,28 +491,28 @@ msgid "Create user %s"
msgstr "Crear el usuario %s"
#: keystone/common/sql/nova.py:88
-#, python-format
-msgid "Add user %s to tenant %s"
+#, fuzzy, python-format
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr "Añadir el usuario %s al arrendatario %s"
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr "Ignorando el rol existente %s"
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr "Crear el rol %s"
-#: keystone/common/sql/nova.py:113
-#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+#: keystone/common/sql/nova.py:114
+#, fuzzy, python-format
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr "Asignar el rol %s al usuario %s en el arrendatario %s"
-#: keystone/common/sql/nova.py:128
-#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+#: keystone/common/sql/nova.py:133
+#, fuzzy, python-format
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "Creando credencial ec2 para el usuario %s y el arrendatario %s"
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -520,21 +529,21 @@ msgstr "No se puede eliminar un rol que no se ha otorgado, %s"
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr "No se ha encontrado el rol %s"
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr "LDAP no soporta el cambio de nombre"
-#: keystone/identity/backends/ldap/core.py:926
-#, python-format
-msgid "User %s is already a member of group %s"
+#: keystone/identity/backends/ldap/core.py:920
+#, fuzzy, python-format
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "El usuario %s ya es miembro del grupo %s"
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -558,18 +567,18 @@ msgstr "No se ha podido comprender la regla %(rule)r"
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
-msgstr "imponer %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
+msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr "La señal no pertenece al arrendatario especificado."
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr "El dominio no predeterminado no está soportado"
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr "La señal con ámbito de dominio no está soportada"
@@ -581,3 +590,15 @@ msgstr "No se puede añadir lista de usuarios de señal."
msgid "Unable to add token to revocation list."
msgstr "No se puede añadir señal a lista de revocación. "
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr "RBAC: Autorizando %s(%s)"
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr "imponer %s: %s"
+
diff --git a/keystone/locale/fi_FI/LC_MESSAGES/keystone.po b/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
index 4db6bfa0..3f5e14db 100644
--- a/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
+++ b/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Finnish (Finland) "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -120,97 +120,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -218,60 +225,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -368,71 +377,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -458,27 +467,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -556,3 +565,60 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone.po b/keystone/locale/fr/LC_MESSAGES/keystone.po
index 6438a8c1..43e889f8 100644
--- a/keystone/locale/fr/LC_MESSAGES/keystone.po
+++ b/keystone/locale/fr/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: French "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -120,97 +120,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -218,60 +225,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -368,71 +377,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -458,27 +467,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -556,3 +565,60 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/hu/LC_MESSAGES/keystone.po b/keystone/locale/hu/LC_MESSAGES/keystone.po
index a0b5a1bd..d6c1de3c 100644
--- a/keystone/locale/hu/LC_MESSAGES/keystone.po
+++ b/keystone/locale/hu/LC_MESSAGES/keystone.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2012-12-15 14:14+0000\n"
"Last-Translator: kelemeng <kelemeng@gnome.hu>\n"
"Language-Team: hu <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgstr "%(property_name)s nem lehet több, mint %(max_length)s karakter."
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr "%(property_name)s nem %(display_expected_type)s"
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr "Nem sikerült %s kiiktatása"
@@ -49,12 +49,12 @@ msgstr "Nem sikerült %s kiiktatása"
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -124,99 +124,106 @@ msgstr "Rosszul formázott végpont: %s hiányos formátum (hiányzik egy típus
msgid "Unable to open template file %s"
msgstr "Nem nyitható meg a sablonfájl: %s"
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
"HTTP PERF: %(time).5f másodperc eddig: %(method)s %(host)s:%(port)s "
"%(path)s)"
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr "Ellenőrzési hiba: %s"
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr "Aláírási hiba: %s"
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr "Nem található a megadott naplózásbeállító fájl: %s"
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr "Érvénytelen rendszernapló szolgáltatás"
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr "%(arg0)s indítása ezen: %(host)s:%(port)s"
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr "arg_dict: %s"
-#: keystone/common/wsgi.py:267
-#, python-format
-msgid "Authorization failed. %s from %s"
+#: keystone/common/wsgi.py:185
+#, fuzzy, python-format
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "Hitelesítés sikertelen. %s innen: %s"
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr "Az erőforrás nem található."
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr "%(arg0)s indítása ezen: %(host)s:%(port)s"
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -224,60 +231,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr "Többszörös név: %s."
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr "Többszörös azonosító: %s."
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, fuzzy, python-format
msgid "LDAP init: url=%s"
msgstr "FakeLdap előkészítési url=%s"
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -287,64 +294,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, fuzzy, python-format
msgid "LDAP bind: dn=%s"
msgstr "FakeLdap bind dn=%s"
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, fuzzy, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr "FakeLdap elem hozzáadása: dn=%s, attrs=%s"
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, fuzzy, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr "FakeLdap keresés itt: dn=%s hatókör=%s lekérdezés=%s"
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, fuzzy, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr "FakeLdap elem módosítása: dn=%s attrs=%s"
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, fuzzy, python-format
msgid "LDAP delete: dn=%s"
msgstr "FakeLdap elem törlése: dn=%s"
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, fuzzy, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr "FakeLdap elem hozzáadása: dn=%s, attrs=%s"
#: keystone/common/ldap/fakeldap.py:146
@@ -373,76 +382,76 @@ msgid "FakeLdap bind fail: password for dn=%s does not match"
msgstr "FakeLdap bind hiba: a jelszó nem egyezik ehhez: dn=%s"
#: keystone/common/ldap/fakeldap.py:190
-#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+#, fuzzy, python-format
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr "FakeLdap elem hozzáadása: dn=%s, attrs=%s"
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr "FakeLdap elem hozzáadása sikertelen: dn=%s már a tárolóban van."
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr "FakeLdap elem törlése: dn=%s"
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr "FakeLdap elem törlése sikertelen: dn=%s nem található."
-#: keystone/common/ldap/fakeldap.py:239
-#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+#: keystone/common/ldap/fakeldap.py:240
+#, fuzzy, python-format
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr "FakeLdap elem módosítása: dn=%s attrs=%s"
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr "FakeLdap elem módosítása sikertelen: dn=%s nem található."
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
"FakeLdap elem módosítása sikertelen: az elemnek nincs törölhető „%s” "
"attribútuma"
-#: keystone/common/ldap/fakeldap.py:271
-#, python-format
+#: keystone/common/ldap/fakeldap.py:273
+#, fuzzy, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
"FakeLdap elem módosítása sikertelen: az elemnek nincs törölhető „%s” "
"attribútuma „%s” értékkel"
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr "FakeLdap elem módosítása sikertelen: ismeretlen parancs: %s"
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr "modify_s %s művelet nincs megvalósítva"
-#: keystone/common/ldap/fakeldap.py:296
-#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#: keystone/common/ldap/fakeldap.py:300
+#, fuzzy, python-format
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr "FakeLdap keresés itt: dn=%s hatókör=%s lekérdezés=%s"
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr "FakeLdap keresés sikertelen: a dn nem található a SCOPE_BASE-hez"
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr "A(z) %s keresési hatókör nincs megvalósítva."
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "A kapott MySQL szerver eltűnt: %s"
@@ -467,28 +476,28 @@ msgid "Create user %s"
msgstr "%s felhasználó létrehozása"
#: keystone/common/sql/nova.py:88
-#, python-format
-msgid "Add user %s to tenant %s"
+#, fuzzy, python-format
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr "%s felhasználó hozzáadása %s bérlőhöz"
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr "Meglévő %s szerep figyelmen kívül hagyása"
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr "%s szerep létrehozása"
-#: keystone/common/sql/nova.py:113
-#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+#: keystone/common/sql/nova.py:114
+#, fuzzy, python-format
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr "%s szerep hozzárendelése %s felhasználóhoz %s bérlőben"
-#: keystone/common/sql/nova.py:128
-#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+#: keystone/common/sql/nova.py:133
+#, fuzzy, python-format
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "EC2 hitelesítési adatok létrehozása %s felhasználóhoz és %s bérlőhöz"
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -505,21 +514,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -543,18 +552,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
-msgstr "%s kikényszerítése: %s"
+msgid "enforce %(action)s: %(credentials)s"
+msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -566,3 +575,21 @@ msgstr "Nem vehető fel a token felhasználólistája."
msgid "Unable to add token to revocation list."
msgstr "A token nem adható a visszavonási listához."
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr "%s kikényszerítése: %s"
+
diff --git a/keystone/locale/it/LC_MESSAGES/keystone.po b/keystone/locale/it/LC_MESSAGES/keystone.po
index 1ee00550..958c30f9 100644
--- a/keystone/locale/it/LC_MESSAGES/keystone.po
+++ b/keystone/locale/it/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Italian "
@@ -38,7 +38,7 @@ msgstr "%(property_name)s non può essere superiore a %(max_length)s caratteri."
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr "Impossibile eseguire il checkout %s"
@@ -48,12 +48,12 @@ msgstr "Impossibile eseguire il checkout %s"
msgid "Project is disabled: %s"
msgstr "Il progetto è disabilitato: %s"
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr "Il dominio è disabilitato: %s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr "L'utente è disabilitato: %s"
@@ -126,17 +126,17 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr "Impossibile aprire il file di template %s"
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr "HTTP PERF: %(time).5f secondi a %(method)s %(host)s:%(port)s %(path)s)"
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr "Verifica errore: %s"
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
@@ -144,142 +144,149 @@ msgstr ""
"errore di firma: impossibile caricare il certificato - assicurarsi che "
"sia stato configurato PKI con 'keystone-manage pki_setup'"
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr "Errore di firma: %s"
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr "Impossibile individuare il file config di registrazione specificato: %s"
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr "Funzione syslog non valida"
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
-msgstr "RBAC: autorizzazione %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
+msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr "RBAC: token non valido"
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr "RBAC: utente non valido"
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr "RBAC: si procede senza progetto"
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr "RBAC: si procede senza tenant"
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr "RBAC: autorizzazione oltrepassata"
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr "RBAC: autorizzazione concessa"
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC: aggiunta parametri del filtro della query (%s)"
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr "Token non valido in normalize_domain_id"
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr "Avvio %(arg0)s in %(host)s:%(port)s"
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
-msgstr "Errore del server"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
+msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr "arg_dict: %s"
-#: keystone/common/wsgi.py:267
-#, python-format
-msgid "Authorization failed. %s from %s"
+#: keystone/common/wsgi.py:185
+#, fuzzy, python-format
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "Autorizzazione non riuscita. %s da %s"
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr "Impossibile trovare la risorsa."
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr "Avvio %(arg0)s in %(host)s:%(port)s"
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr "Errore del server"
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
msgstr "Opzione deref LDAP non valida: %s. Sceglierne una di: "
#: keystone/common/ldap/core.py:87
-#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-msgstr ""
+#, fuzzy, python-format
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
+msgstr "Opzione deref LDAP non valida: %s. Sceglierne una di: "
-#: keystone/common/ldap/core.py:96
-#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+#: keystone/common/ldap/core.py:99
+#, fuzzy, python-format
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr "Ambito LDAP non valido: %s. Sceglierne uno di: "
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr "Nome duplicato, %s."
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr "ID duplicato, %s."
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr "LDAP %s crea"
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr "LDAP %s aggiorna"
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr "LDAP %s elimina"
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr "LDAP inizializza: url=%s"
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -289,46 +296,48 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr "LDAP bind: dn=%s"
-#: keystone/common/ldap/core.py:503
-#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+#: keystone/common/ldap/core.py:508
+#, fuzzy, python-format
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr "LDAP aggiunge: dn=%s, attrs=%s"
-#: keystone/common/ldap/core.py:508
-#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#: keystone/common/ldap/core.py:514
+#, fuzzy, python-format
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr "Ricerca LDAP: dn=%s, scope=%s, query=%s, attrs=%s"
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
@@ -336,19 +345,19 @@ msgstr ""
"Il server LDAP non supporta la paginazione. Disabilitare la paginazione "
"in keystone.conf per evitare questo messaggio."
-#: keystone/common/ldap/core.py:576
-#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+#: keystone/common/ldap/core.py:584
+#, fuzzy, python-format
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr "LDAP modifica: dn=%s, modlist=%s"
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr "LDAP elimina: dn=%s"
-#: keystone/common/ldap/core.py:585
-#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#: keystone/common/ldap/core.py:595
+#, fuzzy, python-format
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr "LDAP delete_ext: dn=%s, serverctrls=%s"
#: keystone/common/ldap/fakeldap.py:146
@@ -377,76 +386,76 @@ msgid "FakeLdap bind fail: password for dn=%s does not match"
msgstr "FakeLdap bind non riuscito: password per dn=%s non corrisponde"
#: keystone/common/ldap/fakeldap.py:190
-#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+#, fuzzy, python-format
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr "FakeLdap aggiunge elemento: dn=%s, attrs=%s"
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr "FakeLdap aggiunta elemento non riuscita: dn=%s è già nell'archivio."
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr "FakeLdap elimina elemento: dn=%s"
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr "FakeLdap elimina elemento non riuscito: dn=%s non trovato."
-#: keystone/common/ldap/fakeldap.py:239
-#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+#: keystone/common/ldap/fakeldap.py:240
+#, fuzzy, python-format
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr "FakeLdap modifica elemento: dn=%s attrs=%s"
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr "FakeLdap modifica elemento: dn=%s non trovato."
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
"FakeLdap modifica elemento non riuscito: l'elemento non ha nessun "
"attributo \"%s\" da eliminare"
-#: keystone/common/ldap/fakeldap.py:271
-#, python-format
+#: keystone/common/ldap/fakeldap.py:273
+#, fuzzy, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
"Modifica elemento FakeLdap non riuscita: l'elemento non ha nessun "
"attributo \"%s\" con il valore \"%s\" da eliminare"
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr "FakeLdap modifica elemento non riuscito: comando %s sconosciuto"
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr "modify_s azione %s non implementata"
-#: keystone/common/ldap/fakeldap.py:296
-#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#: keystone/common/ldap/fakeldap.py:300
+#, fuzzy, python-format
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr "FakeLdap ricerca in dn=%s scope=%s query=%s"
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr "FakeLdap ricerca non riuscita: dn non trovato per SCOPE_BASE"
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr "Ambito di ricerca %s non implementato."
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "Ricevuto messaggio di interruzione della connessione del server mysql: %s"
@@ -471,28 +480,28 @@ msgid "Create user %s"
msgstr "Crea utente %s"
#: keystone/common/sql/nova.py:88
-#, python-format
-msgid "Add user %s to tenant %s"
+#, fuzzy, python-format
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr "Aggiungi utente %s al tenant %s"
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr "Il ruolo esistente viene ignorato %s"
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr "Crea ruolo %s"
-#: keystone/common/sql/nova.py:113
-#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+#: keystone/common/sql/nova.py:114
+#, fuzzy, python-format
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr "Assegna il ruolo %s all'utente %s nel tenant %s"
-#: keystone/common/sql/nova.py:128
-#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+#: keystone/common/sql/nova.py:133
+#, fuzzy, python-format
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "Creazione credenziale ec2 per l'utente %s e del tenant %s"
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -509,21 +518,21 @@ msgstr "Impossibile rimuovere un ruolo che non è stato concesso, %s"
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr "Ruolo %s non trovato"
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr "Modifica nome non supportato da LDAP"
-#: keystone/identity/backends/ldap/core.py:926
-#, python-format
-msgid "User %s is already a member of group %s"
+#: keystone/identity/backends/ldap/core.py:920
+#, fuzzy, python-format
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "L'utente %s è già membro del gruppo %s"
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -547,18 +556,18 @@ msgstr "Impossibile comprendere la regola %(rule)r"
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
-msgstr "applica %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
+msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr "Il token non appartiene al tenant specificato."
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr "Il dominio non predefinito non è supportato"
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr "L'ambito del dominio token non è supportato"
@@ -570,3 +579,15 @@ msgstr "Impossibile aggiungere un elenco utenti token."
msgid "Unable to add token to revocation list."
msgstr "Impossibile aggiungere un token ad un elenco di revoca."
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr "RBAC: autorizzazione %s(%s)"
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr "applica %s: %s"
+
diff --git a/keystone/locale/ja/LC_MESSAGES/keystone.po b/keystone/locale/ja/LC_MESSAGES/keystone.po
index 705c932f..d4cff3f6 100644
--- a/keystone/locale/ja/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ja/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2012-11-03 01:25+0000\n"
"Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
"Language-Team: Japanese "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -121,97 +121,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr "無効な syslog ファシリティ"
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -219,60 +226,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -282,64 +289,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -369,71 +378,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -459,27 +468,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -496,21 +505,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -534,18 +543,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -557,3 +566,60 @@ msgstr "ユーザーリストにトークンを追加できません。"
msgid "Unable to add token to revocation list."
msgstr "失効リストにトークンを追加できません。"
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/ka_GE/LC_MESSAGES/keystone.po b/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
index 6ba6dbb4..35f71d42 100644
--- a/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: ka_GE <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr "დომენი გათიშულია: %s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -120,97 +120,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -218,60 +225,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr "LDAP %s შექმნა"
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr "LDAP %s განახლება"
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr "LDAP %s წაშლა"
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -368,71 +377,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -458,27 +467,27 @@ msgstr "მომხმარებლის შექმნა %s"
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr "როლი %s ვერ მოიძებნა"
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -556,3 +565,60 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/keystone.pot b/keystone/locale/keystone.pot
index 585ca6bf..5ab34be6 100644
--- a/keystone/locale/keystone.pot
+++ b/keystone/locale/keystone.pot
@@ -7,9 +7,9 @@
msgid ""
msgstr ""
"Project-Id-Version: keystone "
-"jenkins.keystone.propose.translation.update.209\n"
+"jenkins.keystone.propose.translation.update.217\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -120,97 +120,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -218,60 +225,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -368,71 +377,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -458,27 +467,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
diff --git a/keystone/locale/ko_KR/LC_MESSAGES/keystone.po b/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
index 160972f1..26433ea8 100644
--- a/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-03-21 18:34+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: ko_KR <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -120,97 +120,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -218,60 +225,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -368,71 +377,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -458,27 +467,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr "Role %s 생성"
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -556,3 +565,60 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
index ee54d3fe..8176a688 100644
--- a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2012-11-02 18:30+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Portuguese (Brazil) "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -120,97 +120,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -218,60 +225,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -368,71 +377,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -458,27 +467,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -556,3 +565,60 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/ru/LC_MESSAGES/keystone.po b/keystone/locale/ru/LC_MESSAGES/keystone.po
index f6148dc0..bfc75bdb 100644
--- a/keystone/locale/ru/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ru/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Russian "
@@ -39,7 +39,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -49,12 +49,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -121,97 +121,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -219,60 +226,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -282,64 +289,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -369,71 +378,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -459,27 +468,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -496,21 +505,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -534,18 +543,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -557,3 +566,60 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/vi_VN/LC_MESSAGES/keystone.po b/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
index 85568202..533803df 100644
--- a/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
+++ b/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Vietnamese (Viet Nam) "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,12 +48,12 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr ""
@@ -120,97 +120,104 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr ""
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr ""
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr ""
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr ""
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr ""
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:267
+#: keystone/common/wsgi.py:185
#, python-format
-msgid "Authorization failed. %s from %s"
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr ""
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr ""
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
@@ -218,60 +225,60 @@ msgstr ""
#: keystone/common/ldap/core.py:87
#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:96
+#: keystone/common/ldap/core.py:99
#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr ""
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr ""
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:503
+#: keystone/common/ldap/core.py:508
#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:514
#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:584
#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr ""
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:585
+#: keystone/common/ldap/core.py:595
#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr ""
#: keystone/common/ldap/fakeldap.py:146
@@ -368,71 +377,71 @@ msgstr ""
#: keystone/common/ldap/fakeldap.py:190
#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:239
+#: keystone/common/ldap/fakeldap.py:240
#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr ""
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:271
+#: keystone/common/ldap/fakeldap.py:273
#, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:296
+#: keystone/common/ldap/fakeldap.py:300
#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr ""
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -458,27 +467,27 @@ msgstr ""
#: keystone/common/sql/nova.py:88
#, python-format
-msgid "Add user %s to tenant %s"
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:113
+#: keystone/common/sql/nova.py:114
#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:128
+#: keystone/common/sql/nova.py:133
#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr ""
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:926
+#: keystone/identity/backends/ldap/core.py:920
#, python-format
-msgid "User %s is already a member of group %s"
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr ""
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
+msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr ""
@@ -556,3 +565,60 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr ""
+
+#~ msgid "Authorization failed. %s from %s"
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP scope: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "LDAP add: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP modify: dn=%s, modlist=%s"
+#~ msgstr ""
+
+#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
+#~ msgstr ""
+
+#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "FakeLdap modify item failed: item has"
+#~ " no attribute \"%s\" with value "
+#~ "\"%s\" to delete"
+#~ msgstr ""
+
+#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#~ msgstr ""
+
+#~ msgid "Add user %s to tenant %s"
+#~ msgstr ""
+
+#~ msgid "Assign role %s to user %s on tenant %s"
+#~ msgstr ""
+
+#~ msgid "Creating ec2 cred for user %s and tenant %s"
+#~ msgstr ""
+
+#~ msgid "User %s is already a member of group %s"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr ""
+
diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
index e2a4e6ac..8c6af897 100644
--- a/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
+++ b/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-21 06:08+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Chinese (China) "
@@ -38,7 +38,7 @@ msgstr "%(property_name)s 不应该超过 %(max_length)s 个字符。"
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr "未能检出 %s"
@@ -48,12 +48,12 @@ msgstr "未能检出 %s"
msgid "Project is disabled: %s"
msgstr "项目已禁用:%s"
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr "域已禁用:%s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr "用户已禁用:%s"
@@ -120,158 +120,165 @@ msgstr "端点 %s 的格式不正确 - 格式不完整(您遗漏了类型通
msgid "Unable to open template file %s"
msgstr "无法打开模板文件 %s"
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr "HTTP 性能:%(time).5f 秒,至 %(method)s %(host)s:%(port)s %(path)s)"
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr "发生验证错误:%s"
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr "发生签名错误:无法装入证书 - 请确保您已使用“keystone-manage pki_setup”配置 PKI"
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr "发生签名错误:%s"
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr "找不到指定的日志记录配置文件:%s"
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr "系统日志工具无效"
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
-msgstr "RBAC:正在授权 %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
+msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr "RBAC:令牌无效"
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr "RBAC:用户无效"
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr "RBAC:正在没有项目的情况下继续"
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr "RBAC:正在没有租户的情况下继续"
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr "RBAC:正在绕过授权"
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr "RBAC:已授予权限"
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC:正在添加查询过滤器参数 (%s)"
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr "normalize_domain_id 中的令牌无效"
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr "正在 %(host)s:%(port)s 上启动 %(arg0)s"
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
-msgstr "服务器错误"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
+msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr "arg_dict:%s"
-#: keystone/common/wsgi.py:267
-#, python-format
-msgid "Authorization failed. %s from %s"
+#: keystone/common/wsgi.py:185
+#, fuzzy, python-format
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "授权失败。%s 来自 %s"
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr "找不到该资源。"
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr "正在 %(host)s:%(port)s 上启动 %(arg0)s"
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr "服务器错误"
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
msgstr "LDAP deref 选项 %s 无效。请选择下列其中一项:"
#: keystone/common/ldap/core.py:87
-#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-msgstr ""
+#, fuzzy, python-format
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
+msgstr "LDAP deref 选项 %s 无效。请选择下列其中一项:"
-#: keystone/common/ldap/core.py:96
-#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+#: keystone/common/ldap/core.py:99
+#, fuzzy, python-format
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr "LDAP 作用域 %s 无效。请选择下列其中一项:"
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr "名称 %s 重复。"
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr "标识 %s 重复。"
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr "LDAP %s 创建"
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr "LDAP %s 更新"
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr "LDAP %s 删除"
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr "LDAP 初始化:url=%s"
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr "LDAP 绑定:dn=%s"
-#: keystone/common/ldap/core.py:503
-#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+#: keystone/common/ldap/core.py:508
+#, fuzzy, python-format
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr "LDAP 添加:dn=%s,attrs=%s"
-#: keystone/common/ldap/core.py:508
-#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#: keystone/common/ldap/core.py:514
+#, fuzzy, python-format
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr "LDAP 搜索:dn=%s,scope=%s,query=%s,attrs=%s"
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr "LDAP 服务器不支持页面调度。请在 keystone.conf 中禁用页面调度以避免出现此消息。"
-#: keystone/common/ldap/core.py:576
-#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+#: keystone/common/ldap/core.py:584
+#, fuzzy, python-format
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr "LDAP 修改:dn=%s,modlist=%s"
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr "LDAP 删除:dn=%s"
-#: keystone/common/ldap/core.py:585
-#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#: keystone/common/ldap/core.py:595
+#, fuzzy, python-format
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr "LDAP delete_ext:dn=%s,serverctrls=%s"
#: keystone/common/ldap/fakeldap.py:146
@@ -367,72 +376,72 @@ msgid "FakeLdap bind fail: password for dn=%s does not match"
msgstr "FakeLdap bind 失败:dn=%s 的密码不匹配"
#: keystone/common/ldap/fakeldap.py:190
-#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+#, fuzzy, python-format
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr "FakeLdap add item:dn=%s,attrs=%s"
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr "FakeLdap add item 失败:dn=%s 已在存储中。"
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr "FakeLdap delete item:dn=%s"
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr "FakeLdap delete item 失败:找不到 dn=%s。"
-#: keystone/common/ldap/fakeldap.py:239
-#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+#: keystone/common/ldap/fakeldap.py:240
+#, fuzzy, python-format
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr "FakeLdap modify item:dn=%s attrs=%s"
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr "FakeLdap modify item 失败:找不到 dn=%s。"
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr "FakeLdap modify item 失败:项没有要删除的任何属性“%s”"
-#: keystone/common/ldap/fakeldap.py:271
-#, python-format
+#: keystone/common/ldap/fakeldap.py:273
+#, fuzzy, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr "FakeLdap modify item 失败:项没有任何符合以下条件的属性“%s”:具有要删除的值“%s”"
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr "FakeLdap modify item 失败:命令 %s 未知"
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr "未实现 modify_s 操作 %s"
-#: keystone/common/ldap/fakeldap.py:296
-#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#: keystone/common/ldap/fakeldap.py:300
+#, fuzzy, python-format
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr "FakeLdap search(在以下位置:dn=%s scope=%s query=%s)"
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr "FakeLdap search 失败:对于 SCOPE_BASE,找不到 dn"
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr "未实现搜索范围 %s。"
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "mysql 服务器已不存在:%s"
@@ -457,28 +466,28 @@ msgid "Create user %s"
msgstr "请创建用户 %s"
#: keystone/common/sql/nova.py:88
-#, python-format
-msgid "Add user %s to tenant %s"
+#, fuzzy, python-format
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr "请将用户 %s 添加至租户 %s"
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr "正在忽略现有角色 %s"
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr "请创建角色 %s"
-#: keystone/common/sql/nova.py:113
-#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+#: keystone/common/sql/nova.py:114
+#, fuzzy, python-format
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr "请将角色 %s 分配给用户 %s(在租户 %s 上)"
-#: keystone/common/sql/nova.py:128
-#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+#: keystone/common/sql/nova.py:133
+#, fuzzy, python-format
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "正在为用户 %s 和租户 %s 创建 ec2 凭证"
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr "无法除去尚未授予的角色 %s"
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr "找不到角色 %s"
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr "更改名称不受 LDAP 支持"
-#: keystone/identity/backends/ldap/core.py:926
-#, python-format
-msgid "User %s is already a member of group %s"
+#: keystone/identity/backends/ldap/core.py:920
+#, fuzzy, python-format
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "用户 %s 已是组 %s 的成员"
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr "未能理解规则 %(rule)r"
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
-msgstr "请强制执行 %s:%s"
+msgid "enforce %(action)s: %(credentials)s"
+msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr "令牌不属于指定的租户。"
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr "非缺省域不受支持"
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr "作用域限定到域的令牌不受支持"
@@ -556,3 +565,15 @@ msgstr "无法添加令牌用户列表。"
msgid "Unable to add token to revocation list."
msgstr "无法将令牌添加至撤销列表。"
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr "RBAC:正在授权 %s(%s)"
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr "请强制执行 %s:%s"
+
diff --git a/keystone/locale/zh_TW/LC_MESSAGES/keystone.po b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
index 96b5e1dc..375815eb 100644
--- a/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
+++ b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-22 17:05+0000\n"
+"POT-Creation-Date: 2013-05-30 17:05+0000\n"
"PO-Revision-Date: 2013-05-22 03:11+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Chinese (Taiwan) "
@@ -38,7 +38,7 @@ msgstr "%(property_name)s 不應超過 %(max_length)s 個字元。"
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:115
+#: keystone/test.py:117
#, python-format
msgid "Failed to checkout %s"
msgstr "無法移出 %s"
@@ -48,12 +48,12 @@ msgstr "無法移出 %s"
msgid "Project is disabled: %s"
msgstr "已停用專案:%s"
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
#, python-format
msgid "Domain is disabled: %s"
msgstr "已停用網域:%s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
#, python-format
msgid "User is disabled: %s"
msgstr "已停用使用者:%s"
@@ -120,158 +120,165 @@ msgstr "端點 %s 的格式不正確 - 格式不完整(遺漏了類型通知
msgid "Unable to open template file %s"
msgstr "無法開啟範本檔 %s"
-#: keystone/common/bufferedhttp.py:102
+#: keystone/common/bufferedhttp.py:101
#, python-format
msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
msgstr "HTTP PERF:%(time).5f 秒鐘以 (%(method)s %(host)s:%(port)s %(path)s)"
-#: keystone/common/cms.py:44
+#: keystone/common/cms.py:42
#, python-format
msgid "Verify error: %s"
msgstr "驗證發生錯誤:%s"
-#: keystone/common/cms.py:135
+#: keystone/common/cms.py:134
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr "簽署發生錯誤:無法載入憑證 - 請確保已使用 'keystone-manage pki_setup' 來配置 PKI"
-#: keystone/common/cms.py:139
+#: keystone/common/cms.py:138
#, python-format
msgid "Signing error: %s"
msgstr "簽署發生錯誤:%s"
-#: keystone/common/config.py:93
+#: keystone/common/config.py:89
#, python-format
msgid "Unable to locate specified logging config file: %s"
msgstr "找不到指定的記載配置檔:%s"
-#: keystone/common/config.py:111
+#: keystone/common/config.py:107
msgid "Invalid syslog facility"
msgstr "無效的 Syslog 機能"
-#: keystone/common/controller.py:19
+#: keystone/common/controller.py:18
#, python-format
-msgid "RBAC: Authorizing %s(%s)"
-msgstr "RBAC:正在授權 %s(%s)"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
+msgstr ""
-#: keystone/common/controller.py:27
+#: keystone/common/controller.py:26
msgid "RBAC: Invalid token"
msgstr "RBAC:無效的記號"
-#: keystone/common/controller.py:37 keystone/common/controller.py:58
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
msgid "RBAC: Invalid user"
msgstr "RBAC:無效的使用者"
-#: keystone/common/controller.py:43
+#: keystone/common/controller.py:42
msgid "RBAC: Proceeding without project"
msgstr "RBAC:在沒有專案的情況下繼續作業"
-#: keystone/common/controller.py:63
+#: keystone/common/controller.py:62
msgid "RBAC: Proceeding without tenant"
msgstr "RBAC:在沒有 Tenant 的情況下繼續作業"
-#: keystone/common/controller.py:93 keystone/common/controller.py:145
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
msgid "RBAC: Bypassing authorization"
msgstr "RBAC:正在略過授權"
-#: keystone/common/controller.py:102 keystone/common/controller.py:143
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
msgid "RBAC: Authorization granted"
msgstr "RBAC:已授與權限"
-#: keystone/common/controller.py:132
+#: keystone/common/controller.py:131
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC:正在新增查詢過濾器參數 (%s)"
-#: keystone/common/controller.py:332
+#: keystone/common/controller.py:331
msgid "Invalid token in normalize_domain_id"
msgstr "normalize_domain_id 中的記號無效"
-#: keystone/common/wsgi.py:106
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr "正在 %(host)s:%(port)s 上啟動 %(arg0)s"
-
-#: keystone/common/wsgi.py:166
-msgid "Server error"
-msgstr "伺服器錯誤"
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
+msgstr ""
-#: keystone/common/wsgi.py:245
+#: keystone/common/wsgi.py:162
#, python-format
msgid "arg_dict: %s"
msgstr "arg_dict:%s"
-#: keystone/common/wsgi.py:267
-#, python-format
-msgid "Authorization failed. %s from %s"
+#: keystone/common/wsgi.py:185
+#, fuzzy, python-format
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "授權失敗。%s(自 %s)"
-#: keystone/common/wsgi.py:510
+#: keystone/common/wsgi.py:428
msgid "The resource could not be found."
msgstr "找不到資源。"
+#: keystone/common/wsgi_server.py:59
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr "正在 %(host)s:%(port)s 上啟動 %(arg0)s"
+
+#: keystone/common/wsgi_server.py:119
+msgid "Server error"
+msgstr "伺服器錯誤"
+
#: keystone/common/ldap/core.py:79
#, python-format
msgid "Invalid LDAP deref option: %s. Choose one of: "
msgstr "無效的 LDAP deref 選項:%s。請選擇下列其中一個:"
#: keystone/common/ldap/core.py:87
-#, python-format
-msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-msgstr ""
+#, fuzzy, python-format
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
+msgstr "無效的 LDAP deref 選項:%s。請選擇下列其中一個:"
-#: keystone/common/ldap/core.py:96
-#, python-format
-msgid "Invalid LDAP scope: %s. Choose one of: "
+#: keystone/common/ldap/core.py:99
+#, fuzzy, python-format
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
msgstr "無效的 LDAP 範圍:%s。請選擇下列其中一個:"
-#: keystone/common/ldap/core.py:185
+#: keystone/common/ldap/core.py:189
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%s\". Format must be "
"<ldap_attribute>:<keystone_attribute>"
msgstr ""
-#: keystone/common/ldap/core.py:190
+#: keystone/common/ldap/core.py:195
#, python-format
msgid ""
"Invalid additional attribute mapping: \"%(item)s\". Value "
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
#: keystone/identity/backends/kvs.py:631
#, python-format
msgid "Duplicate name, %s."
msgstr "重複的名稱,%s。"
-#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
#, python-format
msgid "Duplicate ID, %s."
msgstr "重複的 ID,%s。"
-#: keystone/common/ldap/core.py:289
+#: keystone/common/ldap/core.py:294
#, python-format
msgid "LDAP %s create"
msgstr "LDAP %s 建立"
-#: keystone/common/ldap/core.py:367
+#: keystone/common/ldap/core.py:372
#, python-format
msgid "LDAP %s update"
msgstr "LDAP %s 更新"
-#: keystone/common/ldap/core.py:400
+#: keystone/common/ldap/core.py:405
#, python-format
msgid "LDAP %s delete"
msgstr "LDAP %s 刪除"
-#: keystone/common/ldap/core.py:425
+#: keystone/common/ldap/core.py:430
#, python-format
msgid "LDAP init: url=%s"
msgstr "LDAP 起始設定:URL = %s"
-#: keystone/common/ldap/core.py:426
+#: keystone/common/ldap/core.py:431
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,64 +288,66 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:445
+#: keystone/common/ldap/core.py:450
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:449
+#: keystone/common/ldap/core.py:454
#, python-format
-msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
msgstr ""
-#: keystone/common/ldap/core.py:459
+#: keystone/common/ldap/core.py:464
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:471
+#: keystone/common/ldap/core.py:476
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:478
+#: keystone/common/ldap/core.py:483
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:492
+#: keystone/common/ldap/core.py:497
#, python-format
msgid "LDAP bind: dn=%s"
msgstr "LDAP 連結:DN = %s"
-#: keystone/common/ldap/core.py:503
-#, python-format
-msgid "LDAP add: dn=%s, attrs=%s"
+#: keystone/common/ldap/core.py:508
+#, fuzzy, python-format
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
msgstr "LDAP 新增:DN = %s,屬性 = %s"
-#: keystone/common/ldap/core.py:508
-#, python-format
-msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+#: keystone/common/ldap/core.py:514
+#, fuzzy, python-format
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
msgstr "LDAP 搜尋:DN = %s,範圍 = %s,查詢 = %s,屬性 = %s"
-#: keystone/common/ldap/core.py:559
+#: keystone/common/ldap/core.py:567
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr "「LDAP 伺服器」不支援分頁。請在 keystone.conf 中停用分頁以避免此訊息。"
-#: keystone/common/ldap/core.py:576
-#, python-format
-msgid "LDAP modify: dn=%s, modlist=%s"
+#: keystone/common/ldap/core.py:584
+#, fuzzy, python-format
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
msgstr "LDAP 修改:DN = %s,Modlist = %s"
-#: keystone/common/ldap/core.py:581
+#: keystone/common/ldap/core.py:590
#, python-format
msgid "LDAP delete: dn=%s"
msgstr "LDAP 刪除:DN = %s"
-#: keystone/common/ldap/core.py:585
-#, python-format
-msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+#: keystone/common/ldap/core.py:595
+#, fuzzy, python-format
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
msgstr "LDAP delete_ext:DN = %s,Serverctrls = %s"
#: keystone/common/ldap/fakeldap.py:146
@@ -367,72 +376,72 @@ msgid "FakeLdap bind fail: password for dn=%s does not match"
msgstr "FakeLdap 連結失敗:DN = %s 的密碼不符"
#: keystone/common/ldap/fakeldap.py:190
-#, python-format
-msgid "FakeLdap add item: dn=%s, attrs=%s"
+#, fuzzy, python-format
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
msgstr "FakeLdap 新增項目:DN = %s,屬性 = %s"
-#: keystone/common/ldap/fakeldap.py:192
+#: keystone/common/ldap/fakeldap.py:193
#, python-format
msgid "FakeLdap add item failed: dn=%s is already in store."
msgstr "FakeLdap 新增項目失敗:DN = %s 已在儲存庫中。"
-#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
#, python-format
msgid "FakeLdap delete item: dn=%s"
msgstr "FakeLdap 刪除項目:DN = %s"
-#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
#, python-format
msgid "FakeLdap delete item failed: dn=%s not found."
msgstr "FakeLdap 刪除項目失敗:找不到 DN = %s。"
-#: keystone/common/ldap/fakeldap.py:239
-#, python-format
-msgid "FakeLdap modify item: dn=%s attrs=%s"
+#: keystone/common/ldap/fakeldap.py:240
+#, fuzzy, python-format
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
msgstr "FakeLdap 修改項目:DN = %s 屬性 = %s"
-#: keystone/common/ldap/fakeldap.py:243
+#: keystone/common/ldap/fakeldap.py:245
#, python-format
msgid "FakeLdap modify item failed: dn=%s not found."
msgstr "FakeLdap 修改項目失敗:找不到 DN = %s。"
-#: keystone/common/ldap/fakeldap.py:260
+#: keystone/common/ldap/fakeldap.py:262
#, python-format
msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
msgstr "FakeLdap 修改項目失敗:項目沒有要刪除的屬性 \"%s\""
-#: keystone/common/ldap/fakeldap.py:271
-#, python-format
+#: keystone/common/ldap/fakeldap.py:273
+#, fuzzy, python-format
msgid ""
-"FakeLdap modify item failed: item has no attribute \"%s\" with value "
-"\"%s\" to delete"
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
msgstr "FakeLdap 修改項目失敗:項目沒有要刪除的屬性 \"%s\"(值為 \"%s\")"
-#: keystone/common/ldap/fakeldap.py:276
+#: keystone/common/ldap/fakeldap.py:279
#, python-format
msgid "FakeLdap modify item failed: unknown command %s"
msgstr "FakeLdap 修改項目失敗:不明的指令 %s"
-#: keystone/common/ldap/fakeldap.py:278
+#: keystone/common/ldap/fakeldap.py:281
#, python-format
msgid "modify_s action %s not implemented"
msgstr "未實作 modify_s 動作 %s"
-#: keystone/common/ldap/fakeldap.py:296
-#, python-format
-msgid "FakeLdap search at dn=%s scope=%s query=%s"
+#: keystone/common/ldap/fakeldap.py:300
+#, fuzzy, python-format
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
msgstr "FakeLdap 搜尋(DN = %s 範圍 = %s 查詢 = %s)"
-#: keystone/common/ldap/fakeldap.py:302
+#: keystone/common/ldap/fakeldap.py:306
msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
msgstr "FakeLdap 搜尋失敗:找不到 SCOPE_BASE 的 DN"
-#: keystone/common/ldap/fakeldap.py:316
+#: keystone/common/ldap/fakeldap.py:320
#, python-format
msgid "Search scope %s not implemented."
msgstr "未實作搜尋範圍 %s。"
-#: keystone/common/sql/core.py:207
+#: keystone/common/sql/core.py:205
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "已取得 mysql 伺服器已斷線的訊息:%s"
@@ -457,28 +466,28 @@ msgid "Create user %s"
msgstr "建立使用者 %s"
#: keystone/common/sql/nova.py:88
-#, python-format
-msgid "Add user %s to tenant %s"
+#, fuzzy, python-format
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr "將使用者 %s 新增至 Tenant %s"
-#: keystone/common/sql/nova.py:96
+#: keystone/common/sql/nova.py:97
#, python-format
msgid "Ignoring existing role %s"
msgstr "正在忽略現有角色 %s"
-#: keystone/common/sql/nova.py:103
+#: keystone/common/sql/nova.py:104
#, python-format
msgid "Create role %s"
msgstr "建立角色 %s"
-#: keystone/common/sql/nova.py:113
-#, python-format
-msgid "Assign role %s to user %s on tenant %s"
+#: keystone/common/sql/nova.py:114
+#, fuzzy, python-format
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr "將角色 %s 指派給使用者 %s(在 Tenant %s 上)"
-#: keystone/common/sql/nova.py:128
-#, python-format
-msgid "Creating ec2 cred for user %s and tenant %s"
+#: keystone/common/sql/nova.py:133
+#, fuzzy, python-format
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "正在給使用者 %s 及 Tenant %s 建立 EC2 Cred"
#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
@@ -495,21 +504,21 @@ msgstr "無法移除尚未授權的角色,%s"
msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:692
+#: keystone/identity/backends/ldap/core.py:690
#, python-format
msgid "Role %s not found"
msgstr "找不到角色 %s"
-#: keystone/identity/backends/ldap/core.py:912
+#: keystone/identity/backends/ldap/core.py:907
msgid "Changing Name not supported by LDAP"
msgstr "LDAP 不支援變更名稱"
-#: keystone/identity/backends/ldap/core.py:926
-#, python-format
-msgid "User %s is already a member of group %s"
+#: keystone/identity/backends/ldap/core.py:920
+#, fuzzy, python-format
+msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "使用者 %s 已是群組 %s 的成員"
-#: keystone/identity/backends/ldap/core.py:968
+#: keystone/identity/backends/ldap/core.py:963
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -533,18 +542,18 @@ msgstr "無法理解規則 %(rule)r"
#: keystone/policy/backends/rules.py:93
#, python-format
-msgid "enforce %s: %s"
-msgstr "施行 %s:%s"
+msgid "enforce %(action)s: %(credentials)s"
+msgstr ""
-#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
msgid "Token does not belong to specified tenant."
msgstr "記號不屬於所指定的 Tenant。"
-#: keystone/token/controllers.py:476
+#: keystone/token/controllers.py:475
msgid "Non-default domain is not supported"
msgstr "不支援非預設網域"
-#: keystone/token/controllers.py:484
+#: keystone/token/controllers.py:483
msgid "Domain scoped token is not supported"
msgstr "不支援網域範圍的記號"
@@ -556,3 +565,15 @@ msgstr "無法新增記號使用者清單。"
msgid "Unable to add token to revocation list."
msgstr "無法將記號新增至撤銷清冊。"
+#~ msgid "RBAC: Authorizing %s(%s)"
+#~ msgstr "RBAC:正在授權 %s(%s)"
+
+#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+#~ msgstr ""
+
+#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgstr ""
+
+#~ msgid "enforce %s: %s"
+#~ msgstr "施行 %s:%s"
+