diff --git a/oslo.messaging/locale/de/LC_MESSAGES/oslo.messaging.po b/oslo.messaging/locale/de/LC_MESSAGES/oslo.messaging.po
deleted file mode 100644
index ccdbd77f4..000000000
--- a/oslo.messaging/locale/de/LC_MESSAGES/oslo.messaging.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# German translations for oslo.messaging.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.messaging
-# project.
-#
-# Translators:
-# Andreas Jaeger <jaegerandi@gmail.com>, 2014
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version:  oslo.messaging\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-08-04 06:29+0000\n"
-"PO-Revision-Date: 2015-08-03 21:07+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: German (http://www.transifex.com/openstack/oslomessaging/"
-"language/de/)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.0\n"
-
-#, python-format
-msgid "Exception during message handling: %s"
-msgstr "Exception während Messagebehandlung: %s"
-
-#, python-format
-msgid "Failed to load any notifiers for %s"
-msgstr "Es konnten keine Notifiers für %s geladen werden"
-
-#, python-format
-msgid "Routing '%(event)s' notification to '%(driver)s' driver"
-msgstr "'%(event)s' Notfikation wird zum Treiber '%(driver)s' geroutet."
diff --git a/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging.po b/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging.po
deleted file mode 100644
index 8da1daa9a..000000000
--- a/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# English (United Kingdom) translations for oslo.messaging.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.messaging
-# project.
-#
-# Translators:
-# Andi Chandler <andi@gowling.com>, 2014-2015
-msgid ""
-msgstr ""
-"Project-Id-Version:  oslo.messaging\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-08-04 06:29+0000\n"
-"PO-Revision-Date: 2015-08-03 21:07+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/"
-"oslomessaging/language/en_GB/)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.0\n"
-
-#, python-format
-msgid "Exception during message handling: %s"
-msgstr "Exception during message handling: %s"
-
-#, python-format
-msgid "Failed to load any notifiers for %s"
-msgstr "Failed to load any notifiers for %s"
-
-#, python-format
-msgid "Routing '%(event)s' notification to '%(driver)s' driver"
-msgstr "Routing '%(event)s' notification to '%(driver)s' driver"
diff --git a/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-warning.po b/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-warning.po
new file mode 100644
index 000000000..f7970147c
--- /dev/null
+++ b/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-warning.po
@@ -0,0 +1,26 @@
+# Translations template for oslo.messaging.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the oslo.messaging
+# project.
+#
+# Translators:
+# Adriana Chisco Landazábal <achisco94@gmail.com>, 2015
+# Lucía Pradillos <dreamers_88@hotmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: oslo.messaging\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-08-26 06:33+0000\n"
+"PO-Revision-Date: 2015-08-26 03:46+0000\n"
+"Last-Translator: Lucía Pradillos <dreamers_88@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/openstack/oslomessaging/"
+"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 2.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "start/stop/wait must be called in the same thread"
+msgstr "empezar/parar/esperar debe ser llamado en el mismo hilo"
diff --git a/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging.po b/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging.po
deleted file mode 100644
index 01c01ee22..000000000
--- a/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Spanish translations for oslo.messaging.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.messaging
-# project.
-#
-# Translators:
-# Adriana Chisco Landazábal <achisco94@gmail.com>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version:  oslo.messaging\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-08-04 06:29+0000\n"
-"PO-Revision-Date: 2015-08-03 21:07+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/openstack/oslomessaging/"
-"language/es/)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.0\n"
-
-#, python-format
-msgid "Exception during message handling: %s"
-msgstr "Excepción durante el manejo de mensaje: %s"
-
-#, python-format
-msgid "Failed to load any notifiers for %s"
-msgstr "No se puede cargar notificadores para %s"
-
-#, python-format
-msgid "Routing '%(event)s' notification to '%(driver)s' driver"
-msgstr "Notificación de enrutamiento '%(event)s' para controlador '%(driver)s'"
diff --git a/oslo.messaging/locale/fr/LC_MESSAGES/oslo.messaging.po b/oslo.messaging/locale/fr/LC_MESSAGES/oslo.messaging.po
deleted file mode 100644
index 89d7cfe80..000000000
--- a/oslo.messaging/locale/fr/LC_MESSAGES/oslo.messaging.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# French translations for oslo.messaging.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.messaging
-# project.
-#
-# Translators:
-# Jonathan Dupart <jonathan+transifex@dupart.org>, 2014
-# Lucas Mascaro <mascaro.lucas@yahoo.fr>, 2015
-# Maxime COQUEREL <max.coquerel@gmail.com>, 2014-2015
-msgid ""
-msgstr ""
-"Project-Id-Version:  oslo.messaging\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-08-18 06:33+0000\n"
-"PO-Revision-Date: 2015-08-17 15:20+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: French (http://www.transifex.com/openstack/oslomessaging/"
-"language/fr/)\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.0\n"
-
-#, python-format
-msgid "Exception during message handling: %s"
-msgstr "Exception lors de la manipulation du message: %s"
-
-#, python-format
-msgid "Failed to load any notifiers for %s"
-msgstr "Echec de chargement des notifications pour %s"
-
-#, python-format
-msgid "Routing '%(event)s' notification to '%(driver)s' driver"
-msgstr "Routage '%(event)s' notification du pilote %(driver)s'"
-
-msgid ""
-"wait() should be called after stop() as it waits for existing messages to "
-"finish processing"
-msgstr ""
-"wait() devrai être appelé après stop() vu qu'il attend que les messages "
-"existants aient fini d'être traités"
diff --git a/oslo.messaging/locale/oslo.messaging-log-error.pot b/oslo.messaging/locale/oslo.messaging-log-error.pot
index 1ebab029a..b7e93495a 100644
--- a/oslo.messaging/locale/oslo.messaging-log-error.pot
+++ b/oslo.messaging/locale/oslo.messaging-log-error.pot
@@ -7,9 +7,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: oslo.messaging 2.1.0\n"
+"Project-Id-Version: oslo.messaging 2.4.1.dev1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-29 06:39+0000\n"
+"POT-Creation-Date: 2015-08-26 06:33+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"
@@ -23,3 +23,8 @@ msgstr ""
 msgid "An exception occurred processing the API call: %s "
 msgstr ""
 
+#: oslo_messaging/rpc/dispatcher.py:150
+#, python-format
+msgid "Exception during message handling: %s"
+msgstr ""
+
diff --git a/oslo.messaging/locale/oslo.messaging-log-info.pot b/oslo.messaging/locale/oslo.messaging-log-info.pot
index d921c5a9c..358b89c44 100644
--- a/oslo.messaging/locale/oslo.messaging-log-info.pot
+++ b/oslo.messaging/locale/oslo.messaging-log-info.pot
@@ -7,9 +7,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: oslo.messaging 2.1.0\n"
+"Project-Id-Version: oslo.messaging 2.4.1.dev1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-29 06:39+0000\n"
+"POT-Creation-Date: 2015-08-26 06:33+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"
@@ -18,3 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.0\n"
 
+#: oslo_messaging/notify/_impl_routing.py:117
+#, python-format
+msgid "Routing '%(event)s' notification to '%(driver)s' driver"
+msgstr ""
+
diff --git a/oslo.messaging/locale/oslo.messaging-log-warning.pot b/oslo.messaging/locale/oslo.messaging-log-warning.pot
index aaeafcac0..de9167049 100644
--- a/oslo.messaging/locale/oslo.messaging-log-warning.pot
+++ b/oslo.messaging/locale/oslo.messaging-log-warning.pot
@@ -7,9 +7,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: oslo.messaging 2.2.1.dev10\n"
+"Project-Id-Version: oslo.messaging 2.4.1.dev1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-08-18 06:33+0000\n"
+"POT-Creation-Date: 2015-08-26 06:33+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"
@@ -18,7 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.0\n"
 
-#: oslo_messaging/server.py:146
+#: oslo_messaging/server.py:145
 msgid "start/stop/wait must be called in the same thread"
 msgstr ""
 
+#: oslo_messaging/server.py:178
+msgid ""
+"wait() should be called after stop() as it waits for existing messages to"
+" finish processing"
+msgstr ""
+
+#: oslo_messaging/notify/_impl_routing.py:80
+#, python-format
+msgid "Failed to load any notifiers for %s"
+msgstr ""
+
diff --git a/oslo.messaging/locale/oslo.messaging.pot b/oslo.messaging/locale/oslo.messaging.pot
index ddb4c442c..4c525cfc4 100644
--- a/oslo.messaging/locale/oslo.messaging.pot
+++ b/oslo.messaging/locale/oslo.messaging.pot
@@ -7,9 +7,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: oslo.messaging 2.2.1.dev10\n"
+"Project-Id-Version: oslo.messaging 2.4.1.dev1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-08-18 06:33+0000\n"
+"POT-Creation-Date: 2015-08-26 06:32+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"
@@ -18,24 +18,3 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.0\n"
 
-#: oslo_messaging/server.py:179
-msgid ""
-"wait() should be called after stop() as it waits for existing messages to"
-" finish processing"
-msgstr ""
-
-#: oslo_messaging/notify/_impl_routing.py:80
-#, python-format
-msgid "Failed to load any notifiers for %s"
-msgstr ""
-
-#: oslo_messaging/notify/_impl_routing.py:117
-#, python-format
-msgid "Routing '%(event)s' notification to '%(driver)s' driver"
-msgstr ""
-
-#: oslo_messaging/rpc/dispatcher.py:150
-#, python-format
-msgid "Exception during message handling: %s"
-msgstr ""
-