diff --git a/keystone/locale/de/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/de/LC_MESSAGES/keystone-log-critical.po
index 8e4b677371..89339d09e5 100644
--- a/keystone/locale/de/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/de/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/keystone/language/"
-"de/)\n"
+"Language-Team: German (http://www.transifex.com/p/keystone/language/de/)\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +18,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "Vorlagendatei %s kann nicht geöffnet werden"
diff --git a/keystone/locale/de/LC_MESSAGES/keystone-log-info.po b/keystone/locale/de/LC_MESSAGES/keystone-log-info.po
deleted file mode 100644
index 8242e026a8..0000000000
--- a/keystone/locale/de/LC_MESSAGES/keystone-log-info.po
+++ /dev/null
@@ -1,67 +0,0 @@
-# Translations template for keystone.
-# Copyright (C) 2015 OpenStack Foundation
-# 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: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-06-01 20:22+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/keystone/language/"
-"de/)\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#, python-format
-msgid "Caught %s, exiting"
-msgstr "%s abgefangen. Vorgang wird beendet"
-
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr "%s abgefangen, untergeordnete Elemente werden gestoppt"
-
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr "Untergeordnetes Element %(pid)d durch Signal %(sig)d abgebrochen"
-
-#, python-format
-msgid "Child %(pid)s exited with status %(code)d"
-msgstr "Untergeordnete %(pid)s mit Status %(code)d beendet"
-
-#, python-format
-msgid "Child caught %s, exiting"
-msgstr "Untergeordnetes Element %s abgefangen; Vorgang wird beendet"
-
-#, python-format
-msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
-msgstr "Eventlet backdoor hört auf %(port)s für Prozess %(pid)d"
-
-msgid "Forking too fast, sleeping"
-msgstr "Verzweigung zu schnell; im Ruhemodus"
-
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-"Übergeordneter Prozess wurde unerwartet abgebrochen. Vorgang wird beendet"
-
-#, python-format
-msgid "Started child %d"
-msgstr "Untergeordnetes Element %d gestartet"
-
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr "Starten von %(arg0)s auf %(host)s:%(port)s"
-
-#, python-format
-msgid "Starting %d workers"
-msgstr "Starten von %d Workers"
-
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr "Warten auf Beenden von %d untergeordneten Elementen"
diff --git a/keystone/locale/en_AU/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/en_AU/LC_MESSAGES/keystone-log-critical.po
index d2f5ebe662..4a55482f56 100644
--- a/keystone/locale/en_AU/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/en_AU/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
-"keystone/language/en_AU/)\n"
+"Language-Team: English (Australia) (http://www.transifex.com/p/keystone/"
+"language/en_AU/)\n"
 "Language: en_AU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "Unable to open template file %s"
diff --git a/keystone/locale/en_AU/LC_MESSAGES/keystone-log-error.po b/keystone/locale/en_AU/LC_MESSAGES/keystone-log-error.po
index 02d7325560..c0e6dc92e1 100644
--- a/keystone/locale/en_AU/LC_MESSAGES/keystone-log-error.po
+++ b/keystone/locale/en_AU/LC_MESSAGES/keystone-log-error.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-05-31 04:42+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
+"PO-Revision-Date: 2015-06-26 17:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
-"keystone/language/en_AU/)\n"
+"Language-Team: English (Australia) (http://www.transifex.com/p/keystone/"
+"language/en_AU/)\n"
 "Language: en_AU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,12 +62,3 @@ msgstr "Unable to sign token"
 #, python-format
 msgid "Unexpected error or malformed token determining token expiry: %s"
 msgstr "Unexpected error or malformed token determining token expiry: %s"
-
-msgid "Unhandled exception"
-msgstr "Unhandled exception"
-
-msgid "in dynamic looping call"
-msgstr "in dynamic looping call"
-
-msgid "in fixed duration looping call"
-msgstr "in fixed duration looping call"
diff --git a/keystone/locale/en_AU/LC_MESSAGES/keystone.po b/keystone/locale/en_AU/LC_MESSAGES/keystone.po
index f1e7966505..442e4b6db4 100644
--- a/keystone/locale/en_AU/LC_MESSAGES/keystone.po
+++ b/keystone/locale/en_AU/LC_MESSAGES/keystone.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-06-10 18:41+0000\n"
+"POT-Creation-Date: 2015-07-09 06:08+0000\n"
+"PO-Revision-Date: 2015-06-15 18:18+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
-"keystone/language/en_AU/)\n"
+"Language-Team: English (Australia) (http://www.transifex.com/p/keystone/"
+"language/en_AU/)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff --git a/keystone/locale/en_GB/LC_MESSAGES/keystone-log-info.po b/keystone/locale/en_GB/LC_MESSAGES/keystone-log-info.po
deleted file mode 100644
index 2e35f2ea01..0000000000
--- a/keystone/locale/en_GB/LC_MESSAGES/keystone-log-info.po
+++ /dev/null
@@ -1,75 +0,0 @@
-# Translations template for keystone.
-# Copyright (C) 2015 OpenStack Foundation
-# This file is distributed under the same license as the keystone project.
-#
-# Translators:
-# Andi Chandler <andi@gowling.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: Keystone\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-06-01 20:22+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
-"keystone/language/en_GB/)\n"
-"Language: en_GB\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#, python-format
-msgid ""
-"\"expires_at\" has conflicting values %(existing)s and %(new)s.  Will use "
-"the earliest value."
-msgstr ""
-"\"expires_at\" has conflicting values %(existing)s and %(new)s.  Will use "
-"the earliest value."
-
-#, python-format
-msgid "Caught %s, exiting"
-msgstr "Caught %s, exiting"
-
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr "Caught %s, stopping children"
-
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr "Child %(pid)d killed by signal %(sig)d"
-
-#, python-format
-msgid "Child %(pid)s exited with status %(code)d"
-msgstr "Child %(pid)s exited with status %(code)d"
-
-#, python-format
-msgid "Child caught %s, exiting"
-msgstr "Child caught %s, exiting"
-
-#, python-format
-msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
-msgstr "Eventlet backdoor listening on %(port)s for process %(pid)d"
-
-msgid "Forking too fast, sleeping"
-msgstr "Forking too fast, sleeping"
-
-msgid "Parent process has died unexpectedly, exiting"
-msgstr "Parent process has died unexpectedly, exiting"
-
-#, python-format
-msgid "Started child %d"
-msgstr "Started child %d"
-
-#, python-format
-msgid "Starting %d workers"
-msgstr "Starting %d workers"
-
-#, python-format
-msgid "Total expired tokens removed: %d"
-msgstr "Total expired tokens removed: %d"
-
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr "Waiting on %d children to exit"
diff --git a/keystone/locale/es/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/es/LC_MESSAGES/keystone-log-critical.po
index 6ebff22675..02562bdb09 100644
--- a/keystone/locale/es/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/es/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/keystone/"
-"language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/p/keystone/language/es/)\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +18,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "No se puede abrir el archivo de plantilla %s"
diff --git a/keystone/locale/es/LC_MESSAGES/keystone-log-error.po b/keystone/locale/es/LC_MESSAGES/keystone-log-error.po
deleted file mode 100644
index 51f67910d0..0000000000
--- a/keystone/locale/es/LC_MESSAGES/keystone-log-error.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# Translations template for keystone.
-# Copyright (C) 2015 OpenStack Foundation
-# 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: 2015-06-19 06:09+0000\n"
-"PO-Revision-Date: 2015-06-17 20:52+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/keystone/"
-"language/es/)\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#, python-format
-msgid "Could not bind to %(host)s:%(port)s"
-msgstr "No se puede asociar a %(host)s:%(port)s"
-
-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 ""
-"Error configurando el entorno de depuración. Verifique que la opción --debug-"
-"url tiene el formato <host>:<port> y que un proceso de depuración está "
-"publicado en ese host y puerto"
-
-msgid "Error stopping thread."
-msgstr "Error al detener la línea."
-
-msgid "Error stopping timer."
-msgstr "Error al detener temporizador."
-
-msgid "Error waiting on ThreadGroup."
-msgstr "Error al esperar en ThreadGroup."
-
-msgid "Failed to validate token"
-msgstr "Ha fallado la validación del token"
-
-#, python-format
-msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s"
-msgstr ""
-"Punto final formado incorrectamente %(url)s - clave desconocida %(keyerror)s"
-
-msgid "Server error"
-msgstr "Error del servidor"
-
-msgid "Unhandled exception"
-msgstr "Excepción no controlada"
-
-msgid "in dynamic looping call"
-msgstr "en llamada en bucle dinámica"
-
-msgid "in fixed duration looping call"
-msgstr "en llamada en bucle de duración fija"
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/fr/LC_MESSAGES/keystone-log-critical.po
index c40440beb5..49a110f8ad 100644
--- a/keystone/locale/fr/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/fr/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/keystone/language/"
-"fr/)\n"
+"Language-Team: French (http://www.transifex.com/p/keystone/language/fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +18,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "Impossible d'ouvrir le fichier modèle %s"
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone-log-error.po b/keystone/locale/fr/LC_MESSAGES/keystone-log-error.po
index 87c49b14db..28ade8087c 100644
--- a/keystone/locale/fr/LC_MESSAGES/keystone-log-error.po
+++ b/keystone/locale/fr/LC_MESSAGES/keystone-log-error.po
@@ -9,11 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-05-31 04:42+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
+"PO-Revision-Date: 2015-06-26 17:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/keystone/language/"
-"fr/)\n"
+"Language-Team: French (http://www.transifex.com/p/keystone/language/fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -95,12 +94,3 @@ msgstr "Erreur serveur"
 
 msgid "Unable to sign token"
 msgstr "Impossible de signer le jeton"
-
-msgid "Unhandled exception"
-msgstr "Exception non gérée"
-
-msgid "in dynamic looping call"
-msgstr "dans l'appel en boucle dynamique"
-
-msgid "in fixed duration looping call"
-msgstr "dans l'appel en boucle de durée fixe"
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po b/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po
index 054a06713e..566a211a27 100644
--- a/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po
+++ b/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po
@@ -10,11 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-06-01 20:22+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
+"PO-Revision-Date: 2015-06-26 17:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/keystone/language/"
-"fr/)\n"
+"Language-Team: French (http://www.transifex.com/p/keystone/language/fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,26 +33,6 @@ msgstr ""
 msgid "Adding proxy '%(proxy)s' to KVS %(name)s."
 msgstr "Ahour du mandataire '%(proxy)s' au KVS %(name)s."
 
-#, python-format
-msgid "Caught %s, exiting"
-msgstr "%s interceptée, sortie"
-
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr "%s interceptée, arrêt de l'enfant"
-
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr "Enfant %(pid)d arrêté par le signal %(sig)d"
-
-#, python-format
-msgid "Child %(pid)s exited with status %(code)d"
-msgstr "Processus fils %(pid)s terminé avec le status %(code)d"
-
-#, python-format
-msgid "Child caught %s, exiting"
-msgstr "L'enfant a reçu %s, sortie"
-
 #, python-format
 msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}"
 msgstr ""
@@ -64,13 +43,6 @@ msgstr ""
 msgid "Creating the default role %s because it does not exist."
 msgstr "Création du rôle par défaut %s, car il n'existe pas"
 
-#, python-format
-msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
-msgstr "Eventlet backdoor en écoute sur le port %(port)s for process %(pid)d"
-
-msgid "Forking too fast, sleeping"
-msgstr "Bifurcation trop rapide, pause"
-
 #, python-format
 msgid "KVS region %s key_mangler disabled."
 msgstr "Région KVS %s key_mangler désactivée"
@@ -92,9 +64,6 @@ msgstr ""
 msgid "No bind information present in token"
 msgstr "Aucune information d'attachement n'est présente dans le jeton"
 
-msgid "Parent process has died unexpectedly, exiting"
-msgstr "Processus parent arrêté de manière inattendue, sortie"
-
 #, python-format
 msgid ""
 "Received the following notification: service %(service)s, resource_type: "
@@ -107,18 +76,10 @@ msgstr ""
 msgid "Running command - %s"
 msgstr "Exécution de la commande %s"
 
-#, python-format
-msgid "Started child %d"
-msgstr "Enfant démarré %d"
-
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr "Démarrage de %(arg0)s sur %(host)s:%(port)s"
 
-#, python-format
-msgid "Starting %d workers"
-msgstr "Démarrage des travailleurs %d"
-
 #, python-format
 msgid "Total expired tokens removed: %d"
 msgstr "Total des jetons expirés effacés: %d"
@@ -132,10 +93,3 @@ msgid "Using default dogpile sha1_mangle_key as KVS region %s key_mangler"
 msgstr ""
 "Utilisation du dogpile sha1_mangle_key par défaut comme région KVS %s "
 "key_mangler"
-
-msgid "Wait called after thread killed. Cleaning up."
-msgstr "Pause demandée après suppression de thread. Nettoyage."
-
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr "En attente %d enfants pour sortie"
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po
index a6cfedb0e9..3e25c7e0e8 100644
--- a/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po
+++ b/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po
@@ -9,11 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-05-16 02:25+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
+"PO-Revision-Date: 2015-06-26 17:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/keystone/language/"
-"fr/)\n"
+"Language-Team: French (http://www.transifex.com/p/keystone/language/fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -106,7 +105,3 @@ msgid "keystone-manage ssl_setup is not recommended for production use."
 msgstr ""
 "keystone-manage ssl_setup n'est pas recommandé pour une utilisation en "
 "production."
-
-#, python-format
-msgid "pid %d not in child list"
-msgstr "PID %d absent de la liste d'enfants"
diff --git a/keystone/locale/hu/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/hu/LC_MESSAGES/keystone-log-critical.po
index 767c150e52..23f63b2472 100644
--- a/keystone/locale/hu/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/hu/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/keystone/"
-"language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/p/keystone/language/hu/)\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +18,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "Nem nyitható meg a sablonfájl: %s"
diff --git a/keystone/locale/it/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/it/LC_MESSAGES/keystone-log-critical.po
index 3501010390..5d0e97476a 100644
--- a/keystone/locale/it/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/it/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/keystone/"
-"language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/p/keystone/language/it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +18,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "Impossibile aprire il file di template %s"
diff --git a/keystone/locale/it/LC_MESSAGES/keystone-log-info.po b/keystone/locale/it/LC_MESSAGES/keystone-log-info.po
deleted file mode 100644
index 372df9c351..0000000000
--- a/keystone/locale/it/LC_MESSAGES/keystone-log-info.po
+++ /dev/null
@@ -1,66 +0,0 @@
-# Translations template for keystone.
-# Copyright (C) 2015 OpenStack Foundation
-# 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: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-06-01 20:22+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/keystone/"
-"language/it/)\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#, python-format
-msgid "Caught %s, exiting"
-msgstr "Rilevato %s, esistente"
-
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr "Intercettato %s, arresto in corso dei children"
-
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr "Child %(pid)d interrotto dal segnale %(sig)d"
-
-#, python-format
-msgid "Child %(pid)s exited with status %(code)d"
-msgstr "Child %(pid)s terminato con stato %(code)d"
-
-#, python-format
-msgid "Child caught %s, exiting"
-msgstr "Cogliere Child %s, uscendo"
-
-#, python-format
-msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
-msgstr "Ascolto di eventlet backdoor su %(port)s per il processo %(pid)d"
-
-msgid "Forking too fast, sleeping"
-msgstr "Sblocco troppo veloce, attendere"
-
-msgid "Parent process has died unexpectedly, exiting"
-msgstr "Il processo principale è stato interrotto inaspettatamente, uscire"
-
-#, python-format
-msgid "Started child %d"
-msgstr "Child avviato %d"
-
-#, python-format
-msgid "Starting %(arg0)s on %(host)s:%(port)s"
-msgstr "Avvio %(arg0)s in %(host)s:%(port)s"
-
-#, python-format
-msgid "Starting %d workers"
-msgstr "Avvio %d operatori"
-
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr "In attesa %d degli elementi secondari per uscire"
diff --git a/keystone/locale/ja/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/ja/LC_MESSAGES/keystone-log-critical.po
index b83aaad2c0..6e33e2a479 100644
--- a/keystone/locale/ja/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/ja/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/keystone/"
-"language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/p/keystone/language/ja/)\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +18,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "テンプレートファイル %s を開けません"
diff --git a/keystone/locale/ja/LC_MESSAGES/keystone-log-error.po b/keystone/locale/ja/LC_MESSAGES/keystone-log-error.po
deleted file mode 100644
index c09db98d67..0000000000
--- a/keystone/locale/ja/LC_MESSAGES/keystone-log-error.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# Translations template for keystone.
-# Copyright (C) 2015 OpenStack Foundation
-# This file is distributed under the same license as the keystone project.
-#
-# Translators:
-# Sasuke(Kyohei MORIYAMA) <>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: Keystone\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-05-31 04:42+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/keystone/"
-"language/ja/)\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#, python-format
-msgid "Could not bind to %(host)s:%(port)s"
-msgstr "%(host)s:%(port)s　がバインドできません。"
-
-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 ""
-"デバッグ環境のセットアップ中にエラーが発生しました。オプション --debug-url "
-"が <host>:<port> の形式を持ち、デバッガープロセスがそのポートにおいてリッスン"
-"していることを確認してください。"
-
-#, python-format
-msgid "Error when signing assertion, reason: %(reason)s"
-msgstr "サインアサーション時にエラーが発生しました。理由：%(reason)s"
-
-#, python-format
-msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s"
-msgstr "不正な形式のエンドポイント %(url)s - 未知のキー %(keyerror)s"
-
-msgid "Server error"
-msgstr "内部サーバーエラー"
-
-msgid "Unhandled exception"
-msgstr "未処理例外"
-
-msgid "in dynamic looping call"
-msgstr "動的呼び出しループ"
-
-msgid "in fixed duration looping call"
-msgstr "一定期間の呼び出しループ"
diff --git a/keystone/locale/keystone-log-error.pot b/keystone/locale/keystone-log-error.pot
index 7d1cdea224..1c3ff4184f 100644
--- a/keystone/locale/keystone-log-error.pot
+++ b/keystone/locale/keystone-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: keystone 2015.2.0.dev220\n"
+"Project-Id-Version: keystone 8.0.0.0b2.dev56\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+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"
@@ -79,12 +79,12 @@ msgid ""
 "Skipping unknown format: %s"
 msgstr ""
 
-#: keystone/common/environment/eventlet_server.py:111
+#: keystone/common/environment/eventlet_server.py:112
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s"
 msgstr ""
 
-#: keystone/common/environment/eventlet_server.py:199
+#: keystone/common/environment/eventlet_server.py:200
 msgid "Server error"
 msgstr ""
 
@@ -104,30 +104,6 @@ msgid ""
 "%(region_id)s."
 msgstr ""
 
-#: keystone/openstack/common/loopingcall.py:95
-msgid "in fixed duration looping call"
-msgstr ""
-
-#: keystone/openstack/common/loopingcall.py:138
-msgid "in dynamic looping call"
-msgstr ""
-
-#: keystone/openstack/common/service.py:266
-msgid "Unhandled exception"
-msgstr ""
-
-#: keystone/openstack/common/threadgroup.py:103
-msgid "Error stopping thread."
-msgstr ""
-
-#: keystone/openstack/common/threadgroup.py:110
-msgid "Error stopping timer."
-msgstr ""
-
-#: keystone/openstack/common/threadgroup.py:137
-msgid "Error waiting on ThreadGroup."
-msgstr ""
-
 #: keystone/resource/core.py:484
 #, python-format
 msgid ""
@@ -162,7 +138,7 @@ msgid ""
 "data: %(list)r"
 msgstr ""
 
-#: keystone/token/providers/common.py:673
+#: keystone/token/providers/common.py:678
 msgid "Failed to validate token"
 msgstr ""
 
diff --git a/keystone/locale/keystone-log-info.pot b/keystone/locale/keystone-log-info.pot
index fa4a92371a..45cac7f070 100644
--- a/keystone/locale/keystone-log-info.pot
+++ b/keystone/locale/keystone-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: keystone 2015.2.0.dev220\n"
+"Project-Id-Version: keystone 8.0.0.0b2.dev56\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Creating the default role %s failed because it was already created"
 msgstr ""
 
-#: keystone/auth/controllers.py:88
+#: keystone/auth/controllers.py:109
 #, python-format
 msgid ""
 "\"expires_at\" has conflicting values %(existing)s and %(new)s.  Will use"
@@ -65,7 +65,7 @@ msgstr ""
 msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}"
 msgstr ""
 
-#: keystone/common/environment/eventlet_server.py:115
+#: keystone/common/environment/eventlet_server.py:116
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr ""
@@ -97,63 +97,6 @@ msgid ""
 "%(resource_type)s, operation %(operation)s payload %(payload)s"
 msgstr ""
 
-#: keystone/openstack/common/eventlet_backdoor.py:146
-#, python-format
-msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
-msgstr ""
-
-#: keystone/openstack/common/service.py:166
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: keystone/openstack/common/service.py:232
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: keystone/openstack/common/service.py:260
-#, python-format
-msgid "Child caught %s, exiting"
-msgstr ""
-
-#: keystone/openstack/common/service.py:299
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: keystone/openstack/common/service.py:318
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: keystone/openstack/common/service.py:328
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: keystone/openstack/common/service.py:345
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: keystone/openstack/common/service.py:349
-#, python-format
-msgid "Child %(pid)s exited with status %(code)d"
-msgstr ""
-
-#: keystone/openstack/common/service.py:388
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: keystone/openstack/common/service.py:403
-msgid "Wait called after thread killed. Cleaning up."
-msgstr ""
-
-#: keystone/openstack/common/service.py:419
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
 #: keystone/token/persistence/backends/sql.py:283
 #, python-format
 msgid "Total expired tokens removed: %d"
@@ -201,12 +144,12 @@ msgstr ""
 msgid "Promoted key 0 to be the primary: %s"
 msgstr ""
 
-#: keystone/token/providers/fernet/utils.py:213
+#: keystone/token/providers/fernet/utils.py:215
 #, python-format
 msgid "Excess keys to purge: %s"
 msgstr ""
 
-#: keystone/token/providers/fernet/utils.py:237
+#: keystone/token/providers/fernet/utils.py:239
 #, python-format
 msgid "Loaded %(count)s encryption keys from: %(dir)s"
 msgstr ""
diff --git a/keystone/locale/keystone-log-warning.pot b/keystone/locale/keystone-log-warning.pot
index 26f0c5f646..d0d7771b2f 100644
--- a/keystone/locale/keystone-log-warning.pot
+++ b/keystone/locale/keystone-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: keystone 2015.2.0.dev220\n"
+"Project-Id-Version: keystone 8.0.0.0b2.dev56\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+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"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: keystone/cli.py:157
+#: keystone/cli.py:158
 msgid "keystone-manage pki_setup is not recommended for production use."
 msgstr ""
 
-#: keystone/cli.py:176
+#: keystone/cli.py:177
 msgid "keystone-manage ssl_setup is not recommended for production use."
 msgstr ""
 
-#: keystone/cli.py:482
+#: keystone/cli.py:483
 #, python-format
 msgid "Ignoring file (%s) while scanning domain config directory"
 msgstr ""
@@ -46,21 +46,21 @@ msgid ""
 "%(role)s"
 msgstr ""
 
-#: keystone/auth/controllers.py:425
+#: keystone/auth/controllers.py:446
 #, python-format
 msgid ""
 "User %(user_id)s doesn't have access to default project %(project_id)s. "
 "The token will be unscoped rather than scoped to the project."
 msgstr ""
 
-#: keystone/auth/controllers.py:433
+#: keystone/auth/controllers.py:454
 #, python-format
 msgid ""
 "User %(user_id)s's default project %(project_id)s is disabled. The token "
 "will be unscoped rather than scoped to the project."
 msgstr ""
 
-#: keystone/auth/controllers.py:442
+#: keystone/auth/controllers.py:463
 #, python-format
 msgid ""
 "User %(user_id)s's default project %(project_id)s not found. The token "
@@ -102,7 +102,7 @@ msgstr ""
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:362
+#: keystone/common/wsgi.py:375
 msgid "Invalid token in _get_trust_id_for_request"
 msgstr ""
 
@@ -151,7 +151,7 @@ msgid ""
 "entries %(entries)s%(dots)s"
 msgstr ""
 
-#: keystone/contrib/federation/utils.py:545
+#: keystone/contrib/federation/utils.py:547
 msgid "Ignoring user name"
 msgstr ""
 
@@ -207,16 +207,6 @@ msgstr ""
 msgid "Auth context already exists in the request environment"
 msgstr ""
 
-#: keystone/openstack/common/loopingcall.py:87
-#, python-format
-msgid "task %(func_name)r run outlasted interval by %(delay).2f sec"
-msgstr ""
-
-#: keystone/openstack/common/service.py:353
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
 #: keystone/resource/core.py:1236
 #, python-format
 msgid ""
diff --git a/keystone/locale/ko_KR/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/ko_KR/LC_MESSAGES/keystone-log-critical.po
index b7f255c494..aea93650ce 100644
--- a/keystone/locale/ko_KR/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/ko_KR/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/keystone/"
-"language/ko_KR/)\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/p/keystone/language/"
+"ko_KR/)\n"
 "Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "템플리트 파일 %s을(를) 열 수 없음"
diff --git a/keystone/locale/pl_PL/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/pl_PL/LC_MESSAGES/keystone-log-critical.po
index b774906058..41c85d17b6 100644
--- a/keystone/locale/pl_PL/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/pl_PL/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/keystone/"
-"language/pl_PL/)\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/p/keystone/language/"
+"pl_PL/)\n"
 "Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "Błąd podczas otwierania pliku %s"
diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-critical.po
index 689a23ecc2..bead4ee10b 100644
--- a/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
-"keystone/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/p/keystone/"
+"language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "Não é possível abrir o arquivo de modelo %s"
diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-error.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-error.po
index 02b3759820..b26331a3ef 100644
--- a/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-error.po
+++ b/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-error.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-05-31 04:42+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
+"PO-Revision-Date: 2015-06-26 17:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
-"keystone/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/p/keystone/"
+"language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,12 +54,3 @@ msgstr ""
 msgid "Unexpected error or malformed token determining token expiry: %s"
 msgstr ""
 "Erro inesperado ou token mal formado ao determinar validade do token: %s"
-
-msgid "Unhandled exception"
-msgstr "Exceção não tratada"
-
-msgid "in dynamic looping call"
-msgstr "em chamada de laço dinâmico"
-
-msgid "in fixed duration looping call"
-msgstr "em uma chamada de laço de duração fixa"
diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
index a933972ca6..3f0182e7fd 100644
--- a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
@@ -10,11 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-06-10 18:41+0000\n"
+"POT-Creation-Date: 2015-07-09 06:08+0000\n"
+"PO-Revision-Date: 2015-06-15 18:18+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
-"keystone/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/p/keystone/"
+"language/pt_BR/)\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
diff --git a/keystone/locale/ru/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/ru/LC_MESSAGES/keystone-log-critical.po
index c0e654d5cd..546476523e 100644
--- a/keystone/locale/ru/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/ru/LC_MESSAGES/keystone-log-critical.po
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-05-15 06:07+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/keystone/"
-"language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/p/keystone/language/ru/)\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/keystone/locale/vi_VN/LC_MESSAGES/keystone-log-info.po b/keystone/locale/vi_VN/LC_MESSAGES/keystone-log-info.po
deleted file mode 100644
index 4d0cedfbd0..0000000000
--- a/keystone/locale/vi_VN/LC_MESSAGES/keystone-log-info.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# Translations template for keystone.
-# Copyright (C) 2015 OpenStack Foundation
-# 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: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-06-01 20:22+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/"
-"keystone/language/vi_VN/)\n"
-"Language: vi_VN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#, python-format
-msgid "Caught %s, exiting"
-msgstr "Bắt %s, thoát"
-
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr "Bắt %s, đang dừng tiến trình con"
-
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr "Tiến trình con %(pid)d bị huỷ bởi tín hiệu %(sig)d"
-
-#, python-format
-msgid "Child %(pid)s exited with status %(code)d"
-msgstr "Tiến trình con %(pid)s đã thiaast với trạng thái %(code)d"
-
-#, python-format
-msgid "Child caught %s, exiting"
-msgstr "Tiến trình con bắt %s, thoát"
-
-#, python-format
-msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
-msgstr "Eventlet backdoor lắng nghe trên %(port)s đối với tiến trình %(pid)d"
-
-msgid "Forking too fast, sleeping"
-msgstr "Tạo tiến trình con quá nhanh, nghỉ"
-
-msgid "Parent process has died unexpectedly, exiting"
-msgstr "Tiến trình cha bị chết đột ngột, thoát"
-
-#, python-format
-msgid "Started child %d"
-msgstr "Tiến trình con đã được khởi động %d "
-
-#, python-format
-msgid "Starting %d workers"
-msgstr "Khởi động %d động cơ"
-
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr "Chờ đợi %d tiến trình con để thoát "
diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-critical.po
index a3a728e902..e7bcee5bdf 100644
--- a/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/keystone/"
-"language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/p/keystone/language/"
+"zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "无法打开模板文件 %s"
diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-error.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-error.po
index 6ef9d57561..59cf1ee718 100644
--- a/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-error.po
+++ b/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-error.po
@@ -9,11 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-05-31 04:42+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
+"PO-Revision-Date: 2015-06-26 17:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/keystone/"
-"language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/p/keystone/language/"
+"zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -142,12 +142,3 @@ msgid ""
 msgstr ""
 "针对域配置- %(count)s 结果，响应中出现不是预期结果，第一参数是%(option)s，期"
 "望参数是 %(expected)s 。"
-
-msgid "Unhandled exception"
-msgstr "存在未处理的异常"
-
-msgid "in dynamic looping call"
-msgstr "在动态循环调用中"
-
-msgid "in fixed duration looping call"
-msgstr "在固定时段内循环调用"
diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po
index 988e14785c..40c7c05a29 100644
--- a/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po
+++ b/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-06-11 06:04+0000\n"
-"PO-Revision-Date: 2015-06-01 20:22+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
+"PO-Revision-Date: 2015-06-26 17:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/keystone/"
-"language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/p/keystone/language/"
+"zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,26 +32,6 @@ msgstr ""
 msgid "Adding proxy '%(proxy)s' to KVS %(name)s."
 msgstr "正在将代理'%(proxy)s'加入KVS %(name)s 中。"
 
-#, python-format
-msgid "Caught %s, exiting"
-msgstr "捕获到 %s，正在退出"
-
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr "捕获到 %s，正在停止子代"
-
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr "信号 %(sig)d 已终止子代 %(pid)d"
-
-#, python-format
-msgid "Child %(pid)s exited with status %(code)d"
-msgstr "子代 %(pid)s 已退出，状态为 %(code)d"
-
-#, python-format
-msgid "Child caught %s, exiting"
-msgstr "子代捕获 %s，正在退出"
-
 #, python-format
 msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}"
 msgstr "不能验证未知绑定: {%(bind_type)s: %(identifier)s}"
@@ -60,13 +40,6 @@ msgstr "不能验证未知绑定: {%(bind_type)s: %(identifier)s}"
 msgid "Creating the default role %s because it does not exist."
 msgstr "正在创建默认角色%s，因为它之前不存在。"
 
-#, python-format
-msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
-msgstr "携程为进程 %(pid)d 在后台监听 %(port)s "
-
-msgid "Forking too fast, sleeping"
-msgstr "派生速度太快，正在休眠"
-
 #, python-format
 msgid "KVS region %s key_mangler disabled."
 msgstr "KVS域 %s 的key_mangler处理函数被禁用。"
@@ -87,25 +60,14 @@ msgstr "在绑定信息中没有命名绑定模式%s"
 msgid "No bind information present in token"
 msgstr "令牌中暂无绑定信息"
 
-msgid "Parent process has died unexpectedly, exiting"
-msgstr "父进程已意外终止，正在退出"
-
 #, python-format
 msgid "Running command - %s"
 msgstr "正在运行命令 - %s"
 
-#, python-format
-msgid "Started child %d"
-msgstr "已启动子代 %d"
-
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr "正在 %(host)s:%(port)s 上启动 %(arg0)s"
 
-#, python-format
-msgid "Starting %d workers"
-msgstr "正在启动 %d 工作程序"
-
 #, python-format
 msgid "Total expired tokens removed: %d"
 msgstr "被移除的失效令牌总数：%d"
@@ -118,10 +80,3 @@ msgstr "使用 %(func)s 作为KVS域 %(name)s 的key_mangler处理函数"
 msgid "Using default dogpile sha1_mangle_key as KVS region %s key_mangler"
 msgstr ""
 "使用默认的dogpile sha1_mangle_key函数作为KVS域 %s 的key_mangler处理函数"
-
-msgid "Wait called after thread killed. Cleaning up."
-msgstr "线程结束，正在清理"
-
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr "正在等待 %d 个子代退出"
diff --git a/keystone/locale/zh_TW/LC_MESSAGES/keystone-log-critical.po b/keystone/locale/zh_TW/LC_MESSAGES/keystone-log-critical.po
index b0ff57c965..6c86932d94 100644
--- a/keystone/locale/zh_TW/LC_MESSAGES/keystone-log-critical.po
+++ b/keystone/locale/zh_TW/LC_MESSAGES/keystone-log-critical.po
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2014 OpenStack Foundation
+# Copyright (C) 2015 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2014-09-07 06:06+0000\n"
+"POT-Creation-Date: 2015-07-09 06:09+0000\n"
 "PO-Revision-Date: 2014-08-31 15:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
-"keystone/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/p/keystone/"
+"language/zh_TW/)\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,6 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: keystone/catalog/backends/templated.py:106
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "無法開啟範本檔 %s"