From: Thomas Goirand <thomas@goirand.fr>
Date: Wed, 25 Sep 2013 09:10:43 +0000 (+0800)
Subject: Ran debconf-updatepo
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=163ca9e6b77f4dfc11c3a9cecdb07b7bca0ba4f3;p=openstack-build%2Fcinder-build.git

Ran debconf-updatepo
---

diff --git a/debian/po/cs.po b/debian/po/cs.po
index 199a9f6e7..5f4eea295 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder 2013.1.2-4\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2012-11-28 11:58+0000\n"
+"POT-Creation-Date: 2013-09-25 17:10+0800\n"
 "PO-Revision-Date: 2013-08-28 12:31+0200\n"
 "Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -95,8 +95,8 @@ msgid ""
 "Please specify the URL of your Cinder authentication server. Typically  this "
 "is also the URL of your OpenStack Identity Service (Keystone)."
 msgstr ""
-"Zadejte prosím URL autentizačního serveru pro Cinder. Většinou je to také URL "
-"OpenStack Identity Service (Keystone)."
+"Zadejte prosím URL autentizačního serveru pro Cinder. Většinou je to také "
+"URL OpenStack Identity Service (Keystone)."
 
 #. Type: string
 #. Description
@@ -129,8 +129,57 @@ msgid ""
 "Please specify the name of the LVM volume group (vg) on which Cinder will "
 "create partitions."
 msgstr ""
-"Zadejte prosím název skupiny LVM svazků (vg), na které bude Cinder "
-"vytvářet oddíly."
+"Zadejte prosím název skupiny LVM svazků (vg), na které bude Cinder vytvářet "
+"oddíly."
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../cinder-common.templates:8001 ../cinder-common.templates:9001
+#: ../cinder-common.templates:10001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "Please specify the IP address of that server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -148,7 +197,8 @@ msgid ""
 msgstr ""
 "Aby byla každá služba Openstack (každé API) přístupná, musí být "
 "zaregistrována. To se provádí pomocí příkazů \"keystone service-create\" a "
-"\"keystone endpoint-create\". Zvolte si, zda-li se tyto příkazy mají nyní spustit."
+"\"keystone endpoint-create\". Zvolte si, zda-li se tyto příkazy mají nyní "
+"spustit."
 
 #. Type: boolean
 #. Description
@@ -173,8 +223,8 @@ msgid ""
 "Enter the IP address of your keystone server, so that cinder-api can contact "
 "Keystone to do the Cinder service and endpoint creation."
 msgstr ""
-"Zadejte IP adresu serveru keystone, aby se mohlo cinder-api spojit s Keystone "
-"a provozovat službu Cinder a vytvářet koncové body."
+"Zadejte IP adresu serveru keystone, aby se mohlo cinder-api spojit s "
+"Keystone a provozovat službu Cinder a vytvářet koncové body."
 
 #. Type: password
 #. Description
@@ -205,8 +255,8 @@ msgid ""
 "Enter the IP address that will be used to contact Cinder (eg: the Cinder "
 "endpoint IP address)."
 msgstr ""
-"Zadejte IP adresu, která se bude používat ke spojení s Cinder (např: "
-"IP adresa koncového bodu Cinder)."
+"Zadejte IP adresu, která se bude používat ke spojení s Cinder (např: IP "
+"adresa koncového bodu Cinder)."
 
 #. Type: string
 #. Description
@@ -217,8 +267,8 @@ msgid ""
 "address."
 msgstr ""
 "Tato IP adresa musí být přístupná z klientů, kteří budou tuto službu "
-"používat, takže pokud instalujete veřejný cloud, musí to být veřejná "
-"IP adresa."
+"používat, takže pokud instalujete veřejný cloud, musí to být veřejná IP "
+"adresa."
 
 #. Type: string
 #. Description
diff --git a/debian/po/da.po b/debian/po/da.po
index adf591eb4..ebea8856f 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-02 07:02+0200\n"
+"POT-Creation-Date: 2013-09-25 17:10+0800\n"
 "PO-Revision-Date: 2013-09-09 12:42+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -18,13 +18,15 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:2001
-msgid "Start Cinder services at boot?"
+#: ../cinder-common.templates:1001
+#, fuzzy
+#| msgid "Start Cinder services at boot?"
+msgid "Start cinder services at boot?"
 msgstr "Start Cindertjenester ved opstart?"
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:2001
+#: ../cinder-common.templates:1001
 msgid ""
 "Please choose whether you want to start Cinder services when the machine is "
 "booted up."
@@ -34,151 +36,208 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
 msgid "Set up a database for Cinder?"
 msgstr "Opsæt en database for Cinder?"
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
+#, fuzzy
+#| msgid ""
+#| "No database has been set up for Cinder to use. Before continuing, you "
+#| "should make sure you have the following information:"
 msgid ""
-"No database has been set up for Cinder to use. Before continuing, you should "
-"make sure you have the following information:"
+"No database has been set up for Cinder to use. If you want to set one up "
+"now, please make sure you have all needed information:"
 msgstr ""
 "Der er ikke opsat en database for Cinder. Hvis du ønsker at opsætte en nu så "
 "sikr dig, at du har den følgende information:"
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
+#, fuzzy
+#| msgid ""
+#| " * the type of database that you want to use;\n"
+#| " * the database server hostname (that server must allow TCP connections "
+#| "from this\n"
+#| "   machine);\n"
+#| " * a username and password to access the database."
 msgid ""
-" * the type of database that you want to use;\n"
-" * the database server hostname (that server must allow TCP connections from "
-"this\n"
-"   machine);\n"
-" * a username and password to access the database."
+" * the host name of the database server (which must allow TCP\n"
+"   connections from this machine);\n"
+" * a username and password to access the database;\n"
+" * the type of database management software you want to use."
 msgstr ""
 " * typen af database du ønsker at bruge\n"
 " * værtsnavnet for databaseserveren (som skal tillade TCP-\n"
 "   forbindelser fra denne maskine)\n"
 " * et brugernavn og en adgangskode til at tilgå databasen"
 
-
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
 msgid ""
-"If some of these requirements are missing, do not choose this option and run "
-"with regular SQLite support."
+"If you don't choose this option, no database will be set up and Cinder will "
+"use regular SQLite support."
 msgstr ""
-"Hvis nogle af disse krav mangler, så vælg ikke denne indstilling og kør "
-"med normal SQLite-understøttelse."
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
+#, fuzzy
+#| msgid ""
+#| "You can change this setting later on by running \"dpkg-reconfigure -plow "
+#| "cinder\"."
 msgid ""
 "You can change this setting later on by running \"dpkg-reconfigure -plow "
-"cinder\"."
+"cinder-common\"."
 msgstr ""
 "Du kan ændre denne indstilling senere ved at køre »dpkg-reconfigure -plow "
 "cinder«."
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:4001
-msgid "Authentication server hostname:"
+#: ../cinder-common.templates:3001
+#, fuzzy
+#| msgid "Authentication server hostname:"
+msgid "Auth server hostname:"
 msgstr "Værtsnavn for godkendelsesserver:"
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:4001
+#: ../cinder-common.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify the hostname of the authentication server. Typically this "
+#| "is also the hostname of the OpenStack Identity Service (Keystone)."
 msgid ""
-"Please specify the hostname of the authentication server. Typically this is "
-"also the hostname of the OpenStack Identity Service (Keystone)."
+"Please specify the URL of your Cinder authentication server. Typically  this "
+"is also the URL of your OpenStack Identity Service (Keystone)."
 msgstr ""
-"Angiv venligst værtsnavnet for godkendelsesserveren. Typisk er dette "
-"også værtsnavnet for OpenStack Identity Service (Keystone)."
+"Angiv venligst værtsnavnet for godkendelsesserveren. Typisk er dette også "
+"værtsnavnet for OpenStack Identity Service (Keystone)."
 
 #. Type: string
 #. Description
-#. Translators: a "tenant" in OpenStack world is
-#. an entity that contains one or more username/password couples.
-#. It's typically the tenant that will be used for billing. Having more than one
-#. username/password is very helpful in larger organization.
-#. You're advised to either keep "tenant" without translating it
-#. or keep it aside with your translation. Example for French:
-#. propriétaire ("tenant")
-#: ../cinder-common.templates:5001
-msgid "Authentication server tenant name:"
+#: ../cinder-common.templates:4001
+#, fuzzy
+#| msgid "Authentication server tenant name:"
+msgid "Auth server tenant name:"
 msgstr "Tenantnavn for godkendelsesserver:"
 
 #. Type: string
 #. Description
-#. Translators: a "tenant" in OpenStack world is
-#. an entity that contains one or more username/password couples.
-#. It's typically the tenant that will be used for billing. Having more than one
-#. username/password is very helpful in larger organization.
-#. You're advised to either keep "tenant" without translating it
-#. or keep it aside with your translation. Example for French:
-#. propriétaire ("tenant")
 #: ../cinder-common.templates:5001
-msgid "Please specify the authentication server tenant name."
-msgstr "Angiv venligst tenantnavn for godkendelseserveren."
+#, fuzzy
+#| msgid "Authentication server username:"
+msgid "Auth server username:"
+msgstr "Brugernavn for godkendelsesserver:"
 
-#. Type: string
+#. Type: password
 #. Description
 #: ../cinder-common.templates:6001
-msgid "Authentication server username:"
-msgstr "Brugernavn for godkendelsesserver:"
+#, fuzzy
+#| msgid "Authentication server password:"
+msgid "Auth server password:"
+msgstr "Adgangskode for godkendelsesserver:"
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:6001
-msgid "Please specify the username to use with the authentication server."
-msgstr "Angiv venligst brugernavnet der skal bruges med godkendelseserveren."
+#: ../cinder-common.templates:7001
+msgid "Cinder volume group:"
+msgstr "Cinder-diskenhedsgruppe:"
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-common.templates:7001
-msgid "Authentication server password:"
-msgstr "Adgangskode for godkendelsesserver:"
+#, fuzzy
+#| msgid ""
+#| "Please specify the name of the LVM volume group on which Cinder will "
+#| "create partitions."
+msgid ""
+"Please specify the name of the LVM volume group (vg) on which Cinder will "
+"create partitions."
+msgstr ""
+"Angiv venligst navnet for LVM-diskenhedsgruppen hvor Cinder vil oprette "
+"partitioner."
 
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-common.templates:7001
-msgid "Please specify the password to use with the authentication server."
-msgstr "Angiv venligt adgangskoden til brug med godkendelsesserveren."
+#: ../cinder-common.templates:8001 ../cinder-common.templates:9001
+#: ../cinder-common.templates:10001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
 
 #. Type: string
 #. Description
 #: ../cinder-common.templates:8001
-msgid "Cinder volume group:"
-msgstr "Cinder-diskenhedsgruppe:"
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please specify the IP address of that server."
+msgstr "Angiv venligt adgangskoden til brug med godkendelsesserveren."
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:8001
-msgid ""
-"Please specify the name of the LVM volume group on which Cinder will create "
-"partitions."
+#: ../cinder-common.templates:9001
+msgid "Username for connection to the RabbitMQ server:"
 msgstr ""
-"Angiv venligst navnet for LVM-diskenhedsgruppen hvor Cinder vil oprette "
-"partitioner."
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr "Angiv venligst brugernavnet der skal bruges med godkendelseserveren."
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr "Angiv venligt adgangskoden til brug med godkendelsesserveren."
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:2001
-msgid "Register Cinder in the Keystone endpoint catalog?"
+#: ../cinder-api.templates:1001
+#, fuzzy
+#| msgid "Register Cinder in the Keystone endpoint catalog?"
+msgid "Register Cinder in the keystone endpoint catalog?"
 msgstr "Registrer Cinder i Keystones slutpunktskatalog?"
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:2001
+#: ../cinder-api.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Each OpenStack service (each API) should be registered in order to be "
+#| "accessible. This is done using \"keystone service-create\" and \"keystone "
+#| "endpoint-create\". This can be done automatically now."
 msgid ""
-"Each OpenStack service (each API) should be registered in order to be "
+"Each Openstack services (each API) should be registered in order to be "
 "accessible. This is done using \"keystone service-create\" and \"keystone "
-"endpoint-create\". This can be done automatically now."
+"endpoint-create\". Select if you want to run these commands now."
 msgstr ""
 "Hver OpenStack-tjeneste (hver API) skal registreres for at være tilgængelig. "
 "Dette gøres med »keystone service-create« og »keystone endpoint-create«. "
@@ -186,61 +245,81 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:2001
+#: ../cinder-api.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
-"Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"Note that you will need to have an up and running keystone server on which "
+"to connect using the Keystone auth token."
 msgstr ""
 "Bemærk at du skal have en op og kørende Keystoneserver, som du kan forbinde "
 "til med Keystones godkendelsessymbol."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:3001
-msgid "Keystone server IP address:"
+#: ../cinder-api.templates:2001
+#, fuzzy
+#| msgid "Keystone server IP address:"
+msgid "Keystone IP address:"
 msgstr "IP-adresse for Keystoneserver:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:3001
+#: ../cinder-api.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the Keystone server, so that cinder-api "
+#| "can contact Keystone to do the Cinder service and endpoint creation."
 msgid ""
-"Please enter the IP address of the Keystone server, so that cinder-api can "
-"contact Keystone to do the Cinder service and endpoint creation."
+"Enter the IP address of your keystone server, so that cinder-api can contact "
+"Keystone to do the Cinder service and endpoint creation."
 msgstr ""
 "Indtast IP-adressen for din Keystoneserver, så at cinder-api kan kontakte "
 "Keystone for at udføre Cindertjenesten og slutpunktsoprettelse."
 
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#: ../cinder-api.templates:3001
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone Auth Token:"
 msgstr "Godkendelsessymbol for Keystone:"
 
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:3001
+#, fuzzy
+#| msgid ""
+#| "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#| "authentication token."
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To configure its endpoint in Keystone, cinder-api needs the Keystone auth "
+"token."
 msgstr ""
 "For at konfigurere sit slutpunkt i Keystone skal cinder-api bruge Keystones "
 "godkendelsessymbol."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:4001
 msgid "Cinder endpoint IP address:"
 msgstr "IP-adresse for Cinderslutpunkt:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
-msgid "Please enter the IP address that will be used to contact Cinder."
+#: ../cinder-api.templates:4001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Cinder."
+msgid ""
+"Enter the IP address that will be used to contact Cinder (eg: the Cinder "
+"endpoint IP address)."
 msgstr "Indtast IP-adressen som vil blive brugt til at kontakter Cinder."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:4001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -252,20 +331,33 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:5001
 msgid "Name of the region to register:"
 msgstr "Navn på regionen der skal registreres:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:5001
+#, fuzzy
+#| msgid ""
+#| "OpenStack supports using availability zones, with each region "
+#| "representing a location. Please enter the zone that you wish to use when "
+#| "registering the endpoint."
 msgid ""
-"OpenStack supports using availability zones, with each region representing a "
-"location. Please enter the zone that you wish to use when registering the "
-"endpoint."
+"Openstack can be used using availability zones, with each region "
+"representing a location. Please enter the zone that you wish to use when "
+"registering the endpoint."
 msgstr ""
 "OpenStack understøtter at bruge tilgængelighedszoner, hvor hver region "
 "repræsenterer et sted. Indtast venligst zonen, som du ønsker at bruge, når "
 "du registrerer slutpunktet."
 
+#~ msgid ""
+#~ "If some of these requirements are missing, do not choose this option and "
+#~ "run with regular SQLite support."
+#~ msgstr ""
+#~ "Hvis nogle af disse krav mangler, så vælg ikke denne indstilling og kør "
+#~ "med normal SQLite-understøttelse."
 
+#~ msgid "Please specify the authentication server tenant name."
+#~ msgstr "Angiv venligst tenantnavn for godkendelseserveren."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index b7ef10b8b..dd1bd5df4 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-02 07:02+0200\n"
+"POT-Creation-Date: 2013-09-25 17:10+0800\n"
 "PO-Revision-Date: 2013-09-02 17:12+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: FRENCH <debian-l10n-french@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,14 +19,15 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:2001
-#| msgid "Start cinder services at boot?"
-msgid "Start Cinder services at boot?"
+#: ../cinder-common.templates:1001
+#, fuzzy
+#| msgid "Start Cinder services at boot?"
+msgid "Start cinder services at boot?"
 msgstr "Démarrer les services Cinder au lancement du système ?"
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:2001
+#: ../cinder-common.templates:1001
 msgid ""
 "Please choose whether you want to start Cinder services when the machine is "
 "booted up."
@@ -35,37 +37,39 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
 msgid "Set up a database for Cinder?"
 msgstr "Installer une base de données pour Cinder ?"
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
+#, fuzzy
 #| msgid ""
-#| "No database has been set up for Cinder to use. If you want to set one up "
-#| "now, please make sure you have all needed information:"
+#| "No database has been set up for Cinder to use. Before continuing, you "
+#| "should make sure you have the following information:"
 msgid ""
-"No database has been set up for Cinder to use. Before continuing, you should "
-"make sure you have the following information:"
+"No database has been set up for Cinder to use. If you want to set one up "
+"now, please make sure you have all needed information:"
 msgstr ""
 "Aucune base de données n'a été intallée pour Cinder. Si vous voulez en "
 "installer une maintenant, assurez-vous d'avoir les informations suivantes :"
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
+#, fuzzy
 #| msgid ""
-#| " * the host name of the database server (which must allow TCP\n"
-#| "   connections from this machine);\n"
-#| " * a username and password to access the database;\n"
-#| " * the type of database management software you want to use."
+#| " * the type of database that you want to use;\n"
+#| " * the database server hostname (that server must allow TCP connections "
+#| "from this\n"
+#| "   machine);\n"
+#| " * a username and password to access the database."
 msgid ""
-" * the type of database that you want to use;\n"
-" * the database server hostname (that server must allow TCP connections from "
-"this\n"
-"   machine);\n"
-" * a username and password to access the database."
+" * the host name of the database server (which must allow TCP\n"
+"   connections from this machine);\n"
+" * a username and password to access the database;\n"
+" * the type of database management software you want to use."
 msgstr ""
 "- Le type de base de données que vous souhaitez utiliser ;\n"
 "- le nom d'hôte du serveur de base de données (ce serveur doit accepter les "
@@ -76,43 +80,46 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
 msgid ""
-"If some of these requirements are missing, do not choose this option and run "
-"with regular SQLite support."
+"If you don't choose this option, no database will be set up and Cinder will "
+"use regular SQLite support."
 msgstr ""
-"Si certains de ces prérequis sont manquants, ignorer cette option et "
-"exécuter l'application avec le support sqlite normal."
+"Si vous ne choisissez pas cette option, aucune base de données ne sera "
+"installée et Cinder utilisera le support SQLite normal."
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
+#, fuzzy
 #| msgid ""
 #| "You can change this setting later on by running \"dpkg-reconfigure -plow "
-#| "cinder-common\"."
+#| "cinder\"."
 msgid ""
 "You can change this setting later on by running \"dpkg-reconfigure -plow "
-"cinder\"."
+"cinder-common\"."
 msgstr ""
 "Vous pouvez modifier ce réglage plus tard en lançant « dpkg-reconfigure -"
 "plow cinder-common »."
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:4001
-#| msgid "Auth server hostname:"
-msgid "Authentication server hostname:"
+#: ../cinder-common.templates:3001
+#, fuzzy
+#| msgid "Authentication server hostname:"
+msgid "Auth server hostname:"
 msgstr "Nom d'hôte du serveur d'authentification : "
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:4001
+#: ../cinder-common.templates:3001
+#, fuzzy
 #| msgid ""
-#| "Please specify the URL of your Cinder authentication server. Typically  "
-#| "this is also the URL of your OpenStack Identity Service (Keystone)."
+#| "Please specify the hostname of the authentication server. Typically this "
+#| "is also the hostname of the OpenStack Identity Service (Keystone)."
 msgid ""
-"Please specify the hostname of the authentication server. Typically this is "
-"also the hostname of the OpenStack Identity Service (Keystone)."
+"Please specify the URL of your Cinder authentication server. Typically  this "
+"is also the URL of your OpenStack Identity Service (Keystone)."
 msgstr ""
 "Veuillez indiquer le nom d'hôte de votre serveur d'authentification Cinder. "
 "Typiquement, c'est également le nom d'hôte de votre Service d'Identité "
@@ -120,100 +127,129 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Translators: a "tenant" in OpenStack world is
-#. an entity that contains one or more username/password couples.
-#. It's typically the tenant that will be used for billing. Having more than one
-#. username/password is very helpful in larger organization.
-#. You're advised to either keep "tenant" without translating it
-#. or keep it aside with your translation. Example for French:
-#. propriétaire ("tenant")
-#: ../cinder-common.templates:5001
-#| msgid "Auth server tenant name:"
-msgid "Authentication server tenant name:"
+#: ../cinder-common.templates:4001
+#, fuzzy
+#| msgid "Authentication server tenant name:"
+msgid "Auth server tenant name:"
 msgstr "Nom d'espace client du serveur d'authentification :"
 
 #. Type: string
 #. Description
-#. Translators: a "tenant" in OpenStack world is
-#. an entity that contains one or more username/password couples.
-#. It's typically the tenant that will be used for billing. Having more than one
-#. username/password is very helpful in larger organization.
-#. You're advised to either keep "tenant" without translating it
-#. or keep it aside with your translation. Example for French:
-#. propriétaire ("tenant")
 #: ../cinder-common.templates:5001
-msgid "Please specify the authentication server tenant name."
-msgstr ""
-"Veuillez indiquer le serveur d'authentification pour le nom de l'espace "
-"client."
+#, fuzzy
+#| msgid "Authentication server username:"
+msgid "Auth server username:"
+msgstr "Nom d'utilisateur du serveur d'authentification : "
 
-#. Type: string
+#. Type: password
 #. Description
 #: ../cinder-common.templates:6001
-#| msgid "Auth server username:"
-msgid "Authentication server username:"
-msgstr "Nom d'utilisateur du serveur d'authentification : "
+#, fuzzy
+#| msgid "Authentication server password:"
+msgid "Auth server password:"
+msgstr "Mot de passe du serveur d'authentification : "
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:6001
-msgid "Please specify the username to use with the authentication server."
-msgstr ""
-"Veuillez indiquer le nom d'utilisateur à utiliser sur le serveur "
-"d'authentification."
+#: ../cinder-common.templates:7001
+msgid "Cinder volume group:"
+msgstr "Groupe de volume Cinder : "
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-common.templates:7001
-#| msgid "Auth server password:"
-msgid "Authentication server password:"
-msgstr "Mot de passe du serveur d'authentification : "
+#, fuzzy
+#| msgid ""
+#| "Please specify the name of the LVM volume group on which Cinder will "
+#| "create partitions."
+msgid ""
+"Please specify the name of the LVM volume group (vg) on which Cinder will "
+"create partitions."
+msgstr ""
+"Veuillez indiquer le nom du groupe de volume LVM  sur lequel Cinder créera "
+"les partitions."
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-common.templates:7001
-msgid "Please specify the password to use with the authentication server."
+#: ../cinder-common.templates:8001 ../cinder-common.templates:9001
+#: ../cinder-common.templates:10001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please specify the IP address of that server."
 msgstr ""
 "Veuillez indiquer le mot de passe à utiliser sur le serveur "
 "d'authentification."
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:8001
-msgid "Cinder volume group:"
-msgstr "Groupe de volume Cinder : "
+#: ../cinder-common.templates:9001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:8001
-#| msgid ""
-#| "Please specify the name of the LVM volume group (vg) on which Cinder will "
-#| "create partitions."
-msgid ""
-"Please specify the name of the LVM volume group on which Cinder will create "
-"partitions."
+#: ../cinder-common.templates:9001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please specify the username used to connect to the RabbitMQ server."
 msgstr ""
-"Veuillez indiquer le nom du groupe de volume LVM  sur lequel Cinder créera "
-"les partitions."
+"Veuillez indiquer le nom d'utilisateur à utiliser sur le serveur "
+"d'authentification."
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""
+"Veuillez indiquer le mot de passe à utiliser sur le serveur "
+"d'authentification."
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:2001
-#| msgid "Register Cinder in the keystone endpoint catalog?"
-msgid "Register Cinder in the Keystone endpoint catalog?"
+#: ../cinder-api.templates:1001
+#, fuzzy
+#| msgid "Register Cinder in the Keystone endpoint catalog?"
+msgid "Register Cinder in the keystone endpoint catalog?"
 msgstr "Enregistrer Cinder dans le catalogue de points d'accès Keystone ?"
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:2001
+#: ../cinder-api.templates:1001
+#, fuzzy
 #| msgid ""
-#| "Each Openstack services (each API) should be registered in order to be "
+#| "Each OpenStack service (each API) should be registered in order to be "
 #| "accessible. This is done using \"keystone service-create\" and \"keystone "
-#| "endpoint-create\". Select if you want to run these commands now."
+#| "endpoint-create\". This can be done automatically now."
 msgid ""
-"Each OpenStack service (each API) should be registered in order to be "
+"Each Openstack services (each API) should be registered in order to be "
 "accessible. This is done using \"keystone service-create\" and \"keystone "
-"endpoint-create\". This can be done automatically now."
+"endpoint-create\". Select if you want to run these commands now."
 msgstr ""
 "Chaque service OpenStack (chaque API) doit être enregistré pour être "
 "accessible. Ceci peut être fait en utilisant « keystone service-create » et "
@@ -222,33 +258,36 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:2001
+#: ../cinder-api.templates:1001
+#, fuzzy
 #| msgid ""
-#| "Note that you will need to have an up and running keystone server on "
-#| "which to connect using the Keystone auth token."
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
-"Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"Note that you will need to have an up and running keystone server on which "
+"to connect using the Keystone auth token."
 msgstr ""
 "Veuillez noter que vous aurez besoin d'avoir un serveur Keystone fonctionnel "
 "sur lequel se connecter pour utiliser le jeton d'authentification Keystone."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:3001
-#| msgid "Keystone IP address:"
-msgid "Keystone server IP address:"
+#: ../cinder-api.templates:2001
+#, fuzzy
+#| msgid "Keystone server IP address:"
+msgid "Keystone IP address:"
 msgstr "Adresse IP du serveur Keystone : "
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:3001
+#: ../cinder-api.templates:2001
+#, fuzzy
 #| msgid ""
-#| "Enter the IP address of your keystone server, so that cinder-api can "
-#| "contact Keystone to do the Cinder service and endpoint creation."
+#| "Please enter the IP address of the Keystone server, so that cinder-api "
+#| "can contact Keystone to do the Cinder service and endpoint creation."
 msgid ""
-"Please enter the IP address of the Keystone server, so that cinder-api can "
-"contact Keystone to do the Cinder service and endpoint creation."
+"Enter the IP address of your keystone server, so that cinder-api can contact "
+"Keystone to do the Cinder service and endpoint creation."
 msgstr ""
 "Veuillez indiquer l'adresse IP du serveur Keystone, pour que l'api cinder "
 "puisse contacter Keystone pour établir le service Cinder ainsi que la "
@@ -256,43 +295,46 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
-#| msgid "Keystone Auth Token:"
-msgid "Keystone authentication token:"
+#: ../cinder-api.templates:3001
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone Auth Token:"
 msgstr "Jeton d'authentification Keystone : "
 
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:3001
+#, fuzzy
 #| msgid ""
-#| "To configure its endpoint in Keystone, cinder-api needs the Keystone auth "
-#| "token."
+#| "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#| "authentication token."
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To configure its endpoint in Keystone, cinder-api needs the Keystone auth "
+"token."
 msgstr ""
 "Pour configurer son point d'accès dans Keystone, l'api de cinder a besoin du "
 "jeton d'authentification Keystone."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:4001
 msgid "Cinder endpoint IP address:"
 msgstr "Adresse IP du point d'accès Cinder : "
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
-#| msgid ""
-#| "Enter the IP address that will be used to contact Cinder (eg: the Cinder "
-#| "endpoint IP address)."
-msgid "Please enter the IP address that will be used to contact Cinder."
+#: ../cinder-api.templates:4001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Cinder."
+msgid ""
+"Enter the IP address that will be used to contact Cinder (eg: the Cinder "
+"endpoint IP address)."
 msgstr ""
 "Veuillez indiquer l'adresse IP qui sera utilisée pour contacter Cinder."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:4001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -304,29 +346,35 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:5001
 msgid "Name of the region to register:"
 msgstr "Nom de la région à enregistrer : "
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:5001
+#, fuzzy
 #| msgid ""
-#| "Openstack can be used using availability zones, with each region "
+#| "OpenStack supports using availability zones, with each region "
 #| "representing a location. Please enter the zone that you wish to use when "
 #| "registering the endpoint."
 msgid ""
-"OpenStack supports using availability zones, with each region representing a "
-"location. Please enter the zone that you wish to use when registering the "
-"endpoint."
+"Openstack can be used using availability zones, with each region "
+"representing a location. Please enter the zone that you wish to use when "
+"registering the endpoint."
 msgstr ""
 "OpenStack supporte l'utilisation de zones disponibles, avec chaque région "
 "représentant un lieu. Veuillez entrer une zone que vous souhaitez utiliser "
 "lors de l'enregistrement d'un point d'accès."
 
 #~ msgid ""
-#~ "If you don't choose this option, no database will be set up and Cinder "
-#~ "will use regular SQLite support."
+#~ "If some of these requirements are missing, do not choose this option and "
+#~ "run with regular SQLite support."
+#~ msgstr ""
+#~ "Si certains de ces prérequis sont manquants, ignorer cette option et "
+#~ "exécuter l'application avec le support sqlite normal."
+
+#~ msgid "Please specify the authentication server tenant name."
 #~ msgstr ""
-#~ "Si vous ne choisissez pas cette option, aucune base de données ne sera "
-#~ "installée et Cinder utilisera le support SQLite normal."
+#~ "Veuillez indiquer le serveur d'authentification pour le nom de l'espace "
+#~ "client."
diff --git a/debian/po/it.po b/debian/po/it.po
index 53e0b9d76..59d1675a3 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2012-11-28 11:58+0000\n"
+"POT-Creation-Date: 2013-09-25 17:10+0800\n"
 "PO-Revision-Date: 2013-06-09 15:40+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -132,6 +132,55 @@ msgstr ""
 "Specificare il nome del gruppo di volumi (vg) LVM su cui Cinder creerà le "
 "partizioni."
 
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../cinder-common.templates:8001 ../cinder-common.templates:9001
+#: ../cinder-common.templates:10001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "Please specify the IP address of that server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../cinder-api.templates:1001
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 4c4c66a81..9880d8929 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -2,264 +2,359 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the cinder package.
 # victory <victory.deb@gmail.com>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: cinder\n"
-"Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-02 07:02+0200\n"
-"PO-Revision-Date: 2013-09-02 14:02+0900\n"
-"Last-Translator: victory <victory.deb@gmail.com>\n"
-"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:2001
-msgid "Start Cinder services at boot?"
-msgstr "ブート時に Cinder サービスを開始しますか?"
-
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:2001
-msgid ""
-"Please choose whether you want to start Cinder services when the machine is "
-"booted up."
-msgstr "マシン起動後に Cinder サービスを開始するかどうか選択してください。"
-
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:3001
-msgid "Set up a database for Cinder?"
-msgstr "Cinder 用のデータベースを用意しますか?"
-
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:3001
-msgid ""
-"No database has been set up for Cinder to use. Before continuing, you should "
-"make sure you have the following information:"
-msgstr ""
-"Cinder で利用するデータベースが用意されていません。続ける前に以下の情報が揃っ"
-"ていることを確認してください:"
-
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:3001
-msgid ""
-" * the type of database that you want to use;\n"
-" * the database server hostname (that server must allow TCP connections from "
-"this\n"
-"   machine);\n"
-" * a username and password to access the database."
-msgstr ""
-" - 使いたいデータベースの種類\n"
-" - データベースサーバのホスト名 (このサーバはこのマシンからの\n"
-"   TCP 接続を許可しなければなりません)\n"
-" - データベースにアクセスするためのユーザ名とパスワード"
-
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:3001
-msgid ""
-"If some of these requirements are missing, do not choose this option and run "
-"with regular SQLite support."
-msgstr ""
-"必要な情報が欠けている場合このオプションを却下して標準の SQLite を利用しま"
-"す。"
-
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:3001
-msgid ""
-"You can change this setting later on by running \"dpkg-reconfigure -plow "
-"cinder\"."
-msgstr ""
-"この設定は後で「dpkg-reconfigure -plow cinder」を実行することにより"
-"変更できます。"
-
-#. Type: string
-#. Description
-#: ../cinder-common.templates:4001
-msgid "Authentication server hostname:"
-msgstr "認証サーバのホスト名:"
-
-#. Type: string
-#. Description
-#: ../cinder-common.templates:4001
-msgid ""
-"Please specify the hostname of the authentication server. Typically this is "
-"also the hostname of the OpenStack Identity Service (Keystone)."
-msgstr ""
-"認証サーバのホスト名を指定してください。これは通常 OpenStack Identity Service "
-"(Keystone) のホスト名にもなります。"
-
-#. Type: string
-#. Description
-#. Translators: a "tenant" in OpenStack world is
-#. an entity that contains one or more username/password couples.
-#. It's typically the tenant that will be used for billing. Having more than one
-#. username/password is very helpful in larger organization.
-#. You're advised to either keep "tenant" without translating it
-#. or keep it aside with your translation. Example for French:
-#. propriétaire ("tenant")
-#: ../cinder-common.templates:5001
-msgid "Authentication server tenant name:"
-msgstr "認証サーバの管理用アカウント (tenant) 名"
-
-#. Type: string
-#. Description
-#. Translators: a "tenant" in OpenStack world is
-#. an entity that contains one or more username/password couples.
-#. It's typically the tenant that will be used for billing. Having more than one
-#. username/password is very helpful in larger organization.
-#. You're advised to either keep "tenant" without translating it
-#. or keep it aside with your translation. Example for French:
-#. propriétaire ("tenant")
-#: ../cinder-common.templates:5001
-msgid "Please specify the authentication server tenant name."
-msgstr "認証サーバの管理用アカウント (tenant) 名を指定してください。"
-
-#. Type: string
-#. Description
-#: ../cinder-common.templates:6001
-msgid "Authentication server username:"
-msgstr "認証サーバのユーザ名:"
-
-#. Type: string
-#. Description
-#: ../cinder-common.templates:6001
-msgid "Please specify the username to use with the authentication server."
-msgstr "認証サーバで利用するユーザ名を指定してください。"
-
-#. Type: password
-#. Description
-#: ../cinder-common.templates:7001
-msgid "Authentication server password:"
-msgstr "認証サーバのパスワード:"
-
-#. Type: password
-#. Description
-#: ../cinder-common.templates:7001
-msgid "Please specify the password to use with the authentication server."
-msgstr "認証サーバで利用するパスワードを指定してください。"
-
-#. Type: string
-#. Description
-#: ../cinder-common.templates:8001
-msgid "Cinder volume group:"
-msgstr "Cinder ボリュームグループ:"
-
-#. Type: string
-#. Description
-#: ../cinder-common.templates:8001
-msgid ""
-"Please specify the name of the LVM volume group on which Cinder will create "
-"partitions."
-msgstr ""
-"Cinder にパーティションを作成させる LVM ボリュームグループの名前を指定してくだ"
-"さい。"
-
-#. Type: boolean
-#. Description
-#: ../cinder-api.templates:2001
-msgid "Register Cinder in the Keystone endpoint catalog?"
-msgstr "Cinder を Keystone の端末リストに登録しますか?"
-
-#. Type: boolean
-#. Description
-#: ../cinder-api.templates:2001
-msgid ""
-"Each OpenStack service (each API) should be registered in order to be "
-"accessible. This is done using \"keystone service-create\" and \"keystone "
-"endpoint-create\". This can be done automatically now."
-msgstr ""
-"OpenStack のサービスごと (API ごと) に、アクセスできるようにするため登録すべき"
-"です。「keystone service-create」と「keystone endpoint-create」を使って登録す"
-"ることができます。ここで自動的に行うことができます。"
-
-#. Type: boolean
-#. Description
-#: ../cinder-api.templates:2001
-msgid ""
-"Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
-msgstr ""
-"Keystone 認証文字列を使って接続する先の Keystone サーバが必要なことに注意して"
-"ください。"
-
-#. Type: string
-#. Description
-#: ../cinder-api.templates:3001
-msgid "Keystone server IP address:"
-msgstr "Keystone サーバの IP アドレス:"
-
-#. Type: string
-#. Description
-#: ../cinder-api.templates:3001
-msgid ""
-"Please enter the IP address of the Keystone server, so that cinder-api can "
-"contact Keystone to do the Cinder service and endpoint creation."
-msgstr ""
-"Keystone サーバの IP アドレスを入力してください。それにより cinder-api は "
-"Keystone と通信し、Cinder サービスや端末の作成ができるようになります。"
-
-#. Type: password
-#. Description
-#: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Keystone 認証文字列:"
-
-#. Type: password
-#. Description
-#: ../cinder-api.templates:4001
-msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
-msgstr ""
-"Keystone で端末を設定するには、cinder-api は Keystone 認証文字列を必要としま"
-"す。"
-
-#. Type: string
-#. Description
-#: ../cinder-api.templates:5001
-msgid "Cinder endpoint IP address:"
-msgstr "Cinder 端末の IP アドレス:"
-
-#. Type: string
-#. Description
-#: ../cinder-api.templates:5001
-msgid "Please enter the IP address that will be used to contact Cinder."
-msgstr "Cinder への通信に利用する IP アドレスを入力してください。"
-
-#. Type: string
-#. Description
-#: ../cinder-api.templates:5001
-msgid ""
-"This IP address should be accessible from the clients that will use this "
-"service, so if you are installing a public cloud, this should be a public IP "
-"address."
-msgstr ""
-"この IP アドレスはこのサービスを利用するクライアントからアクセスできないといけ"
-"ないので、パブリッククラウドをインストールしている場合、これは公開 IP アドレス"
-"を使うようにしてください。"
-
-#. Type: string
-#. Description
-#: ../cinder-api.templates:6001
-msgid "Name of the region to register:"
-msgstr "登録する領域の名前:"
-
-#. Type: string
-#. Description
-#: ../cinder-api.templates:6001
-msgid ""
-"OpenStack supports using availability zones, with each region representing a "
-"location. Please enter the zone that you wish to use when registering the "
-"endpoint."
-msgstr ""
-"OpenStack は位置を示す各領域による利用可能区分を利用することができます。端末の"
-"登録時に利用したい区分を入力してください。"
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cinder\n"
+"Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
+"POT-Creation-Date: 2013-09-25 17:10+0800\n"
+"PO-Revision-Date: 2013-09-02 14:02+0900\n"
+"Last-Translator: victory <victory.deb@gmail.com>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cinder-common.templates:1001
+#, fuzzy
+#| msgid "Start Cinder services at boot?"
+msgid "Start cinder services at boot?"
+msgstr "ブート時に Cinder サービスを開始しますか?"
+
+#. Type: boolean
+#. Description
+#: ../cinder-common.templates:1001
+msgid ""
+"Please choose whether you want to start Cinder services when the machine is "
+"booted up."
+msgstr "マシン起動後に Cinder サービスを開始するかどうか選択してください。"
+
+#. Type: boolean
+#. Description
+#: ../cinder-common.templates:2001
+msgid "Set up a database for Cinder?"
+msgstr "Cinder 用のデータベースを用意しますか?"
+
+#. Type: boolean
+#. Description
+#: ../cinder-common.templates:2001
+#, fuzzy
+#| msgid ""
+#| "No database has been set up for Cinder to use. Before continuing, you "
+#| "should make sure you have the following information:"
+msgid ""
+"No database has been set up for Cinder to use. If you want to set one up "
+"now, please make sure you have all needed information:"
+msgstr ""
+"Cinder で利用するデータベースが用意されていません。続ける前に以下の情報が揃っ"
+"ていることを確認してください:"
+
+#. Type: boolean
+#. Description
+#: ../cinder-common.templates:2001
+#, fuzzy
+#| msgid ""
+#| " * the type of database that you want to use;\n"
+#| " * the database server hostname (that server must allow TCP connections "
+#| "from this\n"
+#| "   machine);\n"
+#| " * a username and password to access the database."
+msgid ""
+" * the host name of the database server (which must allow TCP\n"
+"   connections from this machine);\n"
+" * a username and password to access the database;\n"
+" * the type of database management software you want to use."
+msgstr ""
+" - 使いたいデータベースの種類\n"
+" - データベースサーバのホスト名 (このサーバはこのマシンからの\n"
+"   TCP 接続を許可しなければなりません)\n"
+" - データベースにアクセスするためのユーザ名とパスワード"
+
+#. Type: boolean
+#. Description
+#: ../cinder-common.templates:2001
+msgid ""
+"If you don't choose this option, no database will be set up and Cinder will "
+"use regular SQLite support."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cinder-common.templates:2001
+#, fuzzy
+#| msgid ""
+#| "You can change this setting later on by running \"dpkg-reconfigure -plow "
+#| "cinder\"."
+msgid ""
+"You can change this setting later on by running \"dpkg-reconfigure -plow "
+"cinder-common\"."
+msgstr ""
+"この設定は後で「dpkg-reconfigure -plow cinder」を実行することにより変更できま"
+"す。"
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:3001
+#, fuzzy
+#| msgid "Authentication server hostname:"
+msgid "Auth server hostname:"
+msgstr "認証サーバのホスト名:"
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify the hostname of the authentication server. Typically this "
+#| "is also the hostname of the OpenStack Identity Service (Keystone)."
+msgid ""
+"Please specify the URL of your Cinder authentication server. Typically  this "
+"is also the URL of your OpenStack Identity Service (Keystone)."
+msgstr ""
+"認証サーバのホスト名を指定してください。これは通常 OpenStack Identity "
+"Service (Keystone) のホスト名にもなります。"
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:4001
+#, fuzzy
+#| msgid "Authentication server tenant name:"
+msgid "Auth server tenant name:"
+msgstr "認証サーバの管理用アカウント (tenant) 名"
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:5001
+#, fuzzy
+#| msgid "Authentication server username:"
+msgid "Auth server username:"
+msgstr "認証サーバのユーザ名:"
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:6001
+#, fuzzy
+#| msgid "Authentication server password:"
+msgid "Auth server password:"
+msgstr "認証サーバのパスワード:"
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:7001
+msgid "Cinder volume group:"
+msgstr "Cinder ボリュームグループ:"
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:7001
+#, fuzzy
+#| msgid ""
+#| "Please specify the name of the LVM volume group on which Cinder will "
+#| "create partitions."
+msgid ""
+"Please specify the name of the LVM volume group (vg) on which Cinder will "
+"create partitions."
+msgstr ""
+"Cinder にパーティションを作成させる LVM ボリュームグループの名前を指定してく"
+"ださい。"
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../cinder-common.templates:8001 ../cinder-common.templates:9001
+#: ../cinder-common.templates:10001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please specify the IP address of that server."
+msgstr "認証サーバで利用するパスワードを指定してください。"
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr "認証サーバで利用するユーザ名を指定してください。"
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr "認証サーバで利用するパスワードを指定してください。"
+
+#. Type: boolean
+#. Description
+#: ../cinder-api.templates:1001
+#, fuzzy
+#| msgid "Register Cinder in the Keystone endpoint catalog?"
+msgid "Register Cinder in the keystone endpoint catalog?"
+msgstr "Cinder を Keystone の端末リストに登録しますか?"
+
+#. Type: boolean
+#. Description
+#: ../cinder-api.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Each OpenStack service (each API) should be registered in order to be "
+#| "accessible. This is done using \"keystone service-create\" and \"keystone "
+#| "endpoint-create\". This can be done automatically now."
+msgid ""
+"Each Openstack services (each API) should be registered in order to be "
+"accessible. This is done using \"keystone service-create\" and \"keystone "
+"endpoint-create\". Select if you want to run these commands now."
+msgstr ""
+"OpenStack のサービスごと (API ごと) に、アクセスできるようにするため登録すべ"
+"きです。「keystone service-create」と「keystone endpoint-create」を使って登録"
+"することができます。ここで自動的に行うことができます。"
+
+#. Type: boolean
+#. Description
+#: ../cinder-api.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
+msgid ""
+"Note that you will need to have an up and running keystone server on which "
+"to connect using the Keystone auth token."
+msgstr ""
+"Keystone 認証文字列を使って接続する先の Keystone サーバが必要なことに注意して"
+"ください。"
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:2001
+#, fuzzy
+#| msgid "Keystone server IP address:"
+msgid "Keystone IP address:"
+msgstr "Keystone サーバの IP アドレス:"
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the Keystone server, so that cinder-api "
+#| "can contact Keystone to do the Cinder service and endpoint creation."
+msgid ""
+"Enter the IP address of your keystone server, so that cinder-api can contact "
+"Keystone to do the Cinder service and endpoint creation."
+msgstr ""
+"Keystone サーバの IP アドレスを入力してください。それにより cinder-api は "
+"Keystone と通信し、Cinder サービスや端末の作成ができるようになります。"
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:3001
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone Auth Token:"
+msgstr "Keystone 認証文字列:"
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:3001
+#, fuzzy
+#| msgid ""
+#| "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#| "authentication token."
+msgid ""
+"To configure its endpoint in Keystone, cinder-api needs the Keystone auth "
+"token."
+msgstr ""
+"Keystone で端末を設定するには、cinder-api は Keystone 認証文字列を必要としま"
+"す。"
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:4001
+msgid "Cinder endpoint IP address:"
+msgstr "Cinder 端末の IP アドレス:"
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:4001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Cinder."
+msgid ""
+"Enter the IP address that will be used to contact Cinder (eg: the Cinder "
+"endpoint IP address)."
+msgstr "Cinder への通信に利用する IP アドレスを入力してください。"
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:4001
+msgid ""
+"This IP address should be accessible from the clients that will use this "
+"service, so if you are installing a public cloud, this should be a public IP "
+"address."
+msgstr ""
+"この IP アドレスはこのサービスを利用するクライアントからアクセスできないとい"
+"けないので、パブリッククラウドをインストールしている場合、これは公開 IP アド"
+"レスを使うようにしてください。"
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:5001
+msgid "Name of the region to register:"
+msgstr "登録する領域の名前:"
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:5001
+#, fuzzy
+#| msgid ""
+#| "OpenStack supports using availability zones, with each region "
+#| "representing a location. Please enter the zone that you wish to use when "
+#| "registering the endpoint."
+msgid ""
+"Openstack can be used using availability zones, with each region "
+"representing a location. Please enter the zone that you wish to use when "
+"registering the endpoint."
+msgstr ""
+"OpenStack は位置を示す各領域による利用可能区分を利用することができます。端末"
+"の登録時に利用したい区分を入力してください。"
+
+#~ msgid ""
+#~ "If some of these requirements are missing, do not choose this option and "
+#~ "run with regular SQLite support."
+#~ msgstr ""
+#~ "必要な情報が欠けている場合このオプションを却下して標準の SQLite を利用しま"
+#~ "す。"
+
+#~ msgid "Please specify the authentication server tenant name."
+#~ msgstr "認証サーバの管理用アカウント (tenant) 名を指定してください。"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 2ebc988d0..010feabde 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2012-11-28 11:58+0000\n"
+"POT-Creation-Date: 2013-09-25 17:10+0800\n"
 "PO-Revision-Date: 2013-04-13 19:01+0100\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -29,7 +29,8 @@ msgid ""
 "Please choose whether you want to start Cinder services when the machine is "
 "booted up."
 msgstr ""
-"Por favor escolha se pretende iniciar os serviços Cinder quando a máquina é ligada."
+"Por favor escolha se pretende iniciar os serviços Cinder quando a máquina é "
+"ligada."
 
 #. Type: boolean
 #. Description
@@ -45,7 +46,7 @@ msgid ""
 "now, please make sure you have all needed information:"
 msgstr ""
 "Não foi definida nenhuma base de dados para uso do Cinder. Se quer criar uma "
-"agora, certifique-se que tem toda a informação necessária:" 
+"agora, certifique-se que tem toda a informação necessária:"
 
 #. Type: boolean
 #. Description
@@ -56,10 +57,10 @@ msgid ""
 " * a username and password to access the database;\n"
 " * the type of database management software you want to use."
 msgstr ""
-" * o nome da máquina servidor de base de dados (que tem que permitir\n "
-"   ligações TCP a partir desta máquina);\n"
-" * um nome de utilizador e password com permissão para aceder à base de\n "
-"   dados;\n"
+" * o nome da máquina servidor de base de dados (que tem que permitir\n"
+"    ligações TCP a partir desta máquina);\n"
+" * um nome de utilizador e password com permissão para aceder à base de\n"
+"    dados;\n"
 " * o tipo de software de gestão de base de dados que quer usar."
 
 #. Type: boolean
@@ -132,6 +133,55 @@ msgstr ""
 "Indique por favor o nome do grupo LVM (vg) no qual o Cinder irá criar "
 "partições."
 
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../cinder-common.templates:8001 ../cinder-common.templates:9001
+#: ../cinder-common.templates:10001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "Please specify the IP address of that server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../cinder-api.templates:1001
@@ -146,9 +196,9 @@ msgid ""
 "accessible. This is done using \"keystone service-create\" and \"keystone "
 "endpoint-create\". Select if you want to run these commands now."
 msgstr ""
-"Cada serviço Openstack (cada API) deve ser registado de modo a ser acessível. "
-"Isto é feito através do \"keystone service-create\" e \"keystone endpoint-"
-"create\". Indique se quer correr estes comandos agora."
+"Cada serviço Openstack (cada API) deve ser registado de modo a ser "
+"acessível. Isto é feito através do \"keystone service-create\" e \"keystone "
+"endpoint-create\". Indique se quer correr estes comandos agora."
 
 #. Type: boolean
 #. Description
@@ -157,8 +207,8 @@ msgid ""
 "Note that you will need to have an up and running keystone server on which "
 "to connect using the Keystone auth token."
 msgstr ""
-"Note que irá precisar de ter um servidor keystone a correr para se autenticar "
-"com um token de autenticação Keystone."
+"Note que irá precisar de ter um servidor keystone a correr para se "
+"autenticar com um token de autenticação Keystone."
 
 #. Type: string
 #. Description
@@ -216,8 +266,9 @@ msgid ""
 "service, so if you are installing a public cloud, this should be a public IP "
 "address."
 msgstr ""
-"Este endereço IP deverá ser acessível a partir dos clientes que usarão o serviço, "
-"portanto se está a instalar uma cloud pública, este deve ser um endereço IP público."
+"Este endereço IP deverá ser acessível a partir dos clientes que usarão o "
+"serviço, portanto se está a instalar uma cloud pública, este deve ser um "
+"endereço IP público."
 
 #. Type: string
 #. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index b82edee6c..bb7772aee 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder 2013.1.2-4\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-02 07:02+0200\n"
+"POT-Creation-Date: 2013-09-25 17:10+0800\n"
 "PO-Revision-Date: 2013-09-03 19:24+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -20,14 +20,15 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:2001
-#| msgid "Start cinder services at boot?"
-msgid "Start Cinder services at boot?"
+#: ../cinder-common.templates:1001
+#, fuzzy
+#| msgid "Start Cinder services at boot?"
+msgid "Start cinder services at boot?"
 msgstr "Запускать службы Cinder при включении машины?"
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:2001
+#: ../cinder-common.templates:1001
 msgid ""
 "Please choose whether you want to start Cinder services when the machine is "
 "booted up."
@@ -35,253 +36,292 @@ msgstr "Укажите, нужно ли запускать службы Cinder 
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
 msgid "Set up a database for Cinder?"
 msgstr "Настроить базу данных для Cinder?"
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
+#, fuzzy
 #| msgid ""
-#| "No database has been set up for Cinder to use. If you want to set one up "
-#| "now, please make sure you have all needed information:"
+#| "No database has been set up for Cinder to use. Before continuing, you "
+#| "should make sure you have the following information:"
 msgid ""
-"No database has been set up for Cinder to use. Before continuing, you should "
-"make sure you have the following information:"
+"No database has been set up for Cinder to use. If you want to set one up "
+"now, please make sure you have all needed information:"
 msgstr ""
 "Для использования Cinder требуется настроить базу данных. Если вы хотите "
 "сделать это сейчас, то проверьте, что у вас есть вся необходимая информация:"
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
+#, fuzzy
 #| msgid ""
-#| " * the host name of the database server (which must allow TCP\n"
-#| "   connections from this machine);\n"
-#| " * a username and password to access the database;\n"
-#| " * the type of database management software you want to use."
+#| " * the type of database that you want to use;\n"
+#| " * the database server hostname (that server must allow TCP connections "
+#| "from this\n"
+#| "   machine);\n"
+#| " * a username and password to access the database."
 msgid ""
-" * the type of database that you want to use;\n"
-" * the database server hostname (that server must allow TCP connections from "
-"this\n"
-"   machine);\n"
-" * a username and password to access the database."
+" * the host name of the database server (which must allow TCP\n"
+"   connections from this machine);\n"
+" * a username and password to access the database;\n"
+" * the type of database management software you want to use."
 msgstr ""
 " * тип базы данных, который хотите использовать;\n"
-" * имя узла сервера базы данных (этот сервер должен принимать TCP-соединения\n"
+" * имя узла сервера базы данных (этот сервер должен принимать TCP-"
+"соединения\n"
 "   с этой машины);\n"
 " * имя пользователя и пароль для доступа к базе данных."
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
 msgid ""
-"If some of these requirements are missing, do not choose this option and run "
-"with regular SQLite support."
+"If you don't choose this option, no database will be set up and Cinder will "
+"use regular SQLite support."
 msgstr ""
-"Если не хватает хотя бы одного параметра, ответьте отрицательно и включите "
-"поддержку SQLite."
+"Если вы ответите отрицательно, то база данных настроена не будет, и Cinder "
+"будет использоваться SQLite."
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
+#, fuzzy
 #| msgid ""
 #| "You can change this setting later on by running \"dpkg-reconfigure -plow "
-#| "cinder-common\"."
+#| "cinder\"."
 msgid ""
 "You can change this setting later on by running \"dpkg-reconfigure -plow "
-"cinder\"."
+"cinder-common\"."
 msgstr ""
 "Позднее, вы можете изменить эту настройку, запустив «dpkg-reconfigure -plow "
 "cinder»."
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:4001
-#| msgid "Auth server hostname:"
-msgid "Authentication server hostname:"
+#: ../cinder-common.templates:3001
+#, fuzzy
+#| msgid "Authentication server hostname:"
+msgid "Auth server hostname:"
 msgstr "Имя узла сервера аутентификации:"
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:4001
+#: ../cinder-common.templates:3001
+#, fuzzy
 #| msgid ""
-#| "Please specify the URL of your Cinder authentication server. Typically  "
-#| "this is also the URL of your OpenStack Identity Service (Keystone)."
+#| "Please specify the hostname of the authentication server. Typically this "
+#| "is also the hostname of the OpenStack Identity Service (Keystone)."
 msgid ""
-"Please specify the hostname of the authentication server. Typically this is "
-"also the hostname of the OpenStack Identity Service (Keystone)."
+"Please specify the URL of your Cinder authentication server. Typically  this "
+"is also the URL of your OpenStack Identity Service (Keystone)."
 msgstr ""
 "Введите имя узла сервера аутентификации. Данное имя обычно совпадает с "
 "именем узла OpenStack Identity Service (Keystone)."
 
 #. Type: string
 #. Description
-#. Translators: a "tenant" in OpenStack world is
-#. an entity that contains one or more username/password couples.
-#. It's typically the tenant that will be used for billing. Having more than one
-#. username/password is very helpful in larger organization.
-#. You're advised to either keep "tenant" without translating it
-#. or keep it aside with your translation. Example for French:
-#. propriétaire ("tenant")
-#: ../cinder-common.templates:5001
-#| msgid "Auth server tenant name:"
-msgid "Authentication server tenant name:"
+#: ../cinder-common.templates:4001
+#, fuzzy
+#| msgid "Authentication server tenant name:"
+msgid "Auth server tenant name:"
 msgstr "Членское имя сервера аутентификации:"
 
 #. Type: string
 #. Description
-#. Translators: a "tenant" in OpenStack world is
-#. an entity that contains one or more username/password couples.
-#. It's typically the tenant that will be used for billing. Having more than one
-#. username/password is very helpful in larger organization.
-#. You're advised to either keep "tenant" without translating it
-#. or keep it aside with your translation. Example for French:
-#. propriétaire ("tenant")
 #: ../cinder-common.templates:5001
-msgid "Please specify the authentication server tenant name."
-msgstr "Укажите членское имя сервера аутентификации."
+#, fuzzy
+#| msgid "Authentication server username:"
+msgid "Auth server username:"
+msgstr "Имя пользователя для сервера аутентификации:"
 
-#. Type: string
+#. Type: password
 #. Description
 #: ../cinder-common.templates:6001
-#| msgid "Auth server username:"
-msgid "Authentication server username:"
-msgstr "Имя пользователя для сервера аутентификации:"
+#, fuzzy
+#| msgid "Authentication server password:"
+msgid "Auth server password:"
+msgstr "Пароль для сервера аутентификации:"
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:6001
-msgid "Please specify the username to use with the authentication server."
-msgstr "Введите имя пользователя для работы с сервером аутентификации."
+#: ../cinder-common.templates:7001
+msgid "Cinder volume group:"
+msgstr "Группа томов Cinder:"
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-common.templates:7001
-#| msgid "Auth server password:"
-msgid "Authentication server password:"
-msgstr "Пароль для сервера аутентификации:"
+#, fuzzy
+#| msgid ""
+#| "Please specify the name of the LVM volume group on which Cinder will "
+#| "create partitions."
+msgid ""
+"Please specify the name of the LVM volume group (vg) on which Cinder will "
+"create partitions."
+msgstr ""
+"Укажите имя группы томов LVM, в которой Cinder будет создавать разделы."
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-common.templates:7001
-msgid "Please specify the password to use with the authentication server."
-msgstr "Введите пароль для работы с сервером аутентификации."
+#: ../cinder-common.templates:8001 ../cinder-common.templates:9001
+#: ../cinder-common.templates:10001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
 
 #. Type: string
 #. Description
 #: ../cinder-common.templates:8001
-msgid "Cinder volume group:"
-msgstr "Группа томов Cinder:"
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please specify the IP address of that server."
+msgstr "Введите пароль для работы с сервером аутентификации."
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:8001
-#| msgid ""
-#| "Please specify the name of the LVM volume group (vg) on which Cinder will "
-#| "create partitions."
-msgid ""
-"Please specify the name of the LVM volume group on which Cinder will create "
-"partitions."
+#: ../cinder-common.templates:9001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr "Введите имя пользователя для работы с сервером аутентификации."
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Password for connection to the RabbitMQ server:"
 msgstr ""
-"Укажите имя группы томов LVM, в которой Cinder будет создавать "
-"разделы."
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr "Введите пароль для работы с сервером аутентификации."
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:2001
-#| msgid "Register Cinder in the keystone endpoint catalog?"
-msgid "Register Cinder in the Keystone endpoint catalog?"
+#: ../cinder-api.templates:1001
+#, fuzzy
+#| msgid "Register Cinder in the Keystone endpoint catalog?"
+msgid "Register Cinder in the keystone endpoint catalog?"
 msgstr "Зарегистрировать Cinder в каталоге конечных точек Keystone?"
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:2001
+#: ../cinder-api.templates:1001
+#, fuzzy
 #| msgid ""
-#| "Each Openstack services (each API) should be registered in order to be "
+#| "Each OpenStack service (each API) should be registered in order to be "
 #| "accessible. This is done using \"keystone service-create\" and \"keystone "
-#| "endpoint-create\". Select if you want to run these commands now."
+#| "endpoint-create\". This can be done automatically now."
 msgid ""
-"Each OpenStack service (each API) should be registered in order to be "
+"Each Openstack services (each API) should be registered in order to be "
 "accessible. This is done using \"keystone service-create\" and \"keystone "
-"endpoint-create\". This can be done automatically now."
+"endpoint-create\". Select if you want to run these commands now."
 msgstr ""
-"Для доступа к службам Openstack (каждому API) их нужно регистрировать. "
-"Это выполняется с помощью команды «keystone service-create» и «keystone "
-"endpoint-create». Это может быть сделано автоматически прямо сейчас."
+"Для доступа к службам Openstack (каждому API) их нужно регистрировать. Это "
+"выполняется с помощью команды «keystone service-create» и «keystone endpoint-"
+"create». Это может быть сделано автоматически прямо сейчас."
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:2001
+#: ../cinder-api.templates:1001
+#, fuzzy
 #| msgid ""
-#| "Note that you will need to have an up and running keystone server on "
-#| "which to connect using the Keystone auth token."
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
-"Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"Note that you will need to have an up and running keystone server on which "
+"to connect using the Keystone auth token."
 msgstr ""
-"Заметим, что у вас должен быть работающий сервер Keystone, к которому "
-"будет произведено подключение с использованием токена аутентификации Keystone."
+"Заметим, что у вас должен быть работающий сервер Keystone, к которому будет "
+"произведено подключение с использованием токена аутентификации Keystone."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:3001
-#| msgid "Keystone IP address:"
-msgid "Keystone server IP address:"
+#: ../cinder-api.templates:2001
+#, fuzzy
+#| msgid "Keystone server IP address:"
+msgid "Keystone IP address:"
 msgstr "IP-адрес сервера Keystone:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:3001
+#: ../cinder-api.templates:2001
+#, fuzzy
 #| msgid ""
-#| "Enter the IP address of your keystone server, so that cinder-api can "
-#| "contact Keystone to do the Cinder service and endpoint creation."
+#| "Please enter the IP address of the Keystone server, so that cinder-api "
+#| "can contact Keystone to do the Cinder service and endpoint creation."
 msgid ""
-"Please enter the IP address of the Keystone server, so that cinder-api can "
-"contact Keystone to do the Cinder service and endpoint creation."
+"Enter the IP address of your keystone server, so that cinder-api can contact "
+"Keystone to do the Cinder service and endpoint creation."
 msgstr ""
 "Введите IP-адрес сервера Keystone для того, чтобы cinder-api могла "
-"подключиться "
-"к Keystone для запуска службы Cinder и создания конечной точки."
+"подключиться к Keystone для запуска службы Cinder и создания конечной точки."
 
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
-#| msgid "Keystone Auth Token:"
-msgid "Keystone authentication token:"
+#: ../cinder-api.templates:3001
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone Auth Token:"
 msgstr "Токен аутентификации Keystone:"
 
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:3001
+#, fuzzy
 #| msgid ""
-#| "To configure its endpoint in Keystone, cinder-api needs the Keystone auth "
-#| "token."
+#| "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#| "authentication token."
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To configure its endpoint in Keystone, cinder-api needs the Keystone auth "
+"token."
 msgstr ""
-"Для настройки собственной конечной точки в Keystone cinder-api "
-"требуется токен аутентификации Keystone."
+"Для настройки собственной конечной точки в Keystone cinder-api требуется "
+"токен аутентификации Keystone."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:4001
 msgid "Cinder endpoint IP address:"
 msgstr "IP-адрес конечной точки Cinder:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
-#| msgid ""
-#| "Enter the IP address that will be used to contact Cinder (eg: the Cinder "
-#| "endpoint IP address)."
-msgid "Please enter the IP address that will be used to contact Cinder."
+#: ../cinder-api.templates:4001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Cinder."
+msgid ""
+"Enter the IP address that will be used to contact Cinder (eg: the Cinder "
+"endpoint IP address)."
 msgstr "Введите IP-адрес, который будет использован для подключения к Cinder."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:4001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -293,29 +333,33 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:5001
 msgid "Name of the region to register:"
 msgstr "Название области для регистрации:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:5001
+#, fuzzy
 #| msgid ""
-#| "Openstack can be used using availability zones, with each region "
+#| "OpenStack supports using availability zones, with each region "
 #| "representing a location. Please enter the zone that you wish to use when "
 #| "registering the endpoint."
 msgid ""
-"OpenStack supports using availability zones, with each region representing a "
-"location. Please enter the zone that you wish to use when registering the "
-"endpoint."
+"Openstack can be used using availability zones, with each region "
+"representing a location. Please enter the zone that you wish to use when "
+"registering the endpoint."
 msgstr ""
-"Openstack поддерживает разделение на зоны доступности, где каждая "
-"область представляет определённое расположение. Введите зону, которую вы "
-"хотите использовать при регистрации конечной точки."
+"Openstack поддерживает разделение на зоны доступности, где каждая область "
+"представляет определённое расположение. Введите зону, которую вы хотите "
+"использовать при регистрации конечной точки."
 
 #~ msgid ""
-#~ "If you don't choose this option, no database will be set up and Cinder "
-#~ "will use regular SQLite support."
+#~ "If some of these requirements are missing, do not choose this option and "
+#~ "run with regular SQLite support."
 #~ msgstr ""
-#~ "Если вы ответите отрицательно, то база данных настроена не будет, и "
-#~ "Cinder будет использоваться SQLite."
+#~ "Если не хватает хотя бы одного параметра, ответьте отрицательно и "
+#~ "включите поддержку SQLite."
+
+#~ msgid "Please specify the authentication server tenant name."
+#~ msgstr "Укажите членское имя сервера аутентификации."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index b039e3608..706f02a5c 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2012-11-28 11:58+0000\n"
+"POT-Creation-Date: 2013-09-25 17:10+0800\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"
@@ -117,6 +117,55 @@ msgid ""
 "create partitions."
 msgstr ""
 
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../cinder-common.templates:8001 ../cinder-common.templates:9001
+#: ../cinder-common.templates:10001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:8001
+msgid "Please specify the IP address of that server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-common.templates:9001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-common.templates:10001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../cinder-api.templates:1001