Imported Translations from Transifex

Change-Id: I9f027065d4aeaa31fb45274d7664c3920ef40a13

20 files changed, 1256 insertions, 1158 deletions

diff --git a/keystone/locale/bg_BG/LC_MESSAGES/keystone.po b/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
index 73f37573..b56b0def 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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) "
@@ -120,11 +120,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -490,35 +485,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,68 +552,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
 msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
-
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
-
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
+#~ msgid "Unable to add token user list."
 #~ msgstr ""
 
diff --git a/keystone/locale/ca/LC_MESSAGES/keystone.po b/keystone/locale/ca/LC_MESSAGES/keystone.po
index cde8f569..6345a3da 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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"
@@ -121,11 +121,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -185,7 +180,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -201,21 +196,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -248,13 +243,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -491,35 +486,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -558,68 +553,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
-msgstr "No es pot afegir el token a la llista d'usuaris."
-
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
-msgstr "No es pot afegir el token a la llista de revocats."
-
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
 
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
 
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr "No es pot afegir el token a la llista de revocats."
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
-#~ msgstr ""
+#~ msgid "Unable to add token user list."
+#~ msgstr "No es pot afegir el token a la llista d'usuaris."
 
diff --git a/keystone/locale/cs/LC_MESSAGES/keystone.po b/keystone/locale/cs/LC_MESSAGES/keystone.po
index 2c98efe8..f42b06aa 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 17:05+0000\n"
 "PO-Revision-Date: 2013-05-17 16:06+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Czech "
@@ -120,11 +120,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -490,35 +485,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,68 +552,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
 msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
-
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
-
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
+#~ msgid "Unable to add token user list."
 #~ msgstr ""
 
diff --git a/keystone/locale/da/LC_MESSAGES/keystone.po b/keystone/locale/da/LC_MESSAGES/keystone.po
index aab5ee02..9a28147f 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 17:05+0000\n"
 "PO-Revision-Date: 2013-05-17 16:06+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Danish "
@@ -120,11 +120,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -490,35 +485,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,68 +552,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
 msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
-
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
-
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
+#~ msgid "Unable to add token user list."
 #~ msgstr ""
 
diff --git a/keystone/locale/de/LC_MESSAGES/keystone.po b/keystone/locale/de/LC_MESSAGES/keystone.po
index e7f10483..fc30b825 100644
--- a/keystone/locale/de/LC_MESSAGES/keystone.po
+++ b/keystone/locale/de/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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 "
@@ -126,11 +126,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr "Vorlagendatei %s kann nicht geöffnet werden"
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr "HTTP PERF: %(time).5f Sekunden für %(method)s %(host)s:%(port)s %(path)s)"
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -194,7 +189,7 @@ msgstr ""
 "Rollenbasierte Zugriffssteuerung: Hinzufügen von Abfragefilterparametern "
 "(%s)"
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr "Ungültiges Token in 'normalize_domain_id'"
 
@@ -210,21 +205,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr "arg_dict: %s"
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, fuzzy, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr "Autorisierung fehlgeschlagen. %s von %s"
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr "Die Ressource konnte nicht gefunden werden."
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr "Starten von %(arg0)s auf %(host)s:%(port)s"
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr "Serverfehler"
 
@@ -257,13 +252,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr "Doppelter Name, %s."
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr "Doppelte ID, %s."
@@ -508,35 +503,35 @@ msgstr "Rolle %s Benutzer %s auf Nutzer %s zuweisen"
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr "Erstellen von EC2-Berechtigungsnachweis für Benutzer %s und Nutzer %s"
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr "Benutzer nicht in Gruppe gefunden"
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, 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
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr "Rolle %s nicht gefunden"
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr "Änderung von Namen wird von LDAP nicht unterstützt"
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, fuzzy, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr "Benutzer %s ist bereits Mitglied der Gruppe %s."
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -575,23 +570,33 @@ msgstr "Nicht-Standard-Domäne wird nicht unterstützt"
 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:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
-msgstr "Token kann nicht zu Widerrufsliste hinzugefügt werden."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr "Rollenbasierte Zugriffssteuerung: Autorisierung von %s(%s)"
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr "Token kann nicht zu Widerrufsliste hinzugefügt werden."
 
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ 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)"
 
-#~ msgid "enforce %s: %s"
-#~ msgstr "%s erzwingen: %s"
+#~ msgid "Unable to add token user list."
+#~ msgstr "Token kann nicht zu Benutzerliste hinzugefügt werden."
 
diff --git a/keystone/locale/es/LC_MESSAGES/keystone.po b/keystone/locale/es/LC_MESSAGES/keystone.po
index 09e28462..bcc8e3af 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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 "
@@ -128,11 +128,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr "No se puede abrir el archivo de plantilla %s"
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr "PERF HTTP: %(time).5f segundos en %(method)s %(host)s:%(port)s %(path)s)"
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -196,7 +191,7 @@ msgstr "RBAC: Autorización otorgada"
 msgid "RBAC: Adding query filter params (%s)"
 msgstr "RBAC: añadiendo parámetros de filtro de consultas (%s)"
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr "Señal no válida en normalize_domain_id"
 
@@ -212,21 +207,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr "arg_dict: %s"
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, fuzzy, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr "Ha fallado la autorización. %s de %s"
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr "El recurso no se ha podido encontrar."
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr "Iniciando %(arg0)s en %(host)s:%(port)s"
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr "Error de servidor"
 
@@ -259,13 +254,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr "Nombre duplicado, %s."
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr "ID duplicado, %s."
@@ -515,35 +510,35 @@ msgstr "Asignar el rol %s al usuario %s en el arrendatario %s"
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr "Creando credencial ec2 para el usuario %s y el arrendatario %s"
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr "Usuario no encontrado en grupo"
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr "No se puede eliminar un rol que no se ha otorgado, %s"
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr "No se ha encontrado el rol %s"
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr "LDAP no soporta el cambio de nombre"
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, fuzzy, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr "El usuario %s ya es miembro del grupo %s"
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -582,23 +577,33 @@ msgstr "El dominio no predeterminado no está soportado"
 msgid "Domain scoped token is not supported"
 msgstr "La señal con ámbito de dominio no está soportada"
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
-msgstr "No se puede añadir lista de usuarios de señal."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
-msgstr "No se puede añadir señal a lista de revocación. "
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr "RBAC: Autorizando %s(%s)"
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr "No se puede añadir señal a lista de revocación. "
 
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
+#~ "PERF HTTP: %(time).5f segundos en "
+#~ "%(method)s %(host)s:%(port)s %(path)s)"
 
-#~ msgid "enforce %s: %s"
-#~ msgstr "imponer %s: %s"
+#~ msgid "Unable to add token user list."
+#~ msgstr "No se puede añadir lista de usuarios de señal."
 
diff --git a/keystone/locale/fi_FI/LC_MESSAGES/keystone.po b/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
index 3f5e14db..65f84a6d 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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) "
@@ -120,11 +120,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -490,35 +485,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,68 +552,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
 msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
-
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
-
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
+#~ msgid "Unable to add token user list."
 #~ msgstr ""
 
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone.po b/keystone/locale/fr/LC_MESSAGES/keystone.po
index 43e889f8..9607c22e 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 17:05+0000\n"
 "PO-Revision-Date: 2013-05-17 16:06+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French "
@@ -120,11 +120,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -490,35 +485,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,68 +552,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
 msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
-
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
-
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
+#~ msgid "Unable to add token user list."
 #~ msgstr ""
 
diff --git a/keystone/locale/hu/LC_MESSAGES/keystone.po b/keystone/locale/hu/LC_MESSAGES/keystone.po
index d6c1de3c..0c860acf 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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"
@@ -124,13 +124,6 @@ msgstr "Rosszul formázott végpont: %s hiányos formátum (hiányzik egy típus
 msgid "Unable to open template file %s"
 msgstr "Nem nyitható meg a sablonfájl: %s"
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-"HTTP PERF: %(time).5f másodperc eddig: %(method)s %(host)s:%(port)s "
-"%(path)s)"
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -190,7 +183,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -206,21 +199,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr "arg_dict: %s"
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, fuzzy, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr "Hitelesítés sikertelen. %s innen: %s"
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr "Az erőforrás nem található."
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr "%(arg0)s indítása ezen: %(host)s:%(port)s"
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -253,13 +246,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr "Többszörös név: %s."
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr "Többszörös azonosító: %s."
@@ -500,35 +493,35 @@ msgstr "%s szerep hozzárendelése %s felhasználóhoz %s bérlőben"
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr "EC2 hitelesítési adatok létrehozása %s felhasználóhoz és %s bérlőhöz"
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -567,29 +560,33 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
-msgstr "Nem vehető fel a token felhasználólistája."
-
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
-msgstr "A token nem adható a visszavonási listához."
-
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
 
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
 
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr "A token nem adható a visszavonási listához."
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
+#~ "HTTP PERF: %(time).5f másodperc eddig: "
+#~ "%(method)s %(host)s:%(port)s %(path)s)"
 
-#~ msgid "enforce %s: %s"
-#~ msgstr "%s kikényszerítése: %s"
+#~ msgid "Unable to add token user list."
+#~ msgstr "Nem vehető fel a token felhasználólistája."
 
diff --git a/keystone/locale/it/LC_MESSAGES/keystone.po b/keystone/locale/it/LC_MESSAGES/keystone.po
index 958c30f9..06ed0406 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 17:05+0000\n"
 "PO-Revision-Date: 2013-05-17 16:06+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian "
@@ -126,11 +126,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr "Impossibile aprire il file di template %s"
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr "HTTP PERF: %(time).5f secondi a %(method)s %(host)s:%(port)s %(path)s)"
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -192,7 +187,7 @@ msgstr "RBAC: autorizzazione concessa"
 msgid "RBAC: Adding query filter params (%s)"
 msgstr "RBAC: aggiunta parametri del filtro della query (%s)"
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr "Token non valido in normalize_domain_id"
 
@@ -208,21 +203,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr "arg_dict: %s"
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, fuzzy, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr "Autorizzazione non riuscita. %s da %s"
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr "Impossibile trovare la risorsa."
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr "Avvio %(arg0)s in %(host)s:%(port)s"
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr "Errore del server"
 
@@ -255,13 +250,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr "Nome duplicato, %s."
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr "ID duplicato, %s."
@@ -504,35 +499,35 @@ msgstr "Assegna il ruolo %s all'utente %s nel tenant %s"
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr "Creazione credenziale ec2 per l'utente %s e del tenant %s"
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr "Utente non trovato nel gruppo"
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 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:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr "Ruolo %s non trovato"
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr "Modifica nome non supportato da LDAP"
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, fuzzy, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr "L'utente %s è già membro del gruppo %s"
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -571,23 +566,31 @@ msgstr "Il dominio non predefinito non è supportato"
 msgid "Domain scoped token is not supported"
 msgstr "L'ambito del dominio token non è supportato"
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
-msgstr "Impossibile aggiungere un elenco utenti token."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
-msgstr "Impossibile aggiungere un token ad un elenco di revoca."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr "RBAC: autorizzazione %s(%s)"
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr "Impossibile aggiungere un token ad un elenco di revoca."
 
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
+#~ msgstr "HTTP PERF: %(time).5f secondi a %(method)s %(host)s:%(port)s %(path)s)"
 
-#~ msgid "enforce %s: %s"
-#~ msgstr "applica %s: %s"
+#~ msgid "Unable to add token user list."
+#~ msgstr "Impossibile aggiungere un elenco utenti token."
 
diff --git a/keystone/locale/ja/LC_MESSAGES/keystone.po b/keystone/locale/ja/LC_MESSAGES/keystone.po
index d4cff3f6..2c1de10c 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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 "
@@ -121,11 +121,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -185,7 +180,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -201,21 +196,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -248,13 +243,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -491,35 +486,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -558,68 +553,31 @@ msgstr ""
 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 "失効リストにトークンを追加できません。"
-
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
 
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
 
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr "失効リストにトークンを追加できません。"
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
-#~ msgstr ""
+#~ msgid "Unable to add token user list."
+#~ msgstr "ユーザーリストにトークンを追加できません。"
 
diff --git a/keystone/locale/ka_GE/LC_MESSAGES/keystone.po b/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
index 35f71d42..f76075d9 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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"
@@ -120,11 +120,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -490,35 +485,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr "როლი %s ვერ მოიძებნა"
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,68 +552,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
 msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
-
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
-
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
+#~ msgid "Unable to add token user list."
 #~ msgstr ""
 
diff --git a/keystone/locale/keystone.pot b/keystone/locale/keystone.pot
index 5ab34be6..0f7f7acb 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.217\n"
+"jenkins.keystone.propose.translation.update.232\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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"
@@ -120,11 +120,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -490,35 +485,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,11 +552,25 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
+#: keystone/token/backends/memcache.py:172
 msgid "Unable to add token to revocation list."
 msgstr ""
 
diff --git a/keystone/locale/ko_KR/LC_MESSAGES/keystone.po b/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
index 26433ea8..e7358aee 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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"
@@ -120,11 +120,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -490,35 +485,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,68 +552,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
 msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
-
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
-
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
+#~ msgid "Unable to add token user list."
 #~ msgstr ""
 
diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
index 8176a688..fd703e2d 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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) "
@@ -120,11 +120,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -490,35 +485,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,68 +552,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
 msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
-
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
-
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
+#~ msgid "Unable to add token user list."
 #~ msgstr ""
 
diff --git a/keystone/locale/ro/LC_MESSAGES/keystone.po b/keystone/locale/ro/LC_MESSAGES/keystone.po
new file mode 100644
index 00000000..c7621adf
--- /dev/null
+++ b/keystone/locale/ro/LC_MESSAGES/keystone.po
@@ -0,0 +1,577 @@
+# Romanian 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-06-14 17:05+0000\n"
+"PO-Revision-Date: 2013-06-08 07:51+0000\n"
+"Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
+"Language-Team: Romanian "
+"(http://www.transifex.com/projects/p/openstack/language/ro/)\n"
+"Plural-Forms: nplurals=3; "
+"plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2: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 ""
+
+#: keystone/clean.py:25
+#, python-format
+msgid "%(property_name)s cannot be less than %(min_length)s characters."
+msgstr ""
+
+#: keystone/clean.py:29
+#, python-format
+msgid "%(property_name)s should not be greater than %(max_length)s characters."
+msgstr ""
+
+#: keystone/clean.py:36
+#, python-format
+msgid "%(property_name)s is not a %(display_expected_type)s"
+msgstr ""
+
+#: keystone/test.py:117
+#, python-format
+msgid "Failed to checkout %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:72
+#, python-format
+msgid "Project is disabled: %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:78 keystone/auth/plugins/password.py:39
+#, python-format
+msgid "Domain is disabled: %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:84 keystone/auth/plugins/password.py:45
+#, python-format
+msgid "User is disabled: %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: keystone/catalog/core.py:38
+#, python-format
+msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s"
+msgstr ""
+
+#: keystone/catalog/core.py:43
+#, python-format
+msgid ""
+"Malformed endpoint %(url)s - unknown key %(keyerror)s(are you missing "
+"brackets ?)"
+msgstr ""
+
+#: keystone/catalog/core.py:49
+#, python-format
+msgid ""
+"Malformed endpoint %s - incomplete format                   (are you "
+"missing a type notifier ?)"
+msgstr ""
+
+#: keystone/catalog/backends/templated.py:109
+#, python-format
+msgid "Unable to open template file %s"
+msgstr ""
+
+#: keystone/common/cms.py:42
+#, python-format
+msgid "Verify error: %s"
+msgstr ""
+
+#: keystone/common/cms.py:134
+msgid ""
+"Signing error: Unable to load certificate - ensure you've configured PKI "
+"with 'keystone-manage pki_setup'"
+msgstr ""
+
+#: keystone/common/cms.py:138
+#, python-format
+msgid "Signing error: %s"
+msgstr ""
+
+#: keystone/common/config.py:89
+#, python-format
+msgid "Unable to locate specified logging config file: %s"
+msgstr ""
+
+#: keystone/common/config.py:107
+msgid "Invalid syslog facility"
+msgstr ""
+
+#: keystone/common/controller.py:18
+#, python-format
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
+msgstr ""
+
+#: keystone/common/controller.py:26
+msgid "RBAC: Invalid token"
+msgstr ""
+
+#: keystone/common/controller.py:36 keystone/common/controller.py:57
+msgid "RBAC: Invalid user"
+msgstr ""
+
+#: keystone/common/controller.py:42
+msgid "RBAC: Proceeding without project"
+msgstr ""
+
+#: keystone/common/controller.py:62
+msgid "RBAC: Proceeding without tenant"
+msgstr ""
+
+#: keystone/common/controller.py:92 keystone/common/controller.py:144
+msgid "RBAC: Bypassing authorization"
+msgstr ""
+
+#: keystone/common/controller.py:101 keystone/common/controller.py:142
+msgid "RBAC: Authorization granted"
+msgstr ""
+
+#: keystone/common/controller.py:131
+#, python-format
+msgid "RBAC: Adding query filter params (%s)"
+msgstr ""
+
+#: keystone/common/controller.py:322
+msgid "Invalid token in normalize_domain_id"
+msgstr ""
+
+#: keystone/common/utils.py:232
+msgid ""
+"Error setting up the debug environment. Verify that the option --debug-"
+"url has the format <host>:<port> and that a debugger processes is "
+"listening on that port."
+msgstr ""
+
+#: keystone/common/wsgi.py:162
+#, python-format
+msgid "arg_dict: %s"
+msgstr ""
+
+#: keystone/common/wsgi.py:186
+#, python-format
+msgid "Authorization failed. %(exception)s from %(remote_addr)s"
+msgstr ""
+
+#: keystone/common/wsgi.py:429
+msgid "The resource could not be found."
+msgstr ""
+
+#: keystone/common/wsgi_server.py:72
+#, python-format
+msgid "Starting %(arg0)s on %(host)s:%(port)s"
+msgstr ""
+
+#: keystone/common/wsgi_server.py:132
+msgid "Server error"
+msgstr ""
+
+#: keystone/common/ldap/core.py:79
+#, python-format
+msgid "Invalid LDAP deref option: %s. Choose one of: "
+msgstr ""
+
+#: keystone/common/ldap/core.py:87
+#, python-format
+msgid "Invalid LDAP TLS certs option: %(option). Choose one of: %(options)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:99
+#, python-format
+msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:189
+#, python-format
+msgid ""
+"Invalid additional attribute mapping: \"%s\". Format must be "
+"<ldap_attribute>:<keystone_attribute>"
+msgstr ""
+
+#: keystone/common/ldap/core.py:195
+#, python-format
+msgid ""
+"Invalid additional attribute mapping: \"%(item)s\". Value "
+"\"%(attr_map)s\" must use one of %(keys)s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
+#, python-format
+msgid "Duplicate name, %s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
+#, python-format
+msgid "Duplicate ID, %s."
+msgstr ""
+
+#: keystone/common/ldap/core.py:294
+#, python-format
+msgid "LDAP %s create"
+msgstr ""
+
+#: keystone/common/ldap/core.py:372
+#, python-format
+msgid "LDAP %s update"
+msgstr ""
+
+#: keystone/common/ldap/core.py:405
+#, python-format
+msgid "LDAP %s delete"
+msgstr ""
+
+#: keystone/common/ldap/core.py:430
+#, python-format
+msgid "LDAP init: url=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:431
+#, python-format
+msgid ""
+"LDAP init: use_tls=%(use_tls)s\n"
+"tls_cacertfile=%(tls_cacertfile)s\n"
+"tls_cacertdir=%(tls_cacertdir)s\n"
+"tls_req_cert=%(tls_req_cert)s\n"
+"tls_avail=%(tls_avail)s\n"
+msgstr ""
+
+#: keystone/common/ldap/core.py:450
+msgid "Invalid TLS / LDAPS combination"
+msgstr ""
+
+#: keystone/common/ldap/core.py:454
+#, python-format
+msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
+msgstr ""
+
+#: keystone/common/ldap/core.py:464
+#, python-format
+msgid "tls_cacertfile %s not found or is not a file"
+msgstr ""
+
+#: keystone/common/ldap/core.py:476
+#, python-format
+msgid "tls_cacertdir %s not found or is not a directory"
+msgstr ""
+
+#: keystone/common/ldap/core.py:483
+#, python-format
+msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:497
+#, python-format
+msgid "LDAP bind: dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:508
+#, python-format
+msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:514
+#, python-format
+msgid ""
+"LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, "
+"attrs=%(attrlist)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:567
+msgid ""
+"LDAP Server does not support paging. Disable paging in keystone.conf to "
+"avoid this message."
+msgstr ""
+
+#: keystone/common/ldap/core.py:584
+#, python-format
+msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:590
+#, python-format
+msgid "LDAP delete: dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:595
+#, python-format
+msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:146
+#, python-format
+msgid "FakeLdap initialize url=%s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:156
+#, python-format
+msgid "FakeLdap bind dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:163
+#, python-format
+msgid "FakeLdap bind fail: dn=%s not found"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:170
+#, python-format
+msgid "FakeLdap bind fail: password for dn=%s not found"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:175
+#, python-format
+msgid "FakeLdap bind fail: password for dn=%s does not match"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:190
+#, python-format
+msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:193
+#, python-format
+msgid "FakeLdap add item failed: dn=%s is already in store."
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:207 keystone/common/ldap/fakeldap.py:221
+#, python-format
+msgid "FakeLdap delete item: dn=%s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:211 keystone/common/ldap/fakeldap.py:225
+#, python-format
+msgid "FakeLdap delete item failed: dn=%s not found."
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:240
+#, python-format
+msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:245
+#, python-format
+msgid "FakeLdap modify item failed: dn=%s not found."
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:262
+#, python-format
+msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:273
+#, python-format
+msgid ""
+"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
+"\"%(v)s\" to delete"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:279
+#, python-format
+msgid "FakeLdap modify item failed: unknown command %s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:281
+#, python-format
+msgid "modify_s action %s not implemented"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:300
+#, python-format
+msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:306
+msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
+msgstr ""
+
+#: keystone/common/ldap/fakeldap.py:320
+#, python-format
+msgid "Search scope %s not implemented."
+msgstr ""
+
+#: keystone/common/sql/core.py:205
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: keystone/common/sql/legacy.py:180
+#, python-format
+msgid "Cannot migrate EC2 credential: %s"
+msgstr ""
+
+#: keystone/common/sql/migration.py:47
+msgid "version should be an integer"
+msgstr ""
+
+#: keystone/common/sql/nova.py:62
+#, python-format
+msgid "Create tenant %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:79
+#, python-format
+msgid "Create user %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:88
+#, python-format
+msgid "Add user %(user_id)s to tenant %(tenant_id)s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:97
+#, python-format
+msgid "Ignoring existing role %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:104
+#, python-format
+msgid "Create role %s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:114
+#, python-format
+msgid "Assign role %(role_id)s to user %(user_id)s on tenant %(tenant_id)s"
+msgstr ""
+
+#: keystone/common/sql/nova.py:133
+#, python-format
+msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
+msgid "User not found in group"
+msgstr ""
+
+#: keystone/identity/backends/sql.py:425
+#, python-format
+msgid "Cannot remove role that has not been granted, %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:82
+#, python-format
+msgid "Expected dict or list: %s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:677
+#, python-format
+msgid "Role %s not found"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:894
+msgid "Changing Name not supported by LDAP"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:907
+#, python-format
+msgid "User %(user_id)s is already a member of group %(group_id)s"
+msgstr ""
+
+#: keystone/identity/backends/ldap/core.py:950
+#, 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 ""
+
+#: keystone/openstack/common/policy.py:404
+#, python-format
+msgid "No handler for matches of kind %s"
+msgstr ""
+
+#: keystone/openstack/common/policy.py:679
+#, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr ""
+
+#: keystone/policy/backends/rules.py:93
+#, python-format
+msgid "enforce %(action)s: %(credentials)s"
+msgstr ""
+
+#: keystone/token/controllers.py:465 keystone/token/controllers.py:468
+msgid "Token does not belong to specified tenant."
+msgstr ""
+
+#: keystone/token/controllers.py:475
+msgid "Non-default domain is not supported"
+msgstr ""
+
+#: keystone/token/controllers.py:483
+msgid "Domain scoped token is not supported"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
+
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
+
diff --git a/keystone/locale/ru/LC_MESSAGES/keystone.po b/keystone/locale/ru/LC_MESSAGES/keystone.po
index bfc75bdb..4c6b1734 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 17:05+0000\n"
 "PO-Revision-Date: 2013-05-17 16:06+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian "
@@ -121,11 +121,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -185,7 +180,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -201,21 +196,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -248,13 +243,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -491,35 +486,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -558,68 +553,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
 msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
-
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
-
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
+#~ msgid "Unable to add token user list."
 #~ msgstr ""
 
diff --git a/keystone/locale/vi_VN/LC_MESSAGES/keystone.po b/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
index 533803df..ec2988bc 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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) "
@@ -120,11 +120,6 @@ msgstr ""
 msgid "Unable to open template file %s"
 msgstr ""
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr ""
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr ""
 msgid "RBAC: Adding query filter params (%s)"
 msgstr ""
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr ""
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr ""
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr ""
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -490,35 +485,35 @@ msgstr ""
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr ""
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,68 +552,31 @@ msgstr ""
 msgid "Domain scoped token is not supported"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:83
-msgid "Unable to add token user list."
+#: keystone/token/backends/memcache.py:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
 msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr ""
-
-#~ msgid "Authorization failed. %s from %s"
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP scope: %s. Choose one of: "
-#~ msgstr ""
-
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
-
-#~ msgid "LDAP add: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP search: dn=%s, scope=%s, query=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP modify: dn=%s, modlist=%s"
-#~ msgstr ""
-
-#~ msgid "LDAP delete_ext: dn=%s, serverctrls=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap add item: dn=%s, attrs=%s"
-#~ msgstr ""
-
-#~ msgid "FakeLdap modify item: dn=%s attrs=%s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "FakeLdap modify item failed: item has"
-#~ " no attribute \"%s\" with value "
-#~ "\"%s\" to delete"
-#~ msgstr ""
-
-#~ msgid "FakeLdap search at dn=%s scope=%s query=%s"
-#~ msgstr ""
-
-#~ msgid "Add user %s to tenant %s"
-#~ msgstr ""
-
-#~ msgid "Assign role %s to user %s on tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Creating ec2 cred for user %s and tenant %s"
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr ""
 
-#~ msgid "User %s is already a member of group %s"
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
 #~ msgstr ""
 
-#~ msgid "enforce %s: %s"
+#~ msgid "Unable to add token user list."
 #~ msgstr ""
 
diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
index 8c6af897..f7e096ba 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-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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) "
@@ -120,11 +120,6 @@ msgstr "端点 %s 的格式不正确 - 格式不完整（您遗漏了类型通�
 msgid "Unable to open template file %s"
 msgstr "无法打开模板文件 %s"
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr "HTTP 性能：%(time).5f 秒，至 %(method)s %(host)s:%(port)s %(path)s)"
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr "RBAC：已授予权限"
 msgid "RBAC: Adding query filter params (%s)"
 msgstr "RBAC：正在添加查询过滤器参数 (%s)"
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr "normalize_domain_id 中的令牌无效"
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr "arg_dict：%s"
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, fuzzy, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr "授权失败。%s 来自 %s"
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr "找不到该资源。"
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr "正在 %(host)s:%(port)s 上启动 %(arg0)s"
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr "服务器错误"
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr "名称 %s 重复。"
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr "标识 %s 重复。"
@@ -490,35 +485,35 @@ msgstr "请将角色 %s 分配给用户 %s（在租户 %s 上）"
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr "正在为用户 %s 和租户 %s 创建 ec2 凭证"
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr "在组中找不到用户"
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr "无法除去尚未授予的角色 %s"
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr "找不到角色 %s"
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr "更改名称不受 LDAP 支持"
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, fuzzy, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr "用户 %s 已是组 %s 的成员"
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,23 +552,31 @@ msgstr "非缺省域不受支持"
 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:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
-msgstr "无法将令牌添加至撤销列表。"
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr "RBAC：正在授权 %s(%s)"
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr "无法将令牌添加至撤销列表。"
 
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
+#~ msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
+#~ msgstr "HTTP 性能：%(time).5f 秒，至 %(method)s %(host)s:%(port)s %(path)s)"
 
-#~ msgid "enforce %s: %s"
-#~ msgstr "请强制执行 %s：%s"
+#~ msgid "Unable to add token user list."
+#~ msgstr "无法添加令牌用户列表。"
 
diff --git a/keystone/locale/zh_TW/LC_MESSAGES/keystone.po b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
index 375815eb..bae3402f 100644
--- a/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
+++ b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-05-30 17:05+0000\n"
+"POT-Creation-Date: 2013-06-14 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) "
@@ -120,11 +120,6 @@ msgstr "端點 %s 的格式不正確 - 格式不完整（遺漏了類型通知�
 msgid "Unable to open template file %s"
 msgstr "無法開啟範本檔 %s"
 
-#: keystone/common/bufferedhttp.py:101
-#, python-format
-msgid "HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
-msgstr "HTTP PERF：%(time).5f 秒鐘以 (%(method)s %(host)s:%(port)s %(path)s)"
-
 #: keystone/common/cms.py:42
 #, python-format
 msgid "Verify error: %s"
@@ -184,7 +179,7 @@ msgstr "RBAC：已授與權限"
 msgid "RBAC: Adding query filter params (%s)"
 msgstr "RBAC：正在新增查詢過濾器參數 (%s)"
 
-#: keystone/common/controller.py:331
+#: keystone/common/controller.py:322
 msgid "Invalid token in normalize_domain_id"
 msgstr "normalize_domain_id 中的記號無效"
 
@@ -200,21 +195,21 @@ msgstr ""
 msgid "arg_dict: %s"
 msgstr "arg_dict：%s"
 
-#: keystone/common/wsgi.py:185
+#: keystone/common/wsgi.py:186
 #, fuzzy, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr "授權失敗。%s（自 %s）"
 
-#: keystone/common/wsgi.py:428
+#: keystone/common/wsgi.py:429
 msgid "The resource could not be found."
 msgstr "找不到資源。"
 
-#: keystone/common/wsgi_server.py:59
+#: keystone/common/wsgi_server.py:72
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr "正在 %(host)s:%(port)s 上啟動 %(arg0)s"
 
-#: keystone/common/wsgi_server.py:119
+#: keystone/common/wsgi_server.py:132
 msgid "Server error"
 msgstr "伺服器錯誤"
 
@@ -247,13 +242,13 @@ msgid ""
 "\"%(attr_map)s\" must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:603
-#: keystone/identity/backends/kvs.py:631
+#: keystone/common/ldap/core.py:279 keystone/identity/backends/kvs.py:596
+#: keystone/identity/backends/kvs.py:624
 #, python-format
 msgid "Duplicate name, %s."
 msgstr "重複的名稱，%s。"
 
-#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:596
+#: keystone/common/ldap/core.py:289 keystone/identity/backends/kvs.py:589
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr "重複的 ID，%s。"
@@ -490,35 +485,35 @@ msgstr "將角色 %s 指派給使用者 %s（在 Tenant %s 上）"
 msgid "Creating ec2 cred for user %(user_id)s and tenant %(tenant_id)s"
 msgstr "正在給使用者 %s 及 Tenant %s 建立 EC2 Cred"
 
-#: keystone/identity/backends/kvs.py:257 keystone/identity/backends/kvs.py:266
+#: keystone/identity/backends/kvs.py:250 keystone/identity/backends/kvs.py:259
 msgid "User not found in group"
 msgstr "在群組中找不到使用者"
 
-#: keystone/identity/backends/sql.py:424
+#: keystone/identity/backends/sql.py:425
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr "無法移除尚未授權的角色，%s"
 
-#: keystone/identity/backends/ldap/core.py:95
+#: keystone/identity/backends/ldap/core.py:82
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/identity/backends/ldap/core.py:690
+#: keystone/identity/backends/ldap/core.py:677
 #, python-format
 msgid "Role %s not found"
 msgstr "找不到角色 %s"
 
-#: keystone/identity/backends/ldap/core.py:907
+#: keystone/identity/backends/ldap/core.py:894
 msgid "Changing Name not supported by LDAP"
 msgstr "LDAP 不支援變更名稱"
 
-#: keystone/identity/backends/ldap/core.py:920
+#: keystone/identity/backends/ldap/core.py:907
 #, fuzzy, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr "使用者 %s 已是群組 %s 的成員"
 
-#: keystone/identity/backends/ldap/core.py:963
+#: keystone/identity/backends/ldap/core.py:950
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_dn)s'. The user should "
@@ -557,23 +552,31 @@ msgstr "不支援非預設網域"
 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:144
+#, python-format
+msgid ""
+"Successful set of token-index-list for user-key \"%(user_key)s\", "
+"#%(count)d records"
+msgstr ""
 
-#: keystone/token/backends/memcache.py:93
-msgid "Unable to add token to revocation list."
-msgstr "無法將記號新增至撤銷清冊。"
+#: keystone/token/backends/memcache.py:154
+#, python-format
+msgid ""
+"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
+"%(cas_retry)d of %(cas_retry_max)d"
+msgstr ""
 
-#~ msgid "RBAC: Authorizing %s(%s)"
-#~ msgstr "RBAC：正在授權 %s(%s)"
+#: keystone/token/backends/memcache.py:163
+msgid "Unable to add token user list"
+msgstr ""
 
-#~ msgid "Invalid LDAP tls certs option: %s. Choose one of: "
-#~ msgstr ""
+#: keystone/token/backends/memcache.py:172
+msgid "Unable to add token to revocation list."
+msgstr "無法將記號新增至撤銷清冊。"
 
-#~ msgid "Invalid LDAP TLS_AVAIL option: %s. TLSnot available"
-#~ msgstr ""
+#~ 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)"
 
-#~ msgid "enforce %s: %s"
-#~ msgstr "施行 %s：%s"
+#~ msgid "Unable to add token user list."
+#~ msgstr "無法新增記號使用者清單。"