summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenStack Jenkins <jenkins@openstack.org>2013-07-11 17:05:43 +0000
committerOpenStack Jenkins <jenkins@openstack.org>2013-07-11 17:05:43 +0000
commitd546a028e4e9a616aa289e3b34add0f7ad4c4e46 (patch)
tree40fab416126057402ad18fee779dbb0ecf94562e
parent9a5b0c3a95c13d44013f3581821e1f06800cf986 (diff)
Imported Translations from Transifex
Change-Id: I4db62367802c9b2e8953ce5affd04c9ac20e7527
-rw-r--r--keystone/locale/bg_BG/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/ca/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/cs/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/da/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/de/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/es/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/fi_FI/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/fr/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/hu/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/it/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/ja/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/ka_GE/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/keystone.pot94
-rw-r--r--keystone/locale/ko_KR/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/pl_PL/LC_MESSAGES/keystone.po92
-rw-r--r--keystone/locale/pt_BR/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/ro/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/ru/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/sl_SI/LC_MESSAGES/keystone.po92
-rw-r--r--keystone/locale/vi_VN/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/zh_CN/LC_MESSAGES/keystone.po99
-rw-r--r--keystone/locale/zh_TW/LC_MESSAGES/keystone.po99
22 files changed, 1123 insertions, 1036 deletions
diff --git a/keystone/locale/bg_BG/LC_MESSAGES/keystone.po b/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
index 77677455..ef61d876 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -179,7 +195,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -441,12 +457,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -455,37 +475,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/ca/LC_MESSAGES/keystone.po b/keystone/locale/ca/LC_MESSAGES/keystone.po
index 0a5f732e..3d83598f 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,12 +103,12 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
#, fuzzy
msgid "Unable to sign token."
msgstr "No es pot afegir el token a la llista d'usuaris."
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -180,7 +196,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -196,12 +212,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -248,13 +264,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -442,12 +458,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -456,37 +476,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -498,41 +518,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -553,15 +558,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -587,10 +597,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr "No es pot afegir el token a la llista de revocats."
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/cs/LC_MESSAGES/keystone.po b/keystone/locale/cs/LC_MESSAGES/keystone.po
index ac761b39..60948581 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -179,7 +195,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -441,12 +457,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -455,37 +475,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/da/LC_MESSAGES/keystone.po b/keystone/locale/da/LC_MESSAGES/keystone.po
index 930adae2..ed07f63b 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -179,7 +195,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -441,12 +457,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -455,37 +475,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/de/LC_MESSAGES/keystone.po b/keystone/locale/de/LC_MESSAGES/keystone.po
index d4a7b49e..b47004fb 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ 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:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr "%s wurde nicht ausgecheckt"
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr "Rolle %s nicht gefunden"
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr "Nicht gewährte Rolle kann nicht entfernt werden, %s"
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr "Benutzer hat keinen Zugriff auf Projekt"
msgid "User have no access to domain"
msgstr "Benutzer hat keinen Zugriff auf Domäne"
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr "Token kann nicht unterzeichnet werden."
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -189,7 +205,7 @@ msgstr ""
"Rollenbasierte Zugriffssteuerung: Hinzufügen von Abfragefilterparametern "
"(%s)"
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr "Ungültiges Token in 'normalize_domain_id'"
@@ -205,12 +221,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr "arg_dict: %s"
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, fuzzy, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "Autorisierung fehlgeschlagen. %s von %s"
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr "Die Ressource konnte nicht gefunden werden."
@@ -257,13 +273,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr "Doppelter Name, %s."
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr "Doppelte ID, %s."
@@ -457,14 +473,18 @@ msgstr "FakeLdap-Suche fehlgeschlagen: dn für 'SCOPE_BASE' nicht gefunden"
msgid "Search scope %s not implemented."
msgstr "Suchbereich %s nicht implementiert."
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
"Es wurde festgestellt, dass keine Verbindung zum mysql-Server mehr "
"vorhanden ist: %s"
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr "EC2-Berechtigungsnachweis kann nicht migriert werden: %s"
@@ -473,37 +493,37 @@ msgstr "EC2-Berechtigungsnachweis kann nicht migriert werden: %s"
msgid "version should be an integer"
msgstr "Version sollte eine Ganzzahl sein"
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr "Nutzer %s erstellen"
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr "Benutzer %s erstellen"
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, 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:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr "Vorhandene Rolle %s ignorieren"
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr "Rolle %s erstellen"
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, 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:133
+#: keystone/common/sql/nova.py:136
#, 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"
@@ -515,41 +535,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr "Benutzer nicht in Gruppe gefunden"
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr "Rolle %s nicht gefunden"
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr "Änderung von Namen wird von LDAP nicht unterstützt"
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, 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/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr "Nicht gewährte Rolle kann nicht entfernt werden, %s"
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -570,15 +575,20 @@ msgstr "Regel '%(rule)r' konnte nicht verstanden werden"
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr "Token gehört nicht zu angegebenem Nutzer."
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr "Nicht-Standard-Domäne wird nicht unterstützt"
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr "Bereichsorientiertes Token der Domäne wird nicht unterstützt"
@@ -604,10 +614,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr "Token kann nicht zu Widerrufsliste hinzugefügt werden."
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/es/LC_MESSAGES/keystone.po b/keystone/locale/es/LC_MESSAGES/keystone.po
index 308213c3..7f1d56a4 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ 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:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr "No se ha podido extraer %s"
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr "No se ha encontrado el rol %s"
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr "No se puede eliminar un rol que no se ha otorgado, %s"
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr "El usuario no tiene acceso al proyecto"
msgid "User have no access to domain"
msgstr "El usuario no tiene acceso al dominio"
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr "No se ha podido firmar la señal."
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -191,7 +207,7 @@ msgstr "RBAC: Autorización otorgada"
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC: añadiendo parámetros de filtro de consultas (%s)"
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr "Señal no válida en normalize_domain_id"
@@ -207,12 +223,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr "arg_dict: %s"
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, 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:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr "El recurso no se ha podido encontrar."
@@ -259,13 +275,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr "Nombre duplicado, %s."
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr "ID duplicado, %s."
@@ -466,12 +482,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr "Ámbito de búsqueda %s no implementado."
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "Se ha notificado que mysql server ha desaparecido: %s"
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr "No se puede migrar la credencial EC2: %s "
@@ -480,37 +500,37 @@ msgstr "No se puede migrar la credencial EC2: %s "
msgid "version should be an integer"
msgstr "la versión debe ser un entero"
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr "Crear el arrendatario %s"
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr "Crear el usuario %s"
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, 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:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr "Ignorando el rol existente %s"
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr "Crear el rol %s"
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, 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:133
+#: keystone/common/sql/nova.py:136
#, 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"
@@ -522,41 +542,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr "Usuario no encontrado en grupo"
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr "No se ha encontrado el rol %s"
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr "LDAP no soporta el cambio de nombre"
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, 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/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr "No se puede eliminar un rol que no se ha otorgado, %s"
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -577,15 +582,20 @@ msgstr "No se ha podido comprender la regla %(rule)r"
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr "La señal no pertenece al arrendatario especificado."
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr "El dominio no predeterminado no está soportado"
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr "La señal con ámbito de dominio no está soportada"
@@ -611,10 +621,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr "No se puede añadir señal a lista de revocación. "
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/fi_FI/LC_MESSAGES/keystone.po b/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
index 13953bea..1f8b79e2 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -179,7 +195,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -441,12 +457,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -455,37 +475,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone.po b/keystone/locale/fr/LC_MESSAGES/keystone.po
index e41e0ec4..61e4adde 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -179,7 +195,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -441,12 +457,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -455,37 +475,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/hu/LC_MESSAGES/keystone.po b/keystone/locale/hu/LC_MESSAGES/keystone.po
index 8d24f2a8..ca656d2e 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +39,27 @@ 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:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr "Nem sikerült %s kiiktatása"
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -88,12 +104,12 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
#, fuzzy
msgid "Unable to sign token."
msgstr "Nem vehető fel a token felhasználólistája."
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -183,7 +199,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -199,12 +215,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr "arg_dict: %s"
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, fuzzy, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "Hitelesítés sikertelen. %s innen: %s"
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr "Az erőforrás nem található."
@@ -251,13 +267,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr "Többszörös név: %s."
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr "Többszörös azonosító: %s."
@@ -449,12 +465,16 @@ msgstr "FakeLdap keresés sikertelen: a dn nem található a SCOPE_BASE-hez"
msgid "Search scope %s not implemented."
msgstr "A(z) %s keresési hatókör nincs megvalósítva."
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "A kapott MySQL szerver eltűnt: %s"
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr "Nem migrálhatók az EC2 hitelesítési adatok: %s"
@@ -463,37 +483,37 @@ msgstr "Nem migrálhatók az EC2 hitelesítési adatok: %s"
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr "%s bérlő létrehozása"
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr "%s felhasználó létrehozása"
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, 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:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr "Meglévő %s szerep figyelmen kívül hagyása"
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr "%s szerep létrehozása"
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, 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:133
+#: keystone/common/sql/nova.py:136
#, 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"
@@ -505,41 +525,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -560,15 +565,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -594,10 +604,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr "A token nem adható a visszavonási listához."
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/it/LC_MESSAGES/keystone.po b/keystone/locale/it/LC_MESSAGES/keystone.po
index 92701c53..790166b4 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ 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:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr "Impossibile eseguire il checkout %s"
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr "Ruolo %s non trovato"
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr "Impossibile rimuovere un ruolo che non è stato concesso, %s"
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr "L'utente non ha accesso al progetto"
msgid "User have no access to domain"
msgstr "L'utente non ha accesso al dominio"
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr "Impossibile firmare il token."
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -187,7 +203,7 @@ msgstr "RBAC: autorizzazione concessa"
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC: aggiunta parametri del filtro della query (%s)"
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr "Token non valido in normalize_domain_id"
@@ -203,12 +219,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr "arg_dict: %s"
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, fuzzy, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "Autorizzazione non riuscita. %s da %s"
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr "Impossibile trovare la risorsa."
@@ -255,13 +271,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr "Nome duplicato, %s."
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr "ID duplicato, %s."
@@ -455,12 +471,16 @@ msgstr "FakeLdap ricerca non riuscita: dn non trovato per SCOPE_BASE"
msgid "Search scope %s not implemented."
msgstr "Ambito di ricerca %s non implementato."
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "Ricevuto messaggio di interruzione della connessione del server mysql: %s"
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr "Impossibile migrare la credenziale EC2: %s"
@@ -469,37 +489,37 @@ msgstr "Impossibile migrare la credenziale EC2: %s"
msgid "version should be an integer"
msgstr "la versione deve essere un numero intero"
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr "Crea tenant %s"
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr "Crea utente %s"
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, 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:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr "Il ruolo esistente viene ignorato %s"
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr "Crea ruolo %s"
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, 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:133
+#: keystone/common/sql/nova.py:136
#, 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"
@@ -511,41 +531,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr "Utente non trovato nel gruppo"
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr "Ruolo %s non trovato"
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr "Modifica nome non supportato da LDAP"
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, 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/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr "Impossibile rimuovere un ruolo che non è stato concesso, %s"
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -566,15 +571,20 @@ msgstr "Impossibile comprendere la regola %(rule)r"
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr "Il token non appartiene al tenant specificato."
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr "Il dominio non predefinito non è supportato"
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr "L'ambito del dominio token non è supportato"
@@ -600,10 +610,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr "Impossibile aggiungere un token ad un elenco di revoca."
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/ja/LC_MESSAGES/keystone.po b/keystone/locale/ja/LC_MESSAGES/keystone.po
index 783b63ff..bd31a1d3 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,12 +103,12 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
#, fuzzy
msgid "Unable to sign token."
msgstr "ユーザーリストにトークンを追加できません。"
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -180,7 +196,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -196,12 +212,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -248,13 +264,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -442,12 +458,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -456,37 +476,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -498,41 +518,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -553,15 +558,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -587,10 +597,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr "失効リストにトークンを追加できません。"
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/ka_GE/LC_MESSAGES/keystone.po b/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
index ee8c1f87..090bf2e2 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr "როლი %s ვერ მოიძებნა"
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr "მომხმარებელს არ აქვს წვდომ
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -179,7 +195,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -441,12 +457,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -455,37 +475,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr "მომხმარებლის შექმნა %s"
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr "როლი %s ვერ მოიძებნა"
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/keystone.pot b/keystone/locale/keystone.pot
index 9184134a..b5773f2e 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.255\n"
+"jenkins.keystone.propose.translation.update.258\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -179,7 +195,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -441,12 +457,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -455,37 +475,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
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 b4592528..47659fa0 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -179,7 +195,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -441,12 +457,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -455,37 +475,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr "Role %s 생성"
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/pl_PL/LC_MESSAGES/keystone.po b/keystone/locale/pl_PL/LC_MESSAGES/keystone.po
index b3c338c9..960d8df6 100644
--- a/keystone/locale/pl_PL/LC_MESSAGES/keystone.po
+++ b/keystone/locale/pl_PL/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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 17:05+0000\n"
"PO-Revision-Date: 2013-06-28 06:06+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Polish (Poland) "
@@ -39,11 +39,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -88,11 +104,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -180,7 +196,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -196,12 +212,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -248,13 +264,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -442,12 +458,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -456,37 +476,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -498,41 +518,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -553,15 +558,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
index be8cdddb..fed29df8 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -179,7 +195,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -441,12 +457,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -455,37 +475,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/ro/LC_MESSAGES/keystone.po b/keystone/locale/ro/LC_MESSAGES/keystone.po
index 4b835f61..e1b5889a 100644
--- a/keystone/locale/ro/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ro/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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 17:05+0000\n"
"PO-Revision-Date: 2013-06-08 07:51+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Romanian "
@@ -39,11 +39,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -88,11 +104,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -180,7 +196,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -196,12 +212,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -248,13 +264,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -442,12 +458,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -456,37 +476,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -498,41 +518,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -553,15 +558,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -587,10 +597,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/ru/LC_MESSAGES/keystone.po b/keystone/locale/ru/LC_MESSAGES/keystone.po
index 70dfdaa9..5a1f5c36 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +39,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -88,11 +104,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -180,7 +196,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -196,12 +212,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -248,13 +264,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -442,12 +458,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -456,37 +476,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -498,41 +518,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -553,15 +558,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -587,10 +597,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/sl_SI/LC_MESSAGES/keystone.po b/keystone/locale/sl_SI/LC_MESSAGES/keystone.po
index 422278d7..4066e381 100644
--- a/keystone/locale/sl_SI/LC_MESSAGES/keystone.po
+++ b/keystone/locale/sl_SI/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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 17:05+0000\n"
"PO-Revision-Date: 2013-06-28 06:06+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Slovenian (Slovenia) "
@@ -39,11 +39,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -88,11 +104,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -180,7 +196,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -196,12 +212,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -248,13 +264,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -442,12 +458,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -456,37 +476,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -498,41 +518,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -553,15 +558,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
diff --git a/keystone/locale/vi_VN/LC_MESSAGES/keystone.po b/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
index 1551e232..20fbd476 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr ""
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr ""
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -179,7 +195,7 @@ msgstr ""
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr ""
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr ""
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr ""
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr ""
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -441,12 +457,16 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr ""
@@ -455,37 +475,37 @@ msgstr ""
msgid "version should be an integer"
msgstr ""
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr ""
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr ""
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr ""
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr ""
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, python-format
msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
msgstr ""
-#: keystone/common/sql/nova.py:133
+#: keystone/common/sql/nova.py:136
#, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr ""
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr ""
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
index 40d453ae..b3d557a1 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr "%(property_name)s 不应该超过 %(max_length)s 个字符。"
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr "未能检出 %s"
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr "找不到角色 %s"
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr "无法除去尚未授予的角色 %s"
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr "用户对项目没有任何访问权限"
msgid "User have no access to domain"
msgstr "用户对域没有任何访问权限"
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr "无法对令牌进行签名。"
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr "token_format 的值 %s 无效。允许值是 PKI 或 UUID。"
@@ -179,7 +195,7 @@ msgstr "RBAC:已授予权限"
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC:正在添加查询过滤器参数 (%s)"
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr "normalize_domain_id 中的令牌无效"
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr "arg_dict:%s"
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, fuzzy, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "授权失败。%s 来自 %s"
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr "找不到该资源。"
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr "名称 %s 重复。"
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr "标识 %s 重复。"
@@ -441,12 +457,16 @@ msgstr "FakeLdap search 失败:对于 SCOPE_BASE,找不到 dn"
msgid "Search scope %s not implemented."
msgstr "未实现搜索范围 %s。"
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "mysql 服务器已不存在:%s"
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr "无法迁移 EC2 凭证:%s"
@@ -455,37 +475,37 @@ msgstr "无法迁移 EC2 凭证:%s"
msgid "version should be an integer"
msgstr "版本应该为整数"
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr "请创建租户 %s"
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr "请创建用户 %s"
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, fuzzy, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr "请将用户 %s 添加至租户 %s"
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr "正在忽略现有角色 %s"
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr "请创建角色 %s"
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, 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:133
+#: keystone/common/sql/nova.py:136
#, fuzzy, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "正在为用户 %s 和租户 %s 创建 ec2 凭证"
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr "在组中找不到用户"
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr "找不到角色 %s"
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr "更改名称不受 LDAP 支持"
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, fuzzy, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "用户 %s 已是组 %s 的成员"
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr "无法除去尚未授予的角色 %s"
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr "未能理解规则 %(rule)r"
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr "令牌不属于指定的租户。"
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr "非缺省域不受支持"
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr "作用域限定到域的令牌不受支持"
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr "无法将令牌添加至撤销列表。"
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-
diff --git a/keystone/locale/zh_TW/LC_MESSAGES/keystone.po b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
index f6c82401..ae04c15a 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-07-08 17:06+0000\n"
+"POT-Creation-Date: 2013-07-11 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,11 +38,27 @@ msgstr "%(property_name)s 不應超過 %(max_length)s 個字元。"
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:105
+#: keystone/test.py:106
#, python-format
msgid "Failed to checkout %s"
msgstr "無法移出 %s"
+#: keystone/assignment/backends/ldap.py:110
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:456
+#: keystone/identity/backends/ldap.py:433
+#, python-format
+msgid "Role %s not found"
+msgstr "找不到角色 %s"
+
+#: keystone/assignment/backends/sql.py:244
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr "無法移除尚未授權的角色,%s"
+
#: keystone/auth/controllers.py:72
#, python-format
msgid "Project is disabled: %s"
@@ -87,11 +103,11 @@ msgstr "使用者無法存取專案"
msgid "User have no access to domain"
msgstr "使用者無法存取網域"
-#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:119
msgid "Unable to sign token."
msgstr "無法簽署記號。"
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:122
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr "token_format 的值無效:%s。接受的值為 PKI 或 UUID。"
@@ -179,7 +195,7 @@ msgstr "RBAC:已授與權限"
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC:正在新增查詢過濾器參數 (%s)"
-#: keystone/common/controller.py:317
+#: keystone/common/controller.py:318
msgid "Invalid token in normalize_domain_id"
msgstr "normalize_domain_id 中的記號無效"
@@ -195,12 +211,12 @@ msgstr ""
msgid "arg_dict: %s"
msgstr "arg_dict:%s"
-#: keystone/common/wsgi.py:186
+#: keystone/common/wsgi.py:188
#, fuzzy, python-format
msgid "Authorization failed. %(exception)s from %(remote_addr)s"
msgstr "授權失敗。%s(自 %s)"
-#: keystone/common/wsgi.py:429
+#: keystone/common/wsgi.py:431
msgid "The resource could not be found."
msgstr "找不到資源。"
@@ -247,13 +263,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
-#: keystone/identity/backends/kvs.py:658
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:177
+#: keystone/identity/backends/kvs.py:205
#, python-format
msgid "Duplicate name, %s."
msgstr "重複的名稱,%s。"
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:170
#, python-format
msgid "Duplicate ID, %s."
msgstr "重複的 ID,%s。"
@@ -441,12 +457,16 @@ msgstr "FakeLdap 搜尋失敗:找不到 SCOPE_BASE 的 DN"
msgid "Search scope %s not implemented."
msgstr "未實作搜尋範圍 %s。"
-#: keystone/common/sql/core.py:198
+#: keystone/common/sql/core.py:126
+msgid "Global engine callback raised."
+msgstr ""
+
+#: keystone/common/sql/core.py:240
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "已取得 mysql 伺服器已斷線的訊息:%s"
-#: keystone/common/sql/legacy.py:180
+#: keystone/common/sql/legacy.py:188
#, python-format
msgid "Cannot migrate EC2 credential: %s"
msgstr "無法移轉 EC2 認證:%s"
@@ -455,37 +475,37 @@ msgstr "無法移轉 EC2 認證:%s"
msgid "version should be an integer"
msgstr "版本應該是整數"
-#: keystone/common/sql/nova.py:62
+#: keystone/common/sql/nova.py:65
#, python-format
msgid "Create tenant %s"
msgstr "建立 Tenant %s"
-#: keystone/common/sql/nova.py:79
+#: keystone/common/sql/nova.py:82
#, python-format
msgid "Create user %s"
msgstr "建立使用者 %s"
-#: keystone/common/sql/nova.py:88
+#: keystone/common/sql/nova.py:91
#, fuzzy, python-format
msgid "Add user %(user_id)s to tenant %(tenant_id)s"
msgstr "將使用者 %s 新增至 Tenant %s"
-#: keystone/common/sql/nova.py:97
+#: keystone/common/sql/nova.py:100
#, python-format
msgid "Ignoring existing role %s"
msgstr "正在忽略現有角色 %s"
-#: keystone/common/sql/nova.py:104
+#: keystone/common/sql/nova.py:107
#, python-format
msgid "Create role %s"
msgstr "建立角色 %s"
-#: keystone/common/sql/nova.py:114
+#: keystone/common/sql/nova.py:117
#, 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:133
+#: keystone/common/sql/nova.py:136
#, fuzzy, python-format
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "正在給使用者 %s 及 Tenant %s 建立 EC2 Cred"
@@ -497,41 +517,26 @@ msgid ""
"%(role)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+#: keystone/identity/backends/kvs.py:126 keystone/identity/backends/kvs.py:135
msgid "User not found in group"
msgstr "在群組中找不到使用者"
-#: keystone/identity/backends/ldap.py:82
-#, python-format
-msgid "Expected dict or list: %s"
-msgstr ""
-
-#: keystone/identity/backends/ldap.py:376
+#: keystone/identity/backends/ldap.py:192
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_id)s'. The user should "
"be removed from the group. The user will be ignored."
msgstr ""
-#: keystone/identity/backends/ldap.py:638
-#, python-format
-msgid "Role %s not found"
-msgstr "找不到角色 %s"
-
-#: keystone/identity/backends/ldap.py:826
+#: keystone/identity/backends/ldap.py:621
msgid "Changing Name not supported by LDAP"
msgstr "LDAP 不支援變更名稱"
-#: keystone/identity/backends/ldap.py:839
+#: keystone/identity/backends/ldap.py:634
#, fuzzy, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "使用者 %s 已是群組 %s 的成員"
-#: keystone/identity/backends/sql.py:462
-#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr "無法移除尚未授權的角色,%s"
-
#: keystone/openstack/common/policy.py:394
#, python-format
msgid "Failed to understand rule %(rule)s"
@@ -552,15 +557,20 @@ msgstr "無法理解規則 %(rule)r"
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+#: keystone/token/controllers.py:396
+#, python-format
+msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
+msgstr ""
+
+#: keystone/token/controllers.py:413 keystone/token/controllers.py:416
msgid "Token does not belong to specified tenant."
msgstr "記號不屬於所指定的 Tenant。"
-#: keystone/token/controllers.py:463
+#: keystone/token/controllers.py:423
msgid "Non-default domain is not supported"
msgstr "不支援非預設網域"
-#: keystone/token/controllers.py:471
+#: keystone/token/controllers.py:431
msgid "Domain scoped token is not supported"
msgstr "不支援網域範圍的記號"
@@ -586,10 +596,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr "無法將記號新增至撤銷清冊。"
-#~ msgid ""
-#~ "Group member '%(user_dn)s' not found in"
-#~ " '%(group_dn)s'. The user should be "
-#~ "removed from the group. The user "
-#~ "will be ignored."
-#~ msgstr ""
-