diff --git a/horizon/locale/ca/LC_MESSAGES/django.po b/horizon/locale/ca/LC_MESSAGES/django.po
index 6f56fb2986..a9537770c2 100644
--- a/horizon/locale/ca/LC_MESSAGES/django.po
+++ b/horizon/locale/ca/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -104,9 +104,6 @@ msgstr "Versió incorrecta de l'adreça IP"
 msgid "Limit Summary"
 msgstr "Resum Límit"
 
-msgid "Log In"
-msgstr "Inicia la sessió"
-
 msgid "Login"
 msgstr "Login"
 
diff --git a/horizon/locale/cs/LC_MESSAGES/django.po b/horizon/locale/cs/LC_MESSAGES/django.po
index 9958c422cc..058b05552f 100644
--- a/horizon/locale/cs/LC_MESSAGES/django.po
+++ b/horizon/locale/cs/LC_MESSAGES/django.po
@@ -10,11 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-09-21 07:08+0000\n"
+"PO-Revision-Date: 2015-11-17 04:39+0000\n"
 "Last-Translator: Zbyněk Schwarz <zbynek.schwarz@gmail.com>\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
@@ -22,6 +22,18 @@ msgstr ""
 "X-Generator: Zanata 3.7.1\n"
 "Language-Team: Czech\n"
 
+#, python-format
+msgid ""
+"\n"
+"                Login as different user or go back to <a href=\"%(home_url)s"
+"\">home page</a>\n"
+"              "
+msgstr ""
+"\n"
+"                Přihlaste se jako jiný uživatel nebo se vraťte na <a href="
+"\"%(home_url)s\"> domovskou stránku</a>\n"
+"              "
+
 #, python-format
 msgid ""
 "\n"
@@ -223,19 +235,12 @@ msgstr "Neplatná verze IP adresy"
 msgid "Limit Summary"
 msgstr "Omezit souhrn"
 
-msgid "Log In"
-msgstr "Přihlásit"
+msgid "Log in"
+msgstr "Přihlášení"
 
 msgid "Login"
 msgstr "Přihlášení"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Přihlaste se jako jiný uživatel nebo se vraťte na <a href=\"%(home_url)s\"> "
-"domovskou stránku</a>"
-
 msgid "Members"
 msgstr "Členové"
 
diff --git a/horizon/locale/de/LC_MESSAGES/django.po b/horizon/locale/de/LC_MESSAGES/django.po
index f45e84f04d..433be62e5b 100644
--- a/horizon/locale/de/LC_MESSAGES/django.po
+++ b/horizon/locale/de/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -220,19 +220,9 @@ msgstr "Ungültige Version der IP-Adresse"
 msgid "Limit Summary"
 msgstr "Übersicht Begrenzungen"
 
-msgid "Log In"
-msgstr "Anmelden"
-
 msgid "Login"
 msgstr "Login"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Melden Sie sich als anderer Benutzer an oder gehen Sie zurück auf die <a "
-"href=\"%(home_url)s\"> Startseite</a>"
-
 msgid "Members"
 msgstr "Mitglieder"
 
diff --git a/horizon/locale/django.pot b/horizon/locale/django.pot
index 6be8f58c2d..95c1d0ca2b 100644
--- a/horizon/locale/django.pot
+++ b/horizon/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-23 06:35+0000\n"
+"POT-Creation-Date: 2015-11-18 06:35+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,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.1.1\n"
 
-#: base.py:497
+#: base.py:500
 msgid "Other"
 msgstr ""
 
@@ -73,7 +73,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: forms/views.py:133 templates/horizon/common/_workflow.html:49
+#: forms/views.py:133 templates/horizon/common/_workflow.html:54
 msgid "Cancel"
 msgstr ""
 
@@ -145,12 +145,12 @@ msgstr ""
 msgid "Actions"
 msgstr ""
 
-#: tables/base.py:1339
+#: tables/base.py:1343
 #, python-format
 msgid "No match returned for the id \"%s\"."
 msgstr ""
 
-#: tables/base.py:1497
+#: tables/base.py:1501
 msgid "Please select a row before taking that action."
 msgstr ""
 
@@ -162,26 +162,28 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/auth/_login.html:5
-msgid "Log In"
+#: templates/auth/_login_form.html:18
+msgid "Log in"
 msgstr ""
 
-#: templates/auth/_login.html:26
+#: templates/auth/_login_form.html:39
 msgid "You do not have permission to access the resource:"
 msgstr ""
 
-#: templates/auth/_login.html:28
+#: templates/auth/_login_form.html:50
 #, python-format
 msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home "
-"page</a>"
+"\n"
+"                Login as different user or go back to <a "
+"href=\"%(home_url)s\">home page</a>\n"
+"              "
 msgstr ""
 
-#: templates/auth/_login.html:44
+#: templates/auth/_login_form.html:70
 msgid "Sign In"
 msgstr ""
 
-#: templates/auth/_login.html:45
+#: templates/auth/_login_form.html:71
 msgid "Connect"
 msgstr ""
 
@@ -205,22 +207,22 @@ msgstr ""
 msgid "Error: "
 msgstr ""
 
-#: templates/horizon/common/_data_table.html:64
+#: templates/horizon/common/_data_table.html:63
 msgid "Summary"
 msgstr ""
 
-#: templates/horizon/common/_data_table.html:73
+#: templates/horizon/common/_data_table.html:72
 #, python-format
 msgid "Displaying %(counter)s item"
 msgid_plural "Displaying %(counter)s items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/horizon/common/_data_table.html:78
+#: templates/horizon/common/_data_table.html:77
 msgid "&laquo;&nbsp;Prev"
 msgstr ""
 
-#: templates/horizon/common/_data_table.html:81
+#: templates/horizon/common/_data_table.html:80
 msgid "Next&nbsp;&raquo;"
 msgstr ""
 
@@ -320,11 +322,11 @@ msgstr ""
 msgid "This Period's RAM-Hours:"
 msgstr ""
 
-#: templates/horizon/common/_workflow.html:40
+#: templates/horizon/common/_workflow.html:45
 msgid "Back"
 msgstr ""
 
-#: templates/horizon/common/_workflow.html:43
+#: templates/horizon/common/_workflow.html:48
 msgid "Next"
 msgstr ""
 
diff --git a/horizon/locale/en_AU/LC_MESSAGES/django.po b/horizon/locale/en_AU/LC_MESSAGES/django.po
index a3fa482d8b..ab5f32b733 100644
--- a/horizon/locale/en_AU/LC_MESSAGES/django.po
+++ b/horizon/locale/en_AU/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -218,18 +218,9 @@ msgstr "Invalid version for IP address"
 msgid "Limit Summary"
 msgstr "Limit Summary"
 
-msgid "Log In"
-msgstr "Log In"
-
 msgid "Login"
 msgstr "Login"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-
 msgid "Members"
 msgstr "Members"
 
diff --git a/horizon/locale/en_GB/LC_MESSAGES/django.po b/horizon/locale/en_GB/LC_MESSAGES/django.po
index 8ce3a8eff1..f31be1a5d4 100644
--- a/horizon/locale/en_GB/LC_MESSAGES/django.po
+++ b/horizon/locale/en_GB/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -219,18 +219,9 @@ msgstr "Invalid version for IP address"
 msgid "Limit Summary"
 msgstr "Limit Summary"
 
-msgid "Log In"
-msgstr "Log In"
-
 msgid "Login"
 msgstr "Login"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-
 msgid "Members"
 msgstr "Members"
 
diff --git a/horizon/locale/es/LC_MESSAGES/django.po b/horizon/locale/es/LC_MESSAGES/django.po
index a7e47f0df9..ee17b31334 100644
--- a/horizon/locale/es/LC_MESSAGES/django.po
+++ b/horizon/locale/es/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -222,19 +222,9 @@ msgstr "Versión de dirección IP no válida"
 msgid "Limit Summary"
 msgstr "Resumen"
 
-msgid "Log In"
-msgstr "Iniciar sesión"
-
 msgid "Login"
 msgstr "Usuario"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Inicie sesión con otro usuario o volver a la <a href=\"%(home_url)s\"> "
-"página de inicio</a>"
-
 msgid "Members"
 msgstr "Miembros"
 
diff --git a/horizon/locale/es_MX/LC_MESSAGES/django.po b/horizon/locale/es_MX/LC_MESSAGES/django.po
index 12e6a8c3ac..390b01cb60 100644
--- a/horizon/locale/es_MX/LC_MESSAGES/django.po
+++ b/horizon/locale/es_MX/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -195,18 +195,9 @@ msgstr "Versión de dirección IP no válida"
 msgid "Limit Summary"
 msgstr "Resumen de Límite"
 
-msgid "Log In"
-msgstr "Ingresar"
-
 msgid "Login"
 msgstr "Nombre de usuario"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Ingresar como otro usuario o volver a <a href=\"%(home_url)s\"> home page</a>"
-
 msgid "Members"
 msgstr "Miembros"
 
diff --git a/horizon/locale/fi_FI/LC_MESSAGES/django.po b/horizon/locale/fi_FI/LC_MESSAGES/django.po
index 0e39466438..be901ba91a 100644
--- a/horizon/locale/fi_FI/LC_MESSAGES/django.po
+++ b/horizon/locale/fi_FI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -177,19 +177,9 @@ msgstr "Väärä versio IP-osoitteesta"
 msgid "Limit Summary"
 msgstr "Rajoitusten yhteenveto"
 
-msgid "Log In"
-msgstr "Kirjaudu"
-
 msgid "Login"
 msgstr "Kirjaudu"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Kirjaudu toisena käyttäjänä tai mene takaisin <a href=\"%(home_url)s"
-"\">kotisivulle</a>"
-
 msgid "Members"
 msgstr "Jäsenet"
 
diff --git a/horizon/locale/fil/LC_MESSAGES/django.po b/horizon/locale/fil/LC_MESSAGES/django.po
index 51237cb796..62e2c26c1f 100644
--- a/horizon/locale/fil/LC_MESSAGES/django.po
+++ b/horizon/locale/fil/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,19 +113,9 @@ msgstr "Maling bersyon para sa IP address"
 msgid "Limit Summary"
 msgstr "Buod ng Limitasyon"
 
-msgid "Log In"
-msgstr "Long In"
-
 msgid "Login"
 msgstr "Login"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Mag-login bilang ibang user o bumalik sa <a href=\"%(home_url)s\"> home "
-"page</a>"
-
 msgid "Members"
 msgstr "Mga Miyembro"
 
diff --git a/horizon/locale/fr/LC_MESSAGES/django.po b/horizon/locale/fr/LC_MESSAGES/django.po
index 04c1806557..fb244e6b2a 100644
--- a/horizon/locale/fr/LC_MESSAGES/django.po
+++ b/horizon/locale/fr/LC_MESSAGES/django.po
@@ -11,23 +11,36 @@
 # JF Taltavull <jftalta@gmail.com>, 2015
 # Maxime COQUEREL <max.coquerel@gmail.com>, 2015
 # Corinne Verheyde <cverheyd@gmail.com>, 2015. #zanata
+# Gael Rehault <gael01@gmail.com>, 2015. #zanata
 # Kevin Tibi <kodokuu@gmail.com>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-09-16 10:48+0000\n"
-"Last-Translator: Corinne Verheyde <cverheyd@gmail.com>\n"
+"PO-Revision-Date: 2015-11-17 11:11+0000\n"
+"Last-Translator: Gael Rehault <gael01@gmail.com>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Generated-By: Babel 2.0\n"
 "X-Generator: Zanata 3.7.1\n"
 "Language-Team: French\n"
 
+#, python-format
+msgid ""
+"\n"
+"                Login as different user or go back to <a href=\"%(home_url)s"
+"\">home page</a>\n"
+"              "
+msgstr ""
+"\n"
+"                Connectez-vous avec un autre nom d'utilisateur ou revenez à "
+"<a href=\"%(home_url)s\">home page</a>\n"
+"              "
+
 #, python-format
 msgid ""
 "\n"
@@ -226,19 +239,12 @@ msgstr "Version d'adresse IP invalide"
 msgid "Limit Summary"
 msgstr "Synthèse  des Quotas"
 
-msgid "Log In"
+msgid "Log in"
 msgstr "Se connecter"
 
 msgid "Login"
 msgstr "Identifiant"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Connectez-vous avec un autre nom d'utilisateur ou revenez à <a href="
-"\"%(home_url)s\"> la page d’accueil</a>"
-
 msgid "Members"
 msgstr "Membres"
 
diff --git a/horizon/locale/fr/LC_MESSAGES/djangojs.po b/horizon/locale/fr/LC_MESSAGES/djangojs.po
index d55d08502b..5fd78b9ef0 100644
--- a/horizon/locale/fr/LC_MESSAGES/djangojs.po
+++ b/horizon/locale/fr/LC_MESSAGES/djangojs.po
@@ -25,11 +25,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-10-27 11:11+0000\n"
+"PO-Revision-Date: 2015-11-17 11:14+0000\n"
 "Last-Translator: Gael Rehault <gael01@gmail.com>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -148,6 +148,9 @@ msgstr "Nombre décimal requis"
 msgid "Delete"
 msgstr "Supprimer"
 
+msgid "Delete Image"
+msgstr "Supprimer une image"
+
 msgid "Delete Interface"
 msgstr "Supprimer l'Interface"
 
@@ -362,6 +365,10 @@ msgstr "Erreur lors de la soumission du formulaire. Veuillez réessayer. "
 msgid "Total"
 msgstr "Total"
 
+#, python-format
+msgid "Unable to delete: %s."
+msgstr "Impossible de supprimer: %s."
+
 msgid "View Details"
 msgstr "Voir les détails"
 
@@ -413,3 +420,7 @@ msgstr "pas de quota"
 
 msgid "pool default"
 msgstr "pool par défaut"
+
+#, python-format
+msgid "selected \"%s\""
+msgstr "Vous avez sélectionné \"%s\""
diff --git a/horizon/locale/hi/LC_MESSAGES/django.po b/horizon/locale/hi/LC_MESSAGES/django.po
index d36a0255d1..ad225eb9da 100644
--- a/horizon/locale/hi/LC_MESSAGES/django.po
+++ b/horizon/locale/hi/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -183,19 +183,9 @@ msgstr "IP पता के लिए अवैध प्रारूप सं
 msgid "Limit Summary"
 msgstr "सारांश सीमा"
 
-msgid "Log In"
-msgstr "लॉगिन"
-
 msgid "Login"
 msgstr "लॉगिन"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"दूसरे उपयोगकर्ता के रूप में लॉगिन हों या  <a href=\"%(home_url)s\"> मुखपृष्ठ पर वापस "
-"जायें </a>"
-
 msgid "Members"
 msgstr "सदस्य"
 
diff --git a/horizon/locale/hu/LC_MESSAGES/django.po b/horizon/locale/hu/LC_MESSAGES/django.po
index 1374ce143a..fc4df7b386 100644
--- a/horizon/locale/hu/LC_MESSAGES/django.po
+++ b/horizon/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -107,19 +107,9 @@ msgstr "Érvénytelen alhálózati maszk"
 msgid "Invalid version for IP address"
 msgstr "Érvénytelen IP-cím változat"
 
-msgid "Log In"
-msgstr "Bejelentkezés"
-
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Bejelentkezés másik felhasználóval vagy visszatérés a <a href=\"%(home_url)s"
-"\"> főoldalra</a>"
-
 msgid "Members"
 msgstr "Tagok"
 
diff --git a/horizon/locale/id/LC_MESSAGES/django.po b/horizon/locale/id/LC_MESSAGES/django.po
index ca3510056e..ad42212459 100644
--- a/horizon/locale/id/LC_MESSAGES/django.po
+++ b/horizon/locale/id/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -177,18 +177,9 @@ msgstr "Versi alamat IP salah."
 msgid "Limit Summary"
 msgstr "Ringkasan Batasan"
 
-msgid "Log In"
-msgstr "Masuk"
-
 msgid "Login"
 msgstr "Login"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Masuk sebagai user lain atau kembali ke <a href=\"%(home_url)s\"> beranda</a>"
-
 msgid "Members"
 msgstr "Anggota"
 
diff --git a/horizon/locale/it/LC_MESSAGES/django.po b/horizon/locale/it/LC_MESSAGES/django.po
index 4fe1fb9864..ac16eb1dc2 100644
--- a/horizon/locale/it/LC_MESSAGES/django.po
+++ b/horizon/locale/it/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -220,19 +220,9 @@ msgstr "Versione dell'indirizzo IP non valida"
 msgid "Limit Summary"
 msgstr "Riepilogo dei Limiti"
 
-msgid "Log In"
-msgstr "Log In"
-
 msgid "Login"
 msgstr "Login"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Accedi con un dicerso utente o torna alla <a href=\"%(home_url)s\"> home "
-"page</a>"
-
 msgid "Members"
 msgstr "Membri"
 
diff --git a/horizon/locale/ja/LC_MESSAGES/django.po b/horizon/locale/ja/LC_MESSAGES/django.po
index 68b371bbc4..2a0faf0dd2 100644
--- a/horizon/locale/ja/LC_MESSAGES/django.po
+++ b/horizon/locale/ja/LC_MESSAGES/django.po
@@ -6,23 +6,36 @@
 # Shu Muto <shu-mutou@rf.jp.nec.com>, 2015
 # ykatabam <ykatabam@redhat.com>, 2015
 # ykatabam <ykatabam@redhat.com>, 2015
+# Shu Muto <shu-mutou@rf.jp.nec.com>, 2015. #zanata
 # Yuko Katabami <yukokatabami@gmail.com>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-10-06 02:02+0000\n"
-"Last-Translator: Yuko Katabami <yukokatabami@gmail.com>\n"
+"PO-Revision-Date: 2015-11-18 12:22+0000\n"
+"Last-Translator: Shu Muto <shu-mutou@rf.jp.nec.com>\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.0\n"
 "X-Generator: Zanata 3.7.1\n"
 "Language-Team: Japanese\n"
 
+#, python-format
+msgid ""
+"\n"
+"                Login as different user or go back to <a href=\"%(home_url)s"
+"\">home page</a>\n"
+"              "
+msgstr ""
+"\n"
+"                別のユーザーとしてログインするか、<a href=\"%(home_url)s\">"
+"ホームページ</a> に戻ってください。\n"
+"              "
+
 #, python-format
 msgid ""
 "\n"
@@ -216,19 +229,12 @@ msgstr "無効な IP アドレスのバージョン"
 msgid "Limit Summary"
 msgstr "利用可能リソース概要"
 
-msgid "Log In"
+msgid "Log in"
 msgstr "ログイン"
 
 msgid "Login"
 msgstr "ログイン"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"別のユーザーとしてログインするか、<a href=\"%(home_url)s\">ホームページ</a> "
-"に戻ってください。"
-
 msgid "Members"
 msgstr "メンバー"
 
diff --git a/horizon/locale/ko_KR/LC_MESSAGES/django.po b/horizon/locale/ko_KR/LC_MESSAGES/django.po
index 48b408ec87..fab08115ef 100644
--- a/horizon/locale/ko_KR/LC_MESSAGES/django.po
+++ b/horizon/locale/ko_KR/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -215,18 +215,9 @@ msgstr "IP 주소 버전이 잘못되었습니다."
 msgid "Limit Summary"
 msgstr "간략한 요약"
 
-msgid "Log In"
-msgstr "로그인"
-
 msgid "Login"
 msgstr "로그인"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"다른 사용자로 로그인하거나 <a href=\"%(home_url)s\">홈페이지</a>로 되돌아가기"
-
 msgid "Members"
 msgstr "구성원"
 
diff --git a/horizon/locale/nl_NL/LC_MESSAGES/django.po b/horizon/locale/nl_NL/LC_MESSAGES/django.po
index c23c62762c..d04fd5a5e8 100644
--- a/horizon/locale/nl_NL/LC_MESSAGES/django.po
+++ b/horizon/locale/nl_NL/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -149,19 +149,9 @@ msgstr "Ongeldige versie voor IP adres"
 msgid "Limit Summary"
 msgstr "Beperk samenvatting"
 
-msgid "Log In"
-msgstr "Aanmelden"
-
 msgid "Login"
 msgstr "Aanmelden"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Meldt u zich aan als een andere gebruiker of ga terug naar <a href="
-"\"%(home_url)s\">thuis</a>"
-
 msgid "Members"
 msgstr "Leden"
 
diff --git a/horizon/locale/pa_IN/LC_MESSAGES/django.po b/horizon/locale/pa_IN/LC_MESSAGES/django.po
index da2c03d925..fac6d4eb70 100644
--- a/horizon/locale/pa_IN/LC_MESSAGES/django.po
+++ b/horizon/locale/pa_IN/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -218,18 +218,9 @@ msgstr "IP ਪਤੇ ਲਈ ਅਢੁਕਵਾਂ ਸੰਸਕਰਣ"
 msgid "Limit Summary"
 msgstr "ਹੱਦ ਸਾਰ"
 
-msgid "Log In"
-msgstr "ਲਾਗ ਇਨ"
-
 msgid "Login"
 msgstr "ਲਾਗਇਨ"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"ਵੱਖਰੇ ਵਰਤੋਂਕਾਰ ਵਜੋਂ ਲਾਗਇਨ ਹੋਵੋ ਜਾਂ ਵਾਪਸ <a href=\"%(home_url)s\"> ਘਰ ਵਰਕਾ</a> ਤੇ ਜਾਉ।"
-
 msgid "Members"
 msgstr "ਜੀਅ"
 
diff --git a/horizon/locale/pl_PL/LC_MESSAGES/django.po b/horizon/locale/pl_PL/LC_MESSAGES/django.po
index eedd2b6651..f943520e4a 100644
--- a/horizon/locale/pl_PL/LC_MESSAGES/django.po
+++ b/horizon/locale/pl_PL/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -226,19 +226,9 @@ msgstr "Błędna wersja adresu IP"
 msgid "Limit Summary"
 msgstr "Podsumowanie limitów"
 
-msgid "Log In"
-msgstr "Zaloguj"
-
 msgid "Login"
 msgstr "Login"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Należy zalogować się jako inny użytkownik lub wrócić do <a href="
-"\"%(home_url)s\"> strony domowej</a>"
-
 msgid "Members"
 msgstr "Członkowie"
 
diff --git a/horizon/locale/pt/LC_MESSAGES/django.po b/horizon/locale/pt/LC_MESSAGES/django.po
index 9083c91568..9ac108004d 100644
--- a/horizon/locale/pt/LC_MESSAGES/django.po
+++ b/horizon/locale/pt/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -177,19 +177,9 @@ msgstr "Versão inválido para o endereço de IP"
 msgid "Limit Summary"
 msgstr "Resumo do Limite"
 
-msgid "Log In"
-msgstr "Iniciar Sessão"
-
 msgid "Login"
 msgstr "Iniciar Sessão"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Inicie a sessão como um utilizador diferente ou volte para a <a href="
-"\"%(home_url)s\">Página Principal</a>"
-
 msgid "Members"
 msgstr "Membros."
 
diff --git a/horizon/locale/pt_BR/LC_MESSAGES/django.po b/horizon/locale/pt_BR/LC_MESSAGES/django.po
index a2d4e70df5..cd3ba93f22 100644
--- a/horizon/locale/pt_BR/LC_MESSAGES/django.po
+++ b/horizon/locale/pt_BR/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -223,19 +223,9 @@ msgstr "Versão inválida para o endereço IP"
 msgid "Limit Summary"
 msgstr "Resumo de Limites"
 
-msgid "Log In"
-msgstr "Entrar"
-
 msgid "Login"
 msgstr "Logar"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Faça login com um usuário diferente ou volte para a <a href=\"%(home_url)s"
-"\"> página inicial</a>"
-
 msgid "Members"
 msgstr "Membros"
 
diff --git a/horizon/locale/ru/LC_MESSAGES/django.po b/horizon/locale/ru/LC_MESSAGES/django.po
index 4ccb4b2c1b..27dfa79a1d 100644
--- a/horizon/locale/ru/LC_MESSAGES/django.po
+++ b/horizon/locale/ru/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -233,19 +233,9 @@ msgstr "Неправильная версия IP-адреса"
 msgid "Limit Summary"
 msgstr "Сводка лимитов"
 
-msgid "Log In"
-msgstr "Войти"
-
 msgid "Login"
 msgstr "Имя пользователя"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Войдите под другим пользователем или вернитесь на<a href=\"%(home_url)s\"> "
-"домашнюю страницу</a>"
-
 msgid "Members"
 msgstr "Участники"
 
diff --git a/horizon/locale/sl_SI/LC_MESSAGES/django.po b/horizon/locale/sl_SI/LC_MESSAGES/django.po
index 77c916f169..c4399faaa3 100644
--- a/horizon/locale/sl_SI/LC_MESSAGES/django.po
+++ b/horizon/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -136,19 +136,9 @@ msgstr "Neveljavna različica IP-naslova"
 msgid "Limit Summary"
 msgstr "Povzetek omejitev"
 
-msgid "Log In"
-msgstr "Prijava"
-
 msgid "Login"
 msgstr "Prijava"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Prijavite se kot drug uporabnik ali pojdite nazaj na <a href=\"%(home_url)s"
-"\"> domačo stran</a>"
-
 msgid "Members"
 msgstr "Člani"
 
diff --git a/horizon/locale/sr/LC_MESSAGES/django.po b/horizon/locale/sr/LC_MESSAGES/django.po
index dc19e0430a..2069ad028f 100644
--- a/horizon/locale/sr/LC_MESSAGES/django.po
+++ b/horizon/locale/sr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -122,19 +122,9 @@ msgstr "Neispravna verzija IP adrese"
 msgid "Limit Summary"
 msgstr "Rezime ograničenja"
 
-msgid "Log In"
-msgstr "Log In"
-
 msgid "Login"
 msgstr "Login"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Ulogujte se kao drugi korisnik ili idite nazad na <a href=\"%(home_url)s\"> "
-"naslovna stranu</a>"
-
 msgid "Members"
 msgstr "Članovi"
 
diff --git a/horizon/locale/tr_TR/LC_MESSAGES/django.po b/horizon/locale/tr_TR/LC_MESSAGES/django.po
index df55898b79..2fa3f4dfa2 100644
--- a/horizon/locale/tr_TR/LC_MESSAGES/django.po
+++ b/horizon/locale/tr_TR/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -221,19 +221,9 @@ msgstr "Geçersiz IP adres versiyonu"
 msgid "Limit Summary"
 msgstr "Özeti Sınırla"
 
-msgid "Log In"
-msgstr "Oturum Aç"
-
 msgid "Login"
 msgstr "Giriş"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr ""
-"Başka bir kullanıcı ile oturum açın veya <a href=\"%(home_url)s\"> Ana "
-"Sayfa</a>'ya gidin"
-
 msgid "Members"
 msgstr "Üyeler"
 
diff --git a/horizon/locale/zh_CN/LC_MESSAGES/django.po b/horizon/locale/zh_CN/LC_MESSAGES/django.po
index d695087c06..5025503312 100644
--- a/horizon/locale/zh_CN/LC_MESSAGES/django.po
+++ b/horizon/locale/zh_CN/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -218,17 +218,9 @@ msgstr "IP 地址版本无效"
 msgid "Limit Summary"
 msgstr "上限摘要"
 
-msgid "Log In"
-msgstr "登录"
-
 msgid "Login"
 msgstr "登录"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr "使用其他用户登录或返回 <a href=\"%(home_url)s\">首页</a>"
-
 msgid "Members"
 msgstr "成员"
 
diff --git a/horizon/locale/zh_TW/LC_MESSAGES/django.po b/horizon/locale/zh_TW/LC_MESSAGES/django.po
index a6b69b0256..ab3db3a055 100644
--- a/horizon/locale/zh_TW/LC_MESSAGES/django.po
+++ b/horizon/locale/zh_TW/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -214,17 +214,9 @@ msgstr "無效的 IP 位址版本"
 msgid "Limit Summary"
 msgstr "限制摘要"
 
-msgid "Log In"
-msgstr "登入"
-
 msgid "Login"
 msgstr "登入"
 
-#, python-format
-msgid ""
-"Login as different user or go back to <a href=\"%(home_url)s\"> home page</a>"
-msgstr "以不同的用戶身份登入，或者回到<a href=\"%(home_url)s\">首頁</a>"
-
 msgid "Members"
 msgstr "成員"
 
diff --git a/openstack_dashboard/locale/django.pot b/openstack_dashboard/locale/django.pot
index d964deb978..e4287cecbb 100644
--- a/openstack_dashboard/locale/django.pot
+++ b/openstack_dashboard/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-11-17 06:58+0000\n"
+"POT-Creation-Date: 2015-11-18 06:36+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"
@@ -640,14 +640,14 @@ msgstr ""
 #: dashboards/project/access_and_security/templates/access_and_security/keypairs/detail.html:12
 #: dashboards/project/containers/templates/containers/_object_detail.html:9
 #: dashboards/project/firewalls/forms.py:34
-#: dashboards/project/firewalls/forms.py:99
-#: dashboards/project/firewalls/forms.py:126
+#: dashboards/project/firewalls/forms.py:103
+#: dashboards/project/firewalls/forms.py:130
 #: dashboards/project/firewalls/tables.py:291
 #: dashboards/project/firewalls/tables.py:328
 #: dashboards/project/firewalls/tables.py:373
-#: dashboards/project/firewalls/workflows.py:30
-#: dashboards/project/firewalls/workflows.py:218
-#: dashboards/project/firewalls/workflows.py:275
+#: dashboards/project/firewalls/workflows.py:31
+#: dashboards/project/firewalls/workflows.py:240
+#: dashboards/project/firewalls/workflows.py:297
 #: dashboards/project/firewalls/templates/firewalls/_firewall_details.html:5
 #: dashboards/project/firewalls/templates/firewalls/_policy_details.html:5
 #: dashboards/project/firewalls/templates/firewalls/_rule_details.html:5
@@ -781,14 +781,14 @@ msgstr ""
 #: dashboards/project/access_and_security/security_groups/forms.py:56
 #: dashboards/project/access_and_security/security_groups/tables.py:143
 #: dashboards/project/firewalls/forms.py:37
-#: dashboards/project/firewalls/forms.py:101
-#: dashboards/project/firewalls/forms.py:129
+#: dashboards/project/firewalls/forms.py:105
+#: dashboards/project/firewalls/forms.py:133
 #: dashboards/project/firewalls/tables.py:293
 #: dashboards/project/firewalls/tables.py:330
 #: dashboards/project/firewalls/tables.py:375
-#: dashboards/project/firewalls/workflows.py:34
-#: dashboards/project/firewalls/workflows.py:220
-#: dashboards/project/firewalls/workflows.py:278
+#: dashboards/project/firewalls/workflows.py:35
+#: dashboards/project/firewalls/workflows.py:242
+#: dashboards/project/firewalls/workflows.py:300
 #: dashboards/project/firewalls/templates/firewalls/_firewall_details.html:8
 #: dashboards/project/firewalls/templates/firewalls/_policy_details.html:8
 #: dashboards/project/firewalls/templates/firewalls/_rule_details.html:8
@@ -2685,9 +2685,9 @@ msgstr ""
 #: contrib/sahara/content/data_processing/jobs/templates/data_processing.jobs/config_template.html:59
 #: contrib/sahara/content/data_processing/jobs/templates/data_processing.jobs/config_template.html:69
 #: dashboards/project/access_and_security/security_groups/views.py:111
-#: dashboards/project/firewalls/workflows.py:104
-#: dashboards/project/firewalls/workflows.py:254
-#: dashboards/project/firewalls/workflows.py:325
+#: dashboards/project/firewalls/workflows.py:126
+#: dashboards/project/firewalls/workflows.py:276
+#: dashboards/project/firewalls/workflows.py:347
 #: dashboards/project/loadbalancers/workflows.py:131
 #: dashboards/project/loadbalancers/workflows.py:250
 #: dashboards/project/loadbalancers/workflows.py:416
@@ -5942,9 +5942,9 @@ msgstr ""
 #: dashboards/identity/users/forms.py:109
 #: dashboards/identity/users/tables.py:252
 #: dashboards/identity/users/templates/users/_detail_overview.html:19
-#: dashboards/project/firewalls/forms.py:71
+#: dashboards/project/firewalls/forms.py:75
 #: dashboards/project/firewalls/tables.py:313
-#: dashboards/project/firewalls/workflows.py:67
+#: dashboards/project/firewalls/workflows.py:71
 #: dashboards/project/firewalls/templates/firewalls/_rule_details.html:51
 #: dashboards/project/routers/templates/routers/_detail_overview.html:47
 #: dashboards/project/stacks/templates/stacks/_detail_overview.html:53
@@ -6699,8 +6699,8 @@ msgstr ""
 
 #: dashboards/admin/networks/forms.py:77 dashboards/admin/networks/forms.py:239
 #: dashboards/admin/networks/ports/forms.py:46
-#: dashboards/project/firewalls/forms.py:132
-#: dashboards/project/firewalls/workflows.py:281
+#: dashboards/project/firewalls/forms.py:136
+#: dashboards/project/firewalls/workflows.py:303
 #: dashboards/project/loadbalancers/forms.py:38
 #: dashboards/project/loadbalancers/forms.py:93
 #: dashboards/project/loadbalancers/forms.py:176
@@ -6721,8 +6721,8 @@ msgstr ""
 
 #: dashboards/admin/networks/forms.py:78 dashboards/admin/networks/forms.py:240
 #: dashboards/admin/networks/ports/forms.py:47
-#: dashboards/project/firewalls/forms.py:133
-#: dashboards/project/firewalls/workflows.py:282
+#: dashboards/project/firewalls/forms.py:137
+#: dashboards/project/firewalls/workflows.py:304
 #: dashboards/project/loadbalancers/forms.py:39
 #: dashboards/project/loadbalancers/forms.py:94
 #: dashboards/project/loadbalancers/forms.py:177
@@ -6746,9 +6746,9 @@ msgstr ""
 #: dashboards/admin/networks/agents/tables.py:93
 #: dashboards/admin/networks/ports/forms.py:48
 #: dashboards/admin/networks/templates/networks/ports/_detail_overview.html:18
-#: dashboards/project/firewalls/forms.py:134
+#: dashboards/project/firewalls/forms.py:138
 #: dashboards/project/firewalls/tables.py:385
-#: dashboards/project/firewalls/workflows.py:283
+#: dashboards/project/firewalls/workflows.py:305
 #: dashboards/project/loadbalancers/forms.py:40
 #: dashboards/project/loadbalancers/forms.py:95
 #: dashboards/project/loadbalancers/forms.py:178
@@ -6782,12 +6782,12 @@ msgstr ""
 
 #: dashboards/admin/networks/forms.py:80 dashboards/admin/networks/forms.py:242
 #: dashboards/admin/networks/tables.py:100
-#: dashboards/project/firewalls/forms.py:70
-#: dashboards/project/firewalls/forms.py:102
+#: dashboards/project/firewalls/forms.py:74
+#: dashboards/project/firewalls/forms.py:106
 #: dashboards/project/firewalls/tables.py:310
 #: dashboards/project/firewalls/tables.py:334
-#: dashboards/project/firewalls/workflows.py:65
-#: dashboards/project/firewalls/workflows.py:222
+#: dashboards/project/firewalls/workflows.py:69
+#: dashboards/project/firewalls/workflows.py:244
 #: dashboards/project/firewalls/templates/firewalls/_policy_details.html:29
 #: dashboards/project/firewalls/templates/firewalls/_rule_details.html:48
 #: dashboards/project/networks/forms.py:44
@@ -7210,6 +7210,8 @@ msgid "CIDR"
 msgstr ""
 
 #: dashboards/admin/networks/subnets/tables.py:95
+#: dashboards/project/firewalls/forms.py:71
+#: dashboards/project/firewalls/workflows.py:66
 #: dashboards/project/networks/workflows.py:164
 #: dashboards/project/networks/subnets/tables.py:132
 #: dashboards/project/networks/subnets/workflows.py:109
@@ -7422,8 +7424,8 @@ msgstr ""
 #: dashboards/admin/routers/panel.py:22 dashboards/admin/routers/tables.py:46
 #: dashboards/admin/routers/templates/routers/index.html:3
 #: dashboards/identity/projects/workflows.py:77
-#: dashboards/project/firewalls/workflows.py:173
-#: dashboards/project/firewalls/workflows.py:179
+#: dashboards/project/firewalls/workflows.py:195
+#: dashboards/project/firewalls/workflows.py:201
 #: dashboards/project/firewalls/templates/firewalls/_firewall_details.html:29
 #: dashboards/project/network_topology/routers/tables.py:27
 #: dashboards/project/routers/panel.py:22
@@ -9639,7 +9641,7 @@ msgstr ""
 
 #: dashboards/project/access_and_security/security_groups/forms.py:103
 #: dashboards/project/firewalls/tabs.py:96
-#: dashboards/project/firewalls/workflows.py:73
+#: dashboards/project/firewalls/workflows.py:95
 msgid "Rule"
 msgstr ""
 
@@ -9870,7 +9872,7 @@ msgstr ""
 #: dashboards/project/access_and_security/security_groups/views.py:114
 #: dashboards/project/access_and_security/templates/access_and_security/security_groups/add_rule.html:3
 #: dashboards/project/firewalls/tables.py:33
-#: dashboards/project/firewalls/workflows.py:103
+#: dashboards/project/firewalls/workflows.py:125
 msgid "Add Rule"
 msgstr ""
 
@@ -10440,7 +10442,7 @@ msgstr ""
 
 #: dashboards/project/firewalls/forms.py:39
 #: dashboards/project/firewalls/tables.py:297
-#: dashboards/project/firewalls/workflows.py:37
+#: dashboards/project/firewalls/workflows.py:38
 #: dashboards/project/firewalls/templates/firewalls/_rule_details.html:20
 #: dashboards/project/loadbalancers/tables.py:460
 #: dashboards/project/loadbalancers/workflows.py:44
@@ -10451,24 +10453,24 @@ msgid "Protocol"
 msgstr ""
 
 #: dashboards/project/firewalls/forms.py:40
-#: dashboards/project/firewalls/workflows.py:38
+#: dashboards/project/firewalls/workflows.py:39
 #: dashboards/project/loadbalancers/workflows.py:478
 msgid "TCP"
 msgstr ""
 
 #: dashboards/project/firewalls/forms.py:40
-#: dashboards/project/firewalls/workflows.py:39
+#: dashboards/project/firewalls/workflows.py:40
 msgid "UDP"
 msgstr ""
 
 #: dashboards/project/firewalls/forms.py:40
-#: dashboards/project/firewalls/workflows.py:40
+#: dashboards/project/firewalls/workflows.py:41
 msgid "ICMP"
 msgstr ""
 
 #: dashboards/project/firewalls/forms.py:41
 #: dashboards/project/firewalls/tables.py:295
-#: dashboards/project/firewalls/workflows.py:41
+#: dashboards/project/firewalls/workflows.py:42
 #: dashboards/project/firewalls/templates/firewalls/_rule_details.html:21
 #: dashboards/project/firewalls/templates/firewalls/_rule_details.html:24
 #: dashboards/project/firewalls/templates/firewalls/_rule_details.html:27
@@ -10483,7 +10485,7 @@ msgstr ""
 
 #: dashboards/project/firewalls/forms.py:44
 #: dashboards/project/firewalls/tables.py:308
-#: dashboards/project/firewalls/workflows.py:43
+#: dashboards/project/firewalls/workflows.py:44
 #: dashboards/project/firewalls/templates/firewalls/_rule_details.html:17
 #: dashboards/project/instances/audit_tables.py:41
 #: dashboards/project/routers/extensions/routerrules/forms.py:52
@@ -10492,12 +10494,12 @@ msgid "Action"
 msgstr ""
 
 #: dashboards/project/firewalls/forms.py:45
-#: dashboards/project/firewalls/workflows.py:44
+#: dashboards/project/firewalls/workflows.py:45
 msgid "ALLOW"
 msgstr ""
 
 #: dashboards/project/firewalls/forms.py:45
-#: dashboards/project/firewalls/workflows.py:45
+#: dashboards/project/firewalls/workflows.py:46
 msgid "DENY"
 msgstr ""
 
@@ -10506,7 +10508,7 @@ msgid "Action for the firewall rule"
 msgstr ""
 
 #: dashboards/project/firewalls/forms.py:48
-#: dashboards/project/firewalls/workflows.py:47
+#: dashboards/project/firewalls/workflows.py:48
 msgid "Source IP Address/Subnet"
 msgstr ""
 
@@ -10515,7 +10517,7 @@ msgid "Source IP address or subnet"
 msgstr ""
 
 #: dashboards/project/firewalls/forms.py:53
-#: dashboards/project/firewalls/workflows.py:51
+#: dashboards/project/firewalls/workflows.py:52
 msgid "Destination IP Address/Subnet"
 msgstr ""
 
@@ -10524,7 +10526,7 @@ msgid "Destination IP address or subnet"
 msgstr ""
 
 #: dashboards/project/firewalls/forms.py:59
-#: dashboards/project/firewalls/workflows.py:56
+#: dashboards/project/firewalls/workflows.py:57
 msgid "Source Port/Port Range"
 msgstr ""
 
@@ -10533,7 +10535,7 @@ msgid "Source port (integer in [1, 65535] or range in a:b)"
 msgstr ""
 
 #: dashboards/project/firewalls/forms.py:65
-#: dashboards/project/firewalls/workflows.py:61
+#: dashboards/project/firewalls/workflows.py:62
 msgid "Destination Port/Port Range"
 msgstr ""
 
@@ -10541,146 +10543,150 @@ msgstr ""
 msgid "Destination port (integer in [1, 65535] or range in a:b)"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:86
+#: dashboards/project/firewalls/forms.py:73
+msgid "IP Version for Firewall Rule"
+msgstr ""
+
+#: dashboards/project/firewalls/forms.py:90
 #, python-format
 msgid "Rule %s was successfully updated."
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:91
+#: dashboards/project/firewalls/forms.py:95
 #, python-format
 msgid "Failed to update rule %(name)s: %(reason)s"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:103
+#: dashboards/project/firewalls/forms.py:107
 #: dashboards/project/firewalls/tables.py:337
-#: dashboards/project/firewalls/workflows.py:225
+#: dashboards/project/firewalls/workflows.py:247
 #: dashboards/project/firewalls/templates/firewalls/_policy_details.html:32
 msgid "Audited"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:112
+#: dashboards/project/firewalls/forms.py:116
 #, python-format
 msgid "Policy %s was successfully updated."
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:117
+#: dashboards/project/firewalls/forms.py:121
 #, python-format
 msgid "Failed to update policy %(name)s: %(reason)s"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:131
+#: dashboards/project/firewalls/forms.py:135
 #: dashboards/project/firewalls/tables.py:378
 #: dashboards/project/firewalls/tabs.py:105
-#: dashboards/project/firewalls/workflows.py:233
-#: dashboards/project/firewalls/workflows.py:280
+#: dashboards/project/firewalls/workflows.py:255
+#: dashboards/project/firewalls/workflows.py:302
 msgid "Policy"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:147
+#: dashboards/project/firewalls/forms.py:151
 msgid "Unable to retrieve policy list."
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:167
+#: dashboards/project/firewalls/forms.py:171
 #, python-format
 msgid "Firewall %s was successfully updated."
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:172
+#: dashboards/project/firewalls/forms.py:176
 #, python-format
 msgid "Failed to update firewall %(name)s: %(reason)s"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:180
+#: dashboards/project/firewalls/forms.py:184
 #: dashboards/project/firewalls/tables.py:191
 msgid "Insert Rule"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:181
+#: dashboards/project/firewalls/forms.py:185
 msgid "Before"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:183
+#: dashboards/project/firewalls/forms.py:187
 msgid "After"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:208
+#: dashboards/project/firewalls/forms.py:212
 #, python-format
 msgid "Failed to retrieve available rules: %s"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:227
+#: dashboards/project/firewalls/forms.py:231
 #, python-format
 msgid "Rule %(rule)s was successfully inserted to policy %(policy)s."
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:235
+#: dashboards/project/firewalls/forms.py:239
 #, python-format
 msgid "Failed to insert rule to policy %(name)s: %(reason)s"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:243
+#: dashboards/project/firewalls/forms.py:247
 #: dashboards/project/firewalls/tables.py:205
 msgid "Remove Rule"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:261
+#: dashboards/project/firewalls/forms.py:265
 #, python-format
 msgid "Failed to retrieve current rules in policy %(name)s: %(reason)s"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:277
+#: dashboards/project/firewalls/forms.py:281
 #, python-format
 msgid "Rule %(rule)s was successfully removed from policy %(policy)s."
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:285
+#: dashboards/project/firewalls/forms.py:289
 #, python-format
 msgid "Failed to remove rule from policy %(name)s: %(reason)s"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:334
+#: dashboards/project/firewalls/forms.py:338
 msgid "Add Routers"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:337
+#: dashboards/project/firewalls/forms.py:341
 msgid "Add selected router(s) to the firewall."
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:340
+#: dashboards/project/firewalls/forms.py:344
 #, python-format
 msgid "Router(s) was/were successfully added to firewall %(firewall)s."
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:342
+#: dashboards/project/firewalls/forms.py:346
 #, python-format
 msgid "Failed to add router(s) to firewall %(name)s: %(reason)s"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:343
+#: dashboards/project/firewalls/forms.py:347
 #, python-format
 msgid "Failed to retrieve available routers: %(reason)s"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:359
+#: dashboards/project/firewalls/forms.py:363
 #: dashboards/project/firewalls/tables.py:380
 msgid "Associated Routers"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:362
+#: dashboards/project/firewalls/forms.py:366
 msgid "Unselect the router(s) to be removed from firewall."
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:365
+#: dashboards/project/firewalls/forms.py:369
 #, python-format
 msgid "Router(s)  was successfully removed from firewall %(firewall)s."
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:367
+#: dashboards/project/firewalls/forms.py:371
 #, python-format
 msgid "Failed to remove router(s) from firewall %(name)s: %(reason)s"
 msgstr ""
 
-#: dashboards/project/firewalls/forms.py:369
+#: dashboards/project/firewalls/forms.py:373
 #, python-format
 msgid "Failed to retrieve current routers in firewall %(name)s: %(reason)s"
 msgstr ""
@@ -10696,7 +10702,7 @@ msgid "Firewalls"
 msgstr ""
 
 #: dashboards/project/firewalls/tables.py:42
-#: dashboards/project/firewalls/workflows.py:253
+#: dashboards/project/firewalls/workflows.py:275
 msgid "Add Policy"
 msgstr ""
 
@@ -10811,8 +10817,8 @@ msgstr ""
 #: dashboards/project/firewalls/tables.py:321
 #: dashboards/project/firewalls/tables.py:332
 #: dashboards/project/firewalls/views.py:95
-#: dashboards/project/firewalls/workflows.py:131
-#: dashboards/project/firewalls/workflows.py:137
+#: dashboards/project/firewalls/workflows.py:153
+#: dashboards/project/firewalls/workflows.py:159
 #: dashboards/project/firewalls/templates/firewalls/_policy_details.html:17
 msgid "Rules"
 msgstr ""
@@ -10898,7 +10904,7 @@ msgid "Unable to retrieve firewall list."
 msgstr ""
 
 #: dashboards/project/firewalls/tabs.py:114
-#: dashboards/project/firewalls/workflows.py:304
+#: dashboards/project/firewalls/workflows.py:326
 msgid "Firewall"
 msgstr ""
 
@@ -10997,50 +11003,56 @@ msgstr ""
 msgid "Remove Router from Firewall"
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:75
+#: dashboards/project/firewalls/workflows.py:80
+msgid ""
+"Source/Destination Network Address and IP version are inconsistent. "
+"Please make them consistent."
+msgstr ""
+
+#: dashboards/project/firewalls/workflows.py:97
 msgid ""
 "Create a firewall rule.\n"
 "\n"
 "Protocol and action must be specified. Other fields are optional."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:105
+#: dashboards/project/firewalls/workflows.py:127
 #, python-format
 msgid "Added Rule \"%s\"."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:106
+#: dashboards/project/firewalls/workflows.py:128
 #, python-format
 msgid "Unable to add Rule \"%s\"."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:134
+#: dashboards/project/firewalls/workflows.py:156
 msgid "Create a policy with selected rules."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:139
+#: dashboards/project/firewalls/workflows.py:161
 msgid "Select rules for your policy."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:152
+#: dashboards/project/firewalls/workflows.py:174
 #, python-format
 msgid "Unable to retrieve rules (%(error)s)."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:176
+#: dashboards/project/firewalls/workflows.py:198
 msgid "Create a firewall with selected routers."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:181
+#: dashboards/project/firewalls/workflows.py:203
 msgid "Select routers for your firewall."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:192
+#: dashboards/project/firewalls/workflows.py:214
 #, python-format
 msgid "Unable to retrieve routers (%(error)s)."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:235
+#: dashboards/project/firewalls/workflows.py:257
 msgid ""
 "Create a firewall policy with an ordered list of firewall rules.\n"
 "\n"
@@ -11048,42 +11060,42 @@ msgid ""
 "the Rules tab."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:255
+#: dashboards/project/firewalls/workflows.py:277
 #, python-format
 msgid "Added Policy \"%s\"."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:256
+#: dashboards/project/firewalls/workflows.py:278
 #, python-format
 msgid "Unable to add Policy \"%s\"."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:288
+#: dashboards/project/firewalls/workflows.py:310
 msgid "Select a Policy"
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:296
+#: dashboards/project/firewalls/workflows.py:318
 #, python-format
 msgid "Unable to retrieve policy list (%(error)s)."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:306
+#: dashboards/project/firewalls/workflows.py:328
 msgid ""
 "Create a firewall based on a policy.\n"
 "\n"
 "A policy must be selected. Other fields are optional."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:324
+#: dashboards/project/firewalls/workflows.py:346
 msgid "Add Firewall"
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:326
+#: dashboards/project/firewalls/workflows.py:348
 #, python-format
 msgid "Added Firewall \"%s\"."
 msgstr ""
 
-#: dashboards/project/firewalls/workflows.py:327
+#: dashboards/project/firewalls/workflows.py:349
 #, python-format
 msgid "Unable to add Firewall \"%s\"."
 msgstr ""
diff --git a/openstack_dashboard/locale/fr/LC_MESSAGES/django.po b/openstack_dashboard/locale/fr/LC_MESSAGES/django.po
index 1ada9c90ac..90962b1fe1 100644
--- a/openstack_dashboard/locale/fr/LC_MESSAGES/django.po
+++ b/openstack_dashboard/locale/fr/LC_MESSAGES/django.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-11-17 06:14+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-10-27 11:06+0000\n"
+"PO-Revision-Date: 2015-11-17 11:13+0000\n"
 "Last-Translator: Gael Rehault <gael01@gmail.com>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -1439,6 +1439,9 @@ msgstr "Nom de la zone de disponibilité"
 msgid "Availability Zones"
 msgstr "Zones de disponibilité"
 
+msgid "Availability zone"
+msgstr "Zone de disponibilité"
+
 msgid "Available"
 msgstr "disponible(s)"
 
@@ -1616,6 +1619,10 @@ msgctxt "Current status of a Database Backup"
 msgid "Building"
 msgstr "Construction"
 
+msgctxt "Current status of an Instance"
+msgid "Building"
+msgstr "Construction"
+
 msgctxt "Power state of an Instance"
 msgid "Building"
 msgstr "Construction"
@@ -4631,6 +4638,9 @@ msgctxt "Task status of an Instance"
 msgid "Finishing Resize or Migrate"
 msgstr "Finalisation du redimensionnement ou de la migration"
 
+msgid "Firewall"
+msgstr "Pare-feu"
+
 #, python-format
 msgid "Firewall %s was successfully updated."
 msgstr "Le pare-feu %s a été mis à jour avec succès."
@@ -7859,6 +7869,10 @@ msgctxt "Current status of an Instance"
 msgid "Resize/Migrate"
 msgstr "Redimensionnement/Migration"
 
+msgctxt "Current status of an Instance"
+msgid "Resized"
+msgstr "Redimensionnée "
+
 msgctxt "Task status of an Instance"
 msgid "Resized or Migrated"
 msgstr "Redimensionnée ou Migrée"
@@ -8667,6 +8681,9 @@ msgstr "Groupe de serveurs"
 msgid "Server error"
 msgstr "Erreur serveur"
 
+msgid "Servers"
+msgstr "Serveurs"
+
 msgid "Service"
 msgstr "Service"
 
@@ -9154,6 +9171,10 @@ msgctxt "Action log of an instance"
 msgid "Stop"
 msgstr "Stop"
 
+msgctxt "Current status of an Instance"
+msgid "Stopped"
+msgstr "Stoppé"
+
 msgid "Storage location"
 msgstr "Emplacement de stockage"
 
@@ -11135,6 +11156,9 @@ msgstr "Impossible de récupérer les paires de clés."
 msgid "Unable to retrieve limit information."
 msgstr "Impossible de récupérer les informations de limite."
 
+msgid "Unable to retrieve list of routers."
+msgstr "Impossible de récupérer la liste des routeurs."
+
 msgid "Unable to retrieve list of security groups"
 msgstr "Impossible de récupérer la liste des groupes de sécurité"
 
@@ -12704,3 +12728,6 @@ msgstr "v1"
 
 msgid "v2"
 msgstr "v2"
+
+msgid "yes,no,-"
+msgstr "oui,non-"
diff --git a/openstack_dashboard/locale/fr/LC_MESSAGES/djangojs.po b/openstack_dashboard/locale/fr/LC_MESSAGES/djangojs.po
index dbb3671194..9ffcb81b45 100644
--- a/openstack_dashboard/locale/fr/LC_MESSAGES/djangojs.po
+++ b/openstack_dashboard/locale/fr/LC_MESSAGES/djangojs.po
@@ -17,11 +17,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 08:58+0000\n"
+"POT-Creation-Date: 2015-11-18 04:22+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-10-27 11:09+0000\n"
+"PO-Revision-Date: 2015-11-17 11:09+0000\n"
 "Last-Translator: Gael Rehault <gael01@gmail.com>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -398,6 +398,9 @@ msgstr "Image"
 msgid "Image Name"
 msgstr "Nom de l'Image"
 
+msgid "Images"
+msgstr "Images"
+
 msgid "Impact on your quota"
 msgstr "Impact sur votre quota"
 
@@ -959,6 +962,9 @@ msgstr "Impossible d'éditer l'utilisateur"
 msgid "Unable to fetch the service catalog."
 msgstr "Impossible d'extraire le catalogue de services."
 
+msgid "Unable to get the Glance service version."
+msgstr "Impossible d'obtenir la version du service Glance."
+
 msgid "Unable to get the Keystone service version."
 msgstr "Impossible d'obtenir la version de service Keystone."
 
@@ -1081,6 +1087,9 @@ msgstr "ID Utilisateur"
 msgid "User Name"
 msgstr "Nom d'utilisateur"
 
+msgid "Users"
+msgstr "Utilisateurs"
+
 msgid "VCPUS"
 msgstr "VCPUS"