summaryrefslogtreecommitdiffstats
path: root/keystone/locale
diff options
context:
space:
mode:
authorOpenStack Jenkins <jenkins@openstack.org>2013-07-08 17:06:08 +0000
committerOpenStack Jenkins <jenkins@openstack.org>2013-07-08 17:06:08 +0000
commit4e3ab715d30e19f5e967b8de0200ab3e89a8465d (patch)
tree7501ff1c1d7b0467e111426be3f2a65add3f2260 /keystone/locale
parentf37c0ea2adad642e5f2f9648796a03fb2f4a86d5 (diff)
downloadkeystone-4e3ab715d30e19f5e967b8de0200ab3e89a8465d.tar.gz
keystone-4e3ab715d30e19f5e967b8de0200ab3e89a8465d.tar.xz
keystone-4e3ab715d30e19f5e967b8de0200ab3e89a8465d.zip
Imported Translations from Transifex
Change-Id: Id111bde13b52804813994a6a23f639fb1e959b9c
Diffstat (limited to 'keystone/locale')
-rw-r--r--keystone/locale/bg_BG/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/ca/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/cs/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/da/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/de/LC_MESSAGES/keystone.po115
-rw-r--r--keystone/locale/es/LC_MESSAGES/keystone.po115
-rw-r--r--keystone/locale/fi_FI/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/fr/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/hu/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/it/LC_MESSAGES/keystone.po115
-rw-r--r--keystone/locale/ja/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/ka_GE/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/keystone.pot106
-rw-r--r--keystone/locale/ko_KR/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/pl_PL/LC_MESSAGES/keystone.po589
-rw-r--r--keystone/locale/pt_BR/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/ro/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/ru/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/sl_SI/LC_MESSAGES/keystone.po589
-rw-r--r--keystone/locale/vi_VN/LC_MESSAGES/keystone.po111
-rw-r--r--keystone/locale/zh_CN/LC_MESSAGES/keystone.po115
-rw-r--r--keystone/locale/zh_TW/LC_MESSAGES/keystone.po115
22 files changed, 2482 insertions, 931 deletions
diff --git a/keystone/locale/bg_BG/LC_MESSAGES/keystone.po b/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
index 13eb63b9..77677455 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Bulgarian (Bulgaria) "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,50 +48,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -120,18 +120,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -150,40 +150,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -436,7 +441,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -485,39 +490,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -540,15 +552,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -574,3 +586,10 @@ 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 c3c32221..0a5f732e 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2012-11-03 03:08+0000\n"
"Last-Translator: Sergi Almacellas <pokoli@gmail.com>\n"
"Language-Team: ca <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,51 +48,51 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, fuzzy, python-format
msgid "Unable to lookup user %s"
msgstr "No es pot afegir el token a la llista d'usuaris."
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
#, fuzzy
msgid "Unable to sign token."
msgstr "No es pot afegir el token a la llista d'usuaris."
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -121,18 +121,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -151,40 +151,40 @@ msgstr "Fitxer syslog invàlid"
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -205,12 +205,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -243,13 +248,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -437,7 +442,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -486,39 +491,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -541,15 +553,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -575,3 +587,10 @@ 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 104e202c..ac761b39 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Czech "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,50 +48,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -120,18 +120,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -150,40 +150,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -436,7 +441,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -485,39 +490,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -540,15 +552,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -574,3 +586,10 @@ 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 83a0f31b..930adae2 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Danish "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,50 +48,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -120,18 +120,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -150,40 +150,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -436,7 +441,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -485,39 +490,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -540,15 +552,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -574,3 +586,10 @@ 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 4d38a328..d4a7b49e 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-22 03:45+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: German "
@@ -38,7 +38,7 @@ msgstr "%(property_name)s sollte nicht größer als %(max_length)s Zeichen sein.
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr "%s wurde nicht ausgecheckt"
@@ -48,50 +48,50 @@ msgstr "%s wurde nicht ausgecheckt"
msgid "Project is disabled: %s"
msgstr "Projekt ist inaktiviert: %s"
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr "Domäne ist inaktiviert: %s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr "Benutzer ist inaktiviert: %s"
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr "Scoping sowohl auf 'domain' als auch auf 'project' ist nicht zulässig"
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr "Scoping sowohl auf 'domain' als auch auf 'trust' ist nicht zulässig"
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr "Scoping sowohl auf 'project' als auch auf 'trust' ist nicht zulässig"
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr "Suche nach Benutzer %s nicht möglich"
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr "Benutzer nicht gefunden"
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr "Benutzer hat keinen Zugriff auf Projekt"
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr "Benutzer hat keinen Zugriff auf Domäne"
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr "Token kann nicht unterzeichnet werden."
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -126,12 +126,12 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr "Vorlagendatei %s kann nicht geöffnet werden"
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr "Fehler überprüfen: %s"
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
@@ -139,7 +139,7 @@ msgstr ""
"Unterzeichnungsfehler: Zertifikat kann nicht geladen werden - stellen Sie"
" sicher, dass Sie PKI mit 'keystone-manage pki_setup' konfiguriert haben"
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr "Unterzeichnungsfehler: %s"
@@ -158,42 +158,42 @@ msgstr "Ungültige 'syslog'-Funktion"
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr "Rollenbasierte Zugriffssteuerung: Ungültiges Token"
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr "Rollenbasierte Zugriffssteuerung: Ungültiger Benutzer"
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr "Rollenbasierte Zugriffssteuerung: Fortfahren ohne Projekt"
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr "Rollenbasierte Zugriffssteuerung: Fortsetzung ohne Nutzer"
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr "Rollenbasierte Zugriffssteuerung: Umgehen von Autorisierung"
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr "Rollenbasierte Zugriffssteuerung: Autorisierung erteilt"
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
"Rollenbasierte Zugriffssteuerung: Hinzufügen von Abfragefilterparametern "
"(%s)"
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr "Ungültiges Token in 'normalize_domain_id'"
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -214,12 +214,17 @@ msgstr "Autorisierung fehlgeschlagen. %s von %s"
msgid "The resource could not be found."
msgstr "Die Ressource konnte nicht gefunden werden."
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr "Starten von %(arg0)s auf %(host)s:%(port)s"
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr "Serverfehler"
@@ -252,13 +257,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr "Doppelter Name, %s."
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr "Doppelte ID, %s."
@@ -452,7 +457,7 @@ 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:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -503,40 +508,47 @@ msgstr "Rolle %s Benutzer %s auf Nutzer %s zuweisen"
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "Erstellen von EC2-Berechtigungsnachweis für Benutzer %s und Nutzer %s"
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr "Benutzer nicht in Gruppe gefunden"
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr "Nicht gewährte Rolle kann nicht entfernt werden, %s"
+msgid "Expected dict or list: %s"
+msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr "Rolle %s nicht gefunden"
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr "Änderung von Namen wird von LDAP nicht unterstützt"
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, fuzzy, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "Benutzer %s ist bereits Mitglied der Gruppe %s."
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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 ""
+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
@@ -558,15 +570,15 @@ msgstr "Regel '%(rule)r' konnte nicht verstanden werden"
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr "Token gehört nicht zu angegebenem Nutzer."
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr "Nicht-Standard-Domäne wird nicht unterstützt"
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr "Bereichsorientiertes Token der Domäne wird nicht unterstützt"
@@ -592,3 +604,10 @@ 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 8cd820d9..308213c3 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-21 09:13+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Spanish "
@@ -38,7 +38,7 @@ msgstr "%(property_name)s no debe tener más de %(max_length)s caracteres."
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr "No se ha podido extraer %s"
@@ -48,50 +48,50 @@ msgstr "No se ha podido extraer %s"
msgid "Project is disabled: %s"
msgstr "El proyecto está inhabilitado: %s"
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr "El dominio está inhabilitado: %s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr "El usuario está inhabilitado: %s"
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr "El ámbito para dominio y proyecto no está permitido"
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr "El ámbito para dominio y confianza no está permitido"
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr "El ámbito para proyecto y confianza no está permitido"
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr "No se ha podido buscar el usuario %s"
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr "Usuario no encontrado"
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr "El usuario no tiene acceso al proyecto"
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr "El usuario no tiene acceso al dominio"
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr "No se ha podido firmar la señal."
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -128,12 +128,12 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr "No se puede abrir el archivo de plantilla %s"
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr "Verificar error: %s"
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
@@ -141,7 +141,7 @@ msgstr ""
"Error de firma: no se ha podido cargar el certificado; asegúrese de haber"
" configurado la PKI con 'keystone-manage pki_setup'"
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr "Error de firma: %s"
@@ -162,40 +162,40 @@ msgstr "Recurso syslog no válido"
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr "RBAC: Señal no válida"
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr "RBAC: Usuario no válido"
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr "RBAC: continuando sin proyecto"
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr "RBAC: Continuando sin arrendatario"
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr "RBAC: Eludiendo autorización"
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr "RBAC: Autorización otorgada"
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC: añadiendo parámetros de filtro de consultas (%s)"
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr "Señal no válida en normalize_domain_id"
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -216,12 +216,17 @@ msgstr "Ha fallado la autorización. %s de %s"
msgid "The resource could not be found."
msgstr "El recurso no se ha podido encontrar."
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr "Iniciando %(arg0)s en %(host)s:%(port)s"
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr "Error de servidor"
@@ -254,13 +259,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr "Nombre duplicado, %s."
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr "ID duplicado, %s."
@@ -461,7 +466,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr "Ámbito de búsqueda %s no implementado."
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "Se ha notificado que mysql server ha desaparecido: %s"
@@ -510,40 +515,47 @@ msgstr "Asignar el rol %s al usuario %s en el arrendatario %s"
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "Creando credencial ec2 para el usuario %s y el arrendatario %s"
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr "Usuario no encontrado en grupo"
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, 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"
+msgid "Expected dict or list: %s"
+msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: 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/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr "LDAP no soporta el cambio de nombre"
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, fuzzy, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "El usuario %s ya es miembro del grupo %s"
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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 ""
+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
@@ -565,15 +577,15 @@ msgstr "No se ha podido comprender la regla %(rule)r"
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr "La señal no pertenece al arrendatario especificado."
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr "El dominio no predeterminado no está soportado"
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr "La señal con ámbito de dominio no está soportada"
@@ -599,3 +611,10 @@ 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 cb839c03..13953bea 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Finnish (Finland) "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,50 +48,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -120,18 +120,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -150,40 +150,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -436,7 +441,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -485,39 +490,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -540,15 +552,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -574,3 +586,10 @@ 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 048357e5..e41e0ec4 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: French "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,50 +48,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -120,18 +120,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -150,40 +150,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -436,7 +441,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -485,39 +490,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -540,15 +552,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -574,3 +586,10 @@ 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 c6443004..8d24f2a8 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2012-12-15 14:14+0000\n"
"Last-Translator: kelemeng <kelemeng@gnome.hu>\n"
"Language-Team: hu <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgstr "%(property_name)s nem lehet több, mint %(max_length)s karakter."
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr "%(property_name)s nem %(display_expected_type)s"
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr "Nem sikerült %s kiiktatása"
@@ -49,51 +49,51 @@ msgstr "Nem sikerült %s kiiktatása"
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, fuzzy, python-format
msgid "Unable to lookup user %s"
msgstr "Nem vehető fel a token felhasználólistája."
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
#, fuzzy
msgid "Unable to sign token."
msgstr "Nem vehető fel a token felhasználólistája."
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -124,18 +124,18 @@ msgstr "Rosszul formázott végpont: %s hiányos formátum (hiányzik egy típus
msgid "Unable to open template file %s"
msgstr "Nem nyitható meg a sablonfájl: %s"
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr "Ellenőrzési hiba: %s"
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr "Aláírási hiba: %s"
@@ -154,40 +154,40 @@ msgstr "Érvénytelen rendszernapló szolgáltatás"
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -208,12 +208,17 @@ msgstr "Hitelesítés sikertelen. %s innen: %s"
msgid "The resource could not be found."
msgstr "Az erőforrás nem található."
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr "%(arg0)s indítása ezen: %(host)s:%(port)s"
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -246,13 +251,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, 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:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr "Többszörös azonosító: %s."
@@ -444,7 +449,7 @@ 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:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "A kapott MySQL szerver eltűnt: %s"
@@ -493,39 +498,46 @@ msgstr "%s szerep hozzárendelése %s felhasználóhoz %s bérlőben"
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "EC2 hitelesítési adatok létrehozása %s felhasználóhoz és %s bérlőhöz"
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -548,15 +560,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -582,3 +594,10 @@ 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 7f3d7280..92701c53 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Italian "
@@ -38,7 +38,7 @@ msgstr "%(property_name)s non può essere superiore a %(max_length)s caratteri."
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr "Impossibile eseguire il checkout %s"
@@ -48,50 +48,50 @@ msgstr "Impossibile eseguire il checkout %s"
msgid "Project is disabled: %s"
msgstr "Il progetto è disabilitato: %s"
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr "Il dominio è disabilitato: %s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr "L'utente è disabilitato: %s"
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr "Il controllo sia del dominio che del progetto non è consentito"
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr "Il controllo sia del dominio che di trust non è consentito"
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr "Il controllo sia delprogetto che di trust non è consentito"
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr "Impossibile eseguire la ricerca dell'utente %s"
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr "Utente non trovato"
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr "L'utente non ha accesso al progetto"
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr "L'utente non ha accesso al dominio"
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr "Impossibile firmare il token."
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -126,12 +126,12 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr "Impossibile aprire il file di template %s"
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr "Verifica errore: %s"
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
@@ -139,7 +139,7 @@ msgstr ""
"errore di firma: impossibile caricare il certificato - assicurarsi che "
"sia stato configurato PKI con 'keystone-manage pki_setup'"
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr "Errore di firma: %s"
@@ -158,40 +158,40 @@ msgstr "Funzione syslog non valida"
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr "RBAC: token non valido"
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr "RBAC: utente non valido"
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr "RBAC: si procede senza progetto"
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr "RBAC: si procede senza tenant"
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr "RBAC: autorizzazione oltrepassata"
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr "RBAC: autorizzazione concessa"
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC: aggiunta parametri del filtro della query (%s)"
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr "Token non valido in normalize_domain_id"
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -212,12 +212,17 @@ msgstr "Autorizzazione non riuscita. %s da %s"
msgid "The resource could not be found."
msgstr "Impossibile trovare la risorsa."
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr "Avvio %(arg0)s in %(host)s:%(port)s"
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr "Errore del server"
@@ -250,13 +255,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr "Nome duplicato, %s."
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr "ID duplicato, %s."
@@ -450,7 +455,7 @@ 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:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "Ricevuto messaggio di interruzione della connessione del server mysql: %s"
@@ -499,40 +504,47 @@ msgstr "Assegna il ruolo %s all'utente %s nel tenant %s"
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "Creazione credenziale ec2 per l'utente %s e del tenant %s"
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr "Utente non trovato nel gruppo"
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr "Impossibile rimuovere un ruolo che non è stato concesso, %s"
+msgid "Expected dict or list: %s"
+msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr "Ruolo %s non trovato"
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr "Modifica nome non supportato da LDAP"
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, fuzzy, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "L'utente %s è già membro del gruppo %s"
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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 ""
+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
@@ -554,15 +566,15 @@ msgstr "Impossibile comprendere la regola %(rule)r"
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr "Il token non appartiene al tenant specificato."
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr "Il dominio non predefinito non è supportato"
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr "L'ambito del dominio token non è supportato"
@@ -588,3 +600,10 @@ 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 01c80b56..783b63ff 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2012-11-03 01:25+0000\n"
"Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
"Language-Team: Japanese "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,51 +48,51 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, fuzzy, python-format
msgid "Unable to lookup user %s"
msgstr "ユーザーリストにトークンを追加できません。"
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
#, fuzzy
msgid "Unable to sign token."
msgstr "ユーザーリストにトークンを追加できません。"
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -121,18 +121,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -151,40 +151,40 @@ msgstr "無効な syslog ファシリティ"
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -205,12 +205,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -243,13 +248,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -437,7 +442,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -486,39 +491,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -541,15 +553,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -575,3 +587,10 @@ 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 283cee63..ee8c1f87 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: ka_GE <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,50 +48,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr "დომენი გათიშულია: %s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr "მომხმარებელი ვერ მოიძებნა"
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr "მომხმარებელს არ აქვს წვდომა პროექტზე"
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -120,18 +120,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -150,40 +150,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -436,7 +441,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -485,39 +490,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr "როლი %s ვერ მოიძებნა"
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -540,15 +552,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -574,3 +586,10 @@ 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 663e2f7f..9184134a 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.234\n"
+"jenkins.keystone.propose.translation.update.255\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,50 +48,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -120,18 +120,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -150,40 +150,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -436,7 +441,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -485,39 +490,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -540,15 +552,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
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 d80557dd..b4592528 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-03-21 18:34+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: ko_KR <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,50 +48,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -120,18 +120,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -150,40 +150,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -436,7 +441,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -485,39 +490,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -540,15 +552,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -574,3 +586,10 @@ 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
new file mode 100644
index 00000000..b3c338c9
--- /dev/null
+++ b/keystone/locale/pl_PL/LC_MESSAGES/keystone.po
@@ -0,0 +1,589 @@
+# Polish (Poland) translations for keystone.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the keystone project.
+#
+# Translators:
+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"
+"PO-Revision-Date: 2013-06-28 06:06+0000\n"
+"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
+"Language-Team: Polish (Poland) "
+"(http://www.transifex.com/projects/p/openstack/language/pl_PL/)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && "
+"(n%100<10 || n%100>=20) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: keystone/clean.py:23
+#, python-format
+msgid "%s cannot be empty."
+msgstr ""
+
+#: keystone/clean.py:25
+#, python-format
+msgid "%(property_name)s cannot be less than %(min_length)s characters."
+msgstr ""
+
+#: keystone/clean.py:29
+#, python-format
+msgid "%(property_name)s should not be greater than %(max_length)s characters."
+msgstr ""
+
+#: keystone/clean.py:36
+#, python-format
+msgid "%(property_name)s is not a %(display_expected_type)s"
+msgstr ""
+
+#: keystone/test.py:105
+#, python-format
+msgid "Failed to checkout %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:72
+#, python-format
+msgid "Project is disabled: %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
+#, python-format
+msgid "Domain is disabled: %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
+#, python-format
+msgid "User is disabled: %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:259
+msgid "Scoping to both domain and project is not allowed"
+msgstr ""
+
+#: keystone/auth/controllers.py:262
+msgid "Scoping to both domain and trust is not allowed"
+msgstr ""
+
+#: keystone/auth/controllers.py:265
+msgid "Scoping to both project and trust is not allowed"
+msgstr ""
+
+#: keystone/auth/controllers.py:325
+#, python-format
+msgid "Unable to lookup user %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:355
+msgid "User not found"
+msgstr ""
+
+#: keystone/auth/token_factory.py:79
+msgid "User have no access to project"
+msgstr ""
+
+#: keystone/auth/token_factory.py:94
+msgid "User have no access to domain"
+msgstr ""
+
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+msgid "Unable to sign token."
+msgstr ""
+
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#, python-format
+msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
+msgstr ""
+
+#: keystone/catalog/core.py:38
+#, python-format
+msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s"
+msgstr ""
+
+#: keystone/catalog/core.py:43
+#, python-format
+msgid ""
+"Malformed endpoint %(url)s - unknown key %(keyerror)s(are you missing "
+"brackets ?)"
+msgstr ""
+
+#: keystone/catalog/core.py:49
+#, python-format
+msgid ""
+"Malformed endpoint %s - incomplete format (are you "
+"missing a type notifier ?)"
+msgstr ""
+
+#: keystone/catalog/backends/templated.py:109
+#, python-format
+msgid "Unable to open template file %s"
+msgstr ""
+
+#: keystone/common/cms.py:26
+#, python-format
+msgid "Verify error: %s"
+msgstr ""
+
+#: keystone/common/cms.py:118
+msgid ""
+"Signing error: Unable to load certificate - ensure you've configured PKI "
+"with 'keystone-manage pki_setup'"
+msgstr ""
+
+#: keystone/common/cms.py:122
+#, python-format
+msgid "Signing error: %s"
+msgstr ""
+
+#: keystone/common/config.py:89
+#, python-format
+msgid "Unable to locate specified logging config file: %s"
+msgstr ""
+
+#: keystone/common/config.py:107
+msgid "Invalid syslog facility"
+msgstr ""
+
+#: keystone/common/controller.py:18
+#, python-format
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
+msgstr ""
+
+#: keystone/common/controller.py:25
+msgid "RBAC: Invalid token"
+msgstr ""
+
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
+msgid "RBAC: Invalid user"
+msgstr ""
+
+#: keystone/common/controller.py:41
+msgid "RBAC: Proceeding without project"
+msgstr ""
+
+#: keystone/common/controller.py:61
+msgid "RBAC: Proceeding without tenant"
+msgstr ""
+
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
+msgid "RBAC: Bypassing authorization"
+msgstr ""
+
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
+msgid "RBAC: Authorization granted"
+msgstr ""
+
+#: keystone/common/controller.py:130
+#, python-format
+msgid "RBAC: Adding query filter params (%s)"
+msgstr ""
+
+#: keystone/common/controller.py:317
+msgid "Invalid token in normalize_domain_id"
+msgstr ""
+
+#: keystone/common/utils.py:233
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
+msgstr ""
+
+#: keystone/common/wsgi.py:162
+#, python-format
+msgid "arg_dict: %s"
+msgstr ""
+
+#: keystone/common/wsgi.py:186
+#, python-format
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
+msgstr ""
+
+#: keystone/common/wsgi.py:429
+msgid "The resource could not be found."
+msgstr ""
+
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:113
+msgid "Server error"
+msgstr ""
+
+#: keystone/common/ldap/core.py:79
+#, python-format
+msgid "Invalid LDAP deref option: %s. Choose one of: "
+msgstr ""
+
+#: keystone/common/ldap/core.py:87
+#, python-format
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:99
+#, python-format
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:189
+#, python-format
+msgid ""
+"Invalid additional attribute mapping: \"%s\". Format must be "
+"<ldap_attribute>:<keystone_attribute>"
+msgstr ""
+
+#: keystone/common/ldap/core.py:195
+#, python-format
+msgid ""
+"Invalid additional attribute mapping: \"%(item)s\". Value "
+"\"%(attr_map)s\" must use one of %(keys)s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
+#, python-format
+msgid "Duplicate name, %s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#, python-format
+msgid "Duplicate ID, %s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:294
+#, python-format
+msgid "LDAP %s create"
+msgstr ""
+
+#: keystone/common/ldap/core.py:372
+#, python-format
+msgid "LDAP %s update"
+msgstr ""
+
+#: keystone/common/ldap/core.py:405
+#, python-format
+msgid "LDAP %s delete"
+msgstr ""
+
+#: keystone/common/ldap/core.py:430
+#, python-format
+msgid "LDAP init: url=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:431
+#, python-format
+msgid ""
+"LDAP init: use_tls=%(use_tls)s\n"
+"tls_cacertfile=%(tls_cacertfile)s\n"
+"tls_cacertdir=%(tls_cacertdir)s\n"
+"tls_req_cert=%(tls_req_cert)s\n"
+"tls_avail=%(tls_avail)s\n"
+msgstr ""
+
+#: keystone/common/ldap/core.py:450
+msgid "Invalid TLS / LDAPS combination"
+msgstr ""
+
+#: keystone/common/ldap/core.py:454
+#, python-format
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
+msgstr ""
+
+#: keystone/common/ldap/core.py:464
+#, python-format
+msgid "tls_cacertfile %s not found or is not a file"
+msgstr ""
+
+#: keystone/common/ldap/core.py:476
+#, python-format
+msgid "tls_cacertdir %s not found or is not a directory"
+msgstr ""
+
+#: keystone/common/ldap/core.py:483
+#, python-format
+msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:497
+#, python-format
+msgid "LDAP bind: dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:508
+#, python-format
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:514
+#, python-format
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:567
+msgid ""
+"LDAP Server does not support paging. Disable paging in keystone.conf to "
+"avoid this message."
+msgstr ""
+
+#: keystone/common/ldap/core.py:584
+#, python-format
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:590
+#, python-format
+msgid "LDAP delete: dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:595
+#, python-format
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:146
+#, python-format
+msgid "FakeLdap initialize url=%s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:156
+#, python-format
+msgid "FakeLdap bind dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:163
+#, python-format
+msgid "FakeLdap bind fail: dn=%s not found"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:170
+#, python-format
+msgid "FakeLdap bind fail: password for dn=%s not found"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:175
+#, python-format
+msgid "FakeLdap bind fail: password for dn=%s does not match"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:190
+#, python-format
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:193
+#, python-format
+msgid "FakeLdap add item failed: dn=%s is already in store."
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
+#, python-format
+msgid "FakeLdap delete item: dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
+#, python-format
+msgid "FakeLdap delete item failed: dn=%s not found."
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:240
+#, python-format
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:245
+#, python-format
+msgid "FakeLdap modify item failed: dn=%s not found."
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:262
+#, python-format
+msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:273
+#, python-format
+msgid ""
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:279
+#, python-format
+msgid "FakeLdap modify item failed: unknown command %s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:281
+#, python-format
+msgid "modify_s action %s not implemented"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:300
+#, python-format
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:306
+msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:320
+#, python-format
+msgid "Search scope %s not implemented."
+msgstr ""
+
+#: keystone/common/sql/core.py:198
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: keystone/common/sql/legacy.py:180
+#, python-format
+msgid "Cannot migrate EC2 credential: %s"
+msgstr ""
+
+#: keystone/common/sql/migration.py:47
+msgid "version should be an integer"
+msgstr ""
+
+#: keystone/common/sql/nova.py:62
+#, python-format
+msgid "Create tenant %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:79
+#, python-format
+msgid "Create user %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:88
+#, python-format
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:97
+#, python-format
+msgid "Ignoring existing role %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:104
+#, python-format
+msgid "Create role %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:114
+#, 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
+#, python-format
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
+msgstr ""
+
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+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
+#, 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
+msgid "Changing Name not supported by LDAP"
+msgstr ""
+
+#: keystone/identity/backends/ldap.py:839
+#, 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"
+msgstr ""
+
+#: keystone/openstack/common/policy.py:404
+#, python-format
+msgid "No handler for matches of kind %s"
+msgstr ""
+
+#: keystone/openstack/common/policy.py:679
+#, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr ""
+
+#: keystone/policy/backends/rules.py:93
+#, python-format
+msgid "enforce %(action)s: %(credentials)s"
+msgstr ""
+
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+msgid "Token does not belong to specified tenant."
+msgstr ""
+
+#: keystone/token/controllers.py:463
+msgid "Non-default domain is not supported"
+msgstr ""
+
+#: keystone/token/controllers.py:471
+msgid "Domain scoped token is not supported"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
+
diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
index 61f81246..be8cdddb 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2012-11-02 18:30+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Portuguese (Brazil) "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,50 +48,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -120,18 +120,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -150,40 +150,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -436,7 +441,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -485,39 +490,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -540,15 +552,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -574,3 +586,10 @@ 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 f09a1178..4b835f61 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+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,7 +39,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -49,50 +49,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -121,18 +121,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -151,40 +151,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -205,12 +205,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -243,13 +248,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -437,7 +442,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -486,39 +491,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -541,15 +553,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -575,3 +587,10 @@ 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 cbc74358..70dfdaa9 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Russian "
@@ -39,7 +39,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -49,50 +49,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -121,18 +121,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -151,40 +151,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -205,12 +205,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -243,13 +248,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -437,7 +442,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -486,39 +491,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -541,15 +553,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -575,3 +587,10 @@ 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
new file mode 100644
index 00000000..422278d7
--- /dev/null
+++ b/keystone/locale/sl_SI/LC_MESSAGES/keystone.po
@@ -0,0 +1,589 @@
+# Slovenian (Slovenia) translations for keystone.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the keystone project.
+#
+# Translators:
+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"
+"PO-Revision-Date: 2013-06-28 06:06+0000\n"
+"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
+"Language-Team: Slovenian (Slovenia) "
+"(http://www.transifex.com/projects/p/openstack/language/sl_SI/)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 "
+"|| n%100==4 ? 2 : 3)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: keystone/clean.py:23
+#, python-format
+msgid "%s cannot be empty."
+msgstr ""
+
+#: keystone/clean.py:25
+#, python-format
+msgid "%(property_name)s cannot be less than %(min_length)s characters."
+msgstr ""
+
+#: keystone/clean.py:29
+#, python-format
+msgid "%(property_name)s should not be greater than %(max_length)s characters."
+msgstr ""
+
+#: keystone/clean.py:36
+#, python-format
+msgid "%(property_name)s is not a %(display_expected_type)s"
+msgstr ""
+
+#: keystone/test.py:105
+#, python-format
+msgid "Failed to checkout %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:72
+#, python-format
+msgid "Project is disabled: %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
+#, python-format
+msgid "Domain is disabled: %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
+#, python-format
+msgid "User is disabled: %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:259
+msgid "Scoping to both domain and project is not allowed"
+msgstr ""
+
+#: keystone/auth/controllers.py:262
+msgid "Scoping to both domain and trust is not allowed"
+msgstr ""
+
+#: keystone/auth/controllers.py:265
+msgid "Scoping to both project and trust is not allowed"
+msgstr ""
+
+#: keystone/auth/controllers.py:325
+#, python-format
+msgid "Unable to lookup user %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:355
+msgid "User not found"
+msgstr ""
+
+#: keystone/auth/token_factory.py:79
+msgid "User have no access to project"
+msgstr ""
+
+#: keystone/auth/token_factory.py:94
+msgid "User have no access to domain"
+msgstr ""
+
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
+msgid "Unable to sign token."
+msgstr ""
+
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
+#, python-format
+msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
+msgstr ""
+
+#: keystone/catalog/core.py:38
+#, python-format
+msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s"
+msgstr ""
+
+#: keystone/catalog/core.py:43
+#, python-format
+msgid ""
+"Malformed endpoint %(url)s - unknown key %(keyerror)s(are you missing "
+"brackets ?)"
+msgstr ""
+
+#: keystone/catalog/core.py:49
+#, python-format
+msgid ""
+"Malformed endpoint %s - incomplete format (are you "
+"missing a type notifier ?)"
+msgstr ""
+
+#: keystone/catalog/backends/templated.py:109
+#, python-format
+msgid "Unable to open template file %s"
+msgstr ""
+
+#: keystone/common/cms.py:26
+#, python-format
+msgid "Verify error: %s"
+msgstr ""
+
+#: keystone/common/cms.py:118
+msgid ""
+"Signing error: Unable to load certificate - ensure you've configured PKI "
+"with 'keystone-manage pki_setup'"
+msgstr ""
+
+#: keystone/common/cms.py:122
+#, python-format
+msgid "Signing error: %s"
+msgstr ""
+
+#: keystone/common/config.py:89
+#, python-format
+msgid "Unable to locate specified logging config file: %s"
+msgstr ""
+
+#: keystone/common/config.py:107
+msgid "Invalid syslog facility"
+msgstr ""
+
+#: keystone/common/controller.py:18
+#, python-format
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
+msgstr ""
+
+#: keystone/common/controller.py:25
+msgid "RBAC: Invalid token"
+msgstr ""
+
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
+msgid "RBAC: Invalid user"
+msgstr ""
+
+#: keystone/common/controller.py:41
+msgid "RBAC: Proceeding without project"
+msgstr ""
+
+#: keystone/common/controller.py:61
+msgid "RBAC: Proceeding without tenant"
+msgstr ""
+
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
+msgid "RBAC: Bypassing authorization"
+msgstr ""
+
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
+msgid "RBAC: Authorization granted"
+msgstr ""
+
+#: keystone/common/controller.py:130
+#, python-format
+msgid "RBAC: Adding query filter params (%s)"
+msgstr ""
+
+#: keystone/common/controller.py:317
+msgid "Invalid token in normalize_domain_id"
+msgstr ""
+
+#: keystone/common/utils.py:233
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
+msgstr ""
+
+#: keystone/common/wsgi.py:162
+#, python-format
+msgid "arg_dict: %s"
+msgstr ""
+
+#: keystone/common/wsgi.py:186
+#, python-format
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
+msgstr ""
+
+#: keystone/common/wsgi.py:429
+msgid "The resource could not be found."
+msgstr ""
+
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:113
+msgid "Server error"
+msgstr ""
+
+#: keystone/common/ldap/core.py:79
+#, python-format
+msgid "Invalid LDAP deref option: %s. Choose one of: "
+msgstr ""
+
+#: keystone/common/ldap/core.py:87
+#, python-format
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:99
+#, python-format
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:189
+#, python-format
+msgid ""
+"Invalid additional attribute mapping: \"%s\". Format must be "
+"<ldap_attribute>:<keystone_attribute>"
+msgstr ""
+
+#: keystone/common/ldap/core.py:195
+#, python-format
+msgid ""
+"Invalid additional attribute mapping: \"%(item)s\". Value "
+"\"%(attr_map)s\" must use one of %(keys)s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
+#, python-format
+msgid "Duplicate name, %s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
+#, python-format
+msgid "Duplicate ID, %s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:294
+#, python-format
+msgid "LDAP %s create"
+msgstr ""
+
+#: keystone/common/ldap/core.py:372
+#, python-format
+msgid "LDAP %s update"
+msgstr ""
+
+#: keystone/common/ldap/core.py:405
+#, python-format
+msgid "LDAP %s delete"
+msgstr ""
+
+#: keystone/common/ldap/core.py:430
+#, python-format
+msgid "LDAP init: url=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:431
+#, python-format
+msgid ""
+"LDAP init: use_tls=%(use_tls)s\n"
+"tls_cacertfile=%(tls_cacertfile)s\n"
+"tls_cacertdir=%(tls_cacertdir)s\n"
+"tls_req_cert=%(tls_req_cert)s\n"
+"tls_avail=%(tls_avail)s\n"
+msgstr ""
+
+#: keystone/common/ldap/core.py:450
+msgid "Invalid TLS / LDAPS combination"
+msgstr ""
+
+#: keystone/common/ldap/core.py:454
+#, python-format
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
+msgstr ""
+
+#: keystone/common/ldap/core.py:464
+#, python-format
+msgid "tls_cacertfile %s not found or is not a file"
+msgstr ""
+
+#: keystone/common/ldap/core.py:476
+#, python-format
+msgid "tls_cacertdir %s not found or is not a directory"
+msgstr ""
+
+#: keystone/common/ldap/core.py:483
+#, python-format
+msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:497
+#, python-format
+msgid "LDAP bind: dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:508
+#, python-format
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:514
+#, python-format
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:567
+msgid ""
+"LDAP Server does not support paging. Disable paging in keystone.conf to "
+"avoid this message."
+msgstr ""
+
+#: keystone/common/ldap/core.py:584
+#, python-format
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:590
+#, python-format
+msgid "LDAP delete: dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:595
+#, python-format
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:146
+#, python-format
+msgid "FakeLdap initialize url=%s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:156
+#, python-format
+msgid "FakeLdap bind dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:163
+#, python-format
+msgid "FakeLdap bind fail: dn=%s not found"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:170
+#, python-format
+msgid "FakeLdap bind fail: password for dn=%s not found"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:175
+#, python-format
+msgid "FakeLdap bind fail: password for dn=%s does not match"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:190
+#, python-format
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:193
+#, python-format
+msgid "FakeLdap add item failed: dn=%s is already in store."
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
+#, python-format
+msgid "FakeLdap delete item: dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
+#, python-format
+msgid "FakeLdap delete item failed: dn=%s not found."
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:240
+#, python-format
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:245
+#, python-format
+msgid "FakeLdap modify item failed: dn=%s not found."
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:262
+#, python-format
+msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:273
+#, python-format
+msgid ""
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:279
+#, python-format
+msgid "FakeLdap modify item failed: unknown command %s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:281
+#, python-format
+msgid "modify_s action %s not implemented"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:300
+#, python-format
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:306
+msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:320
+#, python-format
+msgid "Search scope %s not implemented."
+msgstr ""
+
+#: keystone/common/sql/core.py:198
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: keystone/common/sql/legacy.py:180
+#, python-format
+msgid "Cannot migrate EC2 credential: %s"
+msgstr ""
+
+#: keystone/common/sql/migration.py:47
+msgid "version should be an integer"
+msgstr ""
+
+#: keystone/common/sql/nova.py:62
+#, python-format
+msgid "Create tenant %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:79
+#, python-format
+msgid "Create user %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:88
+#, python-format
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:97
+#, python-format
+msgid "Ignoring existing role %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:104
+#, python-format
+msgid "Create role %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:114
+#, 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
+#, python-format
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
+msgstr ""
+
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
+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
+#, 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
+msgid "Changing Name not supported by LDAP"
+msgstr ""
+
+#: keystone/identity/backends/ldap.py:839
+#, 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"
+msgstr ""
+
+#: keystone/openstack/common/policy.py:404
+#, python-format
+msgid "No handler for matches of kind %s"
+msgstr ""
+
+#: keystone/openstack/common/policy.py:679
+#, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr ""
+
+#: keystone/policy/backends/rules.py:93
+#, python-format
+msgid "enforce %(action)s: %(credentials)s"
+msgstr ""
+
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
+msgid "Token does not belong to specified tenant."
+msgstr ""
+
+#: keystone/token/controllers.py:463
+msgid "Non-default domain is not supported"
+msgstr ""
+
+#: keystone/token/controllers.py:471
+msgid "Domain scoped token is not supported"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
+
diff --git a/keystone/locale/vi_VN/LC_MESSAGES/keystone.po b/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
index fd927b31..1551e232 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Vietnamese (Viet Nam) "
@@ -38,7 +38,7 @@ msgstr ""
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr ""
@@ -48,50 +48,50 @@ msgstr ""
msgid "Project is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr ""
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr ""
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr ""
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr ""
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr ""
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr ""
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr ""
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr ""
@@ -120,18 +120,18 @@ msgstr ""
msgid "Unable to open template file %s"
msgstr ""
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr ""
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr ""
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr ""
@@ -150,40 +150,40 @@ msgstr ""
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr ""
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr ""
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr ""
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr ""
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr ""
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr ""
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr ""
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr ""
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr ""
msgid "The resource could not be found."
msgstr ""
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr ""
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr ""
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr ""
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr ""
@@ -436,7 +441,7 @@ msgstr ""
msgid "Search scope %s not implemented."
msgstr ""
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
@@ -485,39 +490,46 @@ msgstr ""
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr ""
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr ""
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
+msgid "Expected dict or list: %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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."
+msgid "Cannot remove role that has not been granted, %s"
msgstr ""
#: keystone/openstack/common/policy.py:394
@@ -540,15 +552,15 @@ msgstr ""
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr ""
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr ""
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr ""
@@ -574,3 +586,10 @@ 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 a0f65cdd..40d453ae 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-21 06:08+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Chinese (China) "
@@ -38,7 +38,7 @@ msgstr "%(property_name)s 不应该超过 %(max_length)s 个字符。"
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr "未能检出 %s"
@@ -48,50 +48,50 @@ msgstr "未能检出 %s"
msgid "Project is disabled: %s"
msgstr "项目已禁用:%s"
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr "域已禁用:%s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr "用户已禁用:%s"
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr "不允许同时将作用域限定到域和项目"
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr "不允许同时将作用域限定到域和信任"
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr "不允许同时将作用域限定到项目和信任"
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr "无法查找用户 %s"
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr "找不到用户"
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr "用户对项目没有任何访问权限"
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr "用户对域没有任何访问权限"
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr "无法对令牌进行签名。"
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr "token_format 的值 %s 无效。允许值是 PKI 或 UUID。"
@@ -120,18 +120,18 @@ msgstr "端点 %s 的格式不正确 - 格式不完整(您遗漏了类型通
msgid "Unable to open template file %s"
msgstr "无法打开模板文件 %s"
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr "发生验证错误:%s"
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr "发生签名错误:无法装入证书 - 请确保您已使用“keystone-manage pki_setup”配置 PKI"
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr "发生签名错误:%s"
@@ -150,40 +150,40 @@ msgstr "系统日志工具无效"
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr "RBAC:令牌无效"
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr "RBAC:用户无效"
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr "RBAC:正在没有项目的情况下继续"
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr "RBAC:正在没有租户的情况下继续"
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr "RBAC:正在绕过授权"
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr "RBAC:已授予权限"
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC:正在添加查询过滤器参数 (%s)"
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr "normalize_domain_id 中的令牌无效"
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr "授权失败。%s 来自 %s"
msgid "The resource could not be found."
msgstr "找不到该资源。"
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr "正在 %(host)s:%(port)s 上启动 %(arg0)s"
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr "服务器错误"
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr "名称 %s 重复。"
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr "标识 %s 重复。"
@@ -436,7 +441,7 @@ msgstr "FakeLdap search 失败:对于 SCOPE_BASE,找不到 dn"
msgid "Search scope %s not implemented."
msgstr "未实现搜索范围 %s。"
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "mysql 服务器已不存在:%s"
@@ -485,40 +490,47 @@ msgstr "请将角色 %s 分配给用户 %s(在租户 %s 上)"
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "正在为用户 %s 和租户 %s 创建 ec2 凭证"
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr "在组中找不到用户"
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr "无法除去尚未授予的角色 %s"
+msgid "Expected dict or list: %s"
+msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr "找不到角色 %s"
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr "更改名称不受 LDAP 支持"
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, fuzzy, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "用户 %s 已是组 %s 的成员"
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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 ""
+msgid "Cannot remove role that has not been granted, %s"
+msgstr "无法除去尚未授予的角色 %s"
#: keystone/openstack/common/policy.py:394
#, python-format
@@ -540,15 +552,15 @@ msgstr "未能理解规则 %(rule)r"
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr "令牌不属于指定的租户。"
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr "非缺省域不受支持"
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr "作用域限定到域的令牌不受支持"
@@ -574,3 +586,10 @@ 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 eae36832..f6c82401 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-06-17 17:09+0000\n"
+"POT-Creation-Date: 2013-07-08 17:06+0000\n"
"PO-Revision-Date: 2013-05-22 03:11+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Chinese (Taiwan) "
@@ -38,7 +38,7 @@ msgstr "%(property_name)s 不應超過 %(max_length)s 個字元。"
msgid "%(property_name)s is not a %(display_expected_type)s"
msgstr ""
-#: keystone/test.py:117
+#: keystone/test.py:105
#, python-format
msgid "Failed to checkout %s"
msgstr "無法移出 %s"
@@ -48,50 +48,50 @@ msgstr "無法移出 %s"
msgid "Project is disabled: %s"
msgstr "已停用專案:%s"
-#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:38
#, python-format
msgid "Domain is disabled: %s"
msgstr "已停用網域:%s"
-#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:44
#, python-format
msgid "User is disabled: %s"
msgstr "已停用使用者:%s"
-#: keystone/auth/controllers.py:265
+#: keystone/auth/controllers.py:259
msgid "Scoping to both domain and project is not allowed"
msgstr "不容許將範圍同時設定為網域及專案"
-#: keystone/auth/controllers.py:268
+#: keystone/auth/controllers.py:262
msgid "Scoping to both domain and trust is not allowed"
msgstr "不容許將範圍同時設定為網域及信任"
-#: keystone/auth/controllers.py:271
+#: keystone/auth/controllers.py:265
msgid "Scoping to both project and trust is not allowed"
msgstr "不容許將範圍同時設定為專案及信任"
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:325
#, python-format
msgid "Unable to lookup user %s"
msgstr "無法查閱使用者 %s"
-#: keystone/auth/controllers.py:363
+#: keystone/auth/controllers.py:355
msgid "User not found"
msgstr "找不到使用者"
-#: keystone/auth/token_factory.py:81
+#: keystone/auth/token_factory.py:79
msgid "User have no access to project"
msgstr "使用者無法存取專案"
-#: keystone/auth/token_factory.py:96
+#: keystone/auth/token_factory.py:94
msgid "User have no access to domain"
msgstr "使用者無法存取網域"
-#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+#: keystone/auth/token_factory.py:311 keystone/token/controllers.py:121
msgid "Unable to sign token."
msgstr "無法簽署記號。"
-#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:124
#, python-format
msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
msgstr "token_format 的值無效:%s。接受的值為 PKI 或 UUID。"
@@ -120,18 +120,18 @@ msgstr "端點 %s 的格式不正確 - 格式不完整(遺漏了類型通知
msgid "Unable to open template file %s"
msgstr "無法開啟範本檔 %s"
-#: keystone/common/cms.py:42
+#: keystone/common/cms.py:26
#, python-format
msgid "Verify error: %s"
msgstr "驗證發生錯誤:%s"
-#: keystone/common/cms.py:134
+#: keystone/common/cms.py:118
msgid ""
"Signing error: Unable to load certificate - ensure you've configured PKI "
"with 'keystone-manage pki_setup'"
msgstr "簽署發生錯誤:無法載入憑證 - 請確保已使用 'keystone-manage pki_setup' 來配置 PKI"
-#: keystone/common/cms.py:138
+#: keystone/common/cms.py:122
#, python-format
msgid "Signing error: %s"
msgstr "簽署發生錯誤:%s"
@@ -150,40 +150,40 @@ msgstr "無效的 Syslog 機能"
msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
msgstr ""
-#: keystone/common/controller.py:26
+#: keystone/common/controller.py:25
msgid "RBAC: Invalid token"
msgstr "RBAC:無效的記號"
-#: keystone/common/controller.py:36 keystone/common/controller.py:57
+#: keystone/common/controller.py:35 keystone/common/controller.py:56
msgid "RBAC: Invalid user"
msgstr "RBAC:無效的使用者"
-#: keystone/common/controller.py:42
+#: keystone/common/controller.py:41
msgid "RBAC: Proceeding without project"
msgstr "RBAC:在沒有專案的情況下繼續作業"
-#: keystone/common/controller.py:62
+#: keystone/common/controller.py:61
msgid "RBAC: Proceeding without tenant"
msgstr "RBAC:在沒有 Tenant 的情況下繼續作業"
-#: keystone/common/controller.py:92 keystone/common/controller.py:144
+#: keystone/common/controller.py:91 keystone/common/controller.py:142
msgid "RBAC: Bypassing authorization"
msgstr "RBAC:正在略過授權"
-#: keystone/common/controller.py:101 keystone/common/controller.py:142
+#: keystone/common/controller.py:100 keystone/common/controller.py:140
msgid "RBAC: Authorization granted"
msgstr "RBAC:已授與權限"
-#: keystone/common/controller.py:131
+#: keystone/common/controller.py:130
#, python-format
msgid "RBAC: Adding query filter params (%s)"
msgstr "RBAC:正在新增查詢過濾器參數 (%s)"
-#: keystone/common/controller.py:322
+#: keystone/common/controller.py:317
msgid "Invalid token in normalize_domain_id"
msgstr "normalize_domain_id 中的記號無效"
-#: keystone/common/utils.py:232
+#: keystone/common/utils.py:233
msgid ""
"Error setting up the debug environment. Verify that the option --debug-"
"url has the format <host>:<port> and that a debugger processes is "
@@ -204,12 +204,17 @@ msgstr "授權失敗。%s(自 %s)"
msgid "The resource could not be found."
msgstr "找不到資源。"
-#: keystone/common/wsgi_server.py:72
+#: keystone/common/environment/__init__.py:37
+#, python-format
+msgid "Environment configured as: %s"
+msgstr ""
+
+#: keystone/common/environment/eventlet_server.py:51
#, python-format
msgid "Starting %(arg0)s on %(host)s:%(port)s"
msgstr "正在 %(host)s:%(port)s 上啟動 %(arg0)s"
-#: keystone/common/wsgi_server.py:132
+#: keystone/common/environment/eventlet_server.py:113
msgid "Server error"
msgstr "伺服器錯誤"
@@ -242,13 +247,13 @@ msgid ""
"\"%(attr_map)s\" must use one of %(keys)s."
msgstr ""
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
-#: keystone/identity/backends/kvs.py:624
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:630
+#: keystone/identity/backends/kvs.py:658
#, python-format
msgid "Duplicate name, %s."
msgstr "重複的名稱,%s。"
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:623
#, python-format
msgid "Duplicate ID, %s."
msgstr "重複的 ID,%s。"
@@ -436,7 +441,7 @@ msgstr "FakeLdap 搜尋失敗:找不到 SCOPE_BASE 的 DN"
msgid "Search scope %s not implemented."
msgstr "未實作搜尋範圍 %s。"
-#: keystone/common/sql/core.py:205
+#: keystone/common/sql/core.py:198
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr "已取得 mysql 伺服器已斷線的訊息:%s"
@@ -485,40 +490,47 @@ msgstr "將角色 %s 指派給使用者 %s(在 Tenant %s 上)"
msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
msgstr "正在給使用者 %s 及 Tenant %s 建立 EC2 Cred"
-#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+#: keystone/identity/controllers.py:878
+#, python-format
+msgid ""
+"Group %(group)s not found for role-assignment - %(target)s with Role: "
+"%(role)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:284 keystone/identity/backends/kvs.py:293
msgid "User not found in group"
msgstr "在群組中找不到使用者"
-#: keystone/identity/backends/sql.py:425
+#: keystone/identity/backends/ldap.py:82
#, python-format
-msgid "Cannot remove role that has not been granted, %s"
-msgstr "無法移除尚未授權的角色,%s"
+msgid "Expected dict or list: %s"
+msgstr ""
-#: keystone/identity/backends/ldap/core.py:82
+#: keystone/identity/backends/ldap.py:376
#, python-format
-msgid "Expected dict or list: %s"
+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/core.py:681
+#: keystone/identity/backends/ldap.py:638
#, python-format
msgid "Role %s not found"
msgstr "找不到角色 %s"
-#: keystone/identity/backends/ldap/core.py:898
+#: keystone/identity/backends/ldap.py:826
msgid "Changing Name not supported by LDAP"
msgstr "LDAP 不支援變更名稱"
-#: keystone/identity/backends/ldap/core.py:911
+#: keystone/identity/backends/ldap.py:839
#, fuzzy, python-format
msgid "User %(user_id)s is already a member of group %(group_id)s"
msgstr "使用者 %s 已是群組 %s 的成員"
-#: keystone/identity/backends/ldap/core.py:954
+#: keystone/identity/backends/sql.py:462
#, python-format
-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 ""
+msgid "Cannot remove role that has not been granted, %s"
+msgstr "無法移除尚未授權的角色,%s"
#: keystone/openstack/common/policy.py:394
#, python-format
@@ -540,15 +552,15 @@ msgstr "無法理解規則 %(rule)r"
msgid "enforce %(action)s: %(credentials)s"
msgstr ""
-#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+#: keystone/token/controllers.py:453 keystone/token/controllers.py:456
msgid "Token does not belong to specified tenant."
msgstr "記號不屬於所指定的 Tenant。"
-#: keystone/token/controllers.py:475
+#: keystone/token/controllers.py:463
msgid "Non-default domain is not supported"
msgstr "不支援非預設網域"
-#: keystone/token/controllers.py:483
+#: keystone/token/controllers.py:471
msgid "Domain scoped token is not supported"
msgstr "不支援網域範圍的記號"
@@ -574,3 +586,10 @@ 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 ""
+