From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 10 Oct 2014 07:35:09 +0000 (+0000)
Subject: Fixed debconf template and ran debconf-updatepo.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f988ed81e47ff4052db173ac431a409e94ba442c;p=openstack-build%2Fneutron-build.git

Fixed debconf template and ran debconf-updatepo.

Rewritten-From: 75517bd312b5140c41e21b27e568dff8dc5d4fea
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index a87935eee..d7bc70bb1 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+neutron (2014.2~rc1-3) experimental; urgency=medium
+
+  * Fixed debconf template and ran debconf-updatepo.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 10 Oct 2014 07:34:35 +0000
+
 neutron (2014.2~rc1-2) experimental; urgency=medium
 
   * Mangling upstream rc and beta versions in watch file.
diff --git a/trusty/debian/neutron-common.templates b/trusty/debian/neutron-common.templates
index 6ac68477e..d9e878f6f 100644
--- a/trusty/debian/neutron-common.templates
+++ b/trusty/debian/neutron-common.templates
@@ -33,8 +33,8 @@ _Description: Authentication server password:
 
 Template: neutron/plugin-select
 Type: select
-__Choices: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, ml2/ml2_conf.ini, MetaPlugin, BigSwitch, Cisco, PLUMgrid
-Choices-C: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, ml2/ml2_conf.ini, MetaPlugin, BigSwitch, Cisco, PLUMgrid
+__Choices: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, MetaPlugin, BigSwitch, Cisco, PLUMgrid
+Choices-C: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, MetaPlugin, BigSwitch, Cisco, PLUMgrid
 Default: ml2
 _Description: Neutron plugin:
  Neutron uses a plugin architecture to manage networking. When starting the
diff --git a/trusty/debian/po/de.po b/trusty/debian/po/de.po
index 300b7154e..984a0f1d0 100644
--- 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: 2013-10-13 04:48+0000\n"
+"POT-Creation-Date: 2014-10-10 07:34+0000\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"
@@ -30,8 +30,8 @@ msgid ""
 "this is also the hostname of your OpenStack Identity Service (Keystone)."
 msgstr ""
 "Bitte geben Sie den Rechnernamen Ihres Neutron-Authentifizierungsservers an. "
-"Typischerweise ist das gleichzeitig der Rechnername Ihres "
-"OpenStack-Identitätsdienstes (Keystone)."
+"Typischerweise ist das gleichzeitig der Rechnername Ihres OpenStack-"
+"Identitätsdienstes (Keystone)."
 
 #. Type: string
 #. Description
@@ -70,8 +70,8 @@ msgstr "Passwort des Authentifizierungsservers:"
 #: ../neutron-common.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 benutzt "
-"wird."
+"Bitte geben Sie das Passwort an, das für den Authentifizierungsserver "
+"benutzt wird."
 
 #. Type: select
 #. Choices
@@ -133,12 +133,6 @@ msgstr "Hyper-V"
 msgid "RYU"
 msgstr "RYU"
 
-#. Type: select
-#. Choices
-#: ../neutron-common.templates:6001
-msgid "ml2/ml2_conf.ini"
-msgstr "ml2/ml2_conf.ini"
-
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
@@ -199,9 +193,9 @@ msgid ""
 "No database has been set up for Neutron to use. Before continuing, you "
 "should make sure you have the following information:"
 msgstr ""
-"Für die Benutzung durch Neutron wurde keine Datenbank eingerichtet. Bevor Sie "
-"fortfahren, sollten Sie sich versichern, dass Sie die folgenden Informationen "
-"haben:"
+"Für die Benutzung durch Neutron wurde keine Datenbank eingerichtet. Bevor "
+"Sie fortfahren, sollten Sie sich versichern, dass Sie die folgenden "
+"Informationen haben:"
 
 #. Type: boolean
 #. Description
@@ -291,8 +285,8 @@ msgstr "Passwort für die Verbindung mit dem RabbitMQ-Server:"
 #: ../neutron-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: select
 #. Choices
@@ -300,10 +294,10 @@ msgstr ""
 msgid "local"
 msgstr "lokal"
 
+# http://de.wikipedia.org/wiki/Generic_Routing_Encapsulation_Protocol
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:11001
-# http://de.wikipedia.org/wiki/Generic_Routing_Encapsulation_Protocol
 msgid "gre"
 msgstr "GRE"
 
@@ -352,8 +346,8 @@ msgstr ""
 "Der Wert »lokal« ist nur für das Testen einzelner Boxen nützlich. Damit "
 "Tenant-Netzwerke Verbindungen zwischen Rechnern bereitstellen können, ist es "
 "nötig, entweder »VLAN« auszuwählen und dann »network_vlan_ranges« zu "
-"konfigurieren oder »GRE« und dann »tunnel_id_ranges« einzurichten. Wählen Sie "
-"»keines«, um das Erstellen von Tenant-Netzwerken zu deaktivieren."
+"konfigurieren oder »GRE« und dann »tunnel_id_ranges« einzurichten. Wählen "
+"Sie »keines«, um das Erstellen von Tenant-Netzwerken zu deaktivieren."
 
 #. Type: boolean
 #. Description
@@ -369,9 +363,9 @@ msgid ""
 "server and agents. This requires kernel support for OVS patch ports and GRE "
 "tunneling."
 msgstr ""
-"Bitte wählen Sie, ob auf dem Server und den Clients Unterstützung für "
-"GRE-Netzwerke aktiviert werden soll. Dies erfordert Kernel-Unterstützung für "
-"OVS-Patch-Ports und GRE-Tunnel."
+"Bitte wählen Sie, ob auf dem Server und den Clients Unterstützung für GRE-"
+"Netzwerke aktiviert werden soll. Dies erfordert Kernel-Unterstützung für OVS-"
+"Patch-Ports und GRE-Tunnel."
 
 #. Type: string
 #. Description
@@ -387,10 +381,9 @@ msgid ""
 "enumerating ranges of GRE tunnel IDs that are available for tenant network "
 "allocation if tenant_network_type is \"gre\"."
 msgstr ""
-"Bitte geben Sie eine durch Kommas getrennte Liste von "
-"<tun_min>:<tun_max>-Tupeln ein, die für die Reservierung von "
-"Tenant-Netzwerken verfügbare Bereiche von GRE-Tunnel-IDs aufzählen, falls der "
-"Netzwerktyp »GRE« ist."
+"Bitte geben Sie eine durch Kommas getrennte Liste von <tun_min>:<tun_max>-"
+"Tupeln ein, die für die Reservierung von Tenant-Netzwerken verfügbare "
+"Bereiche von GRE-Tunnel-IDs aufzählen, falls der Netzwerktyp »GRE« ist."
 
 #. Type: string
 #. Description
@@ -450,7 +443,6 @@ msgstr ""
 "Keystone kontaktieren kann, um den Neutron-Dienst und den Endpunkt zu "
 "erstellen."
 
-
 #. Type: password
 #. Description
 #: ../neutron-server.templates:4001
@@ -563,3 +555,6 @@ msgstr ""
 "OpenStack kann mittels Verfügbarkeitszonen verwendet werden, bei der jede "
 "Region einen Ort repräsentiert. Bitte geben Sie die Zone an, die der "
 "Metadaten-Server benutzt."
+
+#~ msgid "ml2/ml2_conf.ini"
+#~ msgstr "ml2/ml2_conf.ini"
diff --git a/trusty/debian/po/es.po b/trusty/debian/po/es.po
index bd755cba4..10385db96 100644
--- a/trusty/debian/po/es.po
+++ b/trusty/debian/po/es.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2013.2.1-1\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-13 04:48+0000\n"
+"POT-Creation-Date: 2014-10-10 07:34+0000\n"
 "PO-Revision-Date: 2013-12-23 16:41+0200\n"
 "Last-Translator: Camaleón <noelamac@gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -149,12 +149,6 @@ msgstr "Hyper-V"
 msgid "RYU"
 msgstr "RYU"
 
-#. Type: select
-#. Choices
-#: ../neutron-common.templates:6001
-msgid "ml2/ml2_conf.ini"
-msgstr "ml2/ml2_conf.ini"
-
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
@@ -250,8 +244,8 @@ msgid ""
 "You can change this setting later on by running \"dpkg-reconfigure -plow "
 "neutron\"."
 msgstr ""
-"Podrá cambiar esta configuración más adelante ejecutando «dpkg-reconfigure "
-"-plow neutron»."
+"Podrá cambiar esta configuración más adelante ejecutando «dpkg-reconfigure -"
+"plow neutron»."
 
 #. Type: string
 #. Description
@@ -485,7 +479,8 @@ msgstr "Dirección IP del punto final de Neutron:"
 #. Description
 #: ../neutron-server.templates:5001
 msgid "Please enter the IP address that will be used to contact Neutron."
-msgstr "Introduzca la dirección IP que se utilizará para contactar con Neutron."
+msgstr ""
+"Introduzca la dirección IP que se utilizará para contactar con Neutron."
 
 #. Type: string
 #. Description
@@ -568,3 +563,6 @@ msgstr ""
 "OpenStack puede utilizarse con zonas de disponibilidad, donde cada región "
 "representa una ubicación. Introduzca la zona que desea que utilice el "
 "servidor de metadatos."
+
+#~ msgid "ml2/ml2_conf.ini"
+#~ msgstr "ml2/ml2_conf.ini"
diff --git a/trusty/debian/po/fr.po b/trusty/debian/po/fr.po
index 07b29166c..a1ceb82ee 100644
--- a/trusty/debian/po/fr.po
+++ b/trusty/debian/po/fr.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2013, French l10n team <debian-l10n-french@lists.debian.org> 
 # This file is distributed under the same license as the neutron package.
 # Julien Patriarca <leatherface@debian.org>, 2013.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-13 04:48+0000\n"
+"POT-Creation-Date: 2014-10-10 07:34+0000\n"
 "PO-Revision-Date: 2013-10-31 11:05+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: FRENCH <debian-l10n-french@lists.debian.org>\n"
@@ -43,8 +43,8 @@ msgstr "Nom d'espace client du serveur d'authentification :"
 #: ../neutron-common.templates:3001
 msgid "Please specify the authentication server tenant name."
 msgstr ""
-"Veuillez indiquer le nom d'espace client du serveur "
-"d'authentification."
+"Veuillez indiquer le nom d'espace client du serveur d'authentification."
+
 #. Type: string
 #. Description
 #: ../neutron-common.templates:4001
@@ -133,12 +133,6 @@ msgstr "Hyper-V"
 msgid "RYU"
 msgstr "RYU"
 
-#. Type: select
-#. Choices
-#: ../neutron-common.templates:6001
-msgid "ml2/ml2_conf.ini"
-msgstr "ml2/ml2_conf.ini"
-
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
@@ -250,8 +244,7 @@ msgstr "Adresse IP de votre hôte RabbitMQ :"
 #. Description
 #. Type: password
 #. Description
-#: ../neutron-common.templates:8001
-#: ../neutron-common.templates:9001
+#: ../neutron-common.templates:8001 ../neutron-common.templates:9001
 #: ../neutron-common.templates:10001
 msgid ""
 "In order to interoperate with other components of OpenStack, this package "
@@ -291,8 +284,8 @@ msgstr "Mot de passe pour la connexion au serveur RabbitMQ :"
 #: ../neutron-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 RabbitMQ."
+"Veuillez indiquer le mot de passe à utiliser pour se connecter au serveur "
+"RabbitMQ."
 
 #. Type: select
 #. Choices
@@ -350,9 +343,9 @@ msgid ""
 msgstr ""
 "La valeur « local » est utile seulement pour des tests avec un seul nœud. "
 "Afin que les réseaux d'espace client fournissent de la connectivité entre "
-"les hôtes, il est nécessaire de choisir entre « vlan » puis de configurer « "
-"network_vlan_ranges », ou bien de choisir « gre » et alors de configurer « "
-"tunnel_id_ranges ». Veuillez choisir « aucun » pour désactiver la création "
+"les hôtes, il est nécessaire de choisir entre « vlan » puis de configurer "
+"« network_vlan_ranges », ou bien de choisir « gre » et alors de configurer "
+"« tunnel_id_ranges ». Veuillez choisir « aucun » pour désactiver la création "
 "de réseaux d'espace client."
 
 #. Type: boolean
@@ -369,8 +362,8 @@ msgid ""
 "server and agents. This requires kernel support for OVS patch ports and GRE "
 "tunneling."
 msgstr ""
-"Veuillez décider si la prise en charge des réseaux GRE doit être activé sur le "
-"serveur et les agents. Ceci nécessite que le noyau gère les « patch "
+"Veuillez décider si la prise en charge des réseaux GRE doit être activé sur "
+"le serveur et les agents. Ceci nécessite que le noyau gère les « patch "
 "ports » OVS et les tunnels GRE."
 
 #. Type: string
@@ -487,8 +480,8 @@ msgid ""
 "address."
 msgstr ""
 "L'adresse IP devra être accessible depuis les clients qui utiliseront ce "
-"service, donc si vous installez un nuage public ce devra être une adresse "
-"IP publique."
+"service, donc si vous installez un nuage public ce devra être une adresse IP "
+"publique."
 
 #. Type: string
 #. Description
@@ -559,3 +552,6 @@ msgstr ""
 "OpenStack supporte l'utilisation de zones disponibles, avec chaque région "
 "représentant un lieu. Veuillez entrer la zone que le serveur de métadonnées "
 "devra utiliser."
+
+#~ msgid "ml2/ml2_conf.ini"
+#~ msgstr "ml2/ml2_conf.ini"
diff --git a/trusty/debian/po/it.po b/trusty/debian/po/it.po
index ab90365b9..aab947794 100644
--- 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: 2013-10-13 04:48+0000\n"
+"POT-Creation-Date: 2014-10-10 07:34+0000\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"
@@ -131,12 +131,6 @@ msgstr "Hyper-V"
 msgid "RYU"
 msgstr "RYU"
 
-#. Type: select
-#. Choices
-#: ../neutron-common.templates:6001
-msgid "ml2/ml2_conf.ini"
-msgstr "ml2/ml2_conf.ini"
-
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
@@ -180,8 +174,8 @@ msgstr ""
 "Neutron usa un'architettura a plugin per gestire la rete. Quando si avvia il "
 "demone del server Neutron, il file di configurazione corrispondente al "
 "plugin che si desidera usare deve essere caricato fornendolo come parametro "
-"all'avvio del demone neutron-server. Inoltre la direttiva core_plugin "
-"deve corrispondere. Selezionare quale plugin usare."
+"all'avvio del demone neutron-server. Inoltre la direttiva core_plugin deve "
+"corrispondere. Selezionare quale plugin usare."
 
 #. Type: boolean
 #. Description
@@ -271,7 +265,8 @@ msgstr "Nome utente per la connessione al server RabbitMQ:"
 #. Description
 #: ../neutron-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
@@ -409,8 +404,8 @@ msgid ""
 "endpoint-create\". This can be done automatically now."
 msgstr ""
 "Ogni servizio OpenStack (ogni API) dovrebbe essere registrato per poter "
-"essere accessibile. Ciò viene fatto usando «keystone service-create» e «"
-"keystone endpoint-create». Ciò può essere fatto ora automaticamente."
+"essere accessibile. Ciò viene fatto usando «keystone service-create» e "
+"«keystone endpoint-create». Ciò può essere fatto ora automaticamente."
 
 #. Type: boolean
 #. Description
@@ -548,3 +543,6 @@ msgstr ""
 "OpenStack può essere usato utilizzando le zone di disponibilità, con ogni "
 "regione che rappresenta una posizione. Inserire la zona che deve essere "
 "usata dal server di metadati."
+
+#~ msgid "ml2/ml2_conf.ini"
+#~ msgstr "ml2/ml2_conf.ini"
diff --git a/trusty/debian/po/pt.po b/trusty/debian/po/pt.po
index 96fbcd74e..0a2ac87da 100644
--- a/trusty/debian/po/pt.po
+++ b/trusty/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2013.2-4\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-13 04:48+0000\n"
+"POT-Creation-Date: 2014-10-10 07:34+0000\n"
 "PO-Revision-Date: 2013-11-18 23:23+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -134,12 +134,6 @@ msgstr "Hyper-V"
 msgid "RYU"
 msgstr "RYU"
 
-#. Type: select
-#. Choices
-#: ../neutron-common.templates:6001
-msgid "ml2/ml2_conf.ini"
-msgstr "ml2/ml2_conf.ini"
-
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
@@ -235,8 +229,8 @@ msgid ""
 "You can change this setting later on by running \"dpkg-reconfigure -plow "
 "neutron\"."
 msgstr ""
-"Você pode modificar estas definições mais tarde ao correr "
-"\"dpkg-reconfigure -plow neutron\"."
+"Você pode modificar estas definições mais tarde ao correr \"dpkg-reconfigure "
+"-plow neutron\"."
 
 #. Type: string
 #. Description
@@ -256,8 +250,8 @@ msgid ""
 "In order to interoperate with other components of OpenStack, this package "
 "needs to connect to a central RabbitMQ server."
 msgstr ""
-"De modo a interagir com outros componentes do OpenStack, este pacote "
-"precisa de ligar a um servidor RabbitMQ central."
+"De modo a interagir com outros componentes do OpenStack, este pacote precisa "
+"de ligar a um servidor RabbitMQ central."
 
 #. Type: string
 #. Description
@@ -348,10 +342,10 @@ msgid ""
 "disable creation of tenant networks."
 msgstr ""
 "O valor \"local\" é útil apenas para testes em máquina-única. De modo a que "
-"redes tenant disponibilizem ligações entre máquinas, é necessário ou escolher "
-"\"vlan\" e depois configurar \"network_vlan_ranges\" ou escolher \"gre\" e "
-"depois configurar \"tunnel_id_ranges\". Escolha \"nenhum\" para desactivar a "
-"criação de redes tenant."
+"redes tenant disponibilizem ligações entre máquinas, é necessário ou "
+"escolher \"vlan\" e depois configurar \"network_vlan_ranges\" ou escolher "
+"\"gre\" e depois configurar \"tunnel_id_ranges\". Escolha \"nenhum\" para "
+"desactivar a criação de redes tenant."
 
 #. Type: boolean
 #. Description
@@ -367,8 +361,8 @@ msgid ""
 "server and agents. This requires kernel support for OVS patch ports and GRE "
 "tunneling."
 msgstr ""
-"Por favor escolha se deve ser activado suporte para redes GRE no servidor "
-"e nos agentes. Isto requer suporte de kernel para portos de patch OVS e "
+"Por favor escolha se deve ser activado suporte para redes GRE no servidor e "
+"nos agentes. Isto requer suporte de kernel para portos de patch OVS e "
 "ligação GRE em túnel."
 
 #. Type: string
@@ -385,10 +379,9 @@ msgid ""
 "enumerating ranges of GRE tunnel IDs that are available for tenant network "
 "allocation if tenant_network_type is \"gre\"."
 msgstr ""
-"Por favor indique uma lista separada por vírgulas de \"tuples\" "
-"<tun_min>:<tun_max> enumerando alcances de IDs de túnel GRE que estão "
-"disponíveis para alocação de rede tenant se o \"tipo de rede tenant\" for "
-"\"gre\"."
+"Por favor indique uma lista separada por vírgulas de \"tuples\" <tun_min>:"
+"<tun_max> enumerando alcances de IDs de túnel GRE que estão disponíveis para "
+"alocação de rede tenant se o \"tipo de rede tenant\" for \"gre\"."
 
 #. Type: string
 #. Description
@@ -427,8 +420,8 @@ msgid ""
 "Note that you will need to have an up and running Keystone server on which "
 "to connect using the Keystone authentication token."
 msgstr ""
-"Note que irá precisar de ter um servidor Keystone a funcionar no qual "
-"ligar usando o sinal de autenticação do Keystone."
+"Note que irá precisar de ter um servidor Keystone a funcionar no qual ligar "
+"usando o sinal de autenticação do Keystone."
 
 #. Type: string
 #. Description
@@ -460,8 +453,8 @@ msgid ""
 "To configure its endpoint in Keystone, neutron-server needs the Keystone "
 "auth token."
 msgstr ""
-"Para configurar o seu endpoint no Keystone, o neutron-server precisa do sinal "
-"de autenticação do Keystone."
+"Para configurar o seu endpoint no Keystone, o neutron-server precisa do "
+"sinal de autenticação do Keystone."
 
 #. Type: string
 #. Description
@@ -484,9 +477,9 @@ msgid ""
 "service, so if you are installing a public cloud, this should be a public IP "
 "address."
 msgstr ""
-"Este endereço IP deve ser acessível a partir dos clientes que vão usar "
-"este serviço, portanto se está a instalar uma \"cloud\" pública, este deve "
-"ser um endereço IP público."
+"Este endereço IP deve ser acessível a partir dos clientes que vão usar este "
+"serviço, portanto se está a instalar uma \"cloud\" pública, este deve ser um "
+"endereço IP público."
 
 #. Type: string
 #. Description
@@ -503,8 +496,8 @@ msgid ""
 "endpoint."
 msgstr ""
 "O OpenStack suporta usar zonas de disponibilidade, com cada região a "
-"representar um local. Por favor indique a zona que deseja usar ao registar "
-"o endpoint."
+"representar um local. Por favor indique a zona que deseja usar ao registar o "
+"endpoint."
 
 #. Type: string
 #. Description
@@ -559,3 +552,5 @@ msgstr ""
 "região a representar um local. Por favor indique a zona que o servidor de "
 "meta-dados deverá usar."
 
+#~ msgid "ml2/ml2_conf.ini"
+#~ msgstr "ml2/ml2_conf.ini"
diff --git a/trusty/debian/po/ru.po b/trusty/debian/po/ru.po
index fb407b9e6..b67646a14 100644
--- 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: 2013-10-13 04:48+0000\n"
+"POT-Creation-Date: 2014-10-10 07:34+0000\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"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
 #. Type: string
@@ -32,8 +32,7 @@ msgid ""
 "this is also the hostname of your OpenStack Identity Service (Keystone)."
 msgstr ""
 "Введите имя узла сервера аутентификации Neutron. Данное имя обычно совпадает "
-"с "
-"OpenStack Identity Service (Keystone)."
+"с OpenStack Identity Service (Keystone)."
 
 #. Type: string
 #. Description
@@ -131,12 +130,6 @@ msgstr "Hyper-V"
 msgid "RYU"
 msgstr "RYU"
 
-#. Type: select
-#. Choices
-#: ../neutron-common.templates:6001
-msgid "ml2/ml2_conf.ini"
-msgstr "ml2/ml2_conf.ini"
-
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
@@ -177,11 +170,10 @@ msgid ""
 "starting the neutron-server daemon. Also, the core_plugin directive needs to "
 "match. Please select which plugin to use."
 msgstr ""
-"В Neutron для управления сетью используется модульная архитектура. "
-"При запуске службы сервера neutron-server параметром задаётся "
-"соответствующий файл настройки модуля. "
-"Также, это значение должно совпадать с директивой core_plugin. "
-"Выберите, какой модуль нужно использовать."
+"В Neutron для управления сетью используется модульная архитектура. При "
+"запуске службы сервера neutron-server параметром задаётся соответствующий "
+"файл настройки модуля. Также, это значение должно совпадать с директивой "
+"core_plugin. Выберите, какой модуль нужно использовать."
 
 #. Type: boolean
 #. Description
@@ -252,8 +244,8 @@ msgid ""
 "In order to interoperate with other components of OpenStack, this package "
 "needs to connect to a central RabbitMQ server."
 msgstr ""
-"Для взаимодействия с другими компонентами OpenStack, этому пакету "
-"необходимо подключаться к центральному серверу RabbitMQ."
+"Для взаимодействия с другими компонентами OpenStack, этому пакету необходимо "
+"подключаться к центральному серверу RabbitMQ."
 
 #. Type: string
 #. Description
@@ -339,11 +331,10 @@ msgid ""
 "choose \"gre\" and then configure \"tunnel_id_ranges\". Choose \"none\" to "
 "disable creation of tenant networks."
 msgstr ""
-"Значение «local» полезно только для тестирования на одной машине. "
-"Чтобы для связи узлов использовались tenant-сети необходимо "
-"или выбрать «vlan» и затем настроить «network_vlan_ranges», "
-"или выбрать «gre» и затем настроить «tunnel_id_ranges». Выберите «нет», "
-"чтобы отключить создание tenant-сетей."
+"Значение «local» полезно только для тестирования на одной машине. Чтобы для "
+"связи узлов использовались tenant-сети необходимо или выбрать «vlan» и затем "
+"настроить «network_vlan_ranges», или выбрать «gre» и затем настроить "
+"«tunnel_id_ranges». Выберите «нет», чтобы отключить создание tenant-сетей."
 
 #. Type: boolean
 #. Description
@@ -359,9 +350,8 @@ msgid ""
 "server and agents. This requires kernel support for OVS patch ports and GRE "
 "tunneling."
 msgstr ""
-"Выберите, нужно ли активировать поддержку сетей GRE на "
-"сервере и агентах. Это требует поддержки в ядре патч-портов OVS и "
-"туннелирования GRE."
+"Выберите, нужно ли активировать поддержку сетей GRE на сервере и агентах. "
+"Это требует поддержки в ядре патч-портов OVS и туннелирования GRE."
 
 #. Type: string
 #. Description
@@ -377,9 +367,9 @@ msgid ""
 "enumerating ranges of GRE tunnel IDs that are available for tenant network "
 "allocation if tenant_network_type is \"gre\"."
 msgstr ""
-"Введите через запятую кортежи <tun_min>:<tun_max>, перечисляющие "
-"диапазоны идентификаторов туннелей GRE, которые доступны для "
-"tenant-сети, если tenant_network_type равен «gre»."
+"Введите через запятую кортежи <tun_min>:<tun_max>, перечисляющие диапазоны "
+"идентификаторов туннелей GRE, которые доступны для tenant-сети, если "
+"tenant_network_type равен «gre»."
 
 #. Type: string
 #. Description
@@ -435,8 +425,7 @@ msgid ""
 "contact Keystone to do the Neutron service and endpoint creation."
 msgstr ""
 "Введите IP-адрес сервера Keystone для того, чтобы neutron-api могла "
-"подключиться "
-"к Keystone для запуска службы Neutron и создания конечной точки."
+"подключиться к Keystone для запуска службы Neutron и создания конечной точки."
 
 #. Type: password
 #. Description
@@ -452,8 +441,7 @@ msgid ""
 "auth token."
 msgstr ""
 "Для настройки собственной конечной точки в Keystone neutron-api требуется "
-"токен "
-"аутентификации Keystone."
+"токен аутентификации Keystone."
 
 #. Type: string
 #. Description
@@ -549,3 +537,5 @@ msgstr ""
 "область представляет определённое расположение. Введите зону, которую должен "
 "использовать сервер метаданных."
 
+#~ msgid "ml2/ml2_conf.ini"
+#~ msgstr "ml2/ml2_conf.ini"
diff --git a/trusty/debian/po/sv.po b/trusty/debian/po/sv.po
index f9377233b..bcd1608a7 100644
--- a/trusty/debian/po/sv.po
+++ b/trusty/debian/po/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-13 04:48+0000\n"
+"POT-Creation-Date: 2014-10-10 07:34+0000\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"
+"Language: Swedish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
-"Language: Swedish\n"
 
 #. Type: string
 #. Description
@@ -133,12 +133,6 @@ msgstr "Hyper-V"
 msgid "RYU"
 msgstr "RYU"
 
-#. Type: select
-#. Choices
-#: ../neutron-common.templates:6001
-msgid "ml2/ml2_conf.ini"
-msgstr "ml2/ml2_conf.ini"
-
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
@@ -544,3 +538,6 @@ msgid ""
 msgstr ""
 "OpenStack kan användas med tillgänglighetszoner. Varje region representerar "
 "en plats. Ange zonen som ska användas när ändpunkten registreras."
+
+#~ msgid "ml2/ml2_conf.ini"
+#~ msgstr "ml2/ml2_conf.ini"
diff --git a/trusty/debian/po/templates.pot b/trusty/debian/po/templates.pot
index bc1aa9d8f..b209fadd5 100644
--- a/trusty/debian/po/templates.pot
+++ b/trusty/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-13 04:48+0000\n"
+"POT-Creation-Date: 2014-10-10 07:34+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"
@@ -127,12 +127,6 @@ msgstr ""
 msgid "RYU"
 msgstr ""
 
-#. Type: select
-#. Choices
-#: ../neutron-common.templates:6001
-msgid "ml2/ml2_conf.ini"
-msgstr ""
-
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001