diff --git a/keystone/locale/de/LC_MESSAGES/keystone.po b/keystone/locale/de/LC_MESSAGES/keystone.po
index c477f860d8..00042cefef 100644
--- a/keystone/locale/de/LC_MESSAGES/keystone.po
+++ b/keystone/locale/de/LC_MESSAGES/keystone.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -423,10 +423,6 @@ msgstr ""
 "Feld \"remaining_uses\" ist auf %(value)s festgelegt, es darf jedoch nicht "
 "festgelegt werden, um eine Vertrauensbeziehung zu übertragen"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr ""
-"Ungültiges Token gefunden. Es ist sowohl projekt- als auch domänenorientiert."
-
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr ""
@@ -479,10 +475,6 @@ msgstr "Ungültiger LDAP Bereich: %(scope)s. Wählen Sie aus: %(options)s"
 msgid "Invalid TLS / LDAPS combination"
 msgstr "Ungültige TLS /LDAPS Kombination"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr "Ungültiger Datentyp für Prüfungsinformationen: %(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "Ungültiges Blob-Objekt im Berechtigungsnachweis"
 
@@ -718,11 +710,6 @@ msgstr ""
 msgid "The action you have requested has not been implemented."
 msgstr "Die von Ihnen angeforderte Aktion wurde nicht implementiert."
 
-msgid "The configured token provider does not support bind authentication."
-msgstr ""
-"Der konfigurierte Token-Provider unterstützt die Bindungsauthentifizierung "
-"nicht."
-
 #, python-format
 msgid ""
 "The password length must be less than or equal to %(size)i. The server could "
@@ -958,10 +945,6 @@ msgstr ""
 msgid "group %(group)s"
 msgstr "Gruppe %(group)s"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "ungültiges Datumsformat %s"
-
 #, python-format
 msgid ""
 "it is not permitted to have two projects acting as domains with the same "
@@ -1007,7 +990,3 @@ msgstr "tls_cacertdir %s nicht gefunden oder ist kein Verzeichnis"
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "tls_cacertfile %s wurde nicht gefunden oder ist keine Datei"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr "Tokenreferenz muss vom Typ 'KeystoneToken' sein. Abgerufen wurde: %s"
diff --git a/keystone/locale/en_GB/LC_MESSAGES/keystone.po b/keystone/locale/en_GB/LC_MESSAGES/keystone.po
index 7d0c70a05f..fc0520faba 100644
--- a/keystone/locale/en_GB/LC_MESSAGES/keystone.po
+++ b/keystone/locale/en_GB/LC_MESSAGES/keystone.po
@@ -10,11 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-06-15 05:24+0000\n"
+"PO-Revision-Date: 2018-08-08 08:58+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -486,10 +486,6 @@ msgstr ""
 msgid "Could not validate the access token"
 msgstr "Could not validate the access token"
 
-#, python-format
-msgid "Could not verify unknown bind: {%(bind_type)s: %(identifier)s}"
-msgstr "Could not verify unknown bind: {%(bind_type)s: %(identifier)s}"
-
 msgid "Credential could not be decrypted. Please contact the administrator"
 msgstr "Credential could not be decrypted. Please contact the administrator"
 
@@ -644,6 +640,10 @@ msgstr ""
 "with the request since it is either malformed or otherwise incorrect. The "
 "client is assumed to be in error."
 
+#, python-format
+msgid "Failed to deserialize %(obj)s. Data is %(data)s"
+msgstr "Failed to deserialise %(obj)s. Data is %(data)s"
+
 msgid "Failed to validate token"
 msgstr "Failed to validate token"
 
@@ -658,9 +658,6 @@ msgstr ""
 "Field \"remaining_uses\" is set to %(value)s while it must not be set in "
 "order to redelegate a trust"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr "Found invalid token: scoped to both project and domain."
-
 msgid "Global role cannot imply a domain-specific role"
 msgstr "Global role cannot imply a domain-specific role"
 
@@ -715,6 +712,12 @@ msgstr ""
 "Insufficient auth methods received for %(user_id)s. Auth Methods Provided: "
 "%(methods)s."
 
+msgid "Internal RBAC enforcement error, invalid rule (action) name."
+msgstr "Internal RBAC enforcement error, invalid rule (action) name."
+
+msgid "Internal error processing authentication and authorization."
+msgstr "Internal error processing authentication and authorisation."
+
 msgid "Invalid EC2 signature."
 msgstr "Invalid EC2 signature."
 
@@ -744,10 +747,6 @@ msgstr "Invalid application credential ID or secret"
 msgid "Invalid application credential: %(detail)s"
 msgstr "Invalid application credential: %(detail)s"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr "Invalid audit info data type: %(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "Invalid blob in credential"
 
@@ -815,6 +814,10 @@ msgstr ""
 "Region+Service allowed. Request was - Endpoint: %(endpoint_id)s, Service: "
 "%(service_id)s, Region: %(region_id)s."
 
+#, python-format
+msgid "Invalid resource limit: %(reason)s."
+msgstr "Invalid resource limit: %(reason)s."
+
 #, python-format
 msgid ""
 "Invalid rule: %(identity_value)s. Both 'groups' and 'domain' keywords must "
@@ -826,9 +829,6 @@ msgstr ""
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-msgid "Invalid signature."
-msgstr "Invalid signature."
-
 msgid "Invalid user / password"
 msgstr "Invalid user / password"
 
@@ -838,11 +838,17 @@ msgstr "Invalid username or TOTP passcode"
 msgid "Invalid username or password"
 msgstr "Invalid username or password"
 
-msgid "Kerberos credentials do not match those in bind"
-msgstr "Kerberos credentials do not match those in bind"
-
-msgid "Kerberos credentials required and not present"
-msgstr "Kerberos credentials required and not present"
+#, python-format
+msgid ""
+"Keystone cannot start due to project hierarchical depth in the current "
+"deployment (project_ids: %(project_id)s) exceeds the enforcement model's "
+"maximum limit of %(max_limit_depth)s. Please use a different enforcement "
+"model to correct the issue."
+msgstr ""
+"Keystone cannot start due to project hierarchical depth in the current "
+"deployment (project_ids: %(project_id)s) exceeds the enforcement model's "
+"maximum limit of %(max_limit_depth)s. Please use a different enforcement "
+"model to correct the issue."
 
 msgid "LDAP does not support write operations"
 msgstr "LDAP does not support write operations"
@@ -892,10 +898,6 @@ msgstr "Multiple domains are not supported"
 msgid "Must specify either domain or project"
 msgstr "Must specify either domain or project"
 
-#, python-format
-msgid "Named bind mode %(name)s not in bind information"
-msgstr "Named bind mode %(name)s not in bind information"
-
 msgid "Neither Project Domain ID nor Project Domain Name was provided."
 msgstr "Neither Project Domain ID nor Project Domain Name was provided."
 
@@ -909,9 +911,6 @@ msgstr ""
 msgid "No authenticated user"
 msgstr "No authenticated user"
 
-msgid "No bind information present in token."
-msgstr "No bind information present in token."
-
 msgid "No domain information specified as part of list request"
 msgstr "No domain information specified as part of list request"
 
@@ -1168,9 +1167,6 @@ msgstr "The authenticated project should match the project_id"
 msgid "The authenticated user should match the trustor"
 msgstr "The authenticated user should match the trustor"
 
-msgid "The configured token provider does not support bind authentication."
-msgstr "The configured token provider does not support bind authentication."
-
 #, python-format
 msgid ""
 "The given operator %(_op)s is not valid. It must be one of the following: "
@@ -1387,13 +1383,6 @@ msgstr ""
 "Unable to update or delete registered limit %(id)s because there are project "
 "limits associated with it."
 
-msgid ""
-"Unable to update the registered limits because there are project limits "
-"associated with it."
-msgstr ""
-"Unable to update the registered limits because there are project limits "
-"associated with it."
-
 msgid "Unable to validate password due to invalid configuration"
 msgstr "Unable to validate password due to invalid configuration"
 
@@ -1622,8 +1611,8 @@ msgid "group %(group)s"
 msgstr "group %(group)s"
 
 #, python-format
-msgid "invalid date format %s"
-msgstr "invalid date format %s"
+msgid "invalidate date format %s"
+msgstr "invalidate date format %s"
 
 #, python-format
 msgid ""
@@ -1684,7 +1673,3 @@ msgstr "tls_cacertdir %s not found or is not a directory"
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "tls_cacertfile %s not found or is not a file"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr "token reference must be a KeystoneToken type, got: %s"
diff --git a/keystone/locale/es/LC_MESSAGES/keystone.po b/keystone/locale/es/LC_MESSAGES/keystone.po
index c14bb2fb31..54621acc81 100644
--- a/keystone/locale/es/LC_MESSAGES/keystone.po
+++ b/keystone/locale/es/LC_MESSAGES/keystone.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -418,10 +418,6 @@ msgstr ""
 "El campo \"remaining_uses\" está establecido en %(value)s, pero no debe "
 "estar establecido para poder redelegar una confianza"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr ""
-"Se ha encontrado una señal no válida: tiene un ámbito de proyecto y dominio."
-
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr ""
@@ -476,11 +472,6 @@ msgstr ""
 msgid "Invalid TLS / LDAPS combination"
 msgstr "Combinación TLS/LDAPS no válida"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr ""
-"Tipo de datos de información de auditoría no válido: %(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "Blob no válido en credencial"
 
@@ -713,11 +704,6 @@ msgstr ""
 msgid "The action you have requested has not been implemented."
 msgstr "La acción que ha solicitado no ha sido implemento"
 
-msgid "The configured token provider does not support bind authentication."
-msgstr ""
-"El proveedor de señales configurado no da soporte a la autenticación de "
-"enlaces."
-
 #, python-format
 msgid ""
 "The password length must be less than or equal to %(size)i. The server could "
@@ -953,10 +939,6 @@ msgstr ""
 msgid "group %(group)s"
 msgstr "grupo %(group)s"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "formato de fecha no válido %s"
-
 #, python-format
 msgid ""
 "it is not permitted to have two projects acting as domains with the same "
@@ -1000,8 +982,3 @@ msgstr "No se ha encontrado o no es un directorio tls_cacertdir %s"
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "No se ha encontrado o no es un fichero tls_cacertfile %s"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr ""
-"la referencia de señal debe ser un tipo KeystoneToken, se ha obtenido: %s"
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone.po b/keystone/locale/fr/LC_MESSAGES/keystone.po
index b72744c933..19eab5216a 100644
--- a/keystone/locale/fr/LC_MESSAGES/keystone.po
+++ b/keystone/locale/fr/LC_MESSAGES/keystone.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -412,9 +412,6 @@ msgstr ""
 "La zone \"remaining_uses\" est définie sur %(value)s alors qu'elle ne doit "
 "pas être définie pour redéléguer une fiducie"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr "Jeton non valide trouvé : portée de projet et de domaine."
-
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr ""
@@ -470,10 +467,6 @@ msgstr "Portée LDAP invalide: %(scope)s. Choisissez parmi: %(options)s"
 msgid "Invalid TLS / LDAPS combination"
 msgstr "Combinaison TLS / LDAPS invalide"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr "Type de données d'information d'audit non valide : %(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "Blob non valide dans les informations d'identification"
 
@@ -706,11 +699,6 @@ msgstr ""
 msgid "The action you have requested has not been implemented."
 msgstr "L'action que vous avez demandée n'a pas été implémentée."
 
-msgid "The configured token provider does not support bind authentication."
-msgstr ""
-"Le fournisseur de jeton configuré ne prend pas en charge l'authentification "
-"par opération de liaison."
-
 #, python-format
 msgid ""
 "The password length must be less than or equal to %(size)i. The server could "
@@ -943,10 +931,6 @@ msgstr ""
 msgid "group %(group)s"
 msgstr "groupe %(group)s"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "Format de date invalid %s"
-
 #, python-format
 msgid ""
 "it is not permitted to have two projects acting as domains with the same "
@@ -991,7 +975,3 @@ msgstr "tls_cacertdir %s introuvable ou n'est pas un répertoire"
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "tls_cacertfile %s introuvable ou n'est pas un fichier"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr "La référence de jeton doit être un type KeystoneToken, obtenu : %s"
diff --git a/keystone/locale/it/LC_MESSAGES/keystone.po b/keystone/locale/it/LC_MESSAGES/keystone.po
index 3ccfca5515..73c39833e1 100644
--- a/keystone/locale/it/LC_MESSAGES/keystone.po
+++ b/keystone/locale/it/LC_MESSAGES/keystone.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -409,9 +409,6 @@ msgstr ""
 "Il campo \"remaining_uses\" è impostato su %(value)s mentre non deve essere "
 "impostato per assegnare una nuova delega ad un trust"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr "trovato token non valido: in ambito sia di progetto che di dominio."
-
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr ""
@@ -467,11 +464,6 @@ msgstr ""
 msgid "Invalid TLS / LDAPS combination"
 msgstr "Combinazione TLS / LDAPS non valida"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr ""
-"Tipo di dati delle informazioni di verifica non valido: %(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "Blob non valido nella credenziale"
 
@@ -704,9 +696,6 @@ msgstr ""
 msgid "The action you have requested has not been implemented."
 msgstr "L'azione richiesta non è stata implementata."
 
-msgid "The configured token provider does not support bind authentication."
-msgstr "Il provider di token configurato non supporta l'autenticazione bind. "
-
 #, python-format
 msgid ""
 "The password length must be less than or equal to %(size)i. The server could "
@@ -938,10 +927,6 @@ msgstr ""
 msgid "group %(group)s"
 msgstr "gruppo %(group)s"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "formato data non valido %s"
-
 #, python-format
 msgid ""
 "it is not permitted to have two projects acting as domains with the same "
@@ -987,8 +972,3 @@ msgstr "Impossibile trovare tls_cacertdir %s o non è una directory"
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "Impossibile trovare tls_cacertfile %s o non è un file"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr ""
-"il riferimento al token deve essere un tipo KeystoneToken, ottenuto: %s"
diff --git a/keystone/locale/ja/LC_MESSAGES/keystone.po b/keystone/locale/ja/LC_MESSAGES/keystone.po
index 4c7d9edc3a..144611ac84 100644
--- a/keystone/locale/ja/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ja/LC_MESSAGES/keystone.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -403,11 +403,6 @@ msgstr ""
 "フィールド \"remaining_uses\" は %(value)s になっていますが、トラストを再委任"
 "するにはこのフィールドが設定されていてはなりません"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr ""
-"無効なトークンが見つかりました: スコープがプロジェクトとドメインの両方に対し"
-"て設定されています。"
-
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr "ドメイン固有の設定ではグループ %(group)s はサポートされません"
@@ -461,10 +456,6 @@ msgstr ""
 msgid "Invalid TLS / LDAPS combination"
 msgstr "無効な TLS / LDAPS の組み合わせです"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr "無効な監査情報データタイプ %(data)s (%(type)s) です"
-
 msgid "Invalid blob in credential"
 msgstr "クレデンシャル内の blob が無効です"
 
@@ -695,9 +686,6 @@ msgstr ""
 msgid "The action you have requested has not been implemented."
 msgstr "要求したアクションは実装されていません。"
 
-msgid "The configured token provider does not support bind authentication."
-msgstr "設定済みトークンプロバイダーはバインド認証をサポートしません。"
-
 #, python-format
 msgid ""
 "The password length must be less than or equal to %(size)i. The server could "
@@ -932,10 +920,6 @@ msgstr ""
 msgid "group %(group)s"
 msgstr "グループ %(group)s"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "日付形式 %s は無効です"
-
 #, python-format
 msgid ""
 "it is not permitted to have two projects acting as domains with the same "
@@ -980,7 +964,3 @@ msgstr ""
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "tls_cacertfile %s が見つからない、もしくは、ファイルではありません。"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr "トークン参照は KeystoneToken 型である必要があります。%s を受信しました"
diff --git a/keystone/locale/ko_KR/LC_MESSAGES/keystone.po b/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
index dd3b60dd48..264edc34bc 100644
--- a/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -393,10 +393,6 @@ msgstr ""
 "필드 \"remaining_uses\"가 %(value)s(으)로 설정되었으나 신뢰를 재위임하려면 설"
 "정하지 않아야 함"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr ""
-"올바르지 않은 토큰이 있습니다. 프로젝트와 도메인 둘 다 범위에 포함됩니다."
-
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr "도메인 특정 구성에 대해 %(group)s 그룹이 지원되지 않음"
@@ -446,10 +442,6 @@ msgstr "올바르지 않은 LDAP 범위: %(scope)s. 다음 중 하나를 선택:
 msgid "Invalid TLS / LDAPS combination"
 msgstr "잘못된 TLS / LDAPS 결합."
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr "올바르지 않은 감사 정보 데이터 유형: %(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "신임 정보에 올바르지 blob가 있음"
 
@@ -681,9 +673,6 @@ msgstr ""
 msgid "The action you have requested has not been implemented."
 msgstr "요청한 조치가 구현되지 않았습니다."
 
-msgid "The configured token provider does not support bind authentication."
-msgstr "구성된 토큰 제공자가 바인드 인증을 지원하지 않습니다. "
-
 #, python-format
 msgid ""
 "The password length must be less than or equal to %(size)i. The server could "
@@ -906,10 +895,6 @@ msgstr ""
 msgid "group %(group)s"
 msgstr "%(group)s 그룹"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "올바르지 않은 날짜 형식 %s"
-
 #, python-format
 msgid ""
 "it is not permitted to have two projects acting as domains with the same "
@@ -950,7 +935,3 @@ msgstr "tls_cacertdir %s를 찾을 수 없으며, 이 디렉토리에 존재하
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "tls_cacertfile %s를 찾을 수 없스며, 그런 파일이 없습니다."
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr "토큰 참조는 KeystoneToken 유형이어야 합니다. %s을(를) 가져왔습니다."
diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
index 89c1ec99a0..59e7891320 100644
--- a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -403,9 +403,6 @@ msgstr ""
 "O campo \"remaining_uses\" está configurado como %(value)s enquanto ele não "
 "deve ser configurado para delegar novamente uma confiança"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr "Token inválido encontrado: escopo para ambos o projeto e o domínio."
-
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr ""
@@ -458,11 +455,6 @@ msgstr "Escopo LDAP inválido: %(scope)s. Escolha um de: %(options)s"
 msgid "Invalid TLS / LDAPS combination"
 msgstr "Combinação TLS / LADPS inválida"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr ""
-"Tipo de dados de informações de auditoria inválido: %(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "BLOB inválido na credencial"
 
@@ -694,9 +686,6 @@ msgstr ""
 msgid "The action you have requested has not been implemented."
 msgstr "A ação que você solicitou não foi implementada."
 
-msgid "The configured token provider does not support bind authentication."
-msgstr "O provedor de token configurado não suporta autenticação de ligação."
-
 #, python-format
 msgid ""
 "The password length must be less than or equal to %(size)i. The server could "
@@ -927,10 +916,6 @@ msgstr ""
 msgid "group %(group)s"
 msgstr "grupo %(group)s"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "formato de data inválido %s"
-
 #, python-format
 msgid ""
 "it is not permitted to have two projects acting as domains with the same "
@@ -975,7 +960,3 @@ msgstr "tls_cacertdir %s não encontrado ou não é um diretório"
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "tls_cacertfile %s não encontrada ou não é um arquivo"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr "referência de token deve ser um tipo KeystoneToken, obteve: %s"
diff --git a/keystone/locale/ru/LC_MESSAGES/keystone.po b/keystone/locale/ru/LC_MESSAGES/keystone.po
index 7f9091d236..b52b0367c9 100644
--- a/keystone/locale/ru/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ru/LC_MESSAGES/keystone.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -396,11 +396,6 @@ msgstr ""
 "Полю \"remaining_uses\" присвоено значение %(value)s, хотя поле не может "
 "быть задано для изменения делегирования группы доверия"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr ""
-"Обнаружен недопустимый маркер: он относится и к уровню проекта, и к уровню "
-"домена."
-
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr ""
@@ -457,10 +452,6 @@ msgstr ""
 msgid "Invalid TLS / LDAPS combination"
 msgstr "Недопустимое сочетание TLS/LDAPS"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr "Недопустимый тип данных в информации контроля: %(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "Недопустимый большой двоичный объект в разрешении"
 
@@ -691,9 +682,6 @@ msgstr ""
 msgid "The action you have requested has not been implemented."
 msgstr "Запрошенное действие не реализовано."
 
-msgid "The configured token provider does not support bind authentication."
-msgstr "Настроенный модуль маркера не поддерживает идентификацию привязки."
-
 #, python-format
 msgid ""
 "The password length must be less than or equal to %(size)i. The server could "
@@ -920,10 +908,6 @@ msgstr ""
 msgid "group %(group)s"
 msgstr "группа %(group)s"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "Недопустимый формат даты %s"
-
 #, python-format
 msgid ""
 "it is not permitted to have two projects acting as domains with the same "
@@ -970,7 +954,3 @@ msgstr "tls_cacertdir %s не найден или не является ката
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "tls_cacertfile %s не найден или не является файлом"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr "Ссылка на маркер должна относиться к типу KeystoneToken, а получено %s"
diff --git a/keystone/locale/tr_TR/LC_MESSAGES/keystone.po b/keystone/locale/tr_TR/LC_MESSAGES/keystone.po
index 66e071614d..e0ca88709d 100644
--- a/keystone/locale/tr_TR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/tr_TR/LC_MESSAGES/keystone.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -268,9 +268,6 @@ msgstr ""
 "\"remaining_uses\" alanı %(value)s olarak ayarlanmış, bir güvene tekrar "
 "yetki vermek için böyle ayarlanmamalı"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr "Geçersiz jeton bulundu: hem proje hem alana kapsanmış."
-
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr "%(group)s grubu alana özel yapılandırmalar için desteklenmiyor"
@@ -321,10 +318,6 @@ msgstr "Geçersiz LDAP kapsamı: %(scope)s. Şunlardan birini seçin: %(options)
 msgid "Invalid TLS / LDAPS combination"
 msgstr "Geçersiz TLS / LDAPS kombinasyonu"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr "Geçersiz denetim bilgisi veri türü: %(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "Kimlik bilgisinde geçersiz düğüm"
 
@@ -698,10 +691,6 @@ msgstr "kapalı bir proje içeren bir alt grupta proje oluşturulamaz: %s"
 msgid "group %(group)s"
 msgstr "grup %(group)s"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "geçersiz tarih biçimi %s"
-
 #, python-format
 msgid "option %(option)s in group %(group)s"
 msgstr "%(group)s grubundaki %(option)s seçeneği"
@@ -730,7 +719,3 @@ msgstr "tls_cacertdir %s bulunamadı ya da bir dizin"
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "tls_cacertfile %s bulunamadı ya da bir dosya değil"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr "jeton referansı bir KeystoneToken türünde olmalı, alınan: %s"
diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
index 2686d62112..81c097eb2c 100644
--- a/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
+++ b/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -367,9 +367,6 @@ msgid ""
 msgstr ""
 "字段“remaining_uses”已设置为 %(value)s，尽管为了重新委派信任，不能设置该字段"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr "发现无效令牌：范围同时为项目和域。"
-
 msgid "Global role cannot imply a domain-specific role"
 msgstr "全局角色不能隐含一个具体域角色。"
 
@@ -418,10 +415,6 @@ msgstr "无效的 LDAP作用域: %(scope)s.  选择以下选项之一: %(options
 msgid "Invalid TLS / LDAPS combination"
 msgstr "无效的 TLS / LDAPS 组合"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr "无效审计信息数据类型：%(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "凭证中的 BLOB 无效"
 
@@ -627,9 +620,6 @@ msgstr ""
 msgid "The action you have requested has not been implemented."
 msgstr "您请求的操作暂未被执行"
 
-msgid "The configured token provider does not support bind authentication."
-msgstr "所配置的令牌提供者不支持绑定认证。"
-
 #, python-format
 msgid ""
 "The password length must be less than or equal to %(size)i. The server could "
@@ -849,10 +839,6 @@ msgstr "无法删除充当域的已启用项目。请先禁用项目 %s。"
 msgid "group %(group)s"
 msgstr "组 %(group)s"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "日期格式 %s 无效"
-
 #, python-format
 msgid ""
 "it is not permitted to have two projects acting as domains with the same "
@@ -891,7 +877,3 @@ msgstr "tls_cacertdir %s 未找到或者不是一个目录"
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "tls_cacertfile %s 未找到或者不是一个文件"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr "令牌引用必须为 KeystoneToken 类型，但收到：%s"
diff --git a/keystone/locale/zh_TW/LC_MESSAGES/keystone.po b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
index f1ff1046c1..3acbcfb376 100644
--- a/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
+++ b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-06-16 01:19+0000\n"
+"POT-Creation-Date: 2018-08-08 22:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -354,9 +354,6 @@ msgid ""
 msgstr ""
 "欄位 \"remaining_uses\" 設定為 %(value)s，但為了重新委派信任，不能設定該欄位"
 
-msgid "Found invalid token: scoped to both project and domain."
-msgstr "找到無效記號：已將範圍限定為專案及網域。"
-
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr "網域特定配置不支援群組 %(group)s"
@@ -402,10 +399,6 @@ msgstr "無效的 LDAP 範圍：%(scope)s。請選擇 %(options)s 的其中之
 msgid "Invalid TLS / LDAPS combination"
 msgstr "無效的 TLS/LDAPS 組合"
 
-#, python-format
-msgid "Invalid audit info data type: %(data)s (%(type)s)"
-msgstr "審核資訊資料類型無效：%(data)s (%(type)s)"
-
 msgid "Invalid blob in credential"
 msgstr "認證中的二進位大型物件無效"
 
@@ -610,9 +603,6 @@ msgstr ""
 msgid "The action you have requested has not been implemented."
 msgstr "尚未實作所要求的動作。"
 
-msgid "The configured token provider does not support bind authentication."
-msgstr "所配置的記號提供者不支援連結鑑別。"
-
 #, python-format
 msgid ""
 "The password length must be less than or equal to %(size)i. The server could "
@@ -823,10 +813,6 @@ msgstr "無法刪除已啟用且正在充當網域的專案。請先停用專案
 msgid "group %(group)s"
 msgstr "群組 %(group)s"
 
-#, python-format
-msgid "invalid date format %s"
-msgstr "無效的日期格式 %s"
-
 #, python-format
 msgid ""
 "it is not permitted to have two projects acting as domains with the same "
@@ -865,7 +851,3 @@ msgstr "tls_cacertdir %s 找不到，或者不是目錄"
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr "tls_cacertfile %s 找不到，或者不是檔案"
-
-#, python-format
-msgid "token reference must be a KeystoneToken type, got: %s"
-msgstr "記號參照必須是 KeystoneToken 類型，但卻取得：%s"
diff --git a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
index 36390b5aa2..bbf6861eef 100644
--- a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
+++ b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
@@ -4,11 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keystone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-16 01:17+0000\n"
+"POT-Creation-Date: 2018-08-08 22:56+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-03-08 12:18+0000\n"
+"PO-Revision-Date: 2018-08-08 09:01+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
 "Language-Team: English (United Kingdom)\n"
 "Language: en_GB\n"
@@ -50,15 +50,30 @@ msgstr "11.0.1"
 msgid "11.0.3"
 msgstr "11.0.3"
 
-msgid "11.0.3-4"
-msgstr "11.0.3-4"
+msgid "11.0.4"
+msgstr "11.0.4"
 
 msgid "12.0.0"
 msgstr "12.0.0"
 
+msgid "12.0.1"
+msgstr "12.0.1"
+
 msgid "13.0.0"
 msgstr "13.0.0"
 
+msgid "13.0.1"
+msgstr "13.0.1"
+
+msgid "14.0.0.0b1"
+msgstr "14.0.0.0b1"
+
+msgid "14.0.0.0b2"
+msgstr "14.0.0.0b2"
+
+msgid "14.0.0.0b3"
+msgstr "14.0.0.0b3"
+
 msgid "8.0.1"
 msgstr "8.0.1"
 
@@ -89,6 +104,17 @@ msgstr ""
 "`debug` option. If you'd like to return extra information to clients set the "
 "value to ``true``. This extra information may help an attacker."
 
+msgid ""
+"A new interface called `list_federated_users_info` is added to shadow "
+"backend. It's used to get the shadow user information internally. If you are "
+"maintaining any out-tree shadow backends, please implement this function for "
+"them as well."
+msgstr ""
+"A new interface called `list_federated_users_info` is added to shadow "
+"backend. It's used to get the shadow user information internally. If you are "
+"maintaining any out-tree shadow backends, please implement this function for "
+"them as well."
+
 msgid ""
 "Add ``cache_on_issue`` flag to ``[token]`` section that enables placing "
 "issued tokens to validation cache thus reducing the first validation time as "
@@ -149,6 +175,23 @@ msgstr ""
 "no valid rules for the user, authentication occurs in the default manner: "
 "any single configured auth method is sufficient to receive a token."
 
+msgid ""
+"As a performance improvement, the base mapping driver's method "
+"``get_domain_mapping_list`` now accepts an optional named argument "
+"``entity_type`` that can be used to get the mappings for a given entity type "
+"only. As this new call signature is already used in the ``identity.core`` "
+"module, authors/maintainers of out-of-tree custom mapping drivers are "
+"expected to update their implementations of ``get_domain_mapping_list`` "
+"method accordingly."
+msgstr ""
+"As a performance improvement, the base mapping driver's method "
+"``get_domain_mapping_list`` now accepts an optional named argument "
+"``entity_type`` that can be used to get the mappings for a given entity type "
+"only. As this new call signature is already used in the ``identity.core`` "
+"module, authors/maintainers of out-of-tree custom mapping drivers are "
+"expected to update their implementations of ``get_domain_mapping_list`` "
+"method accordingly."
+
 msgid "Bug Fixes"
 msgstr "Bug Fixes"
 
@@ -355,6 +398,21 @@ msgstr ""
 "customized the policy.json file, you will need to make these changes. This "
 "was done to better support new features around federation."
 
+msgid ""
+"It is no longer possible to, via the ``paste.ini`` file to inject middleware "
+"into the running keystone application. This reduces the attack surface area. "
+"While this is not a huge reduction in surface area, it is one less potential "
+"place that malicious code could be loaded. Malicious middleware historically "
+"could collect information and/or modify the requests and responses from "
+"Keystone."
+msgstr ""
+"It is no longer possible to, via the ``paste.ini`` file to inject middleware "
+"into the running Keystone application. This reduces the attack surface area. "
+"While this is not a huge reduction in surface area, it is one less potential "
+"place that malicious code could be loaded. Malicious middleware historically "
+"could collect information and/or modify the requests and responses from "
+"Keystone."
+
 msgid ""
 "It is recommended to have the ``healthcheck`` middleware first in the "
 "pipeline::"
@@ -508,6 +566,9 @@ msgstr ""
 "Working Group <https://specs.openstack.org/openstack/api-wg/guidelines/tags."
 "html>`_"
 
+msgid "Queens Series Release Notes"
+msgstr "Queens Series Release Notes"
+
 msgid ""
 "Routes and SQL backends for the contrib extensions have been removed, they "
 "have been incorporated into keystone and are no longer optional. This "
@@ -1444,6 +1505,100 @@ msgstr ""
 "[`bug 1749267 <https://bugs.launchpad.net/keystone/+bug/1749267>`_] A "
 "group's system role assignments are removed when the group is deleted."
 
+msgid ""
+"[`bug 1755874 <https://bugs.launchpad.net/keystone/+bug/1755874>`_] Users "
+"now can have the resource option ``lock_password`` set which prevents the "
+"user from utilizing the self-service password change API. Valid values are "
+"``True``, ``False``, or \"None\" (where ``None`` clears the option)."
+msgstr ""
+"[`bug 1755874 <https://bugs.launchpad.net/keystone/+bug/1755874>`_] Users "
+"now can have the resource option ``lock_password`` set which prevents the "
+"user from utilizing the self-service password change API. Valid values are "
+"``True``, ``False``, or \"None\" (where ``None`` clears the option)."
+
+msgid ""
+"[`bug 1756190 <https://bugs.launchpad.net/keystone/+bug/1756190>`_] When "
+"filtering projects based on tags, the filtering will now be performed by "
+"matching a subset containing the given tags against projects, rather than "
+"exact matching. Providing more tags when performing a search will yield more "
+"exact results while less will return any projects that match the given tags "
+"but could contain other tags as well."
+msgstr ""
+"[`bug 1756190 <https://bugs.launchpad.net/keystone/+bug/1756190>`_] When "
+"filtering projects based on tags, the filtering will now be performed by "
+"matching a subset containing the given tags against projects, rather than "
+"exact matching. Providing more tags when performing a search will yield more "
+"exact results while less will return any projects that match the given tags "
+"but could contain other tags as well."
+
+msgid ""
+"[`bug 1757022 <https://bugs.launchpad.net/keystone/+bug/1757022>`_] In "
+"previous releases,  ``keystone-manage mapping_purge --type {user,group}`` "
+"command would purge all mapping incorrectly instead of only purging the "
+"specified type mappings. ``keystone-manage mapping_purge --type {user,group}"
+"`` now purges only specified type mappings as expected."
+msgstr ""
+"[`bug 1757022 <https://bugs.launchpad.net/keystone/+bug/1757022>`_] In "
+"previous releases,  ``keystone-manage mapping_purge --type {user,group}`` "
+"command would purge all mapping incorrectly instead of only purging the "
+"specified type mappings. ``keystone-manage mapping_purge --type {user,group}"
+"`` now purges only specified type mappings as expected."
+
+msgid ""
+"[`bug 1759289 <https://bugs.launchpad.net/keystone/+bug/1759289>`_] The "
+"``keystone-manage token_flush`` command no longer establishes a connection "
+"to a database, or persistence backend. It's usage should be removed if "
+"you're using a supported non-persistent token format. If you're relying on "
+"external token providers that write tokens to disk and would like to "
+"maintain this functionality, please consider porting it to a separate tool."
+msgstr ""
+"[`bug 1759289 <https://bugs.launchpad.net/keystone/+bug/1759289>`_] The "
+"``keystone-manage token_flush`` command no longer establishes a connection "
+"to a database, or persistence backend. It's usage should be removed if "
+"you're using a supported non-persistent token format. If you're relying on "
+"external token providers that write tokens to disk and would like to "
+"maintain this functionality, please consider porting it to a separate tool."
+
+msgid ""
+"[`bug 1760205 <https://bugs.launchpad.net/keystone/+bug/1760205>`_] When "
+"deleting a shadow user, the related cache info is not invalidated so that "
+"Keystone will raise 404 UserNotFound error when authenticating with the "
+"previous federation info. This bug has been fixed now."
+msgstr ""
+"[`bug 1760205 <https://bugs.launchpad.net/keystone/+bug/1760205>`_] When "
+"deleting a shadow user, the related cache info is not invalidated so that "
+"Keystone will raise 404 UserNotFound error when authenticating with the "
+"previous federation info. This bug has been fixed now."
+
+msgid "``delete group``"
+msgstr "``delete group``"
+
+msgid "``delete user``"
+msgstr "``delete user``"
+
+msgid "``issue_v2_token``"
+msgstr "``issue_v2_token``"
+
+msgid "``issue_v3_token``"
+msgstr "``issue_v3_token``"
+
+msgid ""
+"``keystone-manage db_sync`` will no longer create the Default domain. This "
+"domain is used as the domain for any users created using the legacy v2.0 "
+"API. A default domain is created by ``keystone-manage bootstrap`` and when a "
+"user or project is created using the legacy v2.0 API."
+msgstr ""
+"``keystone-manage db_sync`` will no longer create the Default domain. This "
+"domain is used as the domain for any users created using the legacy v2.0 "
+"API. A default domain is created by ``keystone-manage bootstrap`` and when a "
+"user or project is created using the legacy v2.0 API."
+
+msgid "``keystone.common.kvs.backends.inmemdb.MemoryBackend``"
+msgstr "``keystone.common.kvs.backends.inmemdb.MemoryBackend``"
+
+msgid "``keystone.common.kvs.backends.memcached.MemcachedBackend``"
+msgstr "``keystone.common.kvs.backends.memcached.MemcachedBackend``"
+
 msgid "``keystone.token.persistence.backends.kvs.Token``"
 msgstr "``keystone.token.persistence.backends.kvs.Token``"
 
@@ -1477,6 +1632,21 @@ msgstr "``keystone/contrib/simple_cert``"
 msgid "``keystone/contrib/user_crud``"
 msgstr "``keystone/contrib/user_crud``"
 
+msgid ""
+"``openstack_user_domain`` and ``openstack_project_domain`` attributes were "
+"added to SAML assertion in order to map user and project domains, "
+"respectively."
+msgstr ""
+"``openstack_user_domain`` and ``openstack_project_domain`` attributes were "
+"added to SAML assertion in order to map user and project domains, "
+"respectively."
+
+msgid "``remove user from group``"
+msgstr "``remove user from group``"
+
+msgid "``update group``"
+msgstr "``update group``"
+
 msgid "``update user``"
 msgstr "``update user``"