Included the fixes from the english review.

Change-Id: I5c55b8ba4af1e621ef9b8328d189f7bdde9f7fcc
(cherry picked from commit 424bb2a13915a621e5c290f63b2da9ebfea49c7f)

Rewritten-From: e1a38d7820ea55f5897409b47a68612149f36e3c

diff --git a/trusty/debian/ceilometer-api.templates b/trusty/debian/ceilometer-api.templates
index 760c375ed2a4faa402b9da12c9a386b0d41808f3..c280254e22854bbef37b5f03e07186665eb08d82 100644 (file)
--- a/trusty/debian/ceilometer-api.templates
+++ b/trusty/debian/ceilometer-api.templates
@@ -1,31 +1,39 @@
+# 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: ceilometer/register-endpoint
 Type: boolean
 Default: false
 Template: ceilometer/register-endpoint
 Type: boolean
 Default: false

-_Description: Register Ceilometer in the keystone endpoint catalog?
- Each Openstack services (each API) should be registered in order to be
+_Description: Register Ceilometer 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
  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: ceilometer/keystone-ip
 Type: string
 
 Template: ceilometer/keystone-ip
 Type: string

-_Description: Keystone IP address:
- Enter the IP address of your keystone server, so that ceilometer-api can
+_Description: Keystone server IP address:
+ Please enter the IP address of the Keystone server, so that ceilometer-api can

  contact Keystone to do the Ceilometer service and endpoint creation.
 
 Template: ceilometer/keystone-auth-token
 Type: password
  contact Keystone to do the Ceilometer service and endpoint creation.
 
 Template: ceilometer/keystone-auth-token
 Type: password

-_Description: Keystone Auth Token:
- To configure its endpoint in Keystone, ceilometer-api needs the Keystone auth
- token.
+_Description: Keystone authentication token:
+ To configure its endpoint in Keystone, ceilometer-api needs the Keystone
+ authentication token.

 
 Template: ceilometer/endpoint-ip
 Type: string
 _Description: Ceilometer endpoint IP address:
 
 Template: ceilometer/endpoint-ip
 Type: string
 _Description: Ceilometer endpoint IP address:

- Enter the IP address that will be used to contact Ceilometer (eg: the
- Ceilometer endpoint IP address).
+ Please enter the IP address that will be used to contact Ceilometer.

  .
  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
  .
  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


@@ -35,6 +43,6 @@ Template: ceilometer/region-name
 Type: string
 Default: regionOne
 _Description: Name of the region to register:
 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.
  a location. Please enter the zone that you wish to use when registering the
  endpoint.

diff --git a/trusty/debian/control b/trusty/debian/control
index f24d1a95f9d3268e50cef9e00577d8cf82a73226..521dfefc6d20e6d00d9829bd1a6a4f76a5c3d2a6 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -101,7 +101,7 @@ Depends: libjs-jquery,
          ${python:Depends}
 Description: OpenStack efficient metering counters system - Python libraries
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
          ${python:Depends}
 Description: OpenStack efficient metering counters system - Python libraries
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,

- providing all the counters they need to establish customer billing, accross
+ providing all the counters they need to establish customer billing, accros

  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the
  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the


@@ -120,7 +120,7 @@ Depends: adduser,
 Provides: ${python:Provides}
 Description: OpenStack efficient metering counters system - common files
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
 Provides: ${python:Provides}
 Description: OpenStack efficient metering counters system - common files
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,

- providing all the counters they need to establish customer billing, accross
+ providing all the counters they need to establish customer billing, accros

  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the
  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the


@@ -137,7 +137,7 @@ Depends: ceilometer-common (= ${binary:Version}),
          ${python:Depends}
 Description: OpenStack efficient metering counters system - collector service
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
          ${python:Depends}
 Description: OpenStack efficient metering counters system - collector service
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,

- providing all the counters they need to establish customer billing, accross
+ providing all the counters they need to establish customer billing, accros

  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the
  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the


@@ -156,7 +156,7 @@ Depends: adduser,
          ${python:Depends}
 Description: OpenStack efficient metering counters system (API service)
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
          ${python:Depends}
 Description: OpenStack efficient metering counters system (API service)
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,

- providing all the counters they need to establish customer billing, accross
+ providing all the counters they need to establish customer billing, accros

  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the
  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the


@@ -173,7 +173,7 @@ Depends: ceilometer-common (= ${binary:Version}),
          ${python:Depends}
 Description: OpenStack efficient metering counters system - compute agent
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
          ${python:Depends}
 Description: OpenStack efficient metering counters system - compute agent
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,

- providing all the counters they need to establish customer billing, accross
+ providing all the counters they need to establish customer billing, accros

  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the
  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the


@@ -190,7 +190,7 @@ Depends: ceilometer-common (= ${binary:Version}),
          ${python:Depends}
 Description: OpenStack efficient metering counters system - central agent
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
          ${python:Depends}
 Description: OpenStack efficient metering counters system - central agent
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,

- providing all the counters they need to establish customer billing, accross
+ providing all the counters they need to establish customer billing, accros

  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the
  all current and future OpenStack components. The delivery of counters must be
  traceable and auditable, the counters must be easily extensible to support new
  projects, and agents doing data collections should be independent of the