From 40a21ee937dceec344c8588def82e2ff11819e1d Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 10 Jul 2013 22:55:07 +0800 Subject: [PATCH] Modified templates accoding to the review from the debian-l10n-english. A big thanks to them (Closes: #708748). (cherry picked from commit 2ce14cf26fb21fe87d235073e9834af44166a6f1) Conflicts: debian/changelog Rewritten-From: aec2cb1dde4e19aa813d6eead7ff88448ad18007 --- xenial/debian/changelog | 7 + xenial/debian/heat-api-cfn.templates | 23 ++- xenial/debian/heat-api-cloudwatch.templates | 55 +++++- xenial/debian/heat-api.templates | 56 ++++-- xenial/debian/heat-engine.templates | 27 ++- xenial/debian/po/templates.pot | 198 ++++++++++++++------ 6 files changed, 270 insertions(+), 96 deletions(-) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index f8349afb..093d3a0f 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -4,6 +4,13 @@ heat (2013.2~b1-1) UNRELEASED; urgency=low -- Thomas Goirand Sat, 29 Jun 2013 18:08:30 +0800 +heat (2013.1.2-3) unstable; urgency=low + + * Modified templates accoding to the review from the debian-l10n-english. A + big thanks to them (Closes: #708748). + + -- Thomas Goirand Wed, 10 Jul 2013 22:54:09 +0800 + heat (2013.1.2-2) unstable; urgency=low * Added missing policy.json in heat-common. diff --git a/xenial/debian/heat-api-cfn.templates b/xenial/debian/heat-api-cfn.templates index ca914f37..3b5a3db8 100644 --- a/xenial/debian/heat-api-cfn.templates +++ b/xenial/debian/heat-api-cfn.templates @@ -1,20 +1,33 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-english@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + Template: heat/auth-host Type: string Default: 127.0.0.1 _Description: Auth server hostname: - Please specify the URL of your authentication server. Typically this is also - the URL of your OpenStack Identity Service (Keystone). + Please specify the hostname of your authentication server. Typically this is also + the hostname of your OpenStack Identity Service (Keystone). Template: heat/admin-tenant-name Type: string Default: admin -_Description: Auth server tenant name: +_Description: Authentication server tenant name: + Please specify the authentication server tenant name. Template: heat/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: heat/admin-password Type: password -_Description: Auth server password: +_Description: Authentication server password: + Please specify the password to use with the authentication server. + diff --git a/xenial/debian/heat-api-cloudwatch.templates b/xenial/debian/heat-api-cloudwatch.templates index 46427e48..6c994ac6 100644 --- a/xenial/debian/heat-api-cloudwatch.templates +++ b/xenial/debian/heat-api-cloudwatch.templates @@ -1,20 +1,63 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-english@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + Template: heat/auth-host Type: string Default: 127.0.0.1 -_Description: Auth server hostname: - Please specify the URL of your authentication server. Typically - this is also the URL of your OpenStack Identity Service (Keystone). +_Description: Authentication server hostname: + Please specify the hostname of the authentication server. Typically + this is also the hostname of the OpenStack Identity Service (Keystone). + +Template: heat/admin-tenant-name +Type: string +Default: admin +# 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 parenthezised. Example for French: +# locataire ("tenant") +_Description: Authentication server tenant name: + Please specify the authentication server tenant name. + +Template: heat/admin-user +Type: string +Default: admin +_Description: Authentication server username: + Please specify the username to use with the authentication server. + +Template: heat/admin-password +Type: password +_Description: Authentication server password: + Please specify the password to use with the authentication server. Template: heat/admin-tenant-name Type: string Default: admin -_Description: Auth server tenant name: +# 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 parenthezised. Example for French: +# locataire ("tenant") +_Description: Authentication server tenant name: + Please specify the authentication server tenant name. Template: heat/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: heat/admin-password Type: password -_Description: Auth server password: +_Description: Authentication server password: + Please specify the password to use with the authentication server. diff --git a/xenial/debian/heat-api.templates b/xenial/debian/heat-api.templates index 7c81a84b..40344f69 100644 --- a/xenial/debian/heat-api.templates +++ b/xenial/debian/heat-api.templates @@ -1,52 +1,70 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-english@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + Template: heat/auth-host Type: string Default: 127.0.0.1 -_Description: Auth server hostname: - Please specify the URL of your authentication server. Typically this is also - the URL of your OpenStack Identity Service (Keystone). +_Description: Authentication server hostname: + Please specify the hostname of the authentication server. Typically + this is also the hostname of the OpenStack Identity Service (Keystone). Template: heat/admin-tenant-name Type: string Default: admin -_Description: Auth server tenant name: +# 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 parenthezised. Example for French: +# locataire ("tenant") +_Description: Authentication server tenant name: + Please specify the authentication server tenant name. Template: heat/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: heat/admin-password Type: password -_Description: Auth server password: +_Description: Authentication server password: + Please specify the password to use with the authentication server. Template: heat/register-endpoint Type: boolean Default: false -_Description: Register Heat in the keystone endpoint catalog? - Each Openstack services (each API) should be registered in order to be +_Description: Register Heat in the Keystone endpoint catalog? + 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. . - 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. Template: heat/keystone-ip Type: string -_Description: Keystone IP address: - Enter the IP address of your keystone server, so that heat-api can +_Description: Keystone server IP address: + Please enter the IP address of the Keystone server, so that heat-api can contact Keystone to do the Heat service and endpoint creation. Template: heat/keystone-auth-token Type: password -_Description: Keystone Auth Token: - To configure its endpoint in Keystone, heat-api needs the Keystone auth - token. +_Description: Keystone authentication token: + To configure its endpoint in Keystone, heat-api needs the Keystone + authentication token. Template: heat/endpoint-ip Type: string _Description: Heat endpoint IP address: - Enter the IP address that will be used to contact Heat (eg: the Heat - endpoint IP address). + Please enter the IP address that will be used to contact Heat. . 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 @@ -56,6 +74,6 @@ Template: heat/region-name Type: string Default: regionOne _Description: Name of the region to register: - Openstack can be used using availability zones, with each region representing + OpenStack supports using availability zones, with each region representing a location. Please enter the zone that you wish to use when registering the endpoint. diff --git a/xenial/debian/heat-engine.templates b/xenial/debian/heat-engine.templates index 1efe74fb..cacf35cc 100644 --- a/xenial/debian/heat-engine.templates +++ b/xenial/debian/heat-engine.templates @@ -1,17 +1,26 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-english@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + Template: heat/configure_db Type: boolean Default: true _Description: Set up a database for heat-engine? - No database has been set up for heat-engine to use. Before continuing, you - should make sure you have: + No database has been set up for heat-engine to use. Before + continuing, you should make sure you have the following information: . - - the server host name (that server must allow TCP connections from this + * the type of database that you want to use; + * the database server host name (that server must allow TCP connections from this machine); - - a username and password to access the database. - - A database type that you want to use. + * a username and password to access the database. . - If some of these requirements are missing, reject this option and run with - regular sqlite support. + If some of these requirements are missing, do not choose this option and run with + regular SQLite support. . - You can change this setting later on by running 'dpkg-reconfigure -plow - heat-engine'. + You can change this setting later on by running "dpkg-reconfigure -plow + heat-engine". diff --git a/xenial/debian/po/templates.pot b/xenial/debian/po/templates.pot index d1592914..fbd524ac 100644 --- a/xenial/debian/po/templates.pot +++ b/xenial/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: heat\n" "Report-Msgid-Bugs-To: heat@packages.debian.org\n" -"POT-Creation-Date: 2013-02-02 17:40+0000\n" +"POT-Creation-Date: 2013-07-10 22:55+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,149 +19,233 @@ msgstr "" #. Type: boolean #. Description -#: ../heat-engine.templates:1001 +#: ../heat-engine.templates:2001 msgid "Set up a database for heat-engine?" msgstr "" #. Type: boolean #. Description -#: ../heat-engine.templates:1001 +#: ../heat-engine.templates:2001 msgid "" "No database has been set up for heat-engine to use. Before continuing, you " -"should make sure you have:" +"should make sure you have the following information:" msgstr "" #. Type: boolean #. Description -#: ../heat-engine.templates:1001 +#: ../heat-engine.templates:2001 msgid "" -" - the server host name (that server must allow TCP connections from this\n" +" * the type of database that you want to use;\n" +" * the database server host name (that server must allow TCP connections " +"from this\n" " machine);\n" -" - a username and password to access the database.\n" -" - A database type that you want to use." +" * a username and password to access the database." msgstr "" #. Type: boolean #. Description -#: ../heat-engine.templates:1001 +#: ../heat-engine.templates:2001 msgid "" -"If some of these requirements are missing, reject this option and run with " -"regular sqlite support." +"If some of these requirements are missing, do not choose this option and run " +"with regular SQLite support." msgstr "" #. Type: boolean #. Description -#: ../heat-engine.templates:1001 +#: ../heat-engine.templates:2001 msgid "" -"You can change this setting later on by running 'dpkg-reconfigure -plow " -"heat-engine'." +"You can change this setting later on by running \"dpkg-reconfigure -plow " +"heat-engine\"." msgstr "" #. Type: string #. Description -#: ../heat-api-cfn.templates:1001 ../heat-api-cloudwatch.templates:1001 -#: ../heat-api.templates:1001 +#: ../heat-api-cfn.templates:2001 msgid "Auth server hostname:" msgstr "" #. Type: string #. Description -#: ../heat-api-cfn.templates:1001 ../heat-api-cloudwatch.templates:1001 -#: ../heat-api.templates:1001 +#: ../heat-api-cfn.templates:2001 msgid "" -"Please specify the URL of your authentication server. Typically this is also " -"the URL of your OpenStack Identity Service (Keystone)." +"Please specify the hostname of your authentication server. Typically this is " +"also the hostname of your OpenStack Identity Service (Keystone)." msgstr "" #. Type: string #. Description -#: ../heat-api-cfn.templates:2001 ../heat-api-cloudwatch.templates:2001 -#: ../heat-api.templates:2001 -msgid "Auth server tenant name:" +#. 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 parenthezised. Example for French: +#. locataire ("tenant") +#. 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 parenthezised. Example for French: +#. locataire ("tenant") +#: ../heat-api-cfn.templates:3001 ../heat-api-cloudwatch.templates:3001 +#: ../heat-api-cloudwatch.templates:6001 ../heat-api.templates:3001 +msgid "Authentication server tenant name:" msgstr "" #. Type: string #. Description +#. 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 parenthezised. Example for French: +#. locataire ("tenant") +#. 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 parenthezised. Example for French: +#. locataire ("tenant") #: ../heat-api-cfn.templates:3001 ../heat-api-cloudwatch.templates:3001 -#: ../heat-api.templates:3001 -msgid "Auth server username:" +#: ../heat-api-cloudwatch.templates:6001 ../heat-api.templates:3001 +msgid "Please specify the authentication server tenant name." msgstr "" -#. Type: password +#. Type: string +#. Description +#. Type: string +#. Description +#. Type: string #. Description #: ../heat-api-cfn.templates:4001 ../heat-api-cloudwatch.templates:4001 -#: ../heat-api.templates:4001 -msgid "Auth server password:" +#: ../heat-api-cloudwatch.templates:7001 ../heat-api.templates:4001 +msgid "Authentication server username:" +msgstr "" + +#. Type: string +#. Description +#. Type: string +#. Description +#. Type: string +#. Description +#: ../heat-api-cfn.templates:4001 ../heat-api-cloudwatch.templates:4001 +#: ../heat-api-cloudwatch.templates:7001 ../heat-api.templates:4001 +msgid "Please specify the username to use with the authentication server." +msgstr "" + +#. Type: password +#. Description +#. Type: password +#. Description +#. Type: password +#. Description +#: ../heat-api-cfn.templates:5001 ../heat-api-cloudwatch.templates:5001 +#: ../heat-api-cloudwatch.templates:8001 ../heat-api.templates:5001 +msgid "Authentication server password:" +msgstr "" + +#. Type: password +#. Description +#. Type: password +#. Description +#. Type: password +#. Description +#: ../heat-api-cfn.templates:5001 ../heat-api-cloudwatch.templates:5001 +#: ../heat-api-cloudwatch.templates:8001 ../heat-api.templates:5001 +msgid "Please specify the password to use with the authentication server." +msgstr "" + +#. Type: string +#. Description +#: ../heat-api-cloudwatch.templates:2001 ../heat-api.templates:2001 +msgid "Authentication server hostname:" +msgstr "" + +#. Type: string +#. Description +#: ../heat-api-cloudwatch.templates:2001 ../heat-api.templates:2001 +msgid "" +"Please specify the hostname of the authentication server. Typically this is " +"also the hostname of the OpenStack Identity Service (Keystone)." msgstr "" #. Type: boolean #. Description -#: ../heat-api.templates:5001 -msgid "Register Heat in the keystone endpoint catalog?" +#: ../heat-api.templates:6001 +msgid "Register Heat in the Keystone endpoint catalog?" msgstr "" #. Type: boolean #. Description -#: ../heat-api.templates:5001 +#: ../heat-api.templates:6001 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 "" #. Type: boolean #. Description -#: ../heat-api.templates:5001 +#: ../heat-api.templates:6001 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 "" #. Type: string #. Description -#: ../heat-api.templates:6001 -msgid "Keystone IP address:" +#: ../heat-api.templates:7001 +msgid "Keystone server IP address:" msgstr "" #. Type: string #. Description -#: ../heat-api.templates:6001 +#: ../heat-api.templates:7001 msgid "" -"Enter the IP address of your keystone server, so that heat-api can contact " -"Keystone to do the Heat service and endpoint creation." +"Please enter the IP address of the Keystone server, so that heat-api can " +"contact Keystone to do the Heat service and endpoint creation." msgstr "" #. Type: password #. Description -#: ../heat-api.templates:7001 -msgid "Keystone Auth Token:" +#: ../heat-api.templates:8001 +msgid "Keystone authentication token:" msgstr "" #. Type: password #. Description -#: ../heat-api.templates:7001 +#: ../heat-api.templates:8001 msgid "" -"To configure its endpoint in Keystone, heat-api needs the Keystone auth " -"token." +"To configure its endpoint in Keystone, heat-api needs the Keystone " +"authentication token." msgstr "" #. Type: string #. Description -#: ../heat-api.templates:8001 +#: ../heat-api.templates:9001 msgid "Heat endpoint IP address:" msgstr "" #. Type: string #. Description -#: ../heat-api.templates:8001 -msgid "" -"Enter the IP address that will be used to contact Heat (eg: the Heat " -"endpoint IP address)." +#: ../heat-api.templates:9001 +msgid "Please enter the IP address that will be used to contact Heat." msgstr "" #. Type: string #. Description -#: ../heat-api.templates:8001 +#: ../heat-api.templates:9001 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 " @@ -170,15 +254,15 @@ msgstr "" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-api.templates:10001 msgid "Name of the region to register:" msgstr "" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-api.templates:10001 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 "" -- 2.45.2