X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fpo%2Ftemplates.pot;h=6a07d129cbf264ac5da0d42969cf96cc07405af7;hb=HEAD;hp=44c5cdcb59657876f60dbc6b7fa9dbf61461cc1b;hpb=33f494780fed13daabda23be6ceef83210e1d403;p=openstack-build%2Fneutron-build.git

diff --git a/trusty/debian/po/templates.pot b/trusty/debian/po/templates.pot
index 44c5cdcb5..6a07d129c 100644
--- 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 neutron 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: 2015-02-02 01:45+0100\n"
+"POT-Creation-Date: 2016-03-29 13:50+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"
@@ -382,7 +382,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../neutron-common.templates:17001
-msgid "Nova admin tenant ID:"
+msgid "Nova admin tenant name:"
 msgstr ""
 
 #. Type: string
@@ -390,7 +390,7 @@ msgstr ""
 #: ../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 "
+"Therefore Neutron needs to know the Nova admin tenant name, username and "
 "password."
 msgstr ""
 
@@ -444,7 +444,8 @@ msgstr ""
 #: ../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."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 
 #. Type: string
@@ -461,35 +462,52 @@ msgid ""
 "contact Keystone to do the Neutron service and endpoint creation."
 msgstr ""
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr ""
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server 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 ""
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.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 "
@@ -498,13 +516,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.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 "