Debconf templates update from debian-l10n-english.

See #426086

diff --git a/debian/control b/debian/control
index f7b1505078818ae503e55908bd7a18465ef1a3b6..c6730a510e2cfe98715bae75064b494ca468dfaa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,10 +11,10 @@ Package: roundcube
 Architecture: all
 Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
 Suggests: mysql-server | posgresql-server
-Description: modern, skinnable, AJAX based webmail solution for IMAP servers
+Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
- application-like user interface. It provides full functionality you
- expect from an e-mail client, including MIME support, address book,
+ application-like user interface. It provides full functionality
+ expected from an e-mail client, including MIME support, address book,
  folder manipulation and message filters.
  .
  The user interface is fully skinnable using XHTML and CSS 2.

diff --git a/debian/control.in b/debian/control.in
index 0974d7dbc9c1c67ad53cfbe57e48d30f5500d92b..a7ae7e69b6cbbdb044c7257cb03678713c09db3c 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,10 +11,10 @@ Package: roundcube
 Architecture: all
 Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
 Suggests: mysql-server | posgresql-server
-Description: modern, skinnable, AJAX based webmail solution for IMAP servers
+Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
- application-like user interface. It provides full functionality you
- expect from an e-mail client, including MIME support, address book,
+ application-like user interface. It provides full functionality
+ expected from an e-mail client, including MIME support, address book,
  folder manipulation and message filters.
  .
  The user interface is fully skinnable using XHTML and CSS 2.

diff --git a/debian/templates b/debian/templates
index b75b54ceaf2ecdf328f8efb9c2fe0da4fe7e95d9..9f7d50b1b4d6391627007129da4f5ae4de4aea29 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -1,31 +1,50 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# for an advice to debian-l10n-english@lists.debian.org
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: roundcube/reconfigure-webserver
 Type: multiselect
-_Choices: apache, apache-ssl, apache-perl, apache2
+__Choices: apache, apache-ssl, apache-perl, apache2
 Default: apache, apache-ssl, apache-perl, apache2
-_Description: Webserver Reconfiguration:
- RoundCube supports any web server that php does, but this automatic
- configuration process only supports Apache. Please select which 
- apache version you want to configure the RoundCube frontend for.
+_Description: Web server(s) to configure automatically:
+ RoundCube supports any web server supported by PHP, however only
+ Apache can be configured automatically.
+ .
+ Please select the web server(s) that should be configured
+ automatically for RoundCube.
 
 Template: roundcube/restart-webserver
 Type: boolean
 Default: true
-_Description: Would you like to restart your webserver(s) now?
- Remember that in order to apply the changes your webserver(s) has/have to
- be restarted. 
+_Description: Should the webserver(s) be restarted now?
+ In order to activate the new configuration, the reconfigured web
+ servers have to be restarted.
 
 Template: roundcube/hosts
 Type: string
 Default:
-_Description: IMAP server on which RoundCube should connect to:
- Leave this field blank to show a textbox at login, give a list
- of space-separated hosts to display a pulldown menu or set one
- host. To use SSL connection, use ssl://hostname:993.
+_Description: IMAP server(s) used with RoundCube:
+ Please select the IMAP server that should be used with RoundCube.
+ .
+ If this is left blank, a text box will be displayed at
+ login. Entering a space-separated list of hosts will display a
+ pull-down menu. Entering a single host will enforce using this
+ host.
+ .
+ To use SSL connections, please enter host names as 'ssl://hostname:993'.
 
 Template: roundcube/language
 Type: select
 Choices: ${languages}
 _Description: Default language:
- Each user can select in his preferences the language of the
- interface. However, for the login screen and for the first
- connection, this is the language selected here that will be used.
+ Please choose the default language for RoundCube.
+ .
+ This choice can be overridden by individual users in their preferences.
+ .
+ However, the default language will be used for the login screen and
+ the first connection of users.