[Dbconfig-common-devel] dbconfig-common/debian dbconfig-common.templates,1.9,1.10

seanius@haydn.debian.org seanius@haydn.debian.org


Update of /cvsroot/dbconfig-common/dbconfig-common/debian
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv5569

Modified Files:
	dbconfig-common.templates 
Log Message:
many many debconf suggestions from christian


Index: dbconfig-common.templates
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/dbconfig-common.templates,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dbconfig-common.templates	23 Feb 2005 05:39:57 -0000	1.9
+++ dbconfig-common.templates	30 Mar 2005 02:51:33 -0000	1.10
@@ -5,7 +5,7 @@
  By default, you will be prompted for all administrator-level database
  passwords when you configure, upgrade, or remove applications with
  dbconfig-common.  These passwords will not be stored in debconf for
- any longer than they are needed.  
+ any longer than they are needed.
  .
  This behavior can be disabled, in which case the passwords will
  remain in the debconf password database.  The debconf password
@@ -14,7 +14,7 @@
  .
  If you would rather not be bothered by for an administrative password
  every time you upgrade a database application with dbconfig-common,
- answer "yes".  Otherwise, you should answer "no".
+ you should choose this option.  Otherwise, you should refuse this option.
 
 Template: dbconfig-common/remember-app-pass
 Type: boolean
@@ -32,7 +32,7 @@
  less secure and thus not the default setting.
  .
  If you would rather not be bothered to remember application passwords,
- answer "yes".  Otherwise, you should answer "no".
+ you should choose this option.  Otherwise, you should refuse this option.
 
 Template: dbconfig-common/dbconfig-install
 Type: boolean
@@ -44,10 +44,10 @@
  .
  If you are an advanced database administrator and know that you want
  to perform this configuration manually, or if you database has already
- been installed and configured, answer "no".  Details on what
+ been installed and configured, you should refuse this option.  Details on what
  needs to be done should most likely be provided in /usr/share/doc/${pkg}.
  .
- Otherwise, you should answer "yes" to this question.
+ Otherwise, you should probably choose this option.
 
 Template: dbconfig-common/dbconfig-upgrade
 Type: boolean
@@ -56,12 +56,13 @@
  According to the maintainer for this package, database upgrade
  operations need to be formed on ${pkg}.  Typically this is due to
  changes in how a new upstream version of the package needs to store
- its data.  
+ its data.
  .
- If you want to handle this process manually, choose "no".  Otherwise,
- you should choose "yes".  During the upgrade a backup of your database
- will be made in /var/cache/dbconfig-common/backups, from which which 
- the database can be restored in the case of problems.
+ If you want to handle this process manually, you should
+ refuse this option.  Otherwise, you should choose this option.
+ During the upgrade a backup of your database will be made in
+ /var/cache/dbconfig-common/backups, from which which the database can
+ be restored in the case of problems.
 
 Template: dbconfig-common/dbconfig-remove
 Type: boolean
@@ -73,17 +74,18 @@
  If you like, database removal can be handled with dbconfig-common.
  .
  If you know that you do want to keep this database, or if you want
- to handle the removal of this database manually, answer "no".
+ to handle the removal of this database manually, you should refuse
+ this option.
  .
- Otherwise, you should answer "yes" to this question.
+ Otherwise, you should choose this option.
 
 Template: dbconfig-common/database-type
 Type: select
 Choices: ${database_types}
 Default: 
-_Description: What database type should ${pkg} use?
+_Description: Database type to be used by ${pkg}:
  ${pkg} can be configured to use one of many database types.
- Below, you will be presented with the available choices. 
+ Below, you will be presented with the available choices.
 
 Template: dbconfig-common/purge
 Type: boolean
@@ -93,9 +95,9 @@
  chance to remove them.
  .
  If no longer have need of the data being stored by ${pkg}, you
- should answer "yes".  If you want to hold this data for another
- time, or if you would rather handle this process manually,
- anwer "no".
+ should choose this option.  If you want to hold this data for another
+ time, or if you would rather handle this process manually, you should
+ refuse this option.
 
 Template: dbconfig-common/upgrade-backup
 Type: boolean
@@ -108,45 +110,46 @@
 
 Template: dbconfig-common/passwords-do-not-match
 Type: note
-_Description: Passwords do not match!
- Sorry, the passwords you supplied do not match.  Please try again!
+_Description: Passwords do not match.
+ The passwords you supplied do not match.  Please try again.
 
 Template: dbconfig-common/upgrade-error
 Type: note
-_Description: Error upgrading database for ${pkg}!
- Sorry, there seems to have been an error upgrading the database!
- fortunately, there should be a backup of the database made just before
+_Description: Error upgrading database for ${pkg}.
+ An error seems to have occurred while upgrading the database.
+ .
+ Fortunately, there should be a backup of the database made just before
  the upgrade in ${dbfile}.
  .
- at this point, you will need to downgrade, reinstall, or reconfigure
+ At this point, you will need to downgrade, reinstall, or reconfigure
  this package, or otherwise manually intervene to continue using ${pkg}
- if it's of any help, this was the error encountered:
+ If it's of any help, this was the error encountered:
  .
  ${error}
 
 Template: dbconfig-common/install-error
 Type: note
-_Description: Error installing database for ${pkg}!
- Sorry, there seems to have been an error installing the database!
+_Description: Error installing database for ${pkg}.
+ An error seems to have occurred while installing the database.
  .
- at this point, you will need to reinstall or reconfigure ${pkg},
+ At this point, you will need to reinstall or reconfigure ${pkg},
  or otherwise manually intervene before it will be of any use.
- if it's of any help, this was the error encountered:
+ If it's of any help, this was the error encountered:
  .
  ${error}
 
 Template: dbconfig-common/remove-error
 Type: note
-_Description: Error removing database for ${pkg}!
- Sorry, there seems to have been an error removing the database!
+_Description: Error removing database for ${pkg}.
+ An error seems to have occurred while removing the database.
  .
- For some reason we were unable to perform some of the actions necessary
- removing the database for ${pkg}.  At this point you have two options: you
- can find out what has caused this error, or just answer "no" when you
- are asked if you would like help removing the database (of course the
- latter implies you will have to remove the database manually).
+ For some reason it was not possible to perform some of the actions necessary
+ to remove the database for ${pkg}.  At this point you have two options: you
+ can find out what has caused this error and fix it, or you can refuse
+ the offer for help removing the database (the latter implies you will
+ have to remove the database manually).
  .
- if it's of any help, this was the error encountered:
+ If it's of any help, this was the error encountered:
  .
  ${error}
 
@@ -154,8 +157,8 @@
 Type: select
 Choices: unix socket, tcp/ip
 Default: unix socket
-_Description: How should ${pkg} connect to its mysql database?
- By default, ${pkg} will be configured to use a mysql server
+_Description: Connection method for MySQL database of ${pkg}:
+ By default, ${pkg} will be configured to use a MySQL server
  through a local unix socket (this provides the best performance).
  however, if you would like to connect with a different method, or to a
  different server entirely, select an option from the choices below.
@@ -163,37 +166,37 @@
 Template: dbconfig-common/mysql/host
 Type: select
 Choices: ${hosts}
-_Description: What host is running the mysql server for ${pkg}?
+_Description: Host name of the MySQL database server for ${pkg}:
  Please select the remote hostname to use, or select "new host" to
  enter a new host.
 
 Template: dbconfig-common/mysql/port
 Type: string
-_Description: On what port is the mysql service running?
- If the mysql database on the remote host is running on a non-standard
+_Description: Port number for the MySQL service:
+ If the MySQL database on the remote host is running on a non-standard
  port, this is your oppurtunity to specify what it is.  To use the
  default port, leave this field blank.
 
 Template: dbconfig-common/mysql/newhost
 Type: string
-_Description: what host is running the mysql server for ${pkg}?
- Please provide the hostname of a remote mysql server.
+_Description: Host running the MySQL server for ${pkg}:
+ Please provide the hostname of a remote MySQL server.
  .
  Note: you must have already arranged for the adminstrative
  account to be able to remotely create databases and grant
- privileges.  
+ privileges.
 
 Template: dbconfig-common/mysql/dbname
 Type: string
 Default: ${pkg}
-_Description: What should be the mysql database name for ${pkg}?
- Please provide a name for the mysql database to be used by ${pkg}.
+_Description: MySQL database name for ${pkg}:
+ Please provide a name for the MySQL database to be used by ${pkg}.
 
 Template: dbconfig-common/mysql/app-user
 Type: string
-_Description: What mysql username should ${pkg} use?
- Please provide a mysql username for ${pkg} to register with the
- database server.  A mysql user is not necessarily the same as a
+_Description: MySQL username for ${pkg}:
+ Please provide a MySQL username for ${pkg} to register with the
+ database server.  A MySQL user is not necessarily the same as a
  system login, especially if the database is on a remote server.
  .
  This is the user which will own the database, tables and other
@@ -202,42 +205,40 @@
 
 Template: dbconfig-common/mysql/app-pass
 Type: password
-_Description: What mysql password should ${pkg} use?
+_Description: MySQL application password for ${pkg}:
  Please provide a password for ${pkg} to register with the
  database server.  This may be left blank if no password is required.
 
 Template: dbconfig-common/mysql/app-pass2
 Type: password
-_Description: Please re-enter the password
- Please re-enter the password.
+_Description: Password confirmation:
 
 Template: dbconfig-common/mysql/admin-user
 Type: string
 Default: root
-_Description: What is the name of your database's administrative user?
+_Description: Name of your database's administrative user:
  What is the name of the account with which this package should perform
  administrative actions?  This user is the one which is able to create
- new database users.  
+ new database users.
  .
- For mysql, this is almost always "root".  Note that this is NOT the
+ For MySQL, this is almost always "root".  Note that this is NOT the
  same as the UNIX login 'root'.
 
 Template: dbconfig-common/mysql/admin-pass
 Type: password
-_Description: What is the password of your database's administrative user?
+_Description: Password of your database's administrative user:
  What is the password for the administrative account with which this
- package should create its mysql database and user?
+ package should create its MySQL database and user?
 
 Template: dbconfig-common/mysql/admin-pass2
 Type: password
-_Description: Please re-enter the administrative password
- Please re-enter the administrative password.
+_Description: Password confirmation:
 
 Template: dbconfig-common/pgsql/method
 Type: select
 Choices: unix socket, tcp/ip, tcp/ip + ssl
 Default: unix socket
-_Description: How should ${pkg} connect to its PostgreSQL database?
+_Description: Connection method for PostgreSQL database of ${pkg}:
  By default, ${pkg} will be configured to use a PostgreSQL server
  through a local unix socket (this provides the best performance).
  however, if you would like to connect with a different method, or to a
@@ -246,36 +247,36 @@
 Template: dbconfig-common/pgsql/host
 Type: select
 Choices: ${hosts}
-_Description: what host is running the PostgreSQL server for ${pkg}?
+_Description: Host name of the PostgreSQL database server for ${pkg}:
  Please select the remote hostname to use, or select "new host" to
  enter a new host.
 
 Template: dbconfig-common/pgsql/port
 Type: string
-_Description: On what port is the postgresql service running?
+_Description: Port number for the PostgreSQL service:
  If the postgresql database on the remote host is running on a
  non-standard port, this is your oppurtunity to specify what it is.
  To use the default port, leave this field blank.
 
 Template: dbconfig-common/pgsql/newhost
 Type: string
-_Description: what host is running the PostgreSQL server for ${pkg}?
+_Description: Host running the PostgreSQL server for ${pkg}:
  Please provide the hostname of remote PostgreSQL server.
  .
  Note: you must have already arranged for the adminstrative
  account to be able to remotely create databases and grant
- privileges.  
+ privileges.
 
 Template: dbconfig-common/pgsql/dbname
 Type: string
 Default: ${pkg}
-_Description: What should be the PostgreSQL database name for ${pkg}?
+_Description: PostgreSQL database name for ${pkg}:
  Please provide a name for the PostgreSQL database to be used by ${pkg}.
 
 Template: dbconfig-common/pgsql/app-user
 Type: string
 Default: ${pkg}
-_Description: What PostgreSQL username should ${pkg} use?
+_Description: PostgreSQL username for ${pkg}:
  Please provide a username for ${pkg} to register with the
  database server.  A PostgreSQL user is not necessarily the same as a
  system login, especially if the database is on a remote server.
@@ -287,27 +288,26 @@
 
 Template: dbconfig-common/pgsql/app-pass
 Type: password
-_Description: What PostgreSQL password should ${pkg} use?
+_Description: PostgreSQL application password for ${pkg}:
  Please provide a password for ${pkg} to register with the
  database server.  PostgreSQL access may need to be reconfigured
  to allow password-authenticated access.
 
 Template: dbconfig-common/pgsql/app-pass2
 Type: password
-_Description: Please re-enter the password
- Please re-enter the password.
+_Description: Password confirmation:
 
 Template: dbconfig-common/pgsql/admin-user
 Type: string
 Default: postgres
-_Description: What is the name of your database's administrative user?
+_Description: Name of your database's administrative user:
  What is the name of the account with which this package should perform
  administrative actions?  This user is the one which is able to create
- new database users.  
+ new database users.
 
 Template: dbconfig-common/pgsql/admin-pass
 Type: password
-_Description: What is the password of your database's administrative user?
+_Description: Password of your database's administrative user:
  What is the password for the account with which this package should perform
  administrative actions?  (For a normal Debian PostgreSQL installation,
  a database password is not required, since authentication is done at the
@@ -315,14 +315,13 @@
 
 Template: dbconfig-common/pgsql/admin-pass2
 Type: password
-_Description: Please re-enter the administrative password
- Please re-enter the administrative password.
+_Description: Password confirmation:
 
 Template: dbconfig-common/pgsql/authmethod-admin
 Type: select
 Choices: ident, password
 Default: ident
-_Description: How should the PostgreSQL admin authenticate to the server?
+_Description: Method for authenticating PostgreSQL administrator:
  PostgreSQL servers provide several different mechanisms for authenticating
  connections.  Please select what method the administrative user should use
  when connecting to the server.
@@ -331,7 +330,7 @@
  server will check that the owner of the unix socket is allowed to connect.
  .
  With "ident" authentication to remote hosts, RFC 1413 based ident is
- used (note this can be considered a security risk).  
+ used (note this can be considered a security risk).
  .
  With "password" authentication, a password will be passed to the server
  for use with some authentication backend (such as "md5" or "pam").  Note
@@ -339,13 +338,13 @@
  connections if your connection is not configured to use SSL.
  .
  For a default debian PostgreSQL installation running on the same host,
- you probably want "ident". 
+ you probably want "ident".
 
 Template: dbconfig-common/pgsql/authmethod-user
 Type: select
 Choices: ident, password
 Default: ident
-_Description: How should the PostgreSQL user authenticate to the server?
+_Description: Method for authenticating PostgreSQL user:
  PostgreSQL servers provide several different mechanisms for authenticating
  connections.  Please select what method the database user should use
  when connecting to the server.
@@ -354,7 +353,7 @@
  server will check that the owner of the unix socket is allowed to connect.
  .
  With "ident" authentication to remote hosts, RFC 1413 based ident is
- used (note this can be considered a security risk).  
+ used (note this can be considered a security risk).
  .
  With "password" authentication, a password will be passed to the server
  for use with some authentication backend (such as "md5" or "pam").  Note
@@ -362,7 +361,7 @@
  connections if your connection is not configured to use SSL.
  .
  For a default debian PostgreSQL installation running on the same host,
- you probably want "ident". 
+ you probably want "ident".
 
 Template: dbconfig-common/pgsql/changeconf
 Type: boolean
@@ -371,8 +370,7 @@
  To enable bootstrapping the PostgreSQL database for ${pkg}, the
  configuration of PostgreSQL has to be changed.  It is suggested that
  this is done by dbconfig-common when your package is
- installed.  If you answer here with "No" make sure you read
- /usr/share/doc/${pkg}/README.Debian.
+ installed.
 
 Template: dbconfig-common/pgsql/manualconf
 Type: note