X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fpo%2Fru.po;h=615807f4985c7e2fea81ea61bfbcbe22e21e22d8;hb=HEAD;hp=13c6262210cae85f0c4f65f03136e11458634d1d;hpb=33f494780fed13daabda23be6ceef83210e1d403;p=openstack-build%2Fneutron-build.git

diff --git a/trusty/debian/po/ru.po b/trusty/debian/po/ru.po
index 13c626221..615807f49 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: 2015-02-02 01:45+0100\n"
+"POT-Creation-Date: 2016-03-29 13:50+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"
@@ -416,15 +416,17 @@ msgstr "Укажите IP-адрес этого сервера."
 #. Type: string
 #. Description
 #: ../neutron-common.templates:17001
-msgid "Nova admin tenant ID:"
-msgstr ""
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Nova admin tenant name:"
+msgstr "Имя пользователя сервера аутентификации:"
 
 #. 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 "
+"Therefore Neutron needs to know the Nova admin tenant name, username and "
 "password."
 msgstr ""
 
@@ -485,9 +487,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 "Заметим, что у вас должен быть работающий сервер Keystone, к которому будет "
 "произведено подключение с помощью токена аутентификации Keystone."
@@ -508,37 +515,56 @@ msgstr ""
 "Введите IP-адрес сервера Keystone для того, чтобы neutron-api могла "
 "подключиться к Keystone для запуска службы Neutron и создания конечной точки."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Токен аутентификации Keystone:"
+#, fuzzy
+#| msgid "Auth server username:"
+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 ""
-"Для настройки собственной конечной точки в Keystone neutron-api требуется "
-"токен аутентификации Keystone."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Auth server username:"
+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 "IP-адрес конечной точки Neutron:"
 
 #. 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 "Введите IP-адрес, который будет использован для подключения к Neutron."
 
 #. 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 "
@@ -550,13 +576,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 "
@@ -642,5 +668,15 @@ msgid ""
 "same shared password should be used when setting up the nova-common package."
 msgstr ""
 
+#~ msgid "Keystone authentication token:"
+#~ msgstr "Токен аутентификации Keystone:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "Для настройки собственной конечной точки в Keystone neutron-api требуется "
+#~ "токен аутентификации Keystone."
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"