Do not use Keystone admin auth token to register API endpoint.

Rewritten-From: db66b37688bfddd9c62e3a1dd55c4e4136bbca28

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index b97fafda8b672aea8a01b566cc5f0a0c8609d7f3..b008e00f3f944434f9aab998d455f88708c8587c 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+cinder (2:8.0.0~rc1-2) experimental; urgency=medium
+
+  * Do not use Keystone admin auth token to register API endpoint.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 29 Mar 2016 12:24:55 +0000
+
 cinder (2:8.0.0~rc1-1) experimental; urgency=medium
 
   * New upstream release.

diff --git a/trusty/debian/cinder-api.lintian-overrides b/trusty/debian/cinder-api.lintian-overrides
index 583fbf0db2c7aa6f73bf3d20ec0e3f3e8da0fe72..a9a2a018dd027cc1b3572921b468c482eace100b 100644 (file)
--- a/trusty/debian/cinder-api.lintian-overrides
+++ b/trusty/debian/cinder-api.lintian-overrides
@@ -1,5 +1,7 @@
 cinder-api: unused-debconf-template cinder/register-endpoint
 cinder-api: unused-debconf-template cinder/keystone-ip
-cinder-api: unused-debconf-template cinder/keystone-auth-token
+cinder-api: unused-debconf-template cinder/keystone-admin-name
+cinder-api: unused-debconf-template cinder/keystone-project-name
+cinder-api: unused-debconf-template cinder/keystone-admin-password
 cinder-api: unused-debconf-template cinder/endpoint-ip
 cinder-api: unused-debconf-template cinder/region-name

diff --git a/trusty/debian/cinder-api.templates b/trusty/debian/cinder-api.templates
index 0728356933f2fb2124a737eb47da7393238dda01..d34d7188d83fd878e8bb1b03c06d7191a422ce03 100644 (file)
--- a/trusty/debian/cinder-api.templates
+++ b/trusty/debian/cinder-api.templates
@@ -24,11 +24,25 @@ _Description: Keystone server IP address:
  Please enter the IP address of the Keystone server, so that cinder-api can
  contact Keystone to do the Cinder service and endpoint creation.
 
-Template: cinder/keystone-auth-token
+Template: cinder/keystone-admin-name
+Type: string
+Default: admin
+_Description: Keystone admin name:
+ To register the service endpoint, this package needs to know the Admin login,
+ name, project name, and password to the Keystone server.
+
+Template: cinder/keystone-project-name
+Type: string
+Default: admin
+_Description: Keystone admin project name:
+ To register the service endpoint, this package needs to know the Admin login,
+ name, project name, and password to the Keystone server.
+
+Template: cinder/keystone-admin-password
 Type: password
-_Description: Keystone authentication token:
- To configure its endpoint in Keystone, cinder-api needs the Keystone
- authentication token.
+_Description: Keystone admin password:
+ To register the service endpoint, this package needs to know the Admin login,
+ name, project name, and password to the Keystone server.
 
 Template: cinder/endpoint-ip
 Type: string

diff --git a/trusty/debian/control b/trusty/debian/control
index d7f50b1ee8fe3aa0ec0245ac3c0a452fd356f4ab..7408def896507adfd30f2e304eab64e5a8f5c4ad 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -6,7 +6,7 @@ Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
-               openstack-pkg-tools (>= 38~),
+               openstack-pkg-tools (>= 40~),
                po-debconf,
                python-all,
                python-pbr (>= 1.8),

diff --git a/trusty/debian/po/cs.po b/trusty/debian/po/cs.po
index f4786aa70c0665bee762c3f6737c59859aee01b3..bb95be5936b25d859eb32f002c51fb1e5d64b37c 100644 (file)
--- a/trusty/debian/po/cs.po
+++ b/trusty/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: 2013-12-19 16:02+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+0000\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"
@@ -245,31 +245,48 @@ msgstr ""
 "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
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr "Autentizační klíč pro Keystone:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Aby mohlo cinder-api nastavit v Keystone svůj koncový bod, potřebuje "
-"autentizační klíč pro Keystone."
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "IP adresa koncového bodu Cinder:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr ""
 "Zadejte IP adresu, která se bude používat ke spojení s Cinder (např: IP "
@@ -277,7 +294,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -289,13 +306,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "Název registrované oblasti:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -305,6 +322,13 @@ msgstr ""
 "představuje místo. Zadejte prosím oblast, kterou chcete použít při "
 "registraci koncového bodu."
 
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#~ "authentication token."
+#~ msgstr ""
+#~ "Aby mohlo cinder-api nastavit v Keystone svůj koncový bod, potřebuje "
+#~ "autentizační klíč pro Keystone."
+
 #~ msgid "Start Cinder services at boot?"
 #~ msgstr "Spouštět služby cinder při zavádění?"
 

diff --git a/trusty/debian/po/da.po b/trusty/debian/po/da.po
index 12368e492cb90bb609f2682ac5c4f77fb09e4342..8d98d0b5075549458736031cb53250cc5c550522 100644 (file)
--- a/trusty/debian/po/da.po
+++ b/trusty/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-12-19 16:02+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+0000\n"
 "PO-Revision-Date: 2014-02-22 12:42+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -167,8 +167,8 @@ msgid ""
 "In order to interoperate with other components of OpenStack, this package "
 "needs to connect to a central RabbitMQ server."
 msgstr ""
-"Denne pakke skal forbinde til en central RabbitMQ-server, for at fungere "
-"med andre komponenter i OpenStack."
+"Denne pakke skal forbinde til en central RabbitMQ-server, for at fungere med "
+"andre komponenter i OpenStack."
 
 #. Type: string
 #. Description
@@ -198,7 +198,8 @@ msgstr "Adgangskode for forbindelsen til RabbitMQ-serveren:"
 #. Description
 #: ../cinder-common.templates:10001
 msgid "Please specify the password used to connect to the RabbitMQ server."
-msgstr "Angiv venligt adgangskoden brugt til at forbinde med RAbbitMQ-serveren."
+msgstr ""
+"Angiv venligt adgangskoden brugt til at forbinde med RAbbitMQ-serveren."
 
 #. Type: boolean
 #. Description
@@ -244,37 +245,54 @@ msgstr ""
 "Indtast IP-adressen for din Keystoneserver, så at cinder-api kan kontakte "
 "Keystone for at udføre Cindertjenesten og slutpunktsoprettelse."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr "Godkendelsessymbol for Keystone:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"For at konfigurere sit slutpunkt i Keystone skal cinder-api bruge Keystones "
-"godkendelsessymbol."
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "IP-adresse for Cinderslutpunkt:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr "Indtast IP-adressen som vil blive brugt til at kontakter Cinder."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -286,13 +304,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "Navn på regionen der skal registreres:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -302,3 +320,9 @@ msgstr ""
 "repræsenterer et sted. Indtast venligst zonen, som du ønsker at bruge, når "
 "du registrerer slutpunktet."
 
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#~ "authentication token."
+#~ msgstr ""
+#~ "For at konfigurere sit slutpunkt i Keystone skal cinder-api bruge "
+#~ "Keystones godkendelsessymbol."

diff --git a/trusty/debian/po/de.po b/trusty/debian/po/de.po
index 16b9cd0a18da941018155e0b81b69637be6a6d63..b703e5bb640b009f898a354cebfaef375485283d 100644 (file)
--- a/trusty/debian/po/de.po
+++ b/trusty/debian/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder 2013.2.1-2\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2013-12-19 16:02+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+0000\n"
 "PO-Revision-Date: 2014-01-23 19:01+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -30,8 +30,8 @@ msgid ""
 "make sure you have the following information:"
 msgstr ""
 "Für die Benutzung durch Cinder wurde keine Datenbank eingerichtet. Bevor Sie "
-"fortfahren, sollten Sie sich versichern, dass Sie die folgenden Informationen "
-"haben:"
+"fortfahren, sollten Sie sich versichern, dass Sie die folgenden "
+"Informationen haben:"
 
 #. Type: boolean
 #. Description
@@ -137,8 +137,8 @@ msgstr "Passwort des Authentifizierungsservers:"
 #: ../cinder-common.templates:6001
 msgid "Please specify the password to use with the authentication server."
 msgstr ""
-"Bitte geben Sie das Passwort an, das für den Authentifizierungsserver benutzt "
-"wird."
+"Bitte geben Sie das Passwort an, das für den Authentifizierungsserver "
+"benutzt wird."
 
 #. Type: string
 #. Description
@@ -208,8 +208,8 @@ msgstr "Passwort für die Verbindung mit dem RabbitMQ-Server:"
 #: ../cinder-common.templates:10001
 msgid "Please specify the password used to connect to the RabbitMQ server."
 msgstr ""
-"Bitte geben Sie das Passwort ein, das Sie zum Verbinden mit dem "
-"RabbitMQ-Server verwenden."
+"Bitte geben Sie das Passwort ein, das Sie zum Verbinden mit dem RabbitMQ-"
+"Server verwenden."
 
 #. Type: boolean
 #. Description
@@ -257,31 +257,48 @@ msgstr ""
 "Keystone kontaktieren kann, um den Cinder-Dienst und den Endpunkt zu "
 "erstellen."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr "Keystone-Authentifizierungs-Token:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Cinder-API benötigt das Keystone-Authentifizierungs-Token, um seinen Endpunkt "
-"in Keystone zu konfigurieren."
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "IP-Adresse des Cinder-Endpunkts:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr ""
 "Bitte geben Sie die IP-Adresse ein, die zum Kontaktieren von Cinder benutzt "
@@ -289,7 +306,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -301,13 +318,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "Name der Region, die registriert wird:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -316,3 +333,10 @@ msgstr ""
 "OpenStack unterstützt die Verwendung von Verfügbarkeitszonen, bei der jede "
 "Region einen Ort repräsentiert. Bitte geben Sie die Zone, die Sie benutzen "
 "möchten, bei der Registrierung des Endpunkts an."
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#~ "authentication token."
+#~ msgstr ""
+#~ "Cinder-API benötigt das Keystone-Authentifizierungs-Token, um seinen "
+#~ "Endpunkt in Keystone zu konfigurieren."

diff --git a/trusty/debian/po/es.po b/trusty/debian/po/es.po
index 02cd71194306c6088bdb20f1faf710da221fe0f7..41c389710a320c19ae0e1cc4f872a7fb0e3d730d 100644 (file)
--- a/trusty/debian/po/es.po
+++ b/trusty/debian/po/es.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2013-12-19 16:02+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+0000\n"
 "PO-Revision-Date: 2013-12-08 21:31-0300\n"
 "Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -273,37 +273,54 @@ msgstr ""
 "contactar con Keystone para realizar el servicio Cinder y crear el punto "
 "final."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr "Token de autenticación de Keystone:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Para configurar su punto final en Keystone, cinder-api necesita el token de "
-"autenticación de Keystone."
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "Dirección IP del punto final de Cinder:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr "Introduzca la dirección IP que se utilizará para contactar con Cinder."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -315,13 +332,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "Nombre de la región a registrar:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -331,6 +348,13 @@ msgstr ""
 "representa una ubicación. Introduzca la zona que desea utilizar cuando "
 "registre el punto final."
 
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#~ "authentication token."
+#~ msgstr ""
+#~ "Para configurar su punto final en Keystone, cinder-api necesita el token "
+#~ "de autenticación de Keystone."
+
 #~ msgid "Start Cinder services at boot?"
 #~ msgstr "¿Desea iniciar los servicios de Cinder en el arranque del sistema?"
 

diff --git a/trusty/debian/po/fr.po b/trusty/debian/po/fr.po
index a21638e25e3144c2d0273870720eb9887356a38b..9753a4fa133a677c368b80c995a5b365be204e85 100644 (file)
--- a/trusty/debian/po/fr.po
+++ b/trusty/debian/po/fr.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-10-09 23:29+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+0000\n"
 "PO-Revision-Date: 2013-12-17 08:12+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: FRENCH <debian-l10n-french@lists.debian.org>\n"
@@ -20,28 +20,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../cinder-common.templates:2001
-msgid "Start Cinder services at boot?"
-msgstr "Démarrer les services Cinder au lancement du système ?"
-
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:2001
-msgid ""
-"Please choose whether you want to start Cinder services when the machine is "
-"booted up."
-msgstr ""
-"Veuillez choisir si vous souhaitez lancer les services Cinder lors du "
-"démarrage de la machine."
-
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:3001
 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
 msgid ""
 "No database has been set up for Cinder to use. Before continuing, you should "
 "make sure you have the following information:"
@@ -51,7 +35,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
 msgid ""
 " * the type of database that you want to use;\n"
 " * the database server hostname (that server must allow TCP connections from "
@@ -67,7 +51,7 @@ 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."
@@ -77,7 +61,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-common.templates:3001
+#: ../cinder-common.templates:2001
 msgid ""
 "You can change this setting later on by running \"dpkg-reconfigure -plow "
 "cinder\"."
@@ -87,13 +71,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:4001
+#: ../cinder-common.templates:3001
 msgid "Authentication server hostname:"
 msgstr "Nom d'hôte du serveur d'authentification : "
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:4001
+#: ../cinder-common.templates:3001
 msgid ""
 "Please specify the hostname of the authentication server. Typically this is "
 "also the hostname of the OpenStack Identity Service (Keystone)."
@@ -110,7 +94,7 @@ msgstr ""
 #. You're advised to either keep "tenant" without translating it
 #. or keep it aside with your translation. Example for French:
 #. proprietaire ("tenant")
-#: ../cinder-common.templates:5001
+#: ../cinder-common.templates:4001
 msgid "Authentication server tenant name:"
 msgstr "Nom d'espace client du serveur d'authentification :"
 
@@ -123,20 +107,20 @@ msgstr "Nom d'espace client du serveur d'authentification :"
 #. You're advised to either keep "tenant" without translating it
 #. or keep it aside with your translation. Example for French:
 #. proprietaire ("tenant")
-#: ../cinder-common.templates:5001
+#: ../cinder-common.templates:4001
 msgid "Please specify the authentication server tenant name."
 msgstr ""
 "Veuillez indiquer le nom de l'espace client du serveur d’authentification."
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:6001
+#: ../cinder-common.templates:5001
 msgid "Authentication server username:"
 msgstr "Nom d'utilisateur du serveur d'authentification : "
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:6001
+#: ../cinder-common.templates:5001
 msgid "Please specify the username to use with the authentication server."
 msgstr ""
 "Veuillez indiquer le nom d'utilisateur à utiliser sur le serveur "
@@ -144,13 +128,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../cinder-common.templates:7001
+#: ../cinder-common.templates:6001
 msgid "Authentication server password:"
 msgstr "Mot de passe du serveur d'authentification :"
 
 #. Type: password
 #. Description
-#: ../cinder-common.templates:7001
+#: ../cinder-common.templates:6001
 msgid "Please specify the password to use with the authentication server."
 msgstr ""
 "Veuillez indiquer le mot de passe à utiliser sur le serveur "
@@ -158,13 +142,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:8001
+#: ../cinder-common.templates:7001
 msgid "Cinder volume group:"
 msgstr "Groupe de volume Cinder : "
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:8001
+#: ../cinder-common.templates:7001
 msgid ""
 "Please specify the name of the LVM volume group on which Cinder will create "
 "partitions."
@@ -174,7 +158,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:9001
+#: ../cinder-common.templates:8001
 msgid "IP address of your RabbitMQ host:"
 msgstr "Adresse IP de votre hôte RabbitMQ :"
 
@@ -184,8 +168,8 @@ msgstr "Adresse IP de votre hôte RabbitMQ :"
 #. Description
 #. Type: password
 #. Description
-#: ../cinder-common.templates:9001 ../cinder-common.templates:10001
-#: ../cinder-common.templates:11001
+#: ../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."
@@ -195,21 +179,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:9001
-#| msgid "Please specify the password to use with the authentication server."
+#: ../cinder-common.templates:8001
 msgid "Please specify the IP address of that server."
 msgstr "Veuillez indiquer l'adresse IP de ce serveur."
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:10001
+#: ../cinder-common.templates:9001
 msgid "Username for connection to the RabbitMQ server:"
 msgstr "Nom d'utilisateur pour la connexion au serveur RabbitMQ :"
 
 #. Type: string
 #. Description
-#: ../cinder-common.templates:10001
-#| msgid "Please specify the username to use with the authentication server."
+#: ../cinder-common.templates:9001
 msgid "Please specify the username used to connect to the RabbitMQ server."
 msgstr ""
 "Veuillez indiquer le nom d'utilisateur à utiliser pour se connecter au "
@@ -217,14 +199,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../cinder-common.templates:11001
+#: ../cinder-common.templates:10001
 msgid "Password for connection to the RabbitMQ server:"
 msgstr "Mot de passe pour la connexion au serveur RabbitMQ :"
 
 #. Type: password
 #. Description
-#: ../cinder-common.templates:11001
-#| msgid "Please specify the password to use with the authentication server."
+#: ../cinder-common.templates:10001
 msgid "Please specify the password used to connect to the RabbitMQ server."
 msgstr ""
 "Veuillez indiquer le mot de passe à utiliser pour se connecter au serveur "
@@ -275,38 +256,55 @@ msgstr ""
 "puisse contacter Keystone pour établir le service Cinder et créer le point "
 "d'accès."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr "Jeton d'authentification Keystone : "
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 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
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "Adresse IP du point d'accès Cinder : "
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr ""
 "Veuillez indiquer l'adresse IP qui sera utilisée pour contacter Cinder."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -318,13 +316,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "Nom de la région à enregistrer :"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -334,6 +332,23 @@ msgstr ""
 "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 "Start Cinder services at boot?"
+#~ msgstr "Démarrer les services Cinder au lancement du système ?"
+
+#~ msgid ""
+#~ "Please choose whether you want to start Cinder services when the machine "
+#~ "is booted up."
+#~ msgstr ""
+#~ "Veuillez choisir si vous souhaitez lancer les services Cinder lors du "
+#~ "démarrage de la machine."
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#~ "authentication token."
+#~ msgstr ""
+#~ "Pour configurer son point d'accès dans Keystone, l'api de Cinder a besoin "
+#~ "du jeton d'authentification Keystone."
+
 #~ msgid ""
 #~ "If you don't choose this option, no database will be set up and Cinder "
 #~ "will use regular SQLite support."

diff --git a/trusty/debian/po/it.po b/trusty/debian/po/it.po
index 489d2887f116deccd1802c42653062699ea829ac..3d231970997ffd083c2f2e051368c620569eeace 100644 (file)
--- a/trusty/debian/po/it.po
+++ b/trusty/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: 2013-12-19 16:02+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+0000\n"
 "PO-Revision-Date: 2014-04-06 15:15+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -176,7 +176,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../cinder-common.templates:8001
-#| msgid "Please enter the IP address that will be used to contact Cinder."
 msgid "Please specify the IP address of that server."
 msgstr "Inserire l'indirizzo IP di tale server."
 
@@ -190,7 +189,8 @@ msgstr "Nome utente per la connessione al server RabbitMQ:"
 #. Description
 #: ../cinder-common.templates:9001
 msgid "Please specify the username used to connect to the RabbitMQ server."
-msgstr "Specificare il nome utente da usare per connettersi al server RabbitMQ."
+msgstr ""
+"Specificare il nome utente da usare per connettersi al server RabbitMQ."
 
 #. Type: password
 #. Description
@@ -250,31 +250,48 @@ msgstr ""
 "possa contattare Keystone per effettuare la creazione del servizio e del "
 "punto terminale Cinder."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr "Token di autenticazione Keystone:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Per configurare il proprio punto terminale in Keystone, cinder-api ha "
-"bisogno del token di autenticazione Keystone."
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "Indirizzo IP del punto terminale Cinder:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr ""
 "Inserire l'indirizzo IP che verrà usato per contattare Cinder (es.: "
@@ -282,7 +299,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -294,13 +311,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "Nome della regione da registrare:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -310,6 +327,13 @@ msgstr ""
 "regione che rappresenta una posizione. Inserire la zona che si desidera "
 "usare durante la registrazione del punto terminale."
 
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#~ "authentication token."
+#~ msgstr ""
+#~ "Per configurare il proprio punto terminale in Keystone, cinder-api ha "
+#~ "bisogno del token di autenticazione Keystone."
+
 #~ msgid "Start Cinder services at boot?"
 #~ msgstr "Far partire i servizi cinder all'avvio?"
 

diff --git a/trusty/debian/po/ja.po b/trusty/debian/po/ja.po
index 42d701083e6003a08acf575b84a7bda88768a08c..9d9e1b1a04bdc33757c51ca5f1e9dffd702de71b 100644 (file)
--- a/trusty/debian/po/ja.po
+++ b/trusty/debian/po/ja.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-12-19 16:02+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+0000\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"
@@ -248,37 +248,54 @@ msgstr ""
 "Keystone サーバの IP アドレスを入力してください。それにより cinder-api は "
 "Keystone と通信し、Cinder サービスや端末の作成ができるようになります。"
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr "Keystone 認証文字列:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Keystone で端末を設定するには、cinder-api は Keystone 認証文字列を必要としま"
-"す。"
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "Cinder 端末の IP アドレス:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr "Cinder への通信に利用する IP アドレスを入力してください。"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -290,13 +307,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "登録する領域の名前:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -305,6 +322,13 @@ msgstr ""
 "OpenStack は位置を示す各領域による利用可能区分を利用することができます。端末"
 "の登録時に利用したい区分を入力してください。"
 
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#~ "authentication token."
+#~ msgstr ""
+#~ "Keystone で端末を設定するには、cinder-api は Keystone 認証文字列を必要とし"
+#~ "ます。"
+
 #~ msgid "Start Cinder services at boot?"
 #~ msgstr "ブート時に Cinder サービスを開始しますか?"
 

diff --git a/trusty/debian/po/nl.po b/trusty/debian/po/nl.po
index b98a13082717ca20ae916568ef084d47af69b470..daee8d1500a0209e8baed362bf15c5386a91c752 100644 (file)
--- a/trusty/debian/po/nl.po
+++ b/trusty/debian/po/nl.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-12-19 16:02+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+0000\n"
 "PO-Revision-Date: 2014-10-10 16:01+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -252,31 +252,48 @@ msgstr ""
 "met Keystone kan verbinden om de Cinder-service en het toegangspunt aan te "
 "maken."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr "Authenticatiebewijs voor Keystone:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Om zijn toegangspunt te kunnen aanmaken in Keystone, heeft cinder-api het "
-"authenticatiebewijs voor Keystone nodig."
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "IP-adres van het toegangspunt voor Cinder:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr ""
 "Gelieve het IP-adres in te voeren dat gebruikt zal worden om contact te "
@@ -284,7 +301,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -296,13 +313,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "Naam van de registratieregio:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -311,3 +328,10 @@ msgstr ""
 "Openstack ondersteunt het gebruik van zones van beschikbaarheid, waarbij "
 "elke regio een locatie vertegenwoordigt. Geef aan welke zone u wenst te "
 "gebruiken bij het registreren van het toegangspunt."
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#~ "authentication token."
+#~ msgstr ""
+#~ "Om zijn toegangspunt te kunnen aanmaken in Keystone, heeft cinder-api het "
+#~ "authenticatiebewijs voor Keystone nodig."

diff --git a/trusty/debian/po/pt.po b/trusty/debian/po/pt.po
index b0103e91a06acb44d321435271364e48dd2c1065..630a526815b8905299b0ed2a4a4b2927876d1a3c 100644 (file)
--- a/trusty/debian/po/pt.po
+++ b/trusty/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: 2013-12-19 16:02+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+0000\n"
 "PO-Revision-Date: 2014-10-13 22:07+0100\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -176,7 +176,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../cinder-common.templates:8001
-#| msgid "Please enter the IP address that will be used to contact Cinder."
 msgid "Please specify the IP address of that server."
 msgstr "Indique por favor o endereço IP desse servidor."
 
@@ -250,37 +249,54 @@ msgstr ""
 "Indique o endereço IP do seu servidor Keystone, de modo a que o cinder-api "
 "possa contactar o Keystone para criar o serviço Cinder e o ponto de ligação."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr "Sinal (token) de autenticação do Keystone:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Para configurar o seu ponto de ligação no Keystone, o cinder-api precisa do "
-"sinal de autenticação do Keystone."
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "Endereço IP do ponto de ligação Cinder:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr "Indique o endereço IP que será usado para contactar com o Cinder."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -292,13 +308,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "Nome da região a registar:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -308,4 +324,9 @@ msgstr ""
 "a representar uma localização. Por favor, indique a zona que quer usar ao "
 "registar o ponto de ligação."
 
-
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#~ "authentication token."
+#~ msgstr ""
+#~ "Para configurar o seu ponto de ligação no Keystone, o cinder-api precisa "
+#~ "do sinal de autenticação do Keystone."

diff --git a/trusty/debian/po/ru.po b/trusty/debian/po/ru.po
index 0b8ff112ccff044d9d8773c942880ff7d441432e..9c22445cc020dd51d4404e60a110509eb160dd36 100644 (file)
--- a/trusty/debian/po/ru.po
+++ b/trusty/debian/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder 2013.2-1\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2013-12-19 16:02+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+0000\n"
 "PO-Revision-Date: 2013-11-17 08:49+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -245,37 +245,54 @@ msgstr ""
 "Введите IP-адрес сервера Keystone для того, чтобы cinder-api могла "
 "подключиться к Keystone для запуска службы Cinder и создания конечной точки."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+#, fuzzy
+#| msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr "Токен аутентификации Keystone:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Для настройки собственной конечной точки в Keystone cinder-api требуется "
-"токен аутентификации Keystone."
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "IP-адрес конечной точки Cinder:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr "Введите IP-адрес, который будет использован для подключения к Cinder."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -287,13 +304,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "Название области для регистрации:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -303,6 +320,13 @@ msgstr ""
 "представляет определённое расположение. Введите зону, которую вы хотите "
 "использовать при регистрации конечной точки."
 
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
+#~ "authentication token."
+#~ msgstr ""
+#~ "Для настройки собственной конечной точки в Keystone cinder-api требуется "
+#~ "токен аутентификации Keystone."
+
 #~ msgid "Start Cinder services at boot?"
 #~ msgstr "Запускать службы Cinder при включении машины?"
 

diff --git a/trusty/debian/po/sv.po b/trusty/debian/po/sv.po
index 8138278725b764da7d8ecc53eddca94b11c968a6..8a0a7bcfd5859a2e3be3ae2e51ac319b4ad43d87 100644 (file)
--- a/trusty/debian/po/sv.po
+++ b/trusty/debian/po/sv.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: 2016-03-29 12:24+0000\n"
 "PO-Revision-Date: 2014-01-08 16:52+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -17,20 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:1001
-msgid "Start cinder services at boot?"
-msgstr "Ska cinder-tjänster startas vid systemets uppstart?"
-
-#. Type: boolean
-#. Description
-#: ../cinder-common.templates:1001
-msgid ""
-"Please choose whether you want to start Cinder services when the machine is "
-"booted up."
-msgstr "Ange om du vill att Cinder-tjänster ska starta när maskinen startar."
-
 #. Type: boolean
 #. Description
 #: ../cinder-common.templates:2001
@@ -40,9 +26,13 @@ msgstr "Ska en databas installeras för Cinder?"
 #. Type: boolean
 #. Description
 #: ../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:"
 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:"
 msgstr ""
 "Ingen databas har installerats för Cinder. Innan du fortsätter behöver "
 "följande finnas tillgängligt:"
@@ -50,11 +40,18 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../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."
 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."
 msgstr ""
 " * serverns värdnamn (som måste kunna ta emot TCP-anslutningar\n"
 "   från den här maskinen)\n"
@@ -65,18 +62,20 @@ msgstr ""
 #. 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."
+"If some of these requirements are missing, do not choose this option and run "
+"with regular SQLite support."
 msgstr ""
-"Om något av dessa krav saknar bör du avböja detta alternativ och fortsätta "
-"använda sqlite-stödet."
 
 #. Type: boolean
 #. Description
 #: ../cinder-common.templates:2001
+#, fuzzy
+#| msgid ""
+#| "You can change this setting later on by running \"dpkg-reconfigure -plow "
+#| "cinder-common\"."
 msgid ""
 "You can change this setting later on by running \"dpkg-reconfigure -plow "
-"cinder-common\"."
+"cinder\"."
 msgstr ""
 "Denna inställning kan ändras senare genom att köra \"dpkg-reconfigure -plow "
 "cinder-common\"."
@@ -84,37 +83,81 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../cinder-common.templates:3001
-msgid "Auth server hostname:"
+#, fuzzy
+#| msgid "Auth server hostname:"
+msgid "Authentication server hostname:"
 msgstr "Värdnamn för identifieringsserver:"
 
 #. Type: string
 #. Description
 #: ../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)."
 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)."
 msgstr ""
 "Ange URL till din Cinder-identifieringsserver. Detta är vanligtvis samma URL "
 "som till din OpenStack-identitetstjänst (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:
+#. proprietaire ("tenant")
 #: ../cinder-common.templates:4001
-msgid "Auth server tenant name:"
+#, fuzzy
+#| msgid "Auth server tenant name:"
+msgid "Authentication server tenant name:"
 msgstr "Namn för \"tenant\" (administratör) på identifieringsservern:"
 
+#. 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:
+#. proprietaire ("tenant")
+#: ../cinder-common.templates:4001
+msgid "Please specify the authentication server tenant name."
+msgstr ""
+
 #. Type: string
 #. Description
 #: ../cinder-common.templates:5001
-msgid "Auth server username:"
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Authentication server username:"
 msgstr "Användarnamn på identifieringsservern:"
 
+#. Type: string
+#. Description
+#: ../cinder-common.templates:5001
+msgid "Please specify the username to use with the authentication server."
+msgstr ""
+
 #. Type: password
 #. Description
 #: ../cinder-common.templates:6001
-msgid "Auth server password:"
+#, fuzzy
+#| msgid "Auth server password:"
+msgid "Authentication server password:"
 msgstr "Lösenord på identifieringsservern:"
 
+#. Type: password
+#. Description
+#: ../cinder-common.templates:6001
+msgid "Please specify the password to use with the authentication server."
+msgstr ""
+
 #. Type: string
 #. Description
 #: ../cinder-common.templates:7001
@@ -124,25 +167,85 @@ msgstr "Volymgrupp för Cinder:"
 #. Type: string
 #. Description
 #: ../cinder-common.templates:7001
+#, fuzzy
+#| 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 (vg) on which Cinder will "
-"create partitions."
+"Please specify the name of the LVM volume group on which Cinder will create "
+"partitions."
 msgstr ""
 "Ange namnet för LVM-volym-grupp (vg) där Cinder ska skapa sina 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: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
-msgid "Register Cinder in the keystone endpoint catalog?"
+#: ../cinder-api.templates:2001
+#, fuzzy
+#| msgid "Register Cinder in the keystone endpoint catalog?"
+msgid "Register Cinder in the Keystone endpoint catalog?"
 msgstr "Ska Cinder registreras i keystones katalog med ändpunkter?"
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:1001
+#: ../cinder-api.templates:2001
+#, fuzzy
+#| 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."
 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."
 msgstr ""
 "Alla OpenStack-tjänster (varje API) ska registreras för att kunna användas. "
 "Detta görs med kommandona \"keystone service-create\" och \"keystone "
@@ -150,61 +253,92 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cinder-api.templates:1001
+#: ../cinder-api.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running keystone server on "
+#| "which to connect using the Keystone auth token."
 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."
 msgstr "OBS. Du behöver ha en fungerande keystone-server att ansluta till."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:2001
-msgid "Keystone IP address:"
+#: ../cinder-api.templates:3001
+#, fuzzy
+#| msgid "Keystone IP address:"
+msgid "Keystone server IP address:"
 msgstr "IP-adress till Keystone:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:2001
+#: ../cinder-api.templates:3001
+#, 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."
 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."
 msgstr ""
 "Ange IP-adressen till din keystone-server så att cinder-api kan kontakta "
 "Keystone för att lägga till Cinder-tjänsten som en ändpunkt."
 
-#. Type: password
+#. Type: string
 #. Description
-#: ../cinder-api.templates:3001
-msgid "Keystone Auth Token:"
-msgstr "Autetiseringsvärde för Keystone:"
+#: ../cinder-api.templates:4001
+#, fuzzy
+#| msgid "Keystone IP address:"
+msgid "Keystone admin name:"
+msgstr "IP-adress till Keystone:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:3001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone auth "
-"token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"För att lägga till ändpunkt i Keystone behöver cinder-api ett "
-"autentiseringsvärde för Keystone."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+#, fuzzy
+#| msgid "Keystone IP address:"
+msgid "Keystone admin password:"
+msgstr "IP-adress till Keystone:"
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr "IP-adress för Cinder-ändpunkt:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:4001
-msgid ""
-"Enter the IP address that will be used to contact Cinder (eg: the Cinder "
-"endpoint IP address)."
+#: ../cinder-api.templates:7001
+#, fuzzy
+#| 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."
 msgstr "Ange den IP-adress som ska användas för att kontakta Cinder."
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:7001
 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 "
@@ -216,17 +350,48 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr "Regionnamn:"
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:8001
+#, fuzzy
+#| 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."
 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."
+"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 kan användas med tillgänglighetszoner. Varje region representerar "
 "en plats. Ange zonen som ska användas när ändpunkten registreras."
+
+#~ msgid "Start cinder services at boot?"
+#~ msgstr "Ska cinder-tjänster startas vid systemets uppstart?"
+
+#~ msgid ""
+#~ "Please choose whether you want to start Cinder services when the machine "
+#~ "is booted up."
+#~ msgstr ""
+#~ "Ange om du vill att Cinder-tjänster ska starta när maskinen startar."
+
+#~ msgid ""
+#~ "If you don't choose this option, no database will be set up and Cinder "
+#~ "will use regular SQLite support."
+#~ msgstr ""
+#~ "Om något av dessa krav saknar bör du avböja detta alternativ och "
+#~ "fortsätta använda sqlite-stödet."
+
+#~ msgid "Keystone Auth Token:"
+#~ msgstr "Autetiseringsvärde för Keystone:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone auth "
+#~ "token."
+#~ msgstr ""
+#~ "För att lägga till ändpunkt i Keystone behöver cinder-api ett "
+#~ "autentiseringsvärde för Keystone."

diff --git a/trusty/debian/po/templates.pot b/trusty/debian/po/templates.pot
index c178a2ce2231a218d1997f338a1f9ad0a9e90e04..117c298d61c2176f8f81fed1c2de534ddbbcd27f 100644 (file)
--- a/trusty/debian/po/templates.pot
+++ b/trusty/debian/po/templates.pot
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the cinder package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
-"POT-Creation-Date: 2013-12-19 16:02+0800\n"
+"POT-Creation-Date: 2016-03-29 12:24+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"
@@ -222,35 +222,52 @@ msgid ""
 "contact Keystone to do the Cinder service and endpoint creation."
 msgstr ""
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr ""
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../cinder-api.templates:4001
+#: ../cinder-api.templates:4001 ../cinder-api.templates:5001
+#: ../cinder-api.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, cinder-api needs the Keystone "
-"authentication token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cinder-api.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cinder-api.templates:7001
 msgid "Cinder endpoint IP address:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 msgid "Please enter the IP address that will be used to contact Cinder."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:5001
+#: ../cinder-api.templates:7001
 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 "
@@ -259,13 +276,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid "Name of the region to register:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../cinder-api.templates:6001
+#: ../cinder-api.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "