summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--keystone/locale/bg_BG/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/ca/LC_MESSAGES/keystone.po52
-rw-r--r--keystone/locale/cs/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/da/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/de/LC_MESSAGES/keystone.po576
-rw-r--r--keystone/locale/es/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/fi_FI/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/fr/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/hu/LC_MESSAGES/keystone.po70
-rw-r--r--keystone/locale/it/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/ja/LC_MESSAGES/keystone.po54
-rw-r--r--keystone/locale/ka_GE/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/keystone.pot48
-rw-r--r--keystone/locale/ko_KR/LC_MESSAGES/keystone.po49
-rw-r--r--keystone/locale/pt_BR/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/ru/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/vi_VN/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/zh_CN/LC_MESSAGES/keystone.po46
-rw-r--r--keystone/locale/zh_TW/LC_MESSAGES/keystone.po558
19 files changed, 1560 insertions, 399 deletions
diff --git a/keystone/locale/bg_BG/LC_MESSAGES/keystone.po b/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
index 5a9853e2..e0cbafba 100644
--- a/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
+++ b/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Bulgarian (Bulgaria) "
@@ -261,17 +261,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -490,22 +490,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/ca/LC_MESSAGES/keystone.po b/keystone/locale/ca/LC_MESSAGES/keystone.po
index e7596d8c..f6168492 100644
--- a/keystone/locale/ca/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ca/LC_MESSAGES/keystone.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2012-11-03 03:08+0000\n"
"Last-Translator: Sergi Almacellas <pokoli@gmail.com>\n"
"Language-Team: ca <LL@li.org>\n"
@@ -262,17 +262,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -282,62 +282,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -491,22 +491,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -553,9 +557,3 @@ msgstr "No es pot afegir el token a la llista d'usuaris."
msgid "Unable to add token to revocation list."
msgstr "No es pot afegir el token a la llista de revocats."
-#~ msgid "JSON file representing policy"
-#~ msgstr "Fitxer JSON que repsenta la politica"
-
-#~ msgid "Rule checked when requested rule is not found"
-#~ msgstr "Marca la regla quan aquesta no es troba"
-
diff --git a/keystone/locale/cs/LC_MESSAGES/keystone.po b/keystone/locale/cs/LC_MESSAGES/keystone.po
index 777dabd6..2922672e 100644
--- a/keystone/locale/cs/LC_MESSAGES/keystone.po
+++ b/keystone/locale/cs/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Czech "
@@ -261,17 +261,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -490,22 +490,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/da/LC_MESSAGES/keystone.po b/keystone/locale/da/LC_MESSAGES/keystone.po
index 9fde70c8..31303513 100644
--- a/keystone/locale/da/LC_MESSAGES/keystone.po
+++ b/keystone/locale/da/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Danish "
@@ -261,17 +261,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -490,22 +490,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/de/LC_MESSAGES/keystone.po b/keystone/locale/de/LC_MESSAGES/keystone.po
new file mode 100644
index 00000000..d25fea7f
--- /dev/null
+++ b/keystone/locale/de/LC_MESSAGES/keystone.po
@@ -0,0 +1,576 @@
+# German 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-05-22 17:05+0000\n"
+"PO-Revision-Date: 2013-05-22 03:45+0000\n"
+"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
+"Language-Team: German "
+"(http://www.transifex.com/projects/p/openstack/language/de/)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\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 "%s darf nicht leer sein."
+
+#: keystone/clean.py:25
+#, python-format
+msgid "%(property_name)s cannot be less than %(min_length)s characters."
+msgstr "%(property_name)s darf nicht kleiner als %(min_length)s Zeichen sein."
+
+#: keystone/clean.py:29
+#, python-format
+msgid "%(property_name)s should not be greater than %(max_length)s characters."
+msgstr "%(property_name)s sollte nicht größer als %(max_length)s Zeichen sein."
+
+#: keystone/clean.py:36
+#, python-format
+msgid "%(property_name)s is not a %(display_expected_type)s"
+msgstr ""
+
+#: keystone/test.py:115
+#, python-format
+msgid "Failed to checkout %s"
+msgstr "%s wurde nicht ausgecheckt"
+
+#: keystone/auth/controllers.py:72
+#, python-format
+msgid "Project is disabled: %s"
+msgstr "Projekt ist inaktiviert: %s"
+
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#, python-format
+msgid "Domain is disabled: %s"
+msgstr "Domäne ist inaktiviert: %s"
+
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#, python-format
+msgid "User is disabled: %s"
+msgstr "Benutzer ist inaktiviert: %s"
+
+#: keystone/auth/controllers.py:265
+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
+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
+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
+#, python-format
+msgid "Unable to lookup user %s"
+msgstr "Suche nach Benutzer %s nicht möglich"
+
+#: keystone/auth/controllers.py:363
+msgid "User not found"
+msgstr "Benutzer nicht gefunden"
+
+#: keystone/auth/token_factory.py:81
+msgid "User have no access to project"
+msgstr "Benutzer hat keinen Zugriff auf Projekt"
+
+#: keystone/auth/token_factory.py:96
+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
+msgid "Unable to sign token."
+msgstr "Token kann nicht unterzeichnet werden."
+
+#: keystone/auth/token_factory.py:317 keystone/token/controllers.py:124
+#, python-format
+msgid "Invalid value for token_format: %s. Allowed values are PKI or UUID."
+msgstr ""
+"Ungültiger Wert für 'token_format': %s. Zulässige Werte sind PKI oder "
+"UUID."
+
+#: keystone/catalog/core.py:38
+#, python-format
+msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s"
+msgstr "Fehlerhafter Endpunkt %(url)s - unbekannter Schlüssel %(keyerror)s"
+
+#: keystone/catalog/core.py:43
+#, python-format
+msgid ""
+"Malformed endpoint %(url)s - unknown key %(keyerror)s(are you missing "
+"brackets ?)"
+msgstr ""
+"Fehlerhafter Endpunkt %(url)s - unbekannter Schlüssel %(keyerror)s "
+"(fehlende Klammer?)"
+
+#: keystone/catalog/core.py:49
+#, python-format
+msgid ""
+"Malformed endpoint %s - incomplete format (are you "
+"missing a type notifier ?)"
+msgstr ""
+"Fehlerhafter Endpunkt %s - unvollständiges Format "
+"(fehlender Typenhinweis?)"
+
+#: keystone/catalog/backends/templated.py:109
+#, python-format
+msgid "Unable to open template file %s"
+msgstr "Vorlagendatei %s kann nicht geöffnet werden"
+
+#: keystone/common/bufferedhttp.py:102
+#, python-format
+msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
+msgstr "HTTP PERF: %(time).5f Sekunden für %(method)s %(host)s:%(port)s %(path)s)"
+
+#: keystone/common/cms.py:44
+#, python-format
+msgid "Verify error: %s"
+msgstr "Fehler überprüfen: %s"
+
+#: keystone/common/cms.py:135
+msgid ""
+"Signing error: Unable to load certificate - ensure you've configured PKI "
+"with 'keystone-manage pki_setup'"
+msgstr ""
+"Unterzeichnungsfehler: Zertifikat kann nicht geladen werden - stellen Sie"
+" sicher, dass Sie PKI mit 'keystone-manage pki_setup' konfiguriert haben"
+
+#: keystone/common/cms.py:139
+#, python-format
+msgid "Signing error: %s"
+msgstr "Unterzeichnungsfehler: %s"
+
+#: keystone/common/config.py:93
+#, python-format
+msgid "Unable to locate specified logging config file: %s"
+msgstr "Angegebene Protokollkonfigurationsdatei kann nicht gefunden werden: %s"
+
+#: keystone/common/config.py:111
+msgid "Invalid syslog facility"
+msgstr "Ungültige 'syslog'-Funktion"
+
+#: keystone/common/controller.py:19
+#, python-format
+msgid "RBAC: Authorizing %s(%s)"
+msgstr "Rollenbasierte Zugriffssteuerung: Autorisierung von %s(%s)"
+
+#: keystone/common/controller.py:27
+msgid "RBAC: Invalid token"
+msgstr "Rollenbasierte Zugriffssteuerung: Ungültiges Token"
+
+#: keystone/common/controller.py:37 keystone/common/controller.py:58
+msgid "RBAC: Invalid user"
+msgstr "Rollenbasierte Zugriffssteuerung: Ungültiger Benutzer"
+
+#: keystone/common/controller.py:43
+msgid "RBAC: Proceeding without project"
+msgstr "Rollenbasierte Zugriffssteuerung: Fortfahren ohne Projekt"
+
+#: keystone/common/controller.py:63
+msgid "RBAC: Proceeding without tenant"
+msgstr "Rollenbasierte Zugriffssteuerung: Fortsetzung ohne Nutzer"
+
+#: keystone/common/controller.py:93 keystone/common/controller.py:145
+msgid "RBAC: Bypassing authorization"
+msgstr "Rollenbasierte Zugriffssteuerung: Umgehen von Autorisierung"
+
+#: keystone/common/controller.py:102 keystone/common/controller.py:143
+msgid "RBAC: Authorization granted"
+msgstr "Rollenbasierte Zugriffssteuerung: Autorisierung erteilt"
+
+#: keystone/common/controller.py:132
+#, python-format
+msgid "RBAC: Adding query filter params (%s)"
+msgstr ""
+"Rollenbasierte Zugriffssteuerung: Hinzufügen von Abfragefilterparametern "
+"(%s)"
+
+#: keystone/common/controller.py:332
+msgid "Invalid token in normalize_domain_id"
+msgstr "Ungültiges Token in 'normalize_domain_id'"
+
+#: keystone/common/wsgi.py:106
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr "Starten von %(arg0)s auf %(host)s:%(port)s"
+
+#: keystone/common/wsgi.py:166
+msgid "Server error"
+msgstr "Serverfehler"
+
+#: keystone/common/wsgi.py:245
+#, python-format
+msgid "arg_dict: %s"
+msgstr "arg_dict: %s"
+
+#: keystone/common/wsgi.py:267
+#, python-format
+msgid "Authorization failed. %s from %s"
+msgstr "Autorisierung fehlgeschlagen. %s von %s"
+
+#: keystone/common/wsgi.py:510
+msgid "The resource could not be found."
+msgstr "Die Ressource konnte nicht gefunden werden."
+
+#: keystone/common/ldap/core.py:79
+#, python-format
+msgid "Invalid LDAP deref option: %s. Choose one of: "
+msgstr "Ungültige LDAP-deref-Option: %s. Wählen Sie aus: "
+
+#: keystone/common/ldap/core.py:87
+#, python-format
+msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgstr ""
+
+#: keystone/common/ldap/core.py:96
+#, python-format
+msgid "Invalid LDAP scope: %s. Choose one of: "
+msgstr "Ungültiger LDAP-Umfang: %s. Wählen Sie aus: "
+
+#: keystone/common/ldap/core.py:185
+#, python-format
+msgid ""
+"Invalid additional attribute mapping: \"%s\". Format must be "
+"<ldap_attribute>:<keystone_attribute>"
+msgstr ""
+
+#: keystone/common/ldap/core.py:190
+#, python-format
+msgid ""
+"Invalid additional attribute mapping: \"%(item)s\". Value "
+"\"%(attr_map)s\" must use one of %(keys)s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/identity/backends/kvs.py:631
+#, python-format
+msgid "Duplicate name, %s."
+msgstr "Doppelter Name, %s."
+
+#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#, python-format
+msgid "Duplicate ID, %s."
+msgstr "Doppelte ID, %s."
+
+#: keystone/common/ldap/core.py:289
+#, python-format
+msgid "LDAP %s create"
+msgstr "LDAP %s erstellen"
+
+#: keystone/common/ldap/core.py:367
+#, python-format
+msgid "LDAP %s update"
+msgstr "LDAP %s aktualisieren"
+
+#: keystone/common/ldap/core.py:400
+#, python-format
+msgid "LDAP %s delete"
+msgstr "LDAP %s löschen"
+
+#: keystone/common/ldap/core.py:425
+#, python-format
+msgid "LDAP init: url=%s"
+msgstr "LDAP starten: url=%s"
+
+#: keystone/common/ldap/core.py:426
+#, 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:445
+msgid "Invalid TLS / LDAPS combination"
+msgstr ""
+
+#: keystone/common/ldap/core.py:449
+#, python-format
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgstr ""
+
+#: keystone/common/ldap/core.py:459
+#, python-format
+msgid "tls_cacertfile %s not found or is not a file"
+msgstr ""
+
+#: keystone/common/ldap/core.py:471
+#, python-format
+msgid "tls_cacertdir %s not found or is not a directory"
+msgstr ""
+
+#: keystone/common/ldap/core.py:478
+#, python-format
+msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:492
+#, python-format
+msgid "LDAP bind: dn=%s"
+msgstr "LDAP binden: dn=%s"
+
+#: keystone/common/ldap/core.py:503
+#, python-format
+msgid "LDAP add: dn=%s, attrs=%s"
+msgstr "LDAP hinzufügen: dn=%s, attrs=%s"
+
+#: keystone/common/ldap/core.py:508
+#, python-format
+msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgstr "LDAP-Suche: dn=%s, scope=%s, query=%s, attrs=%s"
+
+#: keystone/common/ldap/core.py:559
+msgid ""
+"LDAP Server does not support paging. Disable paging in keystone.conf to "
+"avoid this message."
+msgstr ""
+"LDAP-Server unterstützt Paging nicht. Inaktivieren Sie das Paging in "
+"keystone.conf, um diese Nachricht zu verhindern."
+
+#: keystone/common/ldap/core.py:576
+#, python-format
+msgid "LDAP modify: dn=%s, modlist=%s"
+msgstr "LDAP ändern: dn=%s, modlist=%s"
+
+#: keystone/common/ldap/core.py:581
+#, python-format
+msgid "LDAP delete: dn=%s"
+msgstr "LDAP löschen: dn=%s"
+
+#: keystone/common/ldap/core.py:585
+#, python-format
+msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgstr "LDAP-'delete_ext': dn=%s, serverctrls=%s"
+
+#: keystone/common/ldap/fakeldap.py:146
+#, python-format
+msgid "FakeLdap initialize url=%s"
+msgstr "FakeLdap starten, url=%s"
+
+#: keystone/common/ldap/fakeldap.py:156
+#, python-format
+msgid "FakeLdap bind dn=%s"
+msgstr "FakeLdap binden, dn=%s"
+
+#: keystone/common/ldap/fakeldap.py:163
+#, python-format
+msgid "FakeLdap bind fail: dn=%s not found"
+msgstr "FakeLdap binden fehlgeschlagen: dn=%s nicht gefunden"
+
+#: keystone/common/ldap/fakeldap.py:170
+#, python-format
+msgid "FakeLdap bind fail: password for dn=%s not found"
+msgstr "FakeLdap binden fehlgeschlagen: Kennwort für dn=%s nicht gefunden"
+
+#: keystone/common/ldap/fakeldap.py:175
+#, python-format
+msgid "FakeLdap bind fail: password for dn=%s does not match"
+msgstr "FakeLdap binden fehlgeschlagen: Kennwort für dn=%s stimmt nicht überein"
+
+#: keystone/common/ldap/fakeldap.py:190
+#, python-format
+msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgstr "FakeLdap-Element hinzufügen: dn=%s, attrs=%s"
+
+#: keystone/common/ldap/fakeldap.py:192
+#, python-format
+msgid "FakeLdap add item failed: dn=%s is already in store."
+msgstr "FakeLdap-Element hinzufügen fehlgeschlagen: dn=%s ist bereits im Speicher."
+
+#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#, python-format
+msgid "FakeLdap delete item: dn=%s"
+msgstr "FakeLdap-Element löschen: dn=%s"
+
+#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#, python-format
+msgid "FakeLdap delete item failed: dn=%s not found."
+msgstr "FakeLdap-Element löschen fehlgeschlagen: dn=%s nicht gefunden."
+
+#: keystone/common/ldap/fakeldap.py:239
+#, python-format
+msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgstr "FakeLdap-Element ändern: dn=%s attrs=%s"
+
+#: keystone/common/ldap/fakeldap.py:243
+#, python-format
+msgid "FakeLdap modify item failed: dn=%s not found."
+msgstr "FakeLdap-Element ändern fehlgeschlagen: dn=%s nicht gefunden."
+
+#: keystone/common/ldap/fakeldap.py:260
+#, python-format
+msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
+msgstr ""
+"FakeLdap-Element ändern fehlgeschlagen: Element hat kein zu löschendes "
+"Attribut \"%s\""
+
+#: keystone/common/ldap/fakeldap.py:271
+#, python-format
+msgid ""
+"FakeLdap modify item failed: item has no attribute \"%s\" with value "
+"\"%s\" to delete"
+msgstr ""
+"FakeLdap-Element ändern fehlgeschlagen: Element hat kein zu löschendes "
+"Attribut \"%s\" mit Wert \"%s\""
+
+#: keystone/common/ldap/fakeldap.py:276
+#, python-format
+msgid "FakeLdap modify item failed: unknown command %s"
+msgstr "FakeLdap-Element ändern fehlgeschlagen: unbekannter Befehl %s"
+
+#: keystone/common/ldap/fakeldap.py:278
+#, python-format
+msgid "modify_s action %s not implemented"
+msgstr "'modify_s'-Aktion %s nicht implementiert"
+
+#: keystone/common/ldap/fakeldap.py:296
+#, python-format
+msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgstr "FakeLdap-Suche unter dn=%s scope=%s query=%s"
+
+#: keystone/common/ldap/fakeldap.py:302
+msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
+msgstr "FakeLdap-Suche fehlgeschlagen: dn für 'SCOPE_BASE' nicht gefunden"
+
+#: keystone/common/ldap/fakeldap.py:316
+#, python-format
+msgid "Search scope %s not implemented."
+msgstr "Suchbereich %s nicht implementiert."
+
+#: keystone/common/sql/core.py:207
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+"Es wurde festgestellt, dass keine Verbindung zum mysql-Server mehr "
+"vorhanden ist: %s"
+
+#: keystone/common/sql/legacy.py:180
+#, python-format
+msgid "Cannot migrate EC2 credential: %s"
+msgstr "EC2-Berechtigungsnachweis kann nicht migriert werden: %s"
+
+#: keystone/common/sql/migration.py:47
+msgid "version should be an integer"
+msgstr "Version sollte eine Ganzzahl sein"
+
+#: keystone/common/sql/nova.py:62
+#, python-format
+msgid "Create tenant %s"
+msgstr "Nutzer %s erstellen"
+
+#: keystone/common/sql/nova.py:79
+#, python-format
+msgid "Create user %s"
+msgstr "Benutzer %s erstellen"
+
+#: keystone/common/sql/nova.py:88
+#, python-format
+msgid "Add user %s to tenant %s"
+msgstr "Benutzer %s zu Nutzer %s hinzufügen"
+
+#: keystone/common/sql/nova.py:96
+#, python-format
+msgid "Ignoring existing role %s"
+msgstr "Vorhandene Rolle %s ignorieren"
+
+#: keystone/common/sql/nova.py:103
+#, python-format
+msgid "Create role %s"
+msgstr "Rolle %s erstellen"
+
+#: keystone/common/sql/nova.py:113
+#, python-format
+msgid "Assign role %s to user %s on tenant %s"
+msgstr "Rolle %s Benutzer %s auf Nutzer %s zuweisen"
+
+#: keystone/common/sql/nova.py:128
+#, python-format
+msgid "Creating ec2 cred for user %s and tenant %s"
+msgstr "Erstellen von EC2-Berechtigungsnachweis für Benutzer %s und Nutzer %s"
+
+#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+msgid "User not found in group"
+msgstr "Benutzer nicht in Gruppe gefunden"
+
+#: keystone/identity/backends/sql.py:424
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr "Nicht gewährte Rolle kann nicht entfernt werden, %s"
+
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
+#, python-format
+msgid "Role %s not found"
+msgstr "Rolle %s nicht gefunden"
+
+#: keystone/identity/backends/ldap/core.py:912
+msgid "Changing Name not supported by LDAP"
+msgstr "Änderung von Namen wird von LDAP nicht unterstützt"
+
+#: keystone/identity/backends/ldap/core.py:926
+#, python-format
+msgid "User %s is already a member of group %s"
+msgstr "Benutzer %s ist bereits Mitglied der Gruppe %s."
+
+#: keystone/identity/backends/ldap/core.py:968
+#, 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 ""
+
+#: keystone/openstack/common/policy.py:394
+#, python-format
+msgid "Failed to understand rule %(rule)s"
+msgstr "Regel '%(rule)s' konnte nicht verstanden werden"
+
+#: keystone/openstack/common/policy.py:404
+#, python-format
+msgid "No handler for matches of kind %s"
+msgstr "Kein Handler für Übereinstimmungen des Typs %s"
+
+#: keystone/openstack/common/policy.py:679
+#, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr "Regel '%(rule)r' konnte nicht verstanden werden"
+
+#: keystone/policy/backends/rules.py:93
+#, python-format
+msgid "enforce %s: %s"
+msgstr "%s erzwingen: %s"
+
+#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+msgid "Token does not belong to specified tenant."
+msgstr "Token gehört nicht zu angegebenem Nutzer."
+
+#: keystone/token/controllers.py:476
+msgid "Non-default domain is not supported"
+msgstr "Nicht-Standard-Domäne wird nicht unterstützt"
+
+#: keystone/token/controllers.py:484
+msgid "Domain scoped token is not supported"
+msgstr "Bereichsorientiertes Token der Domäne wird nicht unterstützt"
+
+#: keystone/token/backends/memcache.py:83
+msgid "Unable to add token user list."
+msgstr "Token kann nicht zu Benutzerliste hinzugefügt werden."
+
+#: keystone/token/backends/memcache.py:93
+msgid "Unable to add token to revocation list."
+msgstr "Token kann nicht zu Widerrufsliste hinzugefügt werden."
+
diff --git a/keystone/locale/es/LC_MESSAGES/keystone.po b/keystone/locale/es/LC_MESSAGES/keystone.po
index d25c4bb1..090c21e7 100644
--- a/keystone/locale/es/LC_MESSAGES/keystone.po
+++ b/keystone/locale/es/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-21 09:13+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Spanish "
@@ -273,17 +273,17 @@ msgstr "Creación de LDAP %s"
msgid "LDAP %s update"
msgstr "Actualización de LDAP %s"
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr "Supresión de LDAP %s"
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr "Inicialización de LDAP: url=%s"
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -293,46 +293,46 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr "Enlace de LDAP: dn=%s"
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr "Adición de LDAP: dn=%s, attrs=%s"
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr "Búsqueda LDAP: dn=%s, scope=%s, query=%s, attrs=%s"
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
@@ -340,17 +340,17 @@ msgstr ""
"El servidor LDAP no soporta la paginación. Inhabilite la paginación en "
"keystone.conf para evitar este mensaje."
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr "Modificación de LDAP: dn=%s, modlist=%s"
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr "Supresión de LDAP: dn=%s"
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr "LDAP delete_ext: dn=%s, serverctrls=%s"
@@ -515,22 +515,26 @@ msgstr "Usuario no encontrado en grupo"
msgid "Cannot remove role that has not been granted, %s"
msgstr "No se puede eliminar un rol que no se ha otorgado, %s"
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr "No se ha encontrado el rol %s"
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr "LDAP no soporta el cambio de nombre"
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr "El usuario %s ya es miembro del grupo %s"
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/fi_FI/LC_MESSAGES/keystone.po b/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
index b7fc6e07..4db6bfa0 100644
--- a/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
+++ b/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Finnish (Finland) "
@@ -261,17 +261,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -490,22 +490,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone.po b/keystone/locale/fr/LC_MESSAGES/keystone.po
index a03ebcf5..6438a8c1 100644
--- a/keystone/locale/fr/LC_MESSAGES/keystone.po
+++ b/keystone/locale/fr/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: French "
@@ -261,17 +261,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -490,22 +490,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/hu/LC_MESSAGES/keystone.po b/keystone/locale/hu/LC_MESSAGES/keystone.po
index c2d5f69f..a0b5a1bd 100644
--- a/keystone/locale/hu/LC_MESSAGES/keystone.po
+++ b/keystone/locale/hu/LC_MESSAGES/keystone.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2012-12-15 14:14+0000\n"
"Last-Translator: kelemeng <kelemeng@gnome.hu>\n"
"Language-Team: hu <LL@li.org>\n"
@@ -267,17 +267,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, fuzzy, python-format
msgid "LDAP init: url=%s"
msgstr "FakeLdap előkészítési url=%s"
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -287,62 +287,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, fuzzy, python-format
msgid "LDAP bind: dn=%s"
msgstr "FakeLdap bind dn=%s"
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, fuzzy, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr "FakeLdap elem hozzáadása: dn=%s, attrs=%s"
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, fuzzy, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr "FakeLdap keresés itt: dn=%s hatókör=%s lekérdezés=%s"
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, fuzzy, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr "FakeLdap elem módosítása: dn=%s attrs=%s"
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, fuzzy, python-format
msgid "LDAP delete: dn=%s"
msgstr "FakeLdap elem törlése: dn=%s"
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, fuzzy, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr "FakeLdap elem hozzáadása: dn=%s, attrs=%s"
@@ -500,22 +500,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -562,27 +566,3 @@ msgstr "Nem vehető fel a token felhasználólistája."
msgid "Unable to add token to revocation list."
msgstr "A token nem adható a visszavonási listához."
-#~ msgid "using _calc_signature_2"
-#~ msgstr "a _calc_signature_2 használata"
-
-#~ msgid "query string: %s"
-#~ msgstr "lekérdezési karakterlánc: %s"
-
-#~ msgid "string_to_sign: %s"
-#~ msgstr "string_to_sign: %s"
-
-#~ msgid "len(b64)=%d"
-#~ msgstr "len(b64)=%d"
-
-#~ msgid "base64 encoded digest: %s"
-#~ msgstr "base64 kódolási kivonat: %s"
-
-#~ msgid "LDAP backend does not allow %s create"
-#~ msgstr "Az LDAP háttérprogram nem engedélyezi %s létrehozását"
-
-#~ msgid "LDAP backend does not allow %s update"
-#~ msgstr "Az LDAP háttérprogram nem engedélyezi %s frissítését"
-
-#~ msgid "LDAP backend does not allow %s delete"
-#~ msgstr "Az LDAP háttérprogram nem engedélyezi %s törlését"
-
diff --git a/keystone/locale/it/LC_MESSAGES/keystone.po b/keystone/locale/it/LC_MESSAGES/keystone.po
index 2cd70075..1ee00550 100644
--- a/keystone/locale/it/LC_MESSAGES/keystone.po
+++ b/keystone/locale/it/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Italian "
@@ -269,17 +269,17 @@ msgstr "LDAP %s crea"
msgid "LDAP %s update"
msgstr "LDAP %s aggiorna"
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr "LDAP %s elimina"
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr "LDAP inizializza: url=%s"
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -289,46 +289,46 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr "LDAP bind: dn=%s"
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr "LDAP aggiunge: dn=%s, attrs=%s"
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr "Ricerca LDAP: dn=%s, scope=%s, query=%s, attrs=%s"
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
@@ -336,17 +336,17 @@ msgstr ""
"Il server LDAP non supporta la paginazione. Disabilitare la paginazione "
"in keystone.conf per evitare questo messaggio."
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr "LDAP modifica: dn=%s, modlist=%s"
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr "LDAP elimina: dn=%s"
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr "LDAP delete_ext: dn=%s, serverctrls=%s"
@@ -504,22 +504,26 @@ msgstr "Utente non trovato nel gruppo"
msgid "Cannot remove role that has not been granted, %s"
msgstr "Impossibile rimuovere un ruolo che non è stato concesso, %s"
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr "Ruolo %s non trovato"
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr "Modifica nome non supportato da LDAP"
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr "L'utente %s è già membro del gruppo %s"
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/ja/LC_MESSAGES/keystone.po b/keystone/locale/ja/LC_MESSAGES/keystone.po
index 292c20dc..705c932f 100644
--- a/keystone/locale/ja/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ja/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2012-11-03 01:25+0000\n"
"Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
"Language-Team: Japanese "
@@ -262,17 +262,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -282,62 +282,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -491,22 +491,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -553,11 +557,3 @@ msgstr "ユーザーリストにトークンを追加できません。"
msgid "Unable to add token to revocation list."
msgstr "失効リストにトークンを追加できません。"
-#~ msgid "JSON file representing policy"
-#~ msgstr ""
-#~ "\t\n"
-#~ "JSON ファイル表現ポリシー"
-
-#~ msgid "Rule checked when requested rule is not found"
-#~ msgstr "要求されたルールが見つからないときにチェックされるルール"
-
diff --git a/keystone/locale/ka_GE/LC_MESSAGES/keystone.po b/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
index 748aaec5..6ba6dbb4 100644
--- a/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: ka_GE <LL@li.org>\n"
@@ -261,17 +261,17 @@ msgstr "LDAP %s შექმნა"
msgid "LDAP %s update"
msgstr "LDAP %s განახლება"
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr "LDAP %s წაშლა"
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -490,22 +490,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr "როლი %s ვერ მოიძებნა"
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/keystone.pot b/keystone/locale/keystone.pot
index 1315d095..585ca6bf 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.208\n"
+"jenkins.keystone.propose.translation.update.209\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -261,17 +261,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -490,22 +490,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/ko_KR/LC_MESSAGES/keystone.po b/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
index 947a15de..160972f1 100644
--- a/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-03-21 18:34+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: ko_KR <LL@li.org>\n"
@@ -261,17 +261,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -490,22 +490,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -552,6 +556,3 @@ msgstr ""
msgid "Unable to add token to revocation list."
msgstr ""
-#~ msgid "%(property_name)s is not a%(display_expected_type)s"
-#~ msgstr ""
-
diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
index 28a4c4a5..ee54d3fe 100644
--- a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2012-11-02 18:30+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Portuguese (Brazil) "
@@ -261,17 +261,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -490,22 +490,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/ru/LC_MESSAGES/keystone.po b/keystone/locale/ru/LC_MESSAGES/keystone.po
index a6cc9455..f6148dc0 100644
--- a/keystone/locale/ru/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ru/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Russian "
@@ -262,17 +262,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -282,62 +282,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -491,22 +491,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/vi_VN/LC_MESSAGES/keystone.po b/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
index 116df755..85568202 100644
--- a/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
+++ b/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-17 16:06+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Vietnamese (Viet Nam) "
@@ -261,17 +261,17 @@ msgstr ""
msgid "LDAP %s update"
msgstr ""
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr ""
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr ""
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr ""
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr ""
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr ""
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr ""
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr ""
@@ -490,22 +490,26 @@ msgstr ""
msgid "Cannot remove role that has not been granted, %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr ""
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
index 891ffe5e..e2a4e6ac 100644
--- a/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
+++ b/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Keystone\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-21 17:06+0000\n"
+"POT-Creation-Date: 2013-05-22 17:05+0000\n"
"PO-Revision-Date: 2013-05-21 06:08+0000\n"
"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
"Language-Team: Chinese (China) "
@@ -261,17 +261,17 @@ msgstr "LDAP %s 创建"
msgid "LDAP %s update"
msgstr "LDAP %s 更新"
-#: keystone/common/ldap/core.py:398
+#: keystone/common/ldap/core.py:400
#, python-format
msgid "LDAP %s delete"
msgstr "LDAP %s 删除"
-#: keystone/common/ldap/core.py:423
+#: keystone/common/ldap/core.py:425
#, python-format
msgid "LDAP init: url=%s"
msgstr "LDAP 初始化:url=%s"
-#: keystone/common/ldap/core.py:424
+#: keystone/common/ldap/core.py:426
#, python-format
msgid ""
"LDAP init: use_tls=%(use_tls)s\n"
@@ -281,62 +281,62 @@ msgid ""
"tls_avail=%(tls_avail)s\n"
msgstr ""
-#: keystone/common/ldap/core.py:443
+#: keystone/common/ldap/core.py:445
msgid "Invalid TLS / LDAPS combination"
msgstr ""
-#: keystone/common/ldap/core.py:447
+#: keystone/common/ldap/core.py:449
#, python-format
msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
msgstr ""
-#: keystone/common/ldap/core.py:457
+#: keystone/common/ldap/core.py:459
#, python-format
msgid "tls_cacertfile %s not found or is not a file"
msgstr ""
-#: keystone/common/ldap/core.py:469
+#: keystone/common/ldap/core.py:471
#, python-format
msgid "tls_cacertdir %s not found or is not a directory"
msgstr ""
-#: keystone/common/ldap/core.py:476
+#: keystone/common/ldap/core.py:478
#, python-format
msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
msgstr ""
-#: keystone/common/ldap/core.py:490
+#: keystone/common/ldap/core.py:492
#, python-format
msgid "LDAP bind: dn=%s"
msgstr "LDAP 绑定:dn=%s"
-#: keystone/common/ldap/core.py:501
+#: keystone/common/ldap/core.py:503
#, python-format
msgid "LDAP add: dn=%s, attrs=%s"
msgstr "LDAP 添加:dn=%s,attrs=%s"
-#: keystone/common/ldap/core.py:506
+#: keystone/common/ldap/core.py:508
#, python-format
msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
msgstr "LDAP 搜索:dn=%s,scope=%s,query=%s,attrs=%s"
-#: keystone/common/ldap/core.py:557
+#: keystone/common/ldap/core.py:559
msgid ""
"LDAP Server does not support paging. Disable paging in keystone.conf to "
"avoid this message."
msgstr "LDAP 服务器不支持页面调度。请在 keystone.conf 中禁用页面调度以避免出现此消息。"
-#: keystone/common/ldap/core.py:574
+#: keystone/common/ldap/core.py:576
#, python-format
msgid "LDAP modify: dn=%s, modlist=%s"
msgstr "LDAP 修改:dn=%s,modlist=%s"
-#: keystone/common/ldap/core.py:579
+#: keystone/common/ldap/core.py:581
#, python-format
msgid "LDAP delete: dn=%s"
msgstr "LDAP 删除:dn=%s"
-#: keystone/common/ldap/core.py:583
+#: keystone/common/ldap/core.py:585
#, python-format
msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
msgstr "LDAP delete_ext:dn=%s,serverctrls=%s"
@@ -490,22 +490,26 @@ msgstr "在组中找不到用户"
msgid "Cannot remove role that has not been granted, %s"
msgstr "无法除去尚未授予的角色 %s"
-#: keystone/identity/backends/ldap/core.py:659
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
#, python-format
msgid "Role %s not found"
msgstr "找不到角色 %s"
-#: keystone/identity/backends/ldap/core.py:879
-#: keystone/identity/backends/ldap/core.py:995
+#: keystone/identity/backends/ldap/core.py:912
msgid "Changing Name not supported by LDAP"
msgstr "更改名称不受 LDAP 支持"
-#: keystone/identity/backends/ldap/core.py:893
+#: keystone/identity/backends/ldap/core.py:926
#, python-format
msgid "User %s is already a member of group %s"
msgstr "用户 %s 已是组 %s 的成员"
-#: keystone/identity/backends/ldap/core.py:935
+#: keystone/identity/backends/ldap/core.py:968
#, python-format
msgid ""
"Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
diff --git a/keystone/locale/zh_TW/LC_MESSAGES/keystone.po b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
new file mode 100644
index 00000000..96b5e1dc
--- /dev/null
+++ b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
@@ -0,0 +1,558 @@
+# Chinese (Taiwan) 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-05-22 17:05+0000\n"
+"PO-Revision-Date: 2013-05-22 03:11+0000\n"
+"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) "
+"(http://www.transifex.com/projects/p/openstack/language/zh_TW/)\n"
+"Plural-Forms: nplurals=1; plural=0\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 "%s 不能是空的。"
+
+#: keystone/clean.py:25
+#, python-format
+msgid "%(property_name)s cannot be less than %(min_length)s characters."
+msgstr "%(property_name)s 不能少於 %(min_length)s 個字元。"
+
+#: keystone/clean.py:29
+#, python-format
+msgid "%(property_name)s should not be greater than %(max_length)s characters."
+msgstr "%(property_name)s 不應超過 %(max_length)s 個字元。"
+
+#: keystone/clean.py:36
+#, python-format
+msgid "%(property_name)s is not a %(display_expected_type)s"
+msgstr ""
+
+#: keystone/test.py:115
+#, python-format
+msgid "Failed to checkout %s"
+msgstr "無法移出 %s"
+
+#: keystone/auth/controllers.py:72
+#, python-format
+msgid "Project is disabled: %s"
+msgstr "已停用專案:%s"
+
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:40
+#, python-format
+msgid "Domain is disabled: %s"
+msgstr "已停用網域:%s"
+
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:46
+#, python-format
+msgid "User is disabled: %s"
+msgstr "已停用使用者:%s"
+
+#: keystone/auth/controllers.py:265
+msgid "Scoping to both domain and project is not allowed"
+msgstr "不容許將範圍同時設定為網域及專案"
+
+#: keystone/auth/controllers.py:268
+msgid "Scoping to both domain and trust is not allowed"
+msgstr "不容許將範圍同時設定為網域及信任"
+
+#: keystone/auth/controllers.py:271
+msgid "Scoping to both project and trust is not allowed"
+msgstr "不容許將範圍同時設定為專案及信任"
+
+#: keystone/auth/controllers.py:333
+#, python-format
+msgid "Unable to lookup user %s"
+msgstr "無法查閱使用者 %s"
+
+#: keystone/auth/controllers.py:363
+msgid "User not found"
+msgstr "找不到使用者"
+
+#: keystone/auth/token_factory.py:81
+msgid "User have no access to project"
+msgstr "使用者無法存取專案"
+
+#: keystone/auth/token_factory.py:96
+msgid "User have no access to domain"
+msgstr "使用者無法存取網域"
+
+#: keystone/auth/token_factory.py:314 keystone/token/controllers.py:121
+msgid "Unable to sign token."
+msgstr "無法簽署記號。"
+
+#: keystone/auth/token_factory.py:317 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。"
+
+#: keystone/catalog/core.py:38
+#, python-format
+msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s"
+msgstr "端點 %(url)s 的格式不正確 - 不明的索引鍵 %(keyerror)s"
+
+#: keystone/catalog/core.py:43
+#, python-format
+msgid ""
+"Malformed endpoint %(url)s - unknown key %(keyerror)s(are you missing "
+"brackets ?)"
+msgstr "端點 %(url)s 的格式不正確 - 不明的索引鍵 %(keyerror)s(遺漏了方括弧嗎?)"
+
+#: keystone/catalog/core.py:49
+#, python-format
+msgid ""
+"Malformed endpoint %s - incomplete format (are you "
+"missing a type notifier ?)"
+msgstr "端點 %s 的格式不正確 - 格式不完整(遺漏了類型通知符嗎?)"
+
+#: keystone/catalog/backends/templated.py:109
+#, python-format
+msgid "Unable to open template file %s"
+msgstr "無法開啟範本檔 %s"
+
+#: keystone/common/bufferedhttp.py:102
+#, python-format
+msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
+msgstr "HTTP PERF:%(time).5f 秒鐘以 (%(method)s %(host)s:%(port)s %(path)s)"
+
+#: keystone/common/cms.py:44
+#, python-format
+msgid "Verify error: %s"
+msgstr "驗證發生錯誤:%s"
+
+#: keystone/common/cms.py:135
+msgid ""
+"Signing error: Unable to load certificate - ensure you've configured PKI "
+"with 'keystone-manage pki_setup'"
+msgstr "簽署發生錯誤:無法載入憑證 - 請確保已使用 'keystone-manage pki_setup' 來配置 PKI"
+
+#: keystone/common/cms.py:139
+#, python-format
+msgid "Signing error: %s"
+msgstr "簽署發生錯誤:%s"
+
+#: keystone/common/config.py:93
+#, python-format
+msgid "Unable to locate specified logging config file: %s"
+msgstr "找不到指定的記載配置檔:%s"
+
+#: keystone/common/config.py:111
+msgid "Invalid syslog facility"
+msgstr "無效的 Syslog 機能"
+
+#: keystone/common/controller.py:19
+#, python-format
+msgid "RBAC: Authorizing %s(%s)"
+msgstr "RBAC:正在授權 %s(%s)"
+
+#: keystone/common/controller.py:27
+msgid "RBAC: Invalid token"
+msgstr "RBAC:無效的記號"
+
+#: keystone/common/controller.py:37 keystone/common/controller.py:58
+msgid "RBAC: Invalid user"
+msgstr "RBAC:無效的使用者"
+
+#: keystone/common/controller.py:43
+msgid "RBAC: Proceeding without project"
+msgstr "RBAC:在沒有專案的情況下繼續作業"
+
+#: keystone/common/controller.py:63
+msgid "RBAC: Proceeding without tenant"
+msgstr "RBAC:在沒有 Tenant 的情況下繼續作業"
+
+#: keystone/common/controller.py:93 keystone/common/controller.py:145
+msgid "RBAC: Bypassing authorization"
+msgstr "RBAC:正在略過授權"
+
+#: keystone/common/controller.py:102 keystone/common/controller.py:143
+msgid "RBAC: Authorization granted"
+msgstr "RBAC:已授與權限"
+
+#: keystone/common/controller.py:132
+#, python-format
+msgid "RBAC: Adding query filter params (%s)"
+msgstr "RBAC:正在新增查詢過濾器參數 (%s)"
+
+#: keystone/common/controller.py:332
+msgid "Invalid token in normalize_domain_id"
+msgstr "normalize_domain_id 中的記號無效"
+
+#: keystone/common/wsgi.py:106
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr "正在 %(host)s:%(port)s 上啟動 %(arg0)s"
+
+#: keystone/common/wsgi.py:166
+msgid "Server error"
+msgstr "伺服器錯誤"
+
+#: keystone/common/wsgi.py:245
+#, python-format
+msgid "arg_dict: %s"
+msgstr "arg_dict:%s"
+
+#: keystone/common/wsgi.py:267
+#, python-format
+msgid "Authorization failed. %s from %s"
+msgstr "授權失敗。%s(自 %s)"
+
+#: keystone/common/wsgi.py:510
+msgid "The resource could not be found."
+msgstr "找不到資源。"
+
+#: keystone/common/ldap/core.py:79
+#, python-format
+msgid "Invalid LDAP deref option: %s. Choose one of: "
+msgstr "無效的 LDAP deref 選項:%s。請選擇下列其中一個:"
+
+#: keystone/common/ldap/core.py:87
+#, python-format
+msgid "Invalid LDAP tls certs option: %s. Choose one of: "
+msgstr ""
+
+#: keystone/common/ldap/core.py:96
+#, python-format
+msgid "Invalid LDAP scope: %s. Choose one of: "
+msgstr "無效的 LDAP 範圍:%s。請選擇下列其中一個:"
+
+#: keystone/common/ldap/core.py:185
+#, python-format
+msgid ""
+"Invalid additional attribute mapping: \"%s\". Format must be "
+"<ldap_attribute>:<keystone_attribute>"
+msgstr ""
+
+#: keystone/common/ldap/core.py:190
+#, python-format
+msgid ""
+"Invalid additional attribute mapping: \"%(item)s\". Value "
+"\"%(attr_map)s\" must use one of %(keys)s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:274 keystone/identity/backends/kvs.py:603
+#: keystone/identity/backends/kvs.py:631
+#, python-format
+msgid "Duplicate name, %s."
+msgstr "重複的名稱,%s。"
+
+#: keystone/common/ldap/core.py:284 keystone/identity/backends/kvs.py:596
+#, python-format
+msgid "Duplicate ID, %s."
+msgstr "重複的 ID,%s。"
+
+#: keystone/common/ldap/core.py:289
+#, python-format
+msgid "LDAP %s create"
+msgstr "LDAP %s 建立"
+
+#: keystone/common/ldap/core.py:367
+#, python-format
+msgid "LDAP %s update"
+msgstr "LDAP %s 更新"
+
+#: keystone/common/ldap/core.py:400
+#, python-format
+msgid "LDAP %s delete"
+msgstr "LDAP %s 刪除"
+
+#: keystone/common/ldap/core.py:425
+#, python-format
+msgid "LDAP init: url=%s"
+msgstr "LDAP 起始設定:URL = %s"
+
+#: keystone/common/ldap/core.py:426
+#, 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:445
+msgid "Invalid TLS / LDAPS combination"
+msgstr ""
+
+#: keystone/common/ldap/core.py:449
+#, python-format
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+msgstr ""
+
+#: keystone/common/ldap/core.py:459
+#, python-format
+msgid "tls_cacertfile %s not found or is not a file"
+msgstr ""
+
+#: keystone/common/ldap/core.py:471
+#, python-format
+msgid "tls_cacertdir %s not found or is not a directory"
+msgstr ""
+
+#: keystone/common/ldap/core.py:478
+#, python-format
+msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:492
+#, python-format
+msgid "LDAP bind: dn=%s"
+msgstr "LDAP 連結:DN = %s"
+
+#: keystone/common/ldap/core.py:503
+#, python-format
+msgid "LDAP add: dn=%s, attrs=%s"
+msgstr "LDAP 新增:DN = %s,屬性 = %s"
+
+#: keystone/common/ldap/core.py:508
+#, python-format
+msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
+msgstr "LDAP 搜尋:DN = %s,範圍 = %s,查詢 = %s,屬性 = %s"
+
+#: keystone/common/ldap/core.py:559
+msgid ""
+"LDAP Server does not support paging. Disable paging in keystone.conf to "
+"avoid this message."
+msgstr "「LDAP 伺服器」不支援分頁。請在 keystone.conf 中停用分頁以避免此訊息。"
+
+#: keystone/common/ldap/core.py:576
+#, python-format
+msgid "LDAP modify: dn=%s, modlist=%s"
+msgstr "LDAP 修改:DN = %s,Modlist = %s"
+
+#: keystone/common/ldap/core.py:581
+#, python-format
+msgid "LDAP delete: dn=%s"
+msgstr "LDAP 刪除:DN = %s"
+
+#: keystone/common/ldap/core.py:585
+#, python-format
+msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
+msgstr "LDAP delete_ext:DN = %s,Serverctrls = %s"
+
+#: keystone/common/ldap/fakeldap.py:146
+#, python-format
+msgid "FakeLdap initialize url=%s"
+msgstr "FakeLdap 起始設定 URL = %s"
+
+#: keystone/common/ldap/fakeldap.py:156
+#, python-format
+msgid "FakeLdap bind dn=%s"
+msgstr "FakeLdap 連結 DN = %s"
+
+#: keystone/common/ldap/fakeldap.py:163
+#, python-format
+msgid "FakeLdap bind fail: dn=%s not found"
+msgstr "FakeLdap 連結失敗:找不到 DN = %s"
+
+#: keystone/common/ldap/fakeldap.py:170
+#, python-format
+msgid "FakeLdap bind fail: password for dn=%s not found"
+msgstr "FakeLdap 連結失敗:找不到 DN = %s 的密碼"
+
+#: keystone/common/ldap/fakeldap.py:175
+#, python-format
+msgid "FakeLdap bind fail: password for dn=%s does not match"
+msgstr "FakeLdap 連結失敗:DN = %s 的密碼不符"
+
+#: keystone/common/ldap/fakeldap.py:190
+#, python-format
+msgid "FakeLdap add item: dn=%s, attrs=%s"
+msgstr "FakeLdap 新增項目:DN = %s,屬性 = %s"
+
+#: keystone/common/ldap/fakeldap.py:192
+#, python-format
+msgid "FakeLdap add item failed: dn=%s is already in store."
+msgstr "FakeLdap 新增項目失敗:DN = %s 已在儲存庫中。"
+
+#: keystone/common/ldap/fakeldap.py:206 keystone/common/ldap/fakeldap.py:220
+#, python-format
+msgid "FakeLdap delete item: dn=%s"
+msgstr "FakeLdap 刪除項目:DN = %s"
+
+#: keystone/common/ldap/fakeldap.py:210 keystone/common/ldap/fakeldap.py:224
+#, python-format
+msgid "FakeLdap delete item failed: dn=%s not found."
+msgstr "FakeLdap 刪除項目失敗:找不到 DN = %s。"
+
+#: keystone/common/ldap/fakeldap.py:239
+#, python-format
+msgid "FakeLdap modify item: dn=%s attrs=%s"
+msgstr "FakeLdap 修改項目:DN = %s 屬性 = %s"
+
+#: keystone/common/ldap/fakeldap.py:243
+#, python-format
+msgid "FakeLdap modify item failed: dn=%s not found."
+msgstr "FakeLdap 修改項目失敗:找不到 DN = %s。"
+
+#: keystone/common/ldap/fakeldap.py:260
+#, python-format
+msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
+msgstr "FakeLdap 修改項目失敗:項目沒有要刪除的屬性 \"%s\""
+
+#: keystone/common/ldap/fakeldap.py:271
+#, python-format
+msgid ""
+"FakeLdap modify item failed: item has no attribute \"%s\" with value "
+"\"%s\" to delete"
+msgstr "FakeLdap 修改項目失敗:項目沒有要刪除的屬性 \"%s\"(值為 \"%s\")"
+
+#: keystone/common/ldap/fakeldap.py:276
+#, python-format
+msgid "FakeLdap modify item failed: unknown command %s"
+msgstr "FakeLdap 修改項目失敗:不明的指令 %s"
+
+#: keystone/common/ldap/fakeldap.py:278
+#, python-format
+msgid "modify_s action %s not implemented"
+msgstr "未實作 modify_s 動作 %s"
+
+#: keystone/common/ldap/fakeldap.py:296
+#, python-format
+msgid "FakeLdap search at dn=%s scope=%s query=%s"
+msgstr "FakeLdap 搜尋(DN = %s 範圍 = %s 查詢 = %s)"
+
+#: keystone/common/ldap/fakeldap.py:302
+msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
+msgstr "FakeLdap 搜尋失敗:找不到 SCOPE_BASE 的 DN"
+
+#: keystone/common/ldap/fakeldap.py:316
+#, python-format
+msgid "Search scope %s not implemented."
+msgstr "未實作搜尋範圍 %s。"
+
+#: keystone/common/sql/core.py:207
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr "已取得 mysql 伺服器已斷線的訊息:%s"
+
+#: keystone/common/sql/legacy.py:180
+#, python-format
+msgid "Cannot migrate EC2 credential: %s"
+msgstr "無法移轉 EC2 認證:%s"
+
+#: 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 "建立 Tenant %s"
+
+#: keystone/common/sql/nova.py:79
+#, python-format
+msgid "Create user %s"
+msgstr "建立使用者 %s"
+
+#: keystone/common/sql/nova.py:88
+#, python-format
+msgid "Add user %s to tenant %s"
+msgstr "將使用者 %s 新增至 Tenant %s"
+
+#: keystone/common/sql/nova.py:96
+#, python-format
+msgid "Ignoring existing role %s"
+msgstr "正在忽略現有角色 %s"
+
+#: keystone/common/sql/nova.py:103
+#, python-format
+msgid "Create role %s"
+msgstr "建立角色 %s"
+
+#: keystone/common/sql/nova.py:113
+#, python-format
+msgid "Assign role %s to user %s on tenant %s"
+msgstr "將角色 %s 指派給使用者 %s(在 Tenant %s 上)"
+
+#: keystone/common/sql/nova.py:128
+#, python-format
+msgid "Creating ec2 cred for user %s and tenant %s"
+msgstr "正在給使用者 %s 及 Tenant %s 建立 EC2 Cred"
+
+#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+msgid "User not found in group"
+msgstr "在群組中找不到使用者"
+
+#: keystone/identity/backends/sql.py:424
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr "無法移除尚未授權的角色,%s"
+
+#: keystone/identity/backends/ldap/core.py:95
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:692
+#, python-format
+msgid "Role %s not found"
+msgstr "找不到角色 %s"
+
+#: keystone/identity/backends/ldap/core.py:912
+msgid "Changing Name not supported by LDAP"
+msgstr "LDAP 不支援變更名稱"
+
+#: keystone/identity/backends/ldap/core.py:926
+#, python-format
+msgid "User %s is already a member of group %s"
+msgstr "使用者 %s 已是群組 %s 的成員"
+
+#: keystone/identity/backends/ldap/core.py:968
+#, 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 ""
+
+#: keystone/openstack/common/policy.py:394
+#, python-format
+msgid "Failed to understand rule %(rule)s"
+msgstr "無法理解規則 %(rule)s"
+
+#: keystone/openstack/common/policy.py:404
+#, python-format
+msgid "No handler for matches of kind %s"
+msgstr "類型為 %s 的相符項沒有處理程式"
+
+#: keystone/openstack/common/policy.py:679
+#, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr "無法理解規則 %(rule)r"
+
+#: keystone/policy/backends/rules.py:93
+#, python-format
+msgid "enforce %s: %s"
+msgstr "施行 %s:%s"
+
+#: keystone/token/controllers.py:466 keystone/token/controllers.py:469
+msgid "Token does not belong to specified tenant."
+msgstr "記號不屬於所指定的 Tenant。"
+
+#: keystone/token/controllers.py:476
+msgid "Non-default domain is not supported"
+msgstr "不支援非預設網域"
+
+#: keystone/token/controllers.py:484
+msgid "Domain scoped token is not supported"
+msgstr "不支援網域範圍的記號"
+
+#: keystone/token/backends/memcache.py:83
+msgid "Unable to add token user list."
+msgstr "無法新增記號使用者清單。"
+
+#: keystone/token/backends/memcache.py:93
+msgid "Unable to add token to revocation list."
+msgstr "無法將記號新增至撤銷清冊。"
+