[debconf_rewrite] includes the fixes from the debian-l10n-english (Closes: #709000).

Change-Id: I499ef363de09250fc251e5c9f0d079dcec078102
(cherry picked from commit ec6c3af9059676700ce944358120b756dab29231)

Rewritten-From: 05ba2ad6393c6adfebf5fb591995faf55ee26f69

diff --git a/xenial/debian/control b/xenial/debian/control
index 0a57c3ce356463d09aef2ceee2235b184ba2d88c..f73bc7dc929ee6b53fd28359f56205cf40c61393 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -70,9 +70,9 @@ Depends: python-cinderclient,
          ${python:Depends}
 Recommends: memcached
 Description: Django module providing web interaction with OpenStack
- The OpenStack Dashboard is a Web application allowing to control an OpenStack
- cloud. It connects to OpenStack services including Nova, Swift, Keystone, etc.
- using the Openstack REST API just like you would do with the command line
+ The OpenStack Dashboard is a web application to control an OpenStack
+ cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
+ using the OpenStack REST API just as you would with the command line
  clients.
  .
  Horizon is a Django module that permits interaction with an OpenStack
@@ -92,9 +92,9 @@ Depends: adduser,
          ${shlibs:Depends}
 Recommends: memcached, openstack-dashboard-apache
 Description: OpenStack Dashboard
- The OpenStack Dashboard is a Web application allowing to control an OpenStack
- cloud. It connects to OpenStack services including Nova, Swift, Keystone, etc.
- using the Openstack REST API just like you would do with the command line
+ The OpenStack Dashboard is a web application to control an OpenStack
+ cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
+ using the OpenStack REST API just as you would with the command line
  clients.
 
 Package: openstack-dashboard-apache
@@ -102,9 +102,9 @@ Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: debconf, openstack-dashboard, ${misc:Depends}
 Description: OpenStack Dashboard - Apache support
- The OpenStack Dashboard is a Web application allowing to control an OpenStack
- cloud. It connects to OpenStack services including Nova, Swift, Keystone, etc.
- using the Openstack REST API just like you would do with the command line
+ The OpenStack Dashboard is a web application to control an OpenStack
+ cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
+ using the OpenStack REST API just as you would with the command line
  clients.
  .
  This package includes the configuration files to use within Apache. If you

diff --git a/xenial/debian/openstack-dashboard-apache.templates b/xenial/debian/openstack-dashboard-apache.templates
index bafe8f65c06493fafbe38ec2be4e288a4c166135..627eddd1eb003532c976776965d778f3b60ac3f2 100644 (file)
--- a/xenial/debian/openstack-dashboard-apache.templates
+++ b/xenial/debian/openstack-dashboard-apache.templates
@@ -11,13 +11,15 @@ Template: horizon/activate_vhost
 Type: boolean
 Default: false
 _Description: Activate Dashboard and disable default VirtualHost?
- In Debian, Apache comes with a default website and a default page, configured
- in /etc/apache2/sites-available/default. Select if this configuration should be
- disabled and replaced by the Openstack Dashboard configuration.
+ The Apache package sets up a default web site and a default page, configured
+ in /etc/apache2/sites-available/default.
+ .
+ Choose this option to replace that default with the OpenStack Dashboard
+ configuration.
 
 Template: horizon/use_ssl
 Type: boolean
 Default: true
-_Description: Should the Dashboard be installed on HTTPS?
- Please choose if you would like Horizon to be installed on HTTPS only, with a
- redirection to HTTPS if HTTP is in use.
+_Description: Should the Dashboard use HTTPS?
+ Select this option if you would like Horizon to be served over HTTPS only,
+ with a redirection to HTTPS if HTTP is in use.