Fix neutron-metadata server templates.

Rewritten-From: 8d79d9e612bc4de5b139326301be33fa09862ad8

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index c3a901def7e46def386f125544f77c952046efe1..f8d94c2f6d3847758b7936dd8f37511015880b6a 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+neutron (2:8.0.0-3) UNRELEASED; urgency=medium
+
+  * Fix neutron-metadata server templates.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 06 Jun 2016 00:26:34 +0200
+
 neutron (2:8.0.0-2) unstable; urgency=medium
 
   [ Ondřej Nový ]

diff --git a/trusty/debian/neutron-metadata-agent.templates b/trusty/debian/neutron-metadata-agent.templates
index 2e9246901a8bcc96471d3d039db81bcce471d100..2fe205b4da8f9f6075881ed5fc76d638cf0c68f0 100644 (file)
--- a/trusty/debian/neutron-metadata-agent.templates
+++ b/trusty/debian/neutron-metadata-agent.templates
@@ -22,11 +22,13 @@ _Description: Auth server tenant name:
 Template: neutron-metadata/admin-user
 Type: string
 Default: admin
-_Description: Auth server username:
+_Description: Authentication server username:
+ Please specify the username to use with the authentication server.
 
 Template: neutron-metadata/admin-password
 Type: password
 _Description: Auth server password:
+ Please specify the password to use with the authentication server.
 
 Template: neutron-metadata/region-name
 Type: string

diff --git a/trusty/debian/po/da.po b/trusty/debian/po/da.po
index 0fc34b73ce53aaf70c69c991737e596a2216898c..839b81a6342559fa4f324539ddfcca0f1b8d85fa 100644 (file)
--- a/trusty/debian/po/da.po
+++ b/trusty/debian/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\n"
 "PO-Revision-Date: 2015-05-31 17:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -48,13 +48,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr "Brugernavn for godkendelsesserveren:"
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr "Angiv venligst brugernavnet der skal bruges med godkendelsesserveren."
 
@@ -66,7 +66,7 @@ msgstr "Adgangskode for godkendelsesserveren:"
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr "Angiv venligst adgangskoden for brug med godkendelsesserveren."
 
@@ -617,12 +617,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr "»Tenant«-navn for godkendelseserver:"
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr "Brugernavn for godkendelsesserver:"
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001
@@ -676,6 +670,9 @@ msgstr ""
 "mellem Neutron metadata proxy-agenten og Nova metadata-serveren. Den samme "
 "delte adgangskode skal bruges når pakken nova-common sættes op."
 
+#~ msgid "Auth server username:"
+#~ msgstr "Brugernavn for godkendelsesserver:"
+
 #~ msgid "Keystone authentication token:"
 #~ msgstr "Symbol for Keystone-godkendelse:"
 

diff --git a/trusty/debian/po/de.po b/trusty/debian/po/de.po
index d119be64557a931be6d9d30bf53737ac47e626b3..1bf9fc409420c8f62dd7a8507f1ca209488b2ff6 100644 (file)
--- a/trusty/debian/po/de.po
+++ b/trusty/debian/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2013.2.1-3\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\n"
 "PO-Revision-Date: 2014-02-11 23:31+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -47,13 +47,13 @@ msgstr "Bitte geben Sie den Tenant-Namen des Authentifizierungsservers an."
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr "Benutzername des Authentifizierungsservers:"
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr ""
 "Bitte geben Sie den Benutzernamen an, der für den Authentifizierungsserver "
@@ -67,7 +67,7 @@ msgstr "Passwort des Authentifizierungsservers:"
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr ""
 "Bitte geben Sie das Passwort an, das für den Authentifizierungsserver "
@@ -637,12 +637,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr "Tenant-Name des Authentifizierungsservers:"
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr "Benutzername des Authentifizierungsservers:"
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001
@@ -691,6 +685,9 @@ msgid ""
 "same shared password should be used when setting up the nova-common package."
 msgstr ""
 
+#~ msgid "Auth server username:"
+#~ msgstr "Benutzername des Authentifizierungsservers:"
+
 #~ msgid "Keystone authentication token:"
 #~ msgstr "Authentifizierungs-Token des Keystone-Servers:"
 

diff --git a/trusty/debian/po/es.po b/trusty/debian/po/es.po
index ace722b1fa6f69bce55f10d99c8d2f6e20493563..4de2ce49a181e12103507b7882a3d7a7e425e994 100644 (file)
--- a/trusty/debian/po/es.po
+++ b/trusty/debian/po/es.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2015.06.24\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\n"
 "PO-Revision-Date: 2015-06-30 17:15+0200\n"
 "Last-Translator: Camaleón <noelamac@gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -66,13 +66,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr "Nombre de usuario del servidor de autenticación:"
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr ""
 "Indique el nombre de usuario para usar con el servidor de autenticación."
@@ -85,7 +85,7 @@ msgstr "Contraseña del servidor de autenticación:"
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr "Indique la contraseña para usar con el servidor de autenticación."
 
@@ -639,12 +639,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr "Nombre del inquilino («tenant») del servidor de autenticación:"
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr "Nombre de usuario del servidor de autenticación:"
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001
@@ -700,6 +694,9 @@ msgstr ""
 "de metadatos de Nova. Debe utilizar esta misma contraseña compartida cuando "
 "configure el paquete nova-common."
 
+#~ msgid "Auth server username:"
+#~ msgstr "Nombre de usuario del servidor de autenticación:"
+
 #~ msgid "Keystone authentication token:"
 #~ msgstr "Token de autenticación de Keystone:"
 

diff --git a/trusty/debian/po/fr.po b/trusty/debian/po/fr.po
index e18c6e02efdcc4eb88aca6a1443fdd0418ef5ec0..709874b8535f3002f72b5a8acee8c3a2ac39b5b6 100644 (file)
--- a/trusty/debian/po/fr.po
+++ b/trusty/debian/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\n"
 "PO-Revision-Date: 2015-05-06 11:59+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: FRENCH <debian-l10n-french@lists.debian.org>\n"
@@ -48,13 +48,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr "Identifiant sur le serveur d'authentification :"
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr ""
 "Veuillez indiquer l'identifiant à utiliser sur le serveur d'authentification."
@@ -67,7 +67,7 @@ msgstr "Mot de passe sur le serveur d'authentification :"
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr ""
 "Veuillez indiquer le mot de passe à utiliser sur le serveur "
@@ -628,12 +628,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr "Nom d'espace client du serveur d'authentification :"
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr "Identifiant sur le serveur d'authentification :"
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001
@@ -689,6 +683,9 @@ msgstr ""
 "de métadonnées de Nova. Le même mot de passe partagé doit être utilisé lors "
 "de l'installation du paquet nova-common."
 
+#~ msgid "Auth server username:"
+#~ msgstr "Identifiant sur le serveur d'authentification :"
+
 #~ msgid "Keystone authentication token:"
 #~ msgstr "Jeton d'authentification Keystone :"
 

diff --git a/trusty/debian/po/it.po b/trusty/debian/po/it.po
index cb1e8d30c5375f73b4fd2206ab32336350c0171c..9e8c3d3936bbf3484cc0b3cf3988c3e26aa6459b 100644 (file)
--- a/trusty/debian/po/it.po
+++ b/trusty/debian/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\n"
 "PO-Revision-Date: 2014-04-21 09:44+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -49,13 +49,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr "Nome utente per il server di autenticazione:"
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr "Specificare il nome utente da usare con il server di autenticazione."
 
@@ -67,7 +67,7 @@ msgstr "Password per il server di autenticazione:"
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr "Specificare la password da usare con il server di autenticazione."
 
@@ -621,12 +621,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr "Nome del «locatario» («tenant») per il server di autenticazione:"
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr "Nome utente per il server di autenticazione:"
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001
@@ -675,6 +669,9 @@ msgid ""
 "same shared password should be used when setting up the nova-common package."
 msgstr ""
 
+#~ msgid "Auth server username:"
+#~ msgstr "Nome utente per il server di autenticazione:"
+
 #~ msgid "Keystone authentication token:"
 #~ msgstr "Token di autenticazione Keystone:"
 

diff --git a/trusty/debian/po/nl.po b/trusty/debian/po/nl.po
index ea184a640b0bc4b85f4db1227344c6cc56023f3b..ac2fce0f54056fe96bc3a84808c126b3932dda6c 100644 (file)
--- a/trusty/debian/po/nl.po
+++ b/trusty/debian/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron_2_8.0.0-1\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\n"
 "PO-Revision-Date: 2016-04-19 15:57+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -49,13 +49,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr "Gebruikersnaam op de authenticatieserver:"
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr ""
 "Geef de gebruikersnaam op die op de authenticatieserver gebruikt moet worden."
@@ -68,7 +68,7 @@ msgstr "Wachtwoord op de authenticatieserver:"
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr ""
 "Geef het wachtwoord op dat op de authenticatieserver gebruikt moet worden."
@@ -425,17 +425,12 @@ msgstr "Geef de regio van de Novaserver op."
 #. Type: string
 #. Description
 #: ../neutron-common.templates:17001
-#| msgid "Nova admin tenant ID:"
 msgid "Nova admin tenant name:"
 msgstr "Naam van de cliëntruimte (tenant) voor de beheerder van Nova:"
 
 #. Type: string
 #. Description
 #: ../neutron-common.templates:17001
-#| msgid ""
-#| "Neutron needs to be able to communicate with Nova through Keystone. "
-#| "Therefore Neutron needs to know the Nova admin tenant ID, username and "
-#| "password."
 msgid ""
 "Neutron needs to be able to communicate with Nova through Keystone. "
 "Therefore Neutron needs to know the Nova admin tenant name, username and "
@@ -496,9 +491,6 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.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."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
 "to connect using a known admin project name, admin username and password. "
@@ -528,7 +520,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-#| msgid "Neutron administrator username:"
 msgid "Keystone admin name:"
 msgstr "Naam van de beheerder voor Keystone:"
 
@@ -551,14 +542,12 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
-#| msgid "Nova admin tenant ID:"
 msgid "Keystone admin project name:"
 msgstr "Naam van het project van de beheerder voor Keystone:"
 
 #. Type: password
 #. Description
 #: ../neutron-server.templates:6001
-#| msgid "Nova administrator password:"
 msgid "Keystone admin password:"
 msgstr "Wachtwoord van de beheerder voor Keystone:"
 
@@ -627,12 +616,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr "Naam van de cliëntruimte (tenant) op de authenticatieserver:"
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr "Gebruikersnaam op de authenticatieserver:"
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001
@@ -688,6 +671,9 @@ msgstr ""
 "voor metagegevens van Nova. Hetzelfde gedeelde wachtwoord moet gebruikt "
 "worden bij het instellen van het pakket nova-common."
 
+#~ msgid "Auth server username:"
+#~ msgstr "Gebruikersnaam op de authenticatieserver:"
+
 #~ msgid "Keystone authentication token:"
 #~ msgstr "Legitimatiebewijs voor Keystone:"
 

diff --git a/trusty/debian/po/pt.po b/trusty/debian/po/pt.po
index 6e950b8b11d6ad9caf90a468b39f0699c41c59d0..47419755e0b78403b6e936e33d28eee5d923fc48 100644 (file)
--- a/trusty/debian/po/pt.po
+++ b/trusty/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2.8.0.0-1\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\n"
 "PO-Revision-Date: 2016-04-15 00:52+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -49,13 +49,13 @@ msgstr "Por favor especifique o nome \"tenant\" do servidor de autenticação."
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr "Nome de utilizador do servidor de autenticação:"
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr ""
 "Por favor especifique o nome de utilizador a usar com o servidor de "
@@ -69,7 +69,7 @@ msgstr "Palavra passe do servidor de autenticação:"
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr ""
 "Por favor especifique a palavra passe a usar com o servidor de autenticação."
@@ -422,25 +422,20 @@ msgstr "Por favor indique a região do servidor Nova."
 #. Type: string
 #. Description
 #: ../neutron-common.templates:17001
-#| msgid "Nova admin tenant ID:"
 msgid "Nova admin tenant name:"
 msgstr "Nome \"tenant\" do administrador do Nova:"
 
 #. Type: string
 #. Description
 #: ../neutron-common.templates:17001
-#| msgid ""
-#| "Neutron needs to be able to communicate with Nova through Keystone. "
-#| "Therefore Neutron needs to know the Nova admin tenant ID, username and "
-#| "password."
 msgid ""
 "Neutron needs to be able to communicate with Nova through Keystone. "
 "Therefore Neutron needs to know the Nova admin tenant name, username and "
 "password."
 msgstr ""
 "O Neutron precisa de ser capaz de comunicar com o Nova através do Keystone. "
-"Por isso o Neutron precisa de saber o nome tenant admin, o nome de utilizador "
-"e palavra passe do Nova."
+"Por isso o Neutron precisa de saber o nome tenant admin, o nome de "
+"utilizador e palavra passe do Nova."
 
 #. Type: string
 #. Description
@@ -493,9 +488,6 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.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."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
 "to connect using a known admin project name, admin username and password. "
@@ -525,7 +517,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-#| msgid "Neutron administrator username:"
 msgid "Keystone admin name:"
 msgstr "Nome de administrador do Keystone:"
 
@@ -547,14 +538,12 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
-#| msgid "Nova admin tenant ID:"
 msgid "Keystone admin project name:"
 msgstr "Nome do projecto admin do Keystone:"
 
 #. Type: password
 #. Description
 #: ../neutron-server.templates:6001
-#| msgid "Nova administrator password:"
 msgid "Keystone admin password:"
 msgstr "Palavra passe admin do Keystone:"
 
@@ -624,12 +613,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr "Nome \"tenant\" do servidor de autenticação:"
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr "Nome de utilizador do servidor de autenticação:"
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001
@@ -685,6 +668,9 @@ msgstr ""
 "meta-dados do Nova. A mesma palavra passe partilhada deve ser usada quando "
 "configurar o pacote nova-common."
 
+#~ msgid "Auth server username:"
+#~ msgstr "Nome de utilizador do servidor de autenticação:"
+
 #~ msgid "Keystone authentication token:"
 #~ msgstr "Sinal de autenticação do Keystone:"
 

diff --git a/trusty/debian/po/pt_BR.po b/trusty/debian/po/pt_BR.po
index 4bdc54d95612235a0e80609230e3063ff6365032..9b620402630d96c50b369744eb90c81a7a1c5e4f 100644 (file)
--- a/trusty/debian/po/pt_BR.po
+++ b/trusty/debian/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\n"
 "PO-Revision-Date: 2016-01-10 15:25-0200\n"
 "Last-Translator: Adriano Rafael Gomes <adrianorg@arg.eti.br>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -50,13 +50,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr "Nome de usuário do servidor de autenticação:"
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr ""
 "Por favor, especifique o nome de usuário para usar com o servidor de "
@@ -70,7 +70,7 @@ msgstr "Senha do servidor de autenticação:"
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr ""
 "Por favor, especifique a senha para usar com o servidor de autenticação."
@@ -629,12 +629,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr "Nome de locatário (\"tenant\") do servidor de autenticação:"
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr "Nome de usuário do servidor de autenticação:"
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001
@@ -690,6 +684,9 @@ msgstr ""
 "Nova. A mesma senha compartilhada deverá ser usada ao configurar o pacote "
 "nova-common."
 
+#~ msgid "Auth server username:"
+#~ msgstr "Nome de usuário do servidor de autenticação:"
+
 #~ msgid "Keystone authentication token:"
 #~ msgstr "\"Token\" de autenticação Keystone:"
 

diff --git a/trusty/debian/po/ru.po b/trusty/debian/po/ru.po
index 615807f4985c7e2fea81ea61bfbcbe22e21e22d8..2517069a00027b17a43a8f0d87189da78c5ca042 100644 (file)
--- a/trusty/debian/po/ru.po
+++ b/trusty/debian/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2014.1-2\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\n"
 "PO-Revision-Date: 2014-05-04 09:17+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -48,13 +48,13 @@ msgstr "Укажите членское имя сервера аутентифи
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr "Имя пользователя для сервера аутентификации:"
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr "Введите имя пользователя для работы с сервером аутентификации."
 
@@ -66,7 +66,7 @@ msgstr "Пароль для сервера аутентификации:"
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr "Введите пароль для работы с сервером аутентификации."
 
@@ -614,12 +614,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr "Членское имя сервера аутентификации:"
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr "Имя пользователя сервера аутентификации:"
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001
@@ -668,6 +662,9 @@ msgid ""
 "same shared password should be used when setting up the nova-common package."
 msgstr ""
 
+#~ msgid "Auth server username:"
+#~ msgstr "Имя пользователя сервера аутентификации:"
+
 #~ msgid "Keystone authentication token:"
 #~ msgstr "Токен аутентификации Keystone:"
 

diff --git a/trusty/debian/po/sv.po b/trusty/debian/po/sv.po
index fdce53a936140cabb0159ce1c963e85363cb6a39..ab605e61a3621235467c9c5fcbefcf8566af2d4d 100644 (file)
--- a/trusty/debian/po/sv.po
+++ b/trusty/debian/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\n"
 "PO-Revision-Date: 2014-01-09 10:22+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -49,13 +49,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr "Användarnamn på identifieringsservern:"
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr ""
 "Ange användarnamnet som ska användas för att komma åt identifieringsservern."
@@ -68,7 +68,7 @@ msgstr "Lösenord på identifieringsservern:"
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr ""
 "Ange lösenordet som ska användas för att komma åt identifieringsservern."
@@ -619,12 +619,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr "Namn för \"tenant\" (administratör) på identifieringsservern:"
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr "Användarnamn på identifieringsservern:"
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001
@@ -672,6 +666,9 @@ msgid ""
 "same shared password should be used when setting up the nova-common package."
 msgstr ""
 
+#~ msgid "Auth server username:"
+#~ msgstr "Användarnamn på identifieringsservern:"
+
 #~ msgid "Keystone authentication token:"
 #~ msgstr "Autetiseringsvärde för Keystone:"
 

diff --git a/trusty/debian/po/templates.pot b/trusty/debian/po/templates.pot
index 6a07d129cbf264ac5da0d42969cf96cc07405af7..58dd1ff679dc0aa1f95543576fdd3e9ed7643032 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 neutron package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-29 13:50+0000\n"
+"POT-Creation-Date: 2016-06-06 00:25+0200\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"
@@ -45,13 +45,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Authentication server username:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-common.templates:4001
+#: ../neutron-common.templates:4001 ../neutron-metadata-agent.templates:4001
 msgid "Please specify the username to use with the authentication server."
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../neutron-common.templates:5001
+#: ../neutron-common.templates:5001 ../neutron-metadata-agent.templates:5001
 msgid "Please specify the password to use with the authentication server."
 msgstr ""
 
@@ -549,12 +549,6 @@ msgstr ""
 msgid "Auth server tenant name:"
 msgstr ""
 
-#. Type: string
-#. Description
-#: ../neutron-metadata-agent.templates:4001
-msgid "Auth server username:"
-msgstr ""
-
 #. Type: password
 #. Description
 #: ../neutron-metadata-agent.templates:5001