[Dbconfig-common-changes] [dbconfig-common] r253 - in branches/sqlite: . debian debian/po dpkg examples/db-test-pgsql-2.0/debian internal

Sun Jun 11 05:06:32 CEST 2006

Author: mattb-guest
Date: 2006-06-11 03:06:00 +0000 (Sun, 11 Jun 2006)
New Revision: 253

Modified:
   branches/sqlite/TODO
   branches/sqlite/debian/changelog
   branches/sqlite/debian/dbconfig-common.templates
   branches/sqlite/debian/po/ca.po
   branches/sqlite/debian/po/cs.po
   branches/sqlite/debian/po/da.po
   branches/sqlite/debian/po/de.po
   branches/sqlite/debian/po/es.po
   branches/sqlite/debian/po/eu.po
   branches/sqlite/debian/po/fr.po
   branches/sqlite/debian/po/it.po
   branches/sqlite/debian/po/nl.po
   branches/sqlite/debian/po/pt.po
   branches/sqlite/debian/po/pt_BR.po
   branches/sqlite/debian/po/sv.po
   branches/sqlite/debian/po/templates.pot
   branches/sqlite/debian/po/vi.po
   branches/sqlite/dpkg/common
   branches/sqlite/dpkg/config
   branches/sqlite/dpkg/postinst
   branches/sqlite/dpkg/postrm
   branches/sqlite/dpkg/prerm
   branches/sqlite/examples/db-test-pgsql-2.0/debian/config
   branches/sqlite/internal/mysql
   branches/sqlite/internal/pgsql
Log:
Merge changes from trunk (r232:252) into the SQLite branch.



Modified: branches/sqlite/TODO
===================================================================

--- branches/sqlite/TODO	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/TODO	2006-06-11 03:06:00 UTC (rev 253)
@@ -2,15 +2,12 @@
   example, if a something goes wrong and the user selects "retry", they
   should get all questions in case they needed to change something that
   they missed.
-- provide a way for pgsql dbapp maintainers to specify whether their
-  package should default to using a specific (and pre-created) unix
-  id, or whether it should use a "password" database account
-- related to the above, a way to automatically detect which will work
-  would be nice.
-- the code could use a major cleanup.  much of it was written before
-  i new of the wonder of "local" in shell functions, and there are a
-  lot of global variables that could/should be removed in favor of 
-  something else.
+- the code is "in the process of" getting a cleanup.  there are still a
+  few globally scoped variables that ought to be removed and/or replaced
+  by local scoped variables.
+- testing various corner cases:
+  - errors dumping during upgrade
+  - errors dumping during purge
 
 further ahead:
 

Modified: branches/sqlite/debian/changelog
===================================================================
--- branches/sqlite/debian/changelog	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/changelog	2006-06-11 03:06:00 UTC (rev 253)
@@ -1,21 +1,57 @@
-dbconfig-common (1.8.14) UNRELEASED; urgency=low
+dbconfig-common (1.8.16.1) UNRELEASED; urgency=low
 
+  * NOT RELEASED YET
+
+ -- sean finney <seanius at debian.org>  Fri, 09 Jun 2006 02:35:46 +0200
+
+dbconfig-common (1.8.16) unstable; urgency=low
+
+  * when determining the local user as which to interact with postgres,
+    additionally check that the account exists before attempting to
+    su/chown stuff to it.  this should make postgres work "out of the box"
+    for both applications that use a system account and those that don't.
+    thanks to stephen gran for the suggestion.  closes: #368854
+  * updated the pgsql password prommpt question to mention this.
+  * when reconfiguring a package, change the "install with dbconfig-common?"
+    question to "reinstall with dbconfig-common?", and default to false.
+    this should make dbconfig-common packages' maintainer scripts idempotent,
+    which could otherwise be considered a policy bug.
+  * bugfix in sql dumping logic (upgrades and purges) for both mysql
+    and pgsql.
+
+ -- sean finney <seanius at debian.org>  Fri, 09 Jun 2006 02:31:09 +0200
+
+dbconfig-common (1.8.15) unstable; urgency=low
+
   [sean finney]
+  * Michael Ablassmeier noticed the the various upgrade files were
+    not being applied in "version" sorted order (and were instead in
+    "sort -n" sorted order).  fixed with an O(n^2) chunk of code that
+    would make any computer scientist cry, if only it were used for
+    sorting more than a small number of files :) closes: #370252.
+
+ -- sean finney <seanius at debian.org>  Sun, 04 Jun 2006 19:03:00 +0200
+
+dbconfig-common (1.8.14) unstable; urgency=low
+
+  [sean finney]
   * provide a new hint option dbc_sql_substitutions, which will pipe
     all provided sql files through the template-based substitution
     filter of dbconfig-generate-include before being processed 
     (closes: #366761).
   * andrew mcmillan found a spelling error, so i ran aspell over all
     the documentation :)
-  * provide a new hint option dbc_default_authmethod_user for the packager
+  * provide a new hint option dbc_authmethod_user for the packager
     to provide the "sane default" for how the application's database
     user should authenticate for pgsql applications (closes: #368219).
+    we'll soon provide a better (automagic) detection, but it shouldn't
+    break things if you start using this feature before then.
   * extra sanity check for a glob that might not expand in some circumstances,
     from matt brown (closes: #368714).
   * more code consolidation, configfile-vs-debconf fixes, removal of some
     obsolete code/templates.
 
- -- sean finney <seanius at debian.org>  Wed, 24 May 2006 18:21:06 +0200
+ -- sean finney <seanius at debian.org>  Tue, 30 May 2006 23:15:35 +0200
 
 dbconfig-common (1.8.13) unstable; urgency=low
 

Modified: branches/sqlite/debian/dbconfig-common.templates
===================================================================
--- branches/sqlite/debian/dbconfig-common.templates	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/dbconfig-common.templates	2006-06-11 03:06:00 UTC (rev 253)
@@ -31,6 +31,17 @@
  .
  Otherwise, you should probably choose this option.
 
+Template: dbconfig-common/dbconfig-reinstall
+Type: boolean
+Default: false
+_Description: Re-install database for ${pkg}?
+ Since you are reconfiguring ${pkg}, you may also want to reinstall the
+ database which it uses.
+ .
+ If you wish to re-install the database for ${pkg}, you should select
+ this option.  If you do not wish to do so (if you are reconfiguring
+ the package for unrelated reasons), you should not select this option.
+
 Template: dbconfig-common/dbconfig-upgrade
 Type: boolean
 Default: true
@@ -278,8 +289,10 @@
 _Description: PostgreSQL application password for ${pkg}:
  Please provide a password for ${pkg} to register with the database
  server.  If left blank, a random password will be generated for you.
- PostgreSQL access may need to be reconfigured to allow
- password-authenticated access.
+ . 
+ If you are using "ident" based authentication, the supplied password will
+ not be used and can be left blank.  Otherwise, PostgreSQL access may
+ need to be reconfigured to allow password-authenticated access.
 
 Template: dbconfig-common/pgsql/admin-user
 Type: string

Modified: branches/sqlite/debian/po/ca.po
===================================================================
--- branches/sqlite/debian/po/ca.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/ca.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: dbconfigcommon1.8.6\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2005-10-19 22:16+0200\n"
 "Last-Translator: Miguel Gea Milvaques\n"
 "Language-Team:  <ca at li.org>\n"
@@ -113,12 +113,45 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr ""
+"S'ha produÃ¯t un error a l'instalÂ·lar la base de dades per ${pkg}. Voleu "
+"reintentar-ho?"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"Com que esteu esborrant ${pkg}, Ã©s possible que ja no vulgueu la base de "
+"dades subjacent que ha estat configurada per fer-ne Ãºs."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Si no necessitareu les dades emmagatzemades per ${pkg}, haurÃeu d'escollir "
+"aquesta opciÃ³.  Si voleu mantenir aquesta informaciÃ³ per un altra vegada, o "
+"si voldreu gestionar aquest procÃ©s manualment, rebutgeu aquesta opciÃ³."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "Voleu actualitzar la base de dades del ${pkg} amb dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -131,7 +164,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -145,13 +178,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Voleu desconfigurar la base de dades de ${pkg} amb dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -161,7 +194,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Si voleu, el dbconfig-common pot encarregar-se del procÃ©s d'esborrar la base "
@@ -169,7 +202,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -180,19 +213,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "En altre cas, escolliu aquesta opciÃ³."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Tipus de base de dades que utilitzarÃ  ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -202,13 +235,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Voleu purgar  la base de dades de ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -218,7 +251,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -230,13 +263,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr "Voleu fer una cÃ²pia de la base de dades de ${pkg} abans d'actualitzar?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -250,25 +283,25 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "Confirmeu la contrasenya:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "Les contrasenyes no coincideixen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Les contrasenyes que heu introduÃ¯t no coincideixen. Torneu a provar."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "S'ha produÃ¯t un error al actualitzar la base de dades d ${pkg}. Voleu "
@@ -276,7 +309,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -286,7 +319,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -296,19 +329,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "S'ha produÃ¯t un error a l'instalÂ·lar la base de dades per ${pkg}. Voleu "
@@ -316,7 +349,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -326,7 +359,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -349,19 +382,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "S'ha produÃ¯t un error esborrant la base de dades de ${pkg}. Voleu reintentar-"
@@ -369,13 +402,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "S'ha produÃ¯t un error metre s'esborrava la base de dades."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -393,13 +426,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -419,7 +452,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr ""
 "IntroduÃ¯u el nom del ordinador que executa el servidor de base de dades "
@@ -427,7 +460,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -437,13 +470,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "IntroduÃ¯u el nÃºmero de port del servei ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -455,7 +488,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 "IntroduÃ¯u el nom del ordinador que executa el servidor de ${dbvendor} pel "
@@ -463,13 +496,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "IntroduÃ¯u el nom del servidor remot de ${dbvendor}."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -479,13 +512,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "IntroduÃ¯u el nom de la base de dades ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -493,13 +526,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "IntroduÃ¯u el nom d 'usuari ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -512,7 +545,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -524,14 +557,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "IntroduÃ¯u el nom d 'usuari ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -541,14 +574,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "IntroduÃ¯u el nom de la base de dades ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -556,20 +589,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "IntroduÃ¯u el nom de la base de dades ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -577,7 +610,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -585,13 +618,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "MÃ¨tode de connexiÃ³ per la base de dades MySQL del ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -605,23 +638,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "IntroduÃ¯u la contrasenya de l'aplicaciÃ³ MySQL per ${pkg}:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"IntroduÃ¯u una contrasenya per ${pkg} per registrar amb el servidor de base "
-"de dades. Si ho deixeu en blanc, es generarÃ  una contrasenya aleatÃ²ria."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -631,7 +654,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -641,31 +664,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "MÃ¨tode de connexiÃ³ per la base de dades PostgreSQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -679,18 +702,29 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "IntroduÃ¯u la contrasenya de l'aplicaciÃ³ PostgreSQL per ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
+"IntroduÃ¯u una contrasenya per ${pkg} per registrar amb el servidor de base "
+"de dades. Si ho deixeu en blanc, es generarÃ  una contrasenya aleatÃ²ria."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
 "IntroduÃ¯u una contrasenya per ${pkg} per registrar amb el servidor de la "
 "base de dades. Si o deixeu en blanc, es generarÃ  una contressenya aleatÃ²ria "
 "per vosaltres. Pot ser que necessiteu reconfigurar l'accÃ©s a PostgreSQL per "
@@ -698,13 +732,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "IntroduÃ¯u l'usuari administrador de la vostra base de dades:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -716,13 +750,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "IntroduÃ¯u la contrasenya del usuari administrador de la base de dades:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -736,13 +770,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'administrador PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -754,25 +788,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'usuari PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -784,7 +818,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -794,7 +828,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -805,7 +839,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -819,7 +853,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -829,13 +863,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Voleu escollir un mÃ¨tode diferent de connexiÃ³ a PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -847,7 +881,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -861,13 +895,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Voleu canviar la configuraciÃ³ de PostgreSQL automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -884,13 +918,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Voleu desfer la configuraciÃ³ de PostgreSQL automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -910,19 +944,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Canvieu el /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -934,19 +968,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL no suporta contrassenyes buides."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common intentarÃ  carregar els parÃ metres existents"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/cs.po
===================================================================
--- branches/sqlite/debian/po/cs.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/cs.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2006-05-06 18:25+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -106,12 +106,43 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr "Chyba pÅ™i instalaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"ProtoÅ¾e odstraÅˆujete balÃk ${pkg}, je moÅ¾nÃ©, Å¾e jiÅ¾ nepotÅ™ebujete databÃ¡zi, "
+"kterou pouÅ¾Ãval pro uloÅ¾enÃ svÃ½ch dat."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"JestliÅ¾e jiÅ¾ nepotÅ™ebujete data uloÅ¾enÃ¡ balÃkem ${pkg}, mÅ¯Å¾ete tuto moÅ¾nost "
+"vybrat. Chcete-li data uchovat pro pÅ™ÃÅ¡tÄ›, nebo pokud byste se radÄ›ji o "
+"odstranÄ›nÃ postarali ruÄnÄ›, moÅ¾nost zamÃtnÄ›te."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "ProvÃ©st aktualizaci databÃ¡ze pro ${pkg} pomocÃ dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -122,7 +153,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -136,13 +167,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Odstranit databÃ¡zi pro ${pkg} pomocÃ dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -152,13 +183,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr "Pokud chcete, mÅ¯Å¾ete databÃ¡zi odstranit pomocÃ dbconfig-common."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -168,19 +199,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "V opaÄnÃ©m pÅ™ÃpadÄ› byste mÄ›li tuto moÅ¾nost vybrat."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Typ databÃ¡ze, kterÃ½ mÃ¡ ${pkg} pouÅ¾Ãt:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -190,13 +221,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Chcete smazat databÃ¡zi balÃku ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -205,7 +236,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -217,13 +248,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr "Chcete pÅ™ed aktualizacÃ zazÃ¡lohovat databÃ¡zi balÃku ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -237,31 +268,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "PotvrzenÃ hesla:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "Hesla nesouhlasÃ."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "ZadanÃ¡ hesla nesouhlasÃ. Zkuste to znovu."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i aktualizaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -271,7 +302,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -281,25 +312,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr "opakovat (pÅ™eskoÄit otÃ¡zky)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr "ignorovat"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i instalaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -309,7 +340,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -333,31 +364,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr "pÅ™eruÅ¡it"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr "opakovat"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i odstranÄ›nÃ databÃ¡ze ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "ZdÃ¡ se, Å¾e se pÅ™i odstraÅˆovÃ¡nÃ databÃ¡ze objevila chyba."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -374,13 +405,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -400,13 +431,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "JmÃ©no poÄÃtaÄe databÃ¡zovÃ©ho serveru ${dbvendor} pro balÃk ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -416,13 +447,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "ÄŒÃslo portu pro sluÅ¾bu ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -434,19 +465,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "PoÄÃtaÄ, na kterÃ©m bÄ›Å¾Ã ${dbvendor} server pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "Zadejte prosÃm jmÃ©no vzdÃ¡lenÃ©ho ${dbvendor} serveru."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -456,26 +487,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "JmÃ©no ${dbvendor} databÃ¡ze pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr "Zadejte jmÃ©no ${dbvendor} databÃ¡ze, kterÃ© bude ${pkg} pouÅ¾Ãvat."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no v ${dbvendor} pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -488,7 +519,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -500,14 +531,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no v ${dbvendor} pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -516,14 +547,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "JmÃ©no ${dbvendor} databÃ¡ze pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -531,20 +562,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "JmÃ©no ${dbvendor} databÃ¡ze pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -552,7 +583,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -560,13 +591,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "ZpÅ¯sob pÅ™ipojenÃ k MySQL databÃ¡zi pro balÃk ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -580,23 +611,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "AplikaÄnÃ MySQL heslo pro balÃk ${pkg}:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Zadejte heslo pro balÃk ${pkg}, kterÃ© se zaregistruje s databÃ¡zovÃ½m "
-"serverem. PonechÃ¡te-li pole prÃ¡zdnÃ©, bude vytvoÅ™eno nÃ¡hodnÃ© heslo."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -606,7 +627,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -616,31 +637,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr "unixovÃ½ socket"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "ZpÅ¯sob pÅ™ipojenÃ k PostgreSQL databÃ¡zi pro balÃk ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -654,31 +675,42 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "AplikaÄnÃ PostgreSQL heslo pro balÃk ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
 "Zadejte heslo pro balÃk ${pkg}, kterÃ© se zaregistruje s databÃ¡zovÃ½m "
+"serverem. PonechÃ¡te-li pole prÃ¡zdnÃ©, bude vytvoÅ™eno nÃ¡hodnÃ© heslo."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
+"Zadejte heslo pro balÃk ${pkg}, kterÃ© se zaregistruje s databÃ¡zovÃ½m "
 "serverem. PonechÃ¡te-li pole prÃ¡zdnÃ©, vygeneruje se nÃ¡hodnÃ© heslo. MoÅ¾nÃ¡ bude "
 "potÅ™eba upravit pÅ™Ãstup k PostgreSQL tak, aby umoÅ¾Åˆoval autentizaci heslem."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "JmÃ©no administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -689,13 +721,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Heslo administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -708,13 +740,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "ZpÅ¯sob autentizace administrÃ¡tora PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -726,25 +758,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr "password"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "ZpÅ¯sob autentizace uÅ¾ivatele PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -756,7 +788,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -766,7 +798,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -776,7 +808,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -789,7 +821,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -799,13 +831,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Zvolit jinÃ½ zpÅ¯sob pÅ™ipojenÃ k PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -816,7 +848,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -829,13 +861,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "ZmÄ›nit nastavenÃ PostgreSQL automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -852,13 +884,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "VrÃ¡tit nastavenÃ PostgreSQL automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -878,19 +910,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Upravte prosÃm /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -902,19 +934,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL nepodporuje prÃ¡zdnÃ¡ hesla."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common se pokusÃ nahrÃ¡t stÃ¡vajÃcÃ nastavenÃ"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/da.po
===================================================================
--- branches/sqlite/debian/po/da.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/da.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2005-12-16 12:49+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h at image.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -108,12 +108,44 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr "Fejl under installationen af ${pkg}'s database. Forsøg igen?"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"Da du er ved at afinstallere ${pkg}, er det muligt at du ikke længere har "
+"brug for den underliggende database, som den har klargjort og brugt."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Hvis du ikke længere har brug for de data, der opbevares af ${pkg}, bør du "
+"vælge denne valgmulighed. Hvis du vil beholde disse data til en anden gang, "
+"eller hvis du hellere vil håndtere denne proces selv, skal du afvise denne "
+"valgmulighed."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "Gennemfør opgradering af databasen for ${pkg} med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -125,7 +157,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -139,13 +171,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Afkonfigurér ${pkg}s database med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -155,13 +187,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr "Hvis du vil have det, kan dbconfig-common fjerne databasen for dig."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -171,19 +203,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "Ellers bør du vælge denne valgmulighed."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Databasetype, der skal bruges af ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -193,13 +225,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Ønsker du at slette databasen for ${pkg} helt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -209,7 +241,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -222,13 +254,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr "Ønsker du at sikkerhedskopiere ${pkg}'s database før du opgraderer?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -242,31 +274,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "Bekræft adgangskode:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "Adgangskoder var ikke ens."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Du adgangskoder, du angav, var ikke ens. Prøv igen."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Fejl under opgradering af ${pkg}'s database. Forøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -276,7 +308,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -286,25 +318,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr "prøv igen (spring over spørgsmål)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr "ignorér"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Fejl under installationen af ${pkg}'s database. Forsøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -314,7 +346,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -338,31 +370,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr "afbryd"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr "prøv igen"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Fejl under afinstallation af ${pkg}'s database. Forsøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "Der lader til at være opstået en fejl under fjernelse af databasen."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -379,13 +411,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -405,13 +437,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Værtsnavn for ${pkg}s ${dbvendor}-databaseserver:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -421,13 +453,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "${dbvendor}-servicens portnummer:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -439,19 +471,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Værten, der kører ${dbvendor}-serveren for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "Angiv værtsnavnet på den fjern ${dbvendor}-server."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -461,26 +493,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor}-databasenavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr "Angiv navnet på den ${dbvendor}-database, der skal bruges af ${pkg}."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor}-brugernavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -492,7 +524,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -504,14 +536,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "${dbvendor}-brugernavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -520,14 +552,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "${dbvendor}-databasenavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -535,20 +567,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "${dbvendor}-databasenavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -556,7 +588,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -564,13 +596,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Forbindelsesmetode for ${pkg}s MySQL-database:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -584,24 +616,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL-programadgangskode for ${pkg}:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Angiv en adgangskode, som ${pkg} kan registrere sig som på databaseserveren. "
-"Hvis du lader feltet stå tomt, vil det blive lavet en tilfældig adgangskode "
-"for dig."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -611,7 +632,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -621,31 +642,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr "unix-sokkel"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Forbindelsesmetode for ${pkg}s PostgreSQL-database:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -659,18 +680,30 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL-programadgangskode for ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
+"Angiv en adgangskode, som ${pkg} kan registrere sig som på databaseserveren. "
+"Hvis du lader feltet stå tomt, vil det blive lavet en tilfældig adgangskode "
+"for dig."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
 "Angiv en adgangskode, som ${pkg} kan registrere sig med på databaseserveren. "
 "Hvis du lader den stå tom, vil der blive genereret en tilfældig adgangskode "
 "for dig. PostgreSQL-adgangen skal muligvis omkonfigureres for at tillade "
@@ -678,13 +711,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "Navnet på din databases administrationsbruger:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -695,13 +728,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Din databases administrationsbrugers adgangskode:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -715,13 +748,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Måde at autentificere PostgreSQL-administratoren på:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -733,25 +766,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr "adgangskode"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Måde at autentificere PostgreSQL-bruger på:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -763,7 +796,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -773,7 +806,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -783,7 +816,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -798,7 +831,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -808,13 +841,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Vil du vælge en anden PostgreSQL-forbindelsesmetode?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -826,7 +859,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -840,13 +873,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Ret PostgreSQL-opsætningen automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -863,13 +896,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Genskab den gamle PostgreSQL-opsætning automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -888,19 +921,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Ret venligst /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -912,19 +945,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL understøtter ikke tomme adgangskoder."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common vil forsøge at indlæse de eksisterende indstillinger"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/de.po
===================================================================
--- branches/sqlite/debian/po/de.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/de.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 0.9\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2005-04-10 20:30+0100\n"
 "Last-Translator: Andreas Tille <tille at debian.org>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -110,12 +110,44 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr "Fehler bei der Installation der Datenbank für ${pkg}.  Wiederholen?"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"Da das Paket ${pkg} entfernt werden soll, ist es möglich, dass die benutzte "
+"Datenbank nicht mehr benötigt wird."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Falls es keine Verwendung mehr für die durch ${pkg} gespeicherten Daten "
+"geben sollte, wählen Sie diese Option.  Wenn die Daten für spätere "
+"Verwendung aufgehoben werden sollen oder dieser Prozess manuell durchgeführt "
+"werden soll, lehnen Sie diese Option ab."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "Aktualisieren der Datenbank für ${pkg} mit dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -128,7 +160,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -143,13 +175,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Dekonfigurieren der Datenbank für ${pkg} mit dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -159,7 +191,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Falls gewünscht, kann das Löschen der Datenbank mit Hilfe von dbconfig-"
@@ -167,7 +199,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -177,19 +209,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "Andernfalls sollte diese Option gewählt werden."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Datenbanktyp, der durch das Paket ${pkg} benutzt werden soll:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -200,13 +232,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Soll die Datenbank für ${pkg} vollkommen entfernt werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -216,7 +248,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -229,7 +261,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "Soll ein Backup der Datenbank für ${pkg} vor der Aktualisierung durchgeführt "
@@ -237,7 +269,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -252,19 +284,19 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "Passwort Bestätigung:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "Die eingegebenen Passwörter stimmen nicht überein. Bitte versuchen Sie es "
@@ -272,13 +304,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Fehler beim Aktualisieren der Datenbank von ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -288,7 +320,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -298,25 +330,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Fehler bei der Installation der Datenbank für ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -326,7 +358,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -350,31 +382,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Fehler beim Löschen der Datenbank von ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "Es scheint ein Fehler beim Löschen der Datenbank aufgetreten zu sein."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -392,13 +424,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -419,13 +451,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Rechnername des ${dbvendor} Datenbankservers für ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -435,13 +467,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Portnummer für den ${dbvendor} Service:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -454,20 +486,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Computer auf dem der ${dbvendor} server für ${pkg} läuft:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Bitte geben Sie den Rechnernamen des entferneten ${dbvendor} Servers ein."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -478,13 +510,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor} Datenbankname für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -493,13 +525,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor} Nutzernamen für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -512,7 +544,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -525,14 +557,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "${dbvendor} Nutzernamen für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -543,14 +575,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "${dbvendor} Datenbankname für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -558,20 +590,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "${dbvendor} Datenbankname für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -579,7 +611,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -587,13 +619,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Verbindungsmethode an die MySQL Datenbank von ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -608,24 +640,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL Anwendungspasswort für ${pkg}:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Bitte geben Sie ein Passwort ein, mit dem sich ${pkg} beim Datenbankserver "
-"anmelden kann.  Wenn Sie das Feld frei lassen, wird automatisch ein "
-"zufälliges Passwort erzeugt."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -635,7 +656,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -645,31 +666,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Verbindungsmethode für die PostgreSQL Datenbank von ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -684,32 +705,44 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL Anwendungspasswort für ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
 "Bitte geben Sie ein Passwort ein, mit dem sich ${pkg} beim Datenbankserver "
+"anmelden kann.  Wenn Sie das Feld frei lassen, wird automatisch ein "
+"zufälliges Passwort erzeugt."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
+"Bitte geben Sie ein Passwort ein, mit dem sich ${pkg} beim Datenbankserver "
 "anmelden kann.  Sollte dieses Feld freigelassen werden, so wird ein "
 "zufälliges Passwort generiert.  Um den Zugriff mit Passwort zu erlauben, "
 "kann eventuell eine Änderung der PostgreSQL Konfiguration nötig werden."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "Login-Name des Datenbank-Administrators:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -721,13 +754,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Passwort des Datenbank-Administrators:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -741,13 +774,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Authentifizierungsmethode des PostgreSQL Administrators:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -759,25 +792,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Authentifizierungsmethode des PostgreSQL Nutzers:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -789,7 +822,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -799,7 +832,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -810,7 +843,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -824,7 +857,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -834,13 +867,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Eine andere Verbindungsmethode für PostgreSQL wählen?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -852,7 +885,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -866,13 +899,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Soll die PostgreSQL Konfiguration automatisch geändert werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -890,13 +923,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Soll die PostgreSQL Konfiguration automatisch geändert werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -918,19 +951,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Bitte passen Sie die Datei /etc/postgresql/pg_hba.conf selbst an."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -942,19 +975,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL unterstützt keine leeren Passwörter."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common wird versuchen, existierende Einstellungen zu setzen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/es.po
===================================================================
--- branches/sqlite/debian/po/es.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/es.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -35,7 +35,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2005-04-01 13:03+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs at debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -131,6 +131,37 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr "Se produjo un error al instalar la base de datos para ${pkg}."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"Es posible que no desee la base de datos de que se ha configurado para "
+"${pkg} dado que lo está eliminando."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Debería escoger esta opción si no necesita más los datos almacenados por "
+"${pkg}. Debería rechazar esta opción si desea guardar los datos para otra "
+"ocasión o si prefiere realizar este proceso manualmente."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr ""
 "¿Desea realizar las actualizaciones de la base de datos de ${pkg} con "
@@ -138,7 +169,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -151,7 +182,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -166,14 +197,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr ""
 "¿Desea desconfigurar la base de datos para ${pkg} con «dbconfig-common»?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -183,7 +214,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Si lo desea, «dbconfig-common» puede gestionar la eliminación de la base de "
@@ -191,7 +222,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -201,19 +232,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "En cualquier otro caso debería seleccionar esta opción."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "El tipo de base de datos que se va a utilizar para ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -223,13 +254,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "¿Desea purgar la base de datos para ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -238,7 +269,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -250,7 +281,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "¿Desea realizar una copia de seguridad de la base de datos de ${pkg} antes "
@@ -258,7 +289,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -273,19 +304,19 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "Confirmación de contraseña:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "Las contraseñas que ha proporcionado no coinciden. Por favor, inténtelo de "
@@ -293,14 +324,14 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 #, fuzzy
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Se produjo un error al actualizar la base de datos para ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 #, fuzzy
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
@@ -310,7 +341,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -320,26 +351,26 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 #, fuzzy
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Se produjo un error al instalar la base de datos para ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 #, fuzzy
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
@@ -349,7 +380,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -364,32 +395,32 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 #, fuzzy
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Se produjo un error al eliminar la base de datos par ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "Parece que se ha producido un error al eliminar la base de datos."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 #, fuzzy
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
@@ -407,13 +438,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -426,13 +457,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Nombre del servidor de base de datos ${dbvendor} para ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -442,13 +473,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Número de puerto del servicio ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -460,13 +491,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Servidor dónde se ejecuta el servidor ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Por favor, indique el nombre del servidor que tiene el servidor remoto "
@@ -474,7 +505,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -484,13 +515,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nombre de la base de datos ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -499,13 +530,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nombre de usuario ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -518,7 +549,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -530,14 +561,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Nombre de usuario ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -548,14 +579,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "Nombre de la base de datos ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -563,20 +594,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "Nombre de la base de datos ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -584,7 +615,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -592,13 +623,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Método de conexión para la base de datos MySQL de ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -612,25 +643,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "Contraseña de aplicación MySQL para ${pkg}:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-#, fuzzy
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Por favor, indique una contraseña para que ${pkg} se registre con el "
-"servidor de base de datos. Puede dejar este campo en blanco si no es "
-"necesaria ninguna contraseña."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -640,7 +659,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -650,31 +669,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Método de conexión para la base de datos PostgreSQL de ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -688,32 +707,44 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Contraseña de aplicación PostgreSQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
 "Por favor, indique una contraseña para que ${pkg} se registre con el "
+"servidor de base de datos. Puede dejar este campo en blanco si no es "
+"necesaria ninguna contraseña."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
+"Por favor, indique una contraseña para que ${pkg} se registre con el "
 "servidor de base de datos. Puede que tenga que reconfigurar PostgreSQL para "
 "permitir acceso autenticado por contraseña."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "Nombre del usuario de administración de base de datos:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -725,13 +756,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Contraseña de su usuario de administración de la base de datos:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -745,13 +776,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Método de autenticación para el administrador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -763,25 +794,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Método de autenticación del usuario de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -793,7 +824,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -803,7 +834,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -813,7 +844,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -828,7 +859,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -838,13 +869,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -853,7 +884,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -867,13 +898,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "¿Desea modificar automáticamente la configuración de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -885,14 +916,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "¿Desea modificar automáticamente la configuración de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -905,19 +936,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor, modifique «/etc/postgresql/pg_hba.conf»"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -929,19 +960,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/eu.po
===================================================================
--- branches/sqlite/debian/po/eu.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/eu.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common-templates-eu\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2005-04-01 00:08+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <eu at li.org>\n"
@@ -111,12 +111,43 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr "Errorea ${pkg}-rentzat databasea instalatzerakoan."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"${pkg} ezabatzen ari zarenez, posible da erabilerako konfiguratu zen "
+"databasea gehiago behar ez izatea."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"${pkg}-ek gordetako datuak ez badira gehiago behar, aukera hau erabili "
+"daiteke. Datuak mantendu edo ezabaketa eskuz egin nahi izan ezkero aukera "
+"hau ezetsi ezazu."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-ren database eguneraketa dbconfig-common bidez egin?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -128,7 +159,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -142,13 +173,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-ren database ezabatzea dbconfig-common bidez egin?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -158,14 +189,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Nahi izan ezkero database ezabatzea dbconfig-common bidez kudea daiteke."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -175,19 +206,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "Bestela aukera hau erabili ezazu."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "${pkg}-ek erabiliko duen database mota:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -197,13 +228,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "${pkg}-ren databasea guztiz ezabatu nahi al duzu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -212,7 +243,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -224,14 +255,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "Eguneratu aurretik ${pkg}-ren databasearen basbeskopia egin nahi al duzu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -245,32 +276,32 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "Pasahitz berrespena:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "Pasahitzak ez dira berdinak."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Emandako pasahitzak ez dira berdinak. Saiatu berriro mesedez."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 #, fuzzy
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-ren databasea eguneratzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 #, fuzzy
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
@@ -279,7 +310,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -288,26 +319,26 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 #, fuzzy
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-rentzat databasea instalatzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 #, fuzzy
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
@@ -316,7 +347,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -331,32 +362,32 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 #, fuzzy
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-ren databasea ezabatzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "Databasea ezabatzerakoan errore bat gertatu dela dirudi."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 #, fuzzy
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
@@ -373,13 +404,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -392,13 +423,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} zerbitzariaren ostalari izena:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -408,13 +439,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "${dbvendor} zerbitzuaren ataka zenbakia:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -426,19 +457,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} zerbitzaria duen  ostalari izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "Ezarri urruneko ${dbvendor} zerbitzariaren ostalari izena."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -448,13 +479,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} database izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -462,13 +493,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} erabiltzaile izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -481,7 +512,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -493,14 +524,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} erabiltzaile izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -510,14 +541,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} database izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -525,20 +556,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} database izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -546,7 +577,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -554,13 +585,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "${pkg}-ren MySQL-rekiko konexio metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -574,24 +605,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "${pkg}-ren MySQL aplikazio pasahitza:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-#, fuzzy
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Ezarri ${pkg}-ek database zerbitzarian erregistratzeko erabiliko duen "
-"pasahitza."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -601,7 +621,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -611,31 +631,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "${pkg}-ren PostgreSQL-rekiko konexio metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -649,32 +669,43 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "${pkg}-ren PostgreSQL aplikazio pasahitza:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
+"Ezarri ${pkg}-ek database zerbitzarian erregistratzeko erabiliko duen "
+"pasahitza."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
 "Mesedez eman ${pkg}-ek database zerbitzarian erregistratzerko pasahitza.  "
 "PostgreSQL sarrera berkonfiguratu egin behar da pasahitz egiaztapen sarrera "
 "baimentzeko."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "Database kudeatzaile erabiltzaile izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -686,13 +717,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Databasearen kudeatzaile erabiltzaileran pasahitza:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -706,13 +737,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "PostgreSQL kudeatzaile egiaztapen metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -723,25 +754,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "PostgreSQL erabiltzaile egiaztapen metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -753,7 +784,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -763,7 +794,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -774,7 +805,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -788,7 +819,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -798,13 +829,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -813,7 +844,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -827,13 +858,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "PostgreSQL konfigurazioa automatikoki aldatu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -845,14 +876,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "PostgreSQL konfigurazioa automatikoki aldatu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -865,19 +896,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Mesedez /etc/postgresql/pg_hba.conf aldatu"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -889,19 +920,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/fr.po
===================================================================
--- branches/sqlite/debian/po/fr.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/fr.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2005-11-09 23:35+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -117,13 +117,46 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr ""
+"Erreur lors de l'installation de la base de données pour ${pkg}. Action "
+"suivante :"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"Comme vous supprimez ${pkg}, il est possible que vous ne vouliez plus "
+"utiliser la base de données qui lui était liée."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Si vous n'avez plus besoin des données enregistrées par ${pkg}, vous pouvez "
+"choisir cette option. Si vous souhaitez conserver ces données, ou si vous "
+"préférez gérer vous-même ce processus, vous pouvez refuser cette option."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr ""
 "Faut-il mettre à jour la base de données de ${pkg} avec dbconfig-common ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -135,7 +168,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -149,14 +182,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr ""
 "Faut-il récupérer la configuration initiale de ${pkg} avec dbconfig-common ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -166,14 +199,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Si vous le souhaitez, dbconfig-common peut supprimer la base de données."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -183,19 +216,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "Autrement, vous devriez choisir cette option."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Type de serveur de bases de données à utiliser avec ${pkg} :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -206,13 +239,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Faut-il purger la base de données de ${pkg} ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -222,7 +255,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -234,14 +267,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "Faut-il sauvegarder la base de données de ${pkg} avant la mise à jour ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -255,19 +288,19 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "Confirmation du mot de passe :"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "Les mots de passe ne correspondent pas"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "Les mots de passe que vous avez indiqués ne correspondent pas. Veuillez "
@@ -275,7 +308,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de la mise à jour de la base de données pour ${pkg}. Action "
@@ -283,7 +316,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -293,7 +326,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -303,19 +336,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr "Recommencer avec les mêmes réglages"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr "Ignorer"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de l'installation de la base de données pour ${pkg}. Action "
@@ -323,7 +356,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -333,7 +366,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -355,19 +388,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr "Abandonner"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr "Recommencer"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de la suppression de la base de données de ${pkg}. Action "
@@ -375,7 +408,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr ""
 "Une erreur semble s'être produite lors de la suppression de la base de "
@@ -383,7 +416,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -401,13 +434,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -427,13 +460,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Nom d'hôte du serveur de bases de données ${dbvendor} pour ${pkg} :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -443,13 +476,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Numéro de port pour le service ${dbvendor} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -461,19 +494,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Nom d'hôte du serveur ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "Veuillez indiquer le nom d'hôte du serveur ${dbvendor} distant."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -483,13 +516,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nom de la base de données ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -498,13 +531,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Identifiant ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -517,7 +550,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -530,14 +563,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Identifiant ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -548,14 +581,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "Nom de la base de données ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -563,20 +596,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "Nom de la base de données ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -584,7 +617,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -592,13 +625,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Méthode de connexion pour la base de données MySQL de ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -612,24 +645,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "Mot de passe de connexion MySQL pour ${pkg} :"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Veuillez indiquer un mot de passe de connexion pour ${pkg} sur le serveur de "
-"bases de données. Si vous laissez ce champ vide, un mot de passe aléatoire "
-"sera créé."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -639,7 +661,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -649,31 +671,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr "Socket UNIX"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr "TCP/IP"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr "TCP/IP + SSL"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Méthode de connexion pour la base de données PostgreSQL de ${pkg} :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -687,18 +709,30 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Mot de passe de connexion PostgreSQL pour ${pkg} :"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
+"Veuillez indiquer un mot de passe de connexion pour ${pkg} sur le serveur de "
+"bases de données. Si vous laissez ce champ vide, un mot de passe aléatoire "
+"sera créé."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
 "Veuillez indiquer un mot de passe pour ${pkg}, destiné à la connexion au "
 "serveur de base de données. Si vous laissez ce champ vide, un mot de passe "
 "aléatoire sera établi. L'accès à PostgreSQL nécessite peut-être une "
@@ -706,13 +740,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "Nom de l'administrateur de la base de données :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -724,13 +758,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Mot de passe de l'administrateur de la base de données :"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -744,13 +778,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Méthode d'authentification de l'administrateur PostgreSQL :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -762,25 +796,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr "Ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr "Mot de passe"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Méthode d'authentification pour l'utilisateur de PostgreSQL :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -792,7 +826,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -802,7 +836,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -813,7 +847,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -826,7 +860,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -836,14 +870,14 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 "Faut-il choisir une méthode différente pour la connexion à PostgreSQL ?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -855,7 +889,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -869,13 +903,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Faut-il modifier la configuration de PostgreSQL automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -892,13 +926,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Faut-il restaurer la configuration de PostgreSQL automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -918,19 +952,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Modification de /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -942,19 +976,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL n'accepte pas les mots de passe vides."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "Tentative de récupération des réglages actuels"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/it.po
===================================================================
--- branches/sqlite/debian/po/it.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/it.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.6\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2005-07-22 11:23+0200\n"
 "Last-Translator: Giuseppe Sacco <eppesuig at debian.org>\n"
 "Language-Team: italian <tp at lists.linux.it>\n"
@@ -98,12 +98,43 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr "Errore nell'installazione del database di ${pkg}. Riprovare?"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"Poiché si sta rimuovendo ${pkg}, è possibile che non si voglia neppure "
+"mantenere il database che era stato appositamente configurato."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Se non si ha più la necessità dei dati memorizzati da ${pkg} si dovrebbe "
+"accettare questa opzione. Se si vogliono mantenere i dati per un uso futuro "
+"o se si vuole gestire la cosa manualmente, si rifiuti questa opzione."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "Effettuare l'aggiornamento di ${pkg} con dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -115,7 +146,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -129,13 +160,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Eliminare la configurazione di dbconfig-common per ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -145,14 +176,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Volendo, la rimozione del database può essere gestita con dbconfig-common."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -162,19 +193,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "Altrimenti la si accetti."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Tipo di database da usare con ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -184,13 +215,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Si vuole eliminare il database di ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -200,7 +231,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -212,14 +243,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "Si vuol fare una copia del database di ${pkg} prima dell'aggiornamento?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -233,31 +264,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "Conferma della password:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "Le password non coincidono."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Le password fornite non coincidono. Riprovare."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Errore aggiornando il database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -267,7 +298,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -277,25 +308,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Errore nell'installazione del database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -304,7 +335,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -327,31 +358,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Errore eliminando il database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "C'è stato un errore durante l'eliminazione del database."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -369,13 +400,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -395,13 +426,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Nome dell'host del server ${dbvendor} per il database di ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -411,13 +442,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Numero della porta del servizio ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -429,19 +460,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Host sul quale è in esecuzione il server ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "Inserire il nome dell'host remoto che ospita il server ${dbvendor}."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -451,26 +482,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome del database ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr "Inserire il nome del database ${dbvendor} da fare usare a ${pkg}."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Utente ${dbvendor} di ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -482,7 +513,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -494,14 +525,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Utente ${dbvendor} di ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -510,14 +541,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "Nome del database ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -525,20 +556,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "Nome del database ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -546,7 +577,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -554,13 +585,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Metodo di connessione al database MySQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -574,23 +605,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "Password applicativa per MySQL per ${pkg}:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Inserire una password per registrare ${pkg} sul server di database. Lasciare "
-"il campo vuoto farà generare una password casuale."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -600,7 +621,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -610,31 +631,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Metodo di connessione al database PostgreSQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -648,18 +669,29 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Password applicativa di ${pkg} per PostgreSQL:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
+"Inserire una password per registrare ${pkg} sul server di database. Lasciare "
+"il campo vuoto farà generare una password casuale."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
 "Inserire una password che ${pkg} userà per registrarsi sul database. Se non "
 "venisse specificata allora ne verrebbe generata una casuale. Le modalità di "
 "accesso al server PostgreSQL potrebbero richiedere delle modifiche per "
@@ -667,13 +699,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "Node dell'utente amministratore del database:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -685,13 +717,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Password per l'utente amministratore del database:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -705,13 +737,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Modalità di autenticazione dell'amministratore PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -723,25 +755,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Modalità di autenticazione dell'utente PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -753,7 +785,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -763,7 +795,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -774,7 +806,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -788,7 +820,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -798,13 +830,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Scegliere un diverso metodo di connessione a PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -816,7 +848,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -830,13 +862,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Modificare la configurazione di PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -848,14 +880,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Modificare la configurazione di PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -868,19 +900,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Modificare /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -892,19 +924,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL non permette le password vuote."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common cercherà di carica le impostazioni esistenti"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/nl.po
===================================================================
--- branches/sqlite/debian/po/nl.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/nl.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2006-02-19 19:12+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -110,12 +110,45 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr ""
+"Fout bij het installeren van de ${pkg}-database. Wilt u dit nogmaals "
+"proberen?"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"Aangezien u ${pkg}aan het verwijderen bent is het mogelijk dat u de "
+"onderliggende database van dit pakket ook niet meer wilt bewaren."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Als u de door ${pkg} opgeslagen gegevens niet langer nodig heeft kunt u hier "
+"best aanvaarden. Als u de opgeslagen gegevens wilt bewaren, of als u deze "
+"procedure liefst handmatig afhandelt dient u hier te weigeren."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-database opwaarderen met dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -127,7 +160,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -142,13 +175,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-database de-configureren via dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -158,14 +191,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Wilt u dat dbconfig-common het verwijderen van de database voor u afhandelt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -175,19 +208,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "Als u dit automatisch wilt laten doen dient u hier te aanvaarden."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Welk type database dient ${pkg} te gebruiken?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -197,13 +230,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Wilt u de ${pkg}-database wissen?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -213,7 +246,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -225,7 +258,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "Wilt u dat er een reservekopie gemaakt wordt van de ${pkg}-database alvorens "
@@ -233,7 +266,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -247,19 +280,19 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "Bevestiging wachtwoord (nogmaals intikken):"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "De door u ingevoerde wachtwoorden komen niet overeen. Gelieve opnieuw te "
@@ -267,7 +300,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "Fout bij het opwaarderen van de ${pkg}-database. Wilt u dit nogmaals "
@@ -275,7 +308,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -285,7 +318,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -295,19 +328,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr "opnieuw proberen (vragen overslaan)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr "negeren"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "Fout bij het installeren van de ${pkg}-database. Wilt u dit nogmaals "
@@ -315,7 +348,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -325,7 +358,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -350,32 +383,32 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr "afbreken"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr "opnieuw proberen"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "Fout bij het verwijderen van de ${pkg}database. Wilt u dit nogmaals proberen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "Er is een fout opgetreden tijdens het verwijderen van de database."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -393,13 +426,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -421,7 +454,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr ""
 "Wat is de computernaam van de door ${pkg} te gebruiken ${dbvendor}-database-"
@@ -429,7 +462,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -439,13 +472,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Via welke poort is de te gebruiken ${dbvendor}-server te benaderen?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -457,7 +490,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 "Wat is de computernaam van de door ${pkg} te gebruiken ${dbvendor}-database-"
@@ -465,7 +498,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Gelieve hier de computernaam van de (niet-lokale) ${dbvendor}-server in te "
@@ -473,7 +506,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -483,14 +516,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr ""
 "Wat is/wordt de naam van de door ${pkg} te gebruiken ${dbvendor}-database?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -499,14 +532,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr ""
 "Met welke gebruikersnaam dient ${pkg} zich bij ${dbvendor} aan te melden?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -519,7 +552,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -532,7 +565,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr ""
@@ -540,7 +573,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -551,7 +584,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr ""
@@ -559,7 +592,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -567,13 +600,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr ""
@@ -581,7 +614,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -589,7 +622,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -597,14 +630,14 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr ""
 "Met welke methode wilt u verbinding leggen met de ${pkg}-MySQL-database?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -618,25 +651,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr ""
 "Wat is het wachtwoord waarmee ${pkg} zich bij MySQL dient aan te melden?"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Gelieve hier het wachtwoord op te geven waarmee ${pkg} zich bij de "
-"databaseserver dient te registreren. Als u dit leeg laat zal er een random "
-"wachtwoord gegenereerd worden."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -646,7 +668,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -656,32 +678,32 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr "unix socket"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr ""
 "Met welke methode wilt u verbinding leggen met de ${pkg}-PostgreSQL-database?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -695,33 +717,45 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr ""
 "Wat is het wachtwoord waarmee ${pkg} zich bij PostgreSQL dient aan te melden?"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
 "Gelieve hier het wachtwoord op te geven waarmee ${pkg} zich bij de "
 "databaseserver dient te registreren. Als u dit leeg laat zal er een random "
+"wachtwoord gegenereerd worden."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
+"Gelieve hier het wachtwoord op te geven waarmee ${pkg} zich bij de "
+"databaseserver dient te registreren. Als u dit leeg laat zal er een random "
 "wachtwoord gegenereerd worden. Het is mogelijk dat PostgreSQL nog moet "
 "ingesteld worden om wachtwoord-geauthenticeerde verbindingen toe te laten."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "Wat is de naam van de beheers-account voor uw database?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -732,13 +766,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Wat is het wachtwoord van de beheers-account voor uw database?"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -752,14 +786,14 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr ""
 "Welke authenticatiemethode wordt gebruikt door de PostgreSQL-beheerder?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -771,26 +805,26 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr "wachtwoord"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr ""
 "Welke authenticatiemethode wordt gebruikt door de PostgreSQL-gebruiker?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -803,7 +837,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -813,7 +847,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -824,7 +858,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -838,7 +872,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -848,13 +882,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Een andere PostgreSQL verbindingsmethode kiezen?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -866,7 +900,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -880,13 +914,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Wilt u dat de PostgreSQL-configuratie automatisch aangepast wordt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -904,13 +938,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Wilt u dat de PostgreSQL-configuratie automatisch teruggezet wordt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -930,19 +964,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Gelieve /etc/postgresql/pg_hba.conf aan te passen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -954,19 +988,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL ondersteunt geen lege wachtwoorden."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common zal proberen bestaande instellingen te laden"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/pt.po
===================================================================
--- branches/sqlite/debian/po/pt.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/pt.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.6\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2006-02-21 23:13+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -99,13 +99,45 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr "Erro ao instalar a base de dados para ${pkg}.  Tentar novamente?"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"JÃ¡ que estÃ¡ a remover ${pkg}, Ã© possÃvel que nÃ£o queira mais a base de dados "
+"que ficou e esteve configurada para ser utilizada."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Se jÃ¡ nÃ£o necessita dos dados que sÃ£o guardados por ${pkg}, vocÃª deve "
+"escolher esta opÃ§Ã£o.  Se deseja manter estes dados para outra utilizaÃ§Ã£o, ou "
+"se vocÃª deseja lidar com este processo manualmente, vocÃª deve recusar esta "
+"opÃ§Ã£o."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr ""
 "Fazer uma actualizaÃ§Ã£o Ã  base de dados para ${pkg} com dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -118,7 +150,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -133,13 +165,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Desconfigrar a base de dados para ${pkg} com o dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -149,7 +181,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Se vocÃª desejar, a remoÃ§Ã£o da base de dados pode ser lidada pelo dbconfig-"
@@ -157,7 +189,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -167,19 +199,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "Caso contrÃ¡rio, deve escolher esta opÃ§Ã£o."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Tipo de base de dados a ser utilizada por ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -189,13 +221,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "VocÃª quer purgar a base de dados para ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -205,7 +237,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -218,13 +250,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr "Deseja salvaguardar a base de dados para ${pkg} antes de actualizar?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -239,32 +271,32 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "ConfirmaÃ§Ã£o da password:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "As passwords nÃ£o coincidem."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "As passwords que vocÃª disponibizou nÃ£o coincidem.  Por favor tente novamente."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Erro ao actualizar a base de dados para ${pkg}.  Tentar novamente?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -274,7 +306,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -284,25 +316,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr "tentar novamente (saltar perguntas)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr "ignorar"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Erro ao instalar a base de dados para ${pkg}.  Tentar novamente?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -312,7 +344,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -336,31 +368,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr "abortar"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr "tentar novamente"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Erro ao remover a base de dados para ${pkg}.  Tentar novamente?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "Parece ter ocorrido um erro enquanto removia a base de dados."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -378,13 +410,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -405,13 +437,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Nome do host do servidor de bases de dados ${dbvendor} para ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -421,13 +453,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "NÃºmero do port que corre o serviÃ§o ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -439,13 +471,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Host que corre o servidor ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Por favor disponibilize o nome de uma mÃ¡quina remota com o servidor "
@@ -453,7 +485,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -463,13 +495,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome de base de dados ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -478,13 +510,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nome de utilizador de ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -497,7 +529,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -509,14 +541,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Nome de utilizador de ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -527,14 +559,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "Nome de base de dados ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -542,20 +574,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "Nome de base de dados ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -563,7 +595,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -571,13 +603,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "MÃ©todo de ligaÃ§Ã£o para a base de dados MySQL de ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -591,24 +623,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "Password da aplicaÃ§Ã£o MySQL para ${pkg}:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Por favor disponibilize uma password para ${pkg} registar com o servidor de "
-"bases de dados. Se for deixado vazio, serÃ¡ gerada uma password aleatÃ³ria "
-"para si."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -618,7 +639,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -628,31 +649,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr "socket unix"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "MÃ©todo de ligaÃ§Ã£o para a base de dados PostgreSQL para ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -666,18 +687,30 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Password da aplicaÃ§Ã£o PostgreSQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
+"Por favor disponibilize uma password para ${pkg} registar com o servidor de "
+"bases de dados. Se for deixado vazio, serÃ¡ gerada uma password aleatÃ³ria "
+"para si."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
 "Por favor disponibilize uma password para ${pkg} se registar com o servidor "
 "de bases de dados.  Se deixado vazio, serÃ¡ gerada uma password aleatÃ³ria "
 "para si. O acesso ao PostgreSQL pode ter de ser reconfigurado para permitir "
@@ -685,13 +718,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "Nome do utilizador administrativo da sua base de dados:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -703,13 +736,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Password do utilizador administrativo da sua base de dados:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -723,13 +756,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "MÃ©todo para autenticar o administrador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -741,25 +774,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr "password"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "MÃ©todo para autenticar o utilizador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -771,7 +804,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -781,7 +814,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -791,7 +824,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -805,7 +838,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -815,13 +848,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Escolher um mÃ©todo de ligaÃ§Ã£o de PostgreSQL diferente?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -833,7 +866,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -846,13 +879,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Alterar a configuraÃ§Ã£o de PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -870,13 +903,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Reverter automaticamente a configuraÃ§Ã£o de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -896,19 +929,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor altere /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -920,19 +953,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr "O PostgreSQL nÃ£o suporta passwords vazias."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "o dbconfig-common irÃ¡ tentar carregar as definiÃ§Ãµes existentes"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/pt_BR.po
===================================================================
--- branches/sqlite/debian/po/pt_BR.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/pt_BR.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.5.1\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2005-04-13 18:51-0300\n"
 "Last-Translator: Gustavo Noronha Silva <kov at debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
@@ -110,12 +110,44 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr "Erro instalando base de dados para o pacote ${pkg}."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"Já que você está removendo o pacote ${pkg} é possível que você não queira "
+"mais a base de dados que foi configurada para que ele usasse."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Se você não precisa mais dos dados sendo guardados para o pacote ${pkg}, "
+"você deve escolher essa opção. Se você quer manter esses dados para mais "
+"algum tempo ou se quiser lidar com o processo manualmente, não escolha essa "
+"opção."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "Atualizar a base de dados do ${pkg} com o dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -127,7 +159,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -141,13 +173,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Desconfigurar a base de dados para ${pkg} com dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -157,7 +189,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Se você quiser, a remoção da base de dados pode ser feita pelo dbconfig-"
@@ -165,7 +197,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -175,19 +207,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "Se não, escolha essa opção."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Banco de dados usado pelo pacote ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -198,13 +230,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Você quer apagar a base de dados para ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -214,7 +246,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -227,7 +259,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "Você quer fazer uma cópia de segurança da base de dados do pacote ${pkg} "
@@ -235,7 +267,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -250,32 +282,32 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "Confirmação de senha:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "As senhas não batem."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "As senhas que você forneceu não batem. Por favor, tente de novo."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 #, fuzzy
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Erro atualizando base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 #, fuzzy
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
@@ -284,7 +316,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -294,26 +326,26 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 #, fuzzy
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Erro instalando base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 #, fuzzy
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
@@ -322,7 +354,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -337,32 +369,32 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 #, fuzzy
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Erro removendo base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "Um erro parece ter acontecido ao remover a base de dados."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 #, fuzzy
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
@@ -380,13 +412,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -399,13 +431,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Nome do host do servidor de banco ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -415,13 +447,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Número de porta para o serviço ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -433,19 +465,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Host que roda o servidor ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "Por favor forneça o nome do host de um servidor ${dbvendor} remoto."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -455,13 +487,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome da base de dados ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -470,13 +502,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nome de usuário ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -489,7 +521,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -501,14 +533,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Nome de usuário ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -519,14 +551,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "Nome da base de dados ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -534,20 +566,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "Nome da base de dados ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -555,7 +587,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -563,13 +595,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Método de conexão para a base de dados MySQL do pacote ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -583,24 +615,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "Senha MySQL da aplicação para o pacote ${pkg}:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-#, fuzzy
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Por favor forneça uma senha para o pacote ${pkg} registrar com o servidor de "
-"banco de dados. Pode ser deixada em branco se não for necessária senha."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -610,7 +631,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -620,31 +641,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Método de conexão para a base de dados PostgreSQL do pacote ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -658,32 +679,43 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Senha da aplicação PostgreSQL para o pacote ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
+"Por favor forneça uma senha para o pacote ${pkg} registrar com o servidor de "
+"banco de dados. Pode ser deixada em branco se não for necessária senha."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
 "Por favor forneça uma senha para que o pacote ${pkg} registre com o servidor "
 "de base de dados. O acesso ao PostgreSQL pode precisar ser configurado para "
 "permitir acesso baseado em autenticação por senha."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "Nome do usuário administrativo do banco de dados:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -694,13 +726,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Senha do usuário administrativo do banco de dados:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -713,13 +745,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Método para autenticar o administrador do PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -731,25 +763,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Método para autenticar o usuário PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -761,7 +793,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -771,7 +803,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -781,7 +813,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -795,7 +827,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -805,13 +837,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -820,7 +852,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -835,13 +867,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Mudar a configuração do PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -853,14 +885,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Mudar a configuração do PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -873,19 +905,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor modifique o /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -897,19 +929,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/sv.po
===================================================================
--- branches/sqlite/debian/po/sv.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/sv.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.8.5\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: 2005-12-01 22:10+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -101,12 +101,43 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr "Fel vid installation av databas fÃ¶r ${pkg}. FÃ¶rsÃ¶ka igen?"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"Eftersom du tar bort ${pkg} Ã¤r det mÃ¶jligt att du inte lÃ¤ngre vill ha kvar "
+"den underliggande databasen som Ã¤r konfigurerad att anvÃ¤ndas av den."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Om du inte lÃ¤ngre har behov av datat som lagrats av ${pkg} bÃ¶r du vÃ¤lja "
+"denna Ã¥tgÃ¤rd. Om du vill behÃ¥lla datat till en annan gÃ¥ng eller om du hellre "
+"vill hantera denna process manuellt, bÃ¶r du vÃ¤gra Ã¥tgÃ¤rden."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "GenomfÃ¶ra uppgradering av databasen fÃ¶r ${pkg} med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -118,7 +149,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -132,13 +163,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Avkonfigurera databasen fÃ¶r ${pkg} med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -148,14 +179,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Om du vill kan borttagningen av databasen hanteras med dbconfig-common."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -165,19 +196,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "Om inte, bÃ¶r du vÃ¤lja denna Ã¥tgÃ¤rd."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Databastyp att anvÃ¤nda fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -187,13 +218,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Vill du rensa databasen fÃ¶r ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -203,7 +234,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -215,13 +246,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr "Vill du sÃ¤kerhetskopiera databasen fÃ¶r ${pkg} fÃ¶re uppgradering?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -235,31 +266,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "BekrÃ¤ftelse av lÃ¶senord:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "LÃ¶senorden stÃ¤mmer inte Ã¶verens."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "LÃ¶senorden du angav stÃ¤mde inte Ã¶verens. VÃ¤nligen fÃ¶rsÃ¶k igen."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Fel vid uppgradering av databas fÃ¶r ${pkg}. FÃ¶rsÃ¶ka igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -269,7 +300,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -279,25 +310,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr "fÃ¶rsÃ¶k igen (hoppa Ã¶ver frÃ¥gor)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr "ignorera"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Fel vid installation av databas fÃ¶r ${pkg}. FÃ¶rsÃ¶ka igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -307,7 +338,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -331,31 +362,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr "avbryt"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr "fÃ¶rsÃ¶k igen"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Fel vid borttagning av databasen fÃ¶r ${pkg}. FÃ¶rsÃ¶ka igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "Ett fel verkar ha intrÃ¤ffat under borttagning av databasen."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -373,13 +404,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -399,13 +430,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "VÃ¤rdnamn fÃ¶r ${dbvendor}-databasservern fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -415,13 +446,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Portnummer fÃ¶r ${dbvendor}-tjÃ¤nsten:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -433,19 +464,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "VÃ¤rd som kÃ¶r servern ${dbvendor} fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "Ange vÃ¤rdnamnet fÃ¶r en fjÃ¤rrserver med ${dbvendor}."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -456,26 +487,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor}-databasnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr "Ange ett namn fÃ¶r ${dbvendor}-databasen som ska anvÃ¤ndas av ${pkg}."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor}-anvÃ¤ndarnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -487,7 +518,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -499,14 +530,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "${dbvendor}-anvÃ¤ndarnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -515,14 +546,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "${dbvendor}-databasnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -530,20 +561,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "${dbvendor}-databasnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -551,7 +582,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -559,13 +590,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Anslutningsmetod fÃ¶r MySQL-databasen fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -579,23 +610,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL-lÃ¶senord fÃ¶r ${pkg}:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"Ange ett lÃ¶senord fÃ¶r ${pkg} att registrera med databasservern.  Om den "
-"lÃ¤mnas blank kommer ett slumpmÃ¤ssigt lÃ¶senord att genereras Ã¥t dig."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -605,7 +626,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -615,31 +636,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr "unix socket"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Anslutningsmetod fÃ¶r PostgreSQL-databasen fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -653,18 +674,29 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL-lÃ¶senord fÃ¶r ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
+"Ange ett lÃ¶senord fÃ¶r ${pkg} att registrera med databasservern.  Om den "
+"lÃ¤mnas blank kommer ett slumpmÃ¤ssigt lÃ¶senord att genereras Ã¥t dig."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
 "Ange ett lÃ¶senord fÃ¶r ${pkg} fÃ¶r att registrera med databasservern.  Om den "
 "lÃ¤mnas blank kommer ett slumpmÃ¤ssigt lÃ¶senord att genereras Ã¥t dig. "
 "Omkonfiguration fÃ¶r tillgÃ¥ng till PostgreSQL kan behÃ¶vas gÃ¶ras fÃ¶r att "
@@ -672,13 +704,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "Namnet pÃ¥ din databasadministratÃ¶rs anvÃ¤ndare:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -690,13 +722,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "LÃ¶senord fÃ¶r din databasadministratÃ¶rs anvÃ¤ndare:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -709,13 +741,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Metod fÃ¶r att autentisera PostgreSQL-administratÃ¶ren:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -727,25 +759,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr "lÃ¶senord"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Metod fÃ¶r att autentisera PostgreSQL-anvÃ¤ndare:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -757,7 +789,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -767,7 +799,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -777,7 +809,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -791,7 +823,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -801,13 +833,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "VÃ¤lja en annan anslutningsmetod fÃ¶r PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -819,7 +851,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -832,13 +864,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Ã„ndra konfiguration fÃ¶r PostgreSQL automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -855,13 +887,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Ã…terstÃ¤ll PostgreSQL-konfigurationen automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -881,19 +913,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "VÃ¤nligen Ã¤ndra /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -905,20 +937,20 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL har inte stÃ¶d fÃ¶r blanka lÃ¶senord."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr ""
 "dbconfig-common kommer att fÃ¶rsÃ¶ka att lÃ¤sa in existerande instÃ¤llningar"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/templates.pot
===================================================================
--- branches/sqlite/debian/po/templates.pot	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/templates.pot	2006-06-11 03:06:00 UTC (rev 253)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-11 14:38+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -84,13 +84,36 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
-msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
+msgid "Re-install database for ${pkg}?"
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
 msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
+msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
+msgid ""
 "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."
@@ -98,7 +121,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -108,13 +131,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -122,13 +145,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -136,19 +159,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -156,13 +179,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -170,7 +193,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -179,13 +202,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -195,31 +218,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -227,7 +250,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -235,25 +258,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -261,7 +284,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -276,31 +299,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -312,13 +335,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -331,13 +354,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -345,13 +368,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -360,19 +383,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -380,26 +403,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -408,7 +431,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -417,13 +440,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
 "be installed into."
@@ -431,13 +454,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -445,19 +468,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -465,7 +488,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -473,13 +496,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -489,21 +512,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr ""
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -511,7 +526,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -519,31 +534,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -553,28 +568,36 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
 
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
+
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -583,13 +606,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -599,13 +622,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -614,25 +637,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -641,7 +664,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -649,7 +672,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -657,7 +680,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -667,7 +690,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -675,13 +698,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -690,7 +713,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -700,13 +723,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -718,13 +741,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -737,19 +760,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -758,19 +781,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/debian/po/vi.po
===================================================================
--- branches/sqlite/debian/po/vi.po	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/debian/po/vi.po	2006-06-11 03:06:00 UTC (rev 253)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.8.5\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-10 18:10+1200\n"
+"POT-Creation-Date: 2006-06-10 18:51+1200\n"
 "PO-Revision-Date: 2005-12-05 15:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -102,12 +102,43 @@
 #. Type: boolean
 #. Description
 #: ../dbconfig-common.templates:37
+#, fuzzy
+msgid "Re-install database for ${pkg}?"
+msgstr "Gáº·p lá»—i khi cÃ i Ä‘áº·t cÆ¡ sá»Ÿ dá»¯ liá»‡u cho ${pkg}. Thá» láº¡i khÃ´ng?"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"VÃ¬ báº¡n Ä‘ang gá»¡ bá» ${pkg}, cÃ³ thá»ƒ báº¡n khÃ´ng cÃ²n muá»‘n giá»¯ láº¡i cÆ¡ sá»Ÿ dá»¯ liá»‡u "
+"bÃªn dÆ°á»›i mÃ  gÃ³i áº¥y Ä‘Ã£ sÆ° dá»¥ng."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:37
+#, fuzzy
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Náº¿u báº¡n khÃ´ng cÃ²n cáº§n láº¡i dá»¯ liá»‡u mÃ  ${pkg} cÃ³ cáº¥t giá»¯ thÃ¬ hÃ£y hiá»‡u lá»±c tÃ¹y "
+"chá»n nÃ y. CÃ²n náº¿u báº¡n muá»‘n giá»¯ dá»¯ liá»‡u nÃ y cho lÃºc sau, hoáº·c náº¿u báº¡n muá»‘n tá»± "
+"cháº¡y tiáº¿n trÃ¬nh nÃ y, thÃ¬ hÃ£y vÃ´ hiá»‡u hÃ³a nÃ³."
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:48
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "NÃ¢ng cáº¥p cÆ¡ sá»Ÿ dá»¯ liá»‡u cho ${pkg} báº±ng dbconfig-common khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -118,7 +149,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:37
+#: ../dbconfig-common.templates:48
 msgid ""
 "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 "
@@ -132,13 +163,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Bá» cáº¥u hÃ¬nh cÆ¡ sá»Ÿ dá»¯ liá»‡u cho ${pkg} báº±ng dbconfig-common khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -148,13 +179,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr "Náº¿u báº¡n muá»‘n, cÃ³ thá»ƒ gá»¡ bá» cÆ¡ sá»Ÿ dá»¯ liá»‡u báº±ng dbconfig-common."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -164,19 +195,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:52
+#: ../dbconfig-common.templates:63
 msgid "Otherwise, you should choose this option."
 msgstr "KhÃ´ng thÃ¬ hÃ£y hiá»‡u lá»±c tÃ¹y chá»n nÃ y."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid "Database type to be used by ${pkg}:"
 msgstr "Kiá»ƒu cÆ¡ sá»Ÿ dá»¯ liá»‡u mÃ  ${pkg} cáº§n dÃ¹ng:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:67
+#: ../dbconfig-common.templates:78
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -186,13 +217,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Báº¡n cÃ³ muá»‘n táº©y cÆ¡ sá»Ÿ dá»¯ liá»‡u cho ${pkg} khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -201,7 +232,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:74
+#: ../dbconfig-common.templates:85
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -213,13 +244,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr "Báº¡n cÃ³ muá»‘n lÆ°u trá»¯ cÆ¡ sá»Ÿ dá»¯ liá»‡u cho ${pkg} trÆ°á»›c khi nÃ¢ng cáº¥p khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:86
+#: ../dbconfig-common.templates:97
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -233,31 +264,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:98
+#: ../dbconfig-common.templates:109
 msgid "Password confirmation:"
 msgstr "XÃ¡c nháºn máºt kháº©u :"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "Passwords do not match."
 msgstr "Hai máºt kháº©u khÃ´ng trÃ¹ng nhau."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:113
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Báº¡n Ä‘Ã£ gÃµ hai máºt kháº©u khÃ´ng trÃ¹ng nhau: hÃ£y thá» láº¡i."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Gáº·p lá»—i khi nÃ¢ng cáº¥p cÆ¡ sá»Ÿ dá»¯ liá»‡u cho ${pkg}. Thá» láº¡i khÃ´ng?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -267,7 +298,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:109
+#: ../dbconfig-common.templates:120
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -277,25 +308,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "retry (skip questions)"
 msgstr "thá» láº¡i (bá» qua cÃ¡c cÃ¢u há»i)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:128
+#: ../dbconfig-common.templates:139
 msgid "ignore"
 msgstr "bá» qua"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Gáº·p lá»—i khi cÃ i Ä‘áº·t cÆ¡ sá»Ÿ dá»¯ liá»‡u cho ${pkg}. Thá» láº¡i khÃ´ng?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -305,7 +336,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:130
+#: ../dbconfig-common.templates:141
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -330,31 +361,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "abort"
 msgstr "há»§y bá»"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:148
+#: ../dbconfig-common.templates:159
 msgid "retry"
 msgstr "thá» láº¡i"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Gáº·p lá»—i khi gá»¡ bá» cÆ¡ sá»Ÿ dá»¯ liá»‡u cho ${pkg}. Thá» láº¡i khÃ´ng?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "An error seems to have occurred while removing the database."
 msgstr "HÃ¬nh nhÆ° lá»—i Ä‘Ã£ xáº£y ra khi gá»¡ bá» cÆ¡ sá»Ÿ dá»¯ liá»‡u."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "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 "
@@ -371,13 +402,13 @@
 # Variable: do not translate/ biáº¿n: Ä‘á»«ng dá»‹ch
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:150
+#: ../dbconfig-common.templates:161
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -399,13 +430,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "TÃªn mÃ¡y cá»§a mÃ¡y phá»¥c vá»¥ cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:173
+#: ../dbconfig-common.templates:184
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -414,13 +445,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Sá»‘ hiá»‡u cá»•ng cho dá»‹ch vá»¥ ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:179
+#: ../dbconfig-common.templates:190
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -431,19 +462,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "MÃ¡y cÃ³ cháº¡y mÃ¡y phá»¥c vá»¥ ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "HÃ£y nháºp tÃªn mÃ¡y cá»§a mÃ¡y phá»¥c vá»¥ ${dbvendor} á»Ÿ xa."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:186
+#: ../dbconfig-common.templates:197
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -453,26 +484,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:195
+#: ../dbconfig-common.templates:206
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr "HÃ£y nháºp tÃªn cho cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} mÃ  ${pkg} sáº½ dÃ¹ng."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "TÃªn dÃ¹ng ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -484,7 +515,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:211
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -496,14 +527,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "TÃªn dÃ¹ng ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:211
+#: ../dbconfig-common.templates:222
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -512,14 +543,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 #, fuzzy
 msgid "${dbvendor} database ownership for ${pkg}:"
 msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid ""
 "Please specify the filesystem ownership that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -527,20 +558,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:228
 msgid "This should be specified in the format owner:group."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 #, fuzzy
 msgid "${dbvendor} database permissions for ${pkg}:"
 msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "Please specify the filesystem permissions that you would like to set on the "
 "${dbvendor} database for ${pkg}."
@@ -548,7 +579,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:236
 msgid ""
 "This should be specified in octal format as would be passed to the chmod  "
 "unix command. eg. 0644."
@@ -556,13 +587,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "PhÆ°Æ¡ng phÃ¡p káº¿t ná»‘i cho cÆ¡ sá»Ÿ dá»¯ liÃªu MySQL cá»§a ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:236
+#: ../dbconfig-common.templates:247
 msgid ""
 "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 "
@@ -576,23 +607,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:244
+#: ../dbconfig-common.templates:255
 msgid "MySQL application password for ${pkg}:"
 msgstr "Máºt kháº©u á»©ng dá»¥ng MySQL cho ${pkg}:"
 
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:244
-msgid ""
-"Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you."
-msgstr ""
-"HÃ£y nháºp máºt kháº©u cho ${pkg} Ä‘á»ƒ Ä‘Äƒng kÃ½ vá»›i mÃ¡y phá»¥c vá»¥ cÆ¡ sá»Ÿ dá»¯ liá»‡u. Náº¿u "
-"bá» rá»—ng thÃ¬ má»™t máºt kháº©u ngáº«u nhiÃªn sáº½ Ä‘Æ°á»£c táº¡o ra cho báº¡n."
-
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:252
+#: ../dbconfig-common.templates:263
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -602,7 +623,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:262
+#: ../dbconfig-common.templates:273
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -612,31 +633,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "unix socket"
 msgstr "á»• cáº¯m UNIX"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip"
 msgstr "TCP/IP"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:279
 msgid "tcp/ip + ssl"
 msgstr "TCP/IP + SSL"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "PhÆ°Æ¡ng phÃ¡p káº¿t ná»‘i cho cÆ¡ sá»Ÿ dá»¯ liá»‡u PostgreSQL cá»§a ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:270
+#: ../dbconfig-common.templates:281
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -650,32 +671,43 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Máºt kháº©u á»©ng dá»¥ng PostgreSQL cho ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:278
+#: ../dbconfig-common.templates:289
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
-"If left blank, a random password will be generated for you. PostgreSQL "
-"access may need to be reconfigured to allow password-authenticated access."
+"If left blank, a random password will be generated for you."
 msgstr ""
 "HÃ£y nháºp máºt kháº©u cho ${pkg} Ä‘á»ƒ Ä‘Äƒng kÃ½ vá»›i mÃ¡y phá»¥c vá»¥ cÆ¡ sá»Ÿ dá»¯ liá»‡u. Náº¿u "
+"bá» rá»—ng thÃ¬ má»™t máºt kháº©u ngáº«u nhiÃªn sáº½ Ä‘Æ°á»£c táº¡o ra cho báº¡n."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:289
+#, fuzzy
+msgid ""
+"If you are using \"ident\" based authentication, the supplied password will "
+"not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
+"be reconfigured to allow password-authenticated access."
+msgstr ""
+"HÃ£y nháºp máºt kháº©u cho ${pkg} Ä‘á»ƒ Ä‘Äƒng kÃ½ vá»›i mÃ¡y phá»¥c vá»¥ cÆ¡ sá»Ÿ dá»¯ liá»‡u. Náº¿u "
 "bá» rá»—ng thÃ¬ má»™t máºt kháº©u ngáº«u nhiÃªn sáº½ Ä‘Æ°á»£c táº¡o ra cho báº¡n. CÃ³ láº½ hÃ£y cáº¥u "
 "hinh láº¡i cÃ¡ch truy cáºp PostgreSQL Ä‘á»ƒ cho phÃ©p cÃ¡ch truy cáºp cÃ³ xÃ¡c thá»©c báº±ng "
 "máºt kháº©u."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid "Name of your database's administrative user:"
 msgstr "TÃªn ngÆ°á»i dÃ¹ng quáº£n trá»‹ cho cÆ¡ sá»Ÿ dá»¯ liá»‡u:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:287
+#: ../dbconfig-common.templates:300
 msgid ""
 "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 "
@@ -686,13 +718,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid "Password of your database's administrative user:"
 msgstr "Máºt kháº©u cá»§a ngÆ°á»i dÃ¹ng quáº£n trá»‹ cho cÆ¡ sá»Ÿ dá»¯ liá»‡u:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:294
+#: ../dbconfig-common.templates:307
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -705,13 +737,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "PhÆ°Æ¡ng phÃ¡p xÃ¡c thá»©c quáº£n trá»‹ PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:304
+#: ../dbconfig-common.templates:317
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -723,25 +755,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:325
+#: ../dbconfig-common.templates:338
 msgid "password"
 msgstr "máºt kháº©u"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "PhÆ°Æ¡ng phÃ¡p xÃ¡c thá»©c ngÆ°á»i dÃ¹ng PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -753,7 +785,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -763,7 +795,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -773,7 +805,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -787,7 +819,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:326
+#: ../dbconfig-common.templates:339
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -797,13 +829,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Chá»n má»™t phÆ°Æ¡ng phÃ¡p káº¿t ná»‘i PostgreSQL khÃ¡c khÃ´ng?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -815,7 +847,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:347
+#: ../dbconfig-common.templates:360
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -829,13 +861,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Tá»± Ä‘á»™ng thay Ä‘á»•i cáº¥u hÃ¬nh PostgreSQL khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:360
+#: ../dbconfig-common.templates:373
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -852,13 +884,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Tá»± Ä‘á»™ng hoÃ n nguyÃªn cáº¥u hÃ¬nh PostgreSQL khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -878,19 +910,19 @@
 # Variable: don't translate / Biáº¿n: Ä‘á»«ng dá»‹ch
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:373
+#: ../dbconfig-common.templates:386
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "HÃ£y sá»a Ä‘á»•i </etc/postgresql/pg_hba.conf>"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:386
+#: ../dbconfig-common.templates:399
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -902,19 +934,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:393
+#: ../dbconfig-common.templates:406
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL khÃ´ng há»— trá»£ máºt kháº©u rá»—ng."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "TrÃ¬nh dbconfig-common sáº½ cá»‘ táº£i thiáº¿t láºp Ä‘Ã£ cÃ³."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:397
+#: ../dbconfig-common.templates:410
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: branches/sqlite/dpkg/common
===================================================================
--- branches/sqlite/dpkg/common	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/dpkg/common	2006-06-11 03:06:00 UTC (rev 253)
@@ -19,7 +19,6 @@
 	dbc_command="$2"
 	dbc_oldversion="$3"
 
-
 	if ! _dbc_sanity_check package command; then
 		dbc_install_error "determining package or command";
 	fi
@@ -32,7 +31,7 @@
 	### some internal variables
 	###
 	# templates common to all database types
-	dbc_standard_templates="database-type dbconfig-install dbconfig-upgrade dbconfig-remove password-confirm app-password-confirm purge upgrade-backup passwords-do-not-match install-error upgrade-error remove-error import-oldsettings internal/reconfiguring"
+	dbc_standard_templates="database-type dbconfig-install dbconfig-upgrade dbconfig-remove dbconfig-reinstall password-confirm app-password-confirm purge upgrade-backup passwords-do-not-match install-error upgrade-error remove-error import-oldsettings internal/reconfiguring"
 
 	# templates common to mysql database types
 	dbc_mysql_templates="mysql/method remote/host remote/newhost mysql/app-pass mysql/admin-user mysql/admin-pass remote/port db/dbname db/app-user"
@@ -61,15 +60,16 @@
 	if [ -f $dbc_globalconfig ]; then
 		. $dbc_globalconfig
 	fi
-	# and the package config
-	dbc_read_package_config
 
+	dbc_set_dbtype_defaults $dbc_dbtype
+}
+
+dbc_set_dbtype_defaults(){
+	dbc_debug "dbc_set_dbtype_defaults() $@"
+
 	# if dbtype isn't set, but dbc_hardcoded_dbtype is set, set dbtype to that
 	if [ "$dbc_hardcoded_dbtype" ]; then
 		dbc_dbtype="$dbc_hardcoded_dbtype"
-	# likewise for dbc_prompted_dbtype (result from debconf not yet written to disk)
-	elif [ "$dbc_prompted_dbtype" ]; then
-		dbc_dbtype="$dbc_prompted_dbtype"
 	fi
 
 	###
@@ -135,6 +135,7 @@
 		dbc_register_templates="$dbc_standard_templates $dbc_mysql_templates $dbc_pgsql_templates $dbc_sqlite_templates"
 	;;
 	esac
+
 }
 
 
@@ -162,6 +163,11 @@
 dbc_read_package_config(){
 	dbc_debug "dbc_read_package_config() $@"
 	_dbc_sanity_check package packageconfig || dbc_install_error
+	
+	# first we set some defaults, which will be overridden by the config
+	dbc_install=true
+	dbc_upgrade=true
+
 	if [ -f $dbc_packageconfig ]; then
 		. $dbc_packageconfig
 	fi
@@ -182,15 +188,9 @@
 ### the "Debconf is Not a Registry" dilemma.
 ###
 dbc_preseed_package_debconf(){
-	dbc_debug "dbc_preseed_package_config() $@"
-	_dbc_sanity_check package packageconfig || dbc_install_error
+	dbc_debug "dbc_preseed_package_debconf() $@"
+	_dbc_sanity_check package || dbc_install_error
 
-	# if the package configuration does not exist then there is
-	# nothing to preseed.
-	if [ ! -f "$dbc_packageconfig" ]; then
-		return 0
-	fi
-
 	# set whether they want our help
 	db_set $dbc_package/dbconfig-install "$dbc_install"
 	db_set $dbc_package/dbconfig-upgrade "$dbc_upgrade"
@@ -199,6 +199,9 @@
 	# set the dbtype
 	db_set $dbc_package/database-type "$dbc_dbtype"
 
+	# a few db-specific things, don't preseed them if we don't know the dbtype yet
+	if [ ! "$dbc_dbtype" ]; then return 0 ; fi
+
 	if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
 		# set app user
 		db_set $dbc_package/db/app-user "$dbc_dbuser"
@@ -228,7 +231,6 @@
 	# set the name of the database to be created
 	db_set $dbc_package/db/dbname "$dbc_dbname"
 
-	# a few db-specific things
 	case $dbc_dbtype in
 	"pgsql")
 		# get the psql authentication method
@@ -263,9 +265,11 @@
 	_dbc_sanity_check package || dbc_install_error
 
 	# gracefully fetch this to support multi-dbtype packages
-	db_get $dbc_package/database-type && dbc_prompted_dbtype="$RET"
+	if [ "$dbc_dbtypes" ]; then
+		db_get $dbc_package/database-type && dbc_dbtype="$RET"
+	fi
 	# dbconfig needs to be reloaded at this point for multi-dbtype apps
-	dbc_config $@
+	dbc_set_dbtype_defaults $dbc_dbtype
 
 	# just to make sure...
 	_dbc_sanity_check dbtype || dbc_install_error
@@ -328,7 +332,7 @@
 ### dump package configuration to a config file
 ###
 dbc_write_package_config(){
-	local iformat ofile warn tfile
+	local iformat ofile tfile
 	dbc_debug "dbc_write_package_config() $@"
 	_dbc_sanity_check packageconfig || dbc_install_error
 	echo "dbconfig-common: writing config to $dbc_packageconfig" >&2
@@ -336,16 +340,9 @@
 	tfile=`mktemp -t dbconfig-package-config.XXXXXX`
 
 	# a quick check if this is a multi-dbtype app
-	if [ "$dbc_prompted_dbtype" ]; then
-		dbc_chosen_dbtype=$dbc_prompted_dbtype; 
-	elif [ "$dbc_hardcoded_dbtype" ]; then
-		dbc_chosen_dbtype="$dbc_hardcoded_dbtype"
-		warn="yes"
+	if [ "$dbc_hardcoded_dbtype" ]; then
+		dbc_dbtype="$dbc_hardcoded_dbtype"
 	fi
-	# yes, the single quotes here are intentional
-	if [ "$dbc_chosen_dbtype" = '${database_type}' ]; then
-		dbc_chosen_dbtype=""
-	fi
 	# and a check for ssl
 	if [ "$dbc_method" = "tcp/ip + ssl" ]; then
 		dbc_ssl="true"
@@ -374,7 +371,7 @@
 #	type to use when a package supports multiple database types.  
 #	don't change this value unless you know for certain that this
 #	package supports multiple database types
-dbc_dbtype="$dbc_chosen_dbtype"
+dbc_dbtype="$dbc_dbtype"
 
 # dbc_dbuser: database user
 #	the name of the user who we will use to connect to the database.
@@ -743,56 +740,50 @@
 }
 
 ##
-## determine whether a db is supported by a package and installed on the system
+## determine whether a db is supported by a package
 ##
-dbc_detect_dbtype(){
+dbc_detect_supported_dbtype(){
 	local query_dbtype
-	dbc_debug "dbc_detect_dbtype() $@"
+	dbc_debug "dbc_detect_supported_dbtype() $@"
 	query_dbtype=$1
-	dbc_dbtype_supported="no"
-	dbc_dbtype_installed="no"
 	# see if the package says it's supported
-	if echo $dbc_dbconfig_dbtypes | grep -qE "(^|,[[:space:]]*)$query_dbtype(\$|,)"; then
-		dbc_dbtype_supported="yes"
+	if echo $dbc_dbtypes | grep -qE "(^|,[[:space:]]*)$query_dbtype(\$|,)"; then
+		return 0
 	fi
+	return 1
+}
 
+##
+## determine whether a db is installed on the system
+##
+dbc_detect_installed_dbtype(){
+	local query_dbtype testfile
+	dbc_debug "dbc_detect_installed_dbtype() $@"
+	query_dbtype=$1
+
 	# see if the dbtype is already installed.  this is not 100% accurate
-	if [ "$dbc_dbtype_supported" = "yes" ]; then
-		 case $query_dbtype in 
-		 "mysql")
-		 	if [ -f /usr/bin/mysql ]; then
-				dbc_dbtype_installed="yes"
-			fi
-		 ;;
-		 "pgsql")
-		 	if [ -f /usr/bin/psql ]; then
-				dbc_dbtype_installed="yes"
-			fi
-		 ;;
-		 "sqlite")
-			if [ -f /usr/bin/sqlite ]; then
-				dbc_dbtype_installed="yes"
-			fi		       
-		 ;;
-		 "")
-		 ;;
-		 esac
-	fi
+	case $query_dbtype in 
+	"mysql") testfile='/usr/bin/mysql'
+	;;
+	"pgsql") testfile='/usr/bin/psql'
+	;;
+	"sqlite") testfile='/usr/bin/sqlite'
+	;;
+	"")
+	;;
+	esac
+
+	[ "$testfile" ] && test -f $testfile && return 0
+	return 1
 }
 
 ###
 ### register all the necessary debconf templates
 ###
 dbc_register_debconf(){
-	local f local authmethod_user
+	local f local
 	dbc_debug "dbc_register_debconf() $@"
 
-	if [ "$dbc_default_authmethod_user" = "password" ]; then
-		authmethod_user="password"
-	else
-		authmethod_user="ident"
-	fi
-
 	for f in $dbc_register_templates; do
 		# perform some basic customizing substitutions
 		db_register dbconfig-common/$f $dbc_package/$f
@@ -801,4 +792,7 @@
 			db_subst $dbc_package/$f dbvendor $dbc_dbvendor
 		fi
 	done
+	if [ "$dbc_dbtypes" ]; then
+		db_subst $dbc_package/database-type database_types $dbc_dbtypes
+	fi
 }

Modified: branches/sqlite/dpkg/config
===================================================================
--- branches/sqlite/dpkg/config	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/dpkg/config	2006-06-11 03:06:00 UTC (rev 253)
@@ -3,7 +3,7 @@
 ###
 
 dbc_go(){
-	local db happy default_dbtype host newhost port oldhosts authmethod_user authmethod_admin do_config need_adminpw need_userpw f _preconf_list _s _t STATEiformat ifile
+	local f db happy default_dbtype host newhost port oldhosts authmethod_admin do_config _preconf_list _s _t STATEiformat ifile install_question
 	. /usr/share/dbconfig-common/dpkg/common
 	dbc_debug "(config) dbc_go() $@"
 
@@ -12,7 +12,7 @@
 	db_capb backup
 
 	# only do this on install/reconfigure
-	if [ "$dbc_command" != "configure" -a "$dbc_command" != "reconfigure" ];
+	if [ "$dbc_command" != "configure" ] && [ "$dbc_command" != "reconfigure" ];
 	then
 		return 0
 	fi
@@ -23,21 +23,33 @@
 	dbc_register_debconf
 	
 	# make sure debconf is up to date with on-disk configuration
+	dbc_read_package_config
 	dbc_preseed_package_debconf
 
+	# the first question we ask will differ depending on how we're invoked
+	if [ "$dbc_command" = "configure" ]; then
+		install_question="$dbc_package/dbconfig-install"
+	else
+		install_question="$dbc_package/dbconfig-reinstall"
+		# if we are reconfiguring (via dpkg-reconfigure), also leave a hint
+		# for our future postinst selves so we know we *should* run the code
+		# that would otherwise think we were upgrading
+		db_set $dbc_package/internal/reconfiguring true
+	fi
+
 	# and start our beautiful state-machine
 	STATE=1
 	while true; do
 	case "$STATE" in
 	# state 1 - ask if they want our help at all
 	1)
-		db_input medium $dbc_package/dbconfig-install || true
+		db_input high $install_question || true
 	;;
 	# state 2 - check to see if they do. 
 	#         - see if this is an upgrade newly supporting dbc
 	#         - multidb support step 1
 	2)
-		db_get $dbc_package/dbconfig-install
+		db_get $install_question
 		if [ "$RET" != "true" ]; then
 			return 0;
 		fi
@@ -91,61 +103,43 @@
 		##
 		## start multidb section
 		## 
-	
-		# check to see if there's a dbtype answer already in debconf
-		db_get $dbc_package/database-type && dbc_prompted_dbtype="$RET"
-	
 		# if the dbtype is hardcoded (using config.mysql, etc), use that
 		if [ "$dbc_hardcoded_dbtype" ]; then
 			dbc_dbtype=$dbc_hardcoded_dbtype
-		# if dbc_dbtype is set (from above or in conf), don't bother
-		elif [ "$dbc_dbtype" ]; then
-			true
-		# else see if they've already told us what to use, use that
-		elif [ "$dbc_prompted_dbtype" ]; then
-			dbc_dbtype=$dbc_prompted_dbtype
-		fi
-
-		# if the package supports multiple dbtypes, help them pick one
-		if [ "$dbc_dbtypes" ]; then
+		# else if the package supports multiple dbtypes, help them pick one
+		elif [ "$dbc_dbtypes" ]; then
 		# loop through all available dbtypes
 			for db in $dbc_all_supported_dbtypes; do
-				# check to see $db is supported
-				dbc_detect_dbtype $db
 				# if we're already happy, we're already done
 				if [ "$happy" ]; then
 					true
-				# else, if it's installed and unpacked, we're happy
-				elif [ "$dbc_dbtype_installed" = "yes" ]; then
-					default_dbtype=$db	
-					happy="yes"
-				# else if it's supported and there's nothing better...
-				elif [ "$dbc_dbtype_supported" = "yes" ]; then
-					if [ ! "$default_dbtype" ]; then
-						default_dbtype=$db	
+				# else, if it's supported, installed and unpacked, we're happy
+				elif dbc_detect_supported_dbtype $db; then
+					# if it's installed, we're happy
+					if dbc_detect_installed_dbtype $db; then
+						happy="yes"
 					fi
+					# but in any case it's be the default even if not happy
+					default_dbtype=$db	
 				fi
 				# otherwise, there's no default yet, which is okay
 			done
 
 			# now that we're done with that, actually do the debconf stuff
 
-			db_subst $dbc_package/database-type database_types "$dbc_dbtypes"
-			# if dbc_dbtype is already set (from conf file) then
-			# use that as a default, otherwise use our best guess
-			if [ "$dbc_dbtype" ]; then
-				default_dbtype="$dbc_dbtype"
+			# if dbc_dbtype isn't already set (from conf file) then
+			# use the default as our best guess
+			if [ ! "$dbc_dbtype" ]; then
+				dbc_dbtype="$default_dbtype"
 			fi
-			db_set  $dbc_package/database-type "$default_dbtype"
+			db_set $dbc_package/database-type "$dbc_dbtype"
 			db_input high $dbc_package/database-type || true
 		fi
 	;;
 	# state 3 - multidb support part 2, pre-seeding, get conn. method
 	3)
 		if [ "$dbc_dbtypes" ]; then
-			db_get  $dbc_package/database-type
-			dbc_prompted_dbtype="$RET"
-
+			db_get $dbc_package/database-type && dbc_dbtype="$RET"
 			# now that we have a dbtype, reload common to set other defaults
 			dbc_config $@
 		fi
@@ -313,8 +307,11 @@
 	# state 8 - pgsql auth stuff, part 2
 	8)
 		if [ "$dbc_dbtype" = "pgsql" ]; then
-			db_get $dbc_package/pgsql/authmethod-admin
-			authmethod_admin="$RET"
+			db_get $dbc_package/pgsql/authmethod-admin && authmethod_admin="$RET"
+			# if we are using ident, we don't need passwords
+			if [ "$authmethod_admin" = "ident" ]; then
+				need_adminpw="false"
+			fi
 			# default the user auth method to the admin method
 			# ...but only if the answer hasn't already been specified.
 			if [ ! "${dbc_authmethod_user}" ]; then
@@ -323,38 +320,20 @@
 			db_input medium $dbc_package/pgsql/authmethod-user || true
 		fi
 	;;
-	# state 9 - pgsql auth part 3, admin/app user, dbname
+	# state 9 - admin/app user/pass, dbname
 	9)
-		if [ "$dbc_dbtype" = "pgsql" ]; then
-			db_get $dbc_package/pgsql/authmethod-user
-			authmethod_user="$RET"
-
-			# if we are using ident, we don't need passwords
-			if [ "$authmethod_admin" = "ident" ]; then
-				need_adminpw="false"
-			fi
-
-			if [ "$authmethod_user" = "ident" ]; then
-				need_userpw="false"
-			fi
-		fi
-
 		if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
 
 			# who's the admin user (is there any reason to even ask this?)
 			# TODO: should there be a difference between the local and 
 			# remote admin?
 			db_input low $dbc_package/$dbc_dbtype/admin-user || true
-
 			if [ "$need_adminpw" != "false" ]; then
 				dbc_get_admin_pass
 			fi
-
 			db_input low $dbc_package/db/app-user || true
+			dbc_get_app_pass
 
-			if [ "$need_userpw" != "false" ]; then
-				dbc_get_app_pass
-			fi
 		fi
 
 		if echo "$dbc_fs_dbtypes" | grep -q "$dbc_dbtype"; then
@@ -382,11 +361,4 @@
 			exit 10
 		fi
 	done
-
-	# finally, if we are reconfiguring (via dpkg-reconfigure), leave a hint
-	# for our future postinst selves so we know we *should* run the code
-	# that would otherwise think we were upgrading
-	if [ "$dbc_command" = "reconfigure" ]; then
-		db_set $dbc_package/internal/reconfiguring true
-	fi
 }

Modified: branches/sqlite/dpkg/postinst
===================================================================
--- branches/sqlite/dpkg/postinst	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/dpkg/postinst	2006-06-11 03:06:00 UTC (rev 253)
@@ -2,24 +2,24 @@
 ### load up common variables and functions
 ###
 dbc_go(){
-	local prev_dbc_upgrade importing_from_non_dbc upgrading f tsubstfile upgrades_pending dumpfile _dbc_asuser
+	local prev_dbc_upgrade importing_from_non_dbc upgrading reconfiguring f tsubstfile upgrades_pending dumpfile _dbc_asuser reinstall
 
 	. /usr/share/dbconfig-common/dpkg/common
 	dbc_debug "(postinst) dbc_go() $@"
-
 	dbc_config $@
-	# read in debconf responses (which are seeded from the config)
-	dbc_read_package_debconf $@
-	# and write them to file.
-	dbc_write_package_config
-	# finally, read in the configuration from this file
-	dbc_read_package_config
 
 	###
 	### begin main code execution
 	###
-	if [ "$dbc_command" = "configure" -o "$dbc_command" = "reconfigure" ]; 
+	if [ "$dbc_command" = "configure" ] || [ "$dbc_command" = "reconfigure" ]; 
 	then
+		# read in debconf responses (which are seeded from the config)
+		dbc_read_package_debconf
+		# and write them to file.
+		dbc_write_package_config
+		# finally, re-read in the configuration from this file
+		dbc_read_package_config
+
 		###
 		### if they don't want our help, quit
 		###
@@ -36,13 +36,18 @@
 		# find out if we're upgrading/reinstalling
 		if [ "$dbc_oldversion" ]; then
 			# read that little crumb left in config if we're reconfiguring
-			db_get $dbc_package/internal/reconfiguring
+			db_get $dbc_package/internal/reconfiguring && reconfiguring="$RET"
+			# and set it back to false
+			db_reset $dbc_package/internal/reconfiguring
 			# if not, we're definitely upgrading
-			if [ "$RET" = "false" ]; then
+			if [ "$reconfiguring" = "false" ]; then
 				upgrading="yes"
+			else
+				db_get $dbc_package/dbconfig-reinstall && reinstall=$RET
+				db_reset $dbc_package/dbconfig-reinstall
+				# if they've said they don't want to reinstall stuff...
+				if [ "$reinstall" = "false" ]; then return 0; fi
 			fi
-			# and set it back to false
-			db_reset $dbc_package/internal/reconfiguring
 		fi
 
 		# now, determine if we're upgrading from a non-dbc version.  if so,
@@ -116,7 +121,7 @@
 			fi
 		fi	
 
-	# end install/reconfigure section
+		# end install/reconfigure section
 
 		if [ "$importing_from_non_dbc" ]; then
 			if ! $dbc_checkuser_command; then
@@ -125,7 +130,7 @@
 			fi
 		fi
 
-	# begin upgrade section
+		# begin upgrade section
 
 		if [ "$upgrading" ]; then
 
@@ -133,19 +138,14 @@
 
 			# if there are any upgrades to be applied
 			if [ "$upgrades_pending" ]; then
-
 				# ask if they want our help in the process at all
 				prev_dbc_upgrade="$dbc_upgrade"
+				db_set $dbc_package/dbconfig-upgrade $dbc_upgrade
 				db_fset $dbc_package/dbconfig-upgrade seen false
 				db_input high $dbc_package/dbconfig-upgrade || true
 				db_go || true
 				db_get $dbc_package/dbconfig-upgrade && dbc_upgrade="$RET"
 
-				# if their answer has changed, synchronize config to disk
-				if [ "$prev_dbc_upgrade" != "$dbc_upgrade" ]; then
-					dbc_write_package_config
-				fi
-
 				# and if they don't want our help, we'll go away
 				if [ "$dbc_upgrade" != "true" ]; then return 0; fi
 
@@ -158,7 +158,7 @@
 				dbc_logline "creating database backup in $dumpfile"
 				# backup before we upgrade
 				_dbc_asuser=""
-				$dbc_dump_cmd > $dumpfile
+				$dbc_dump_cmd $dumpfile
 			fi
 
 			# now perform the updates
@@ -184,7 +184,7 @@
 ## upgrades are provided in-order regardless of which methods are used.
 ##
 _dbc_find_upgrades(){
-	local f sqldir admsqldir scriptdir upgradedirs upgrades_pending
+	local f s sqldir admsqldir scriptdir upgradedirs pending sorted placed tlist
 	# check for new upgrades in these three locations
 	sqldir=$dbc_share/data/$dbc_package/upgrade/$dbc_dbtype
 	admsqldir=$dbc_share/data/$dbc_package/upgrade-dbadmin/$dbc_dbtype
@@ -201,11 +201,44 @@
 	for f in `find $upgradedirs -type f -print0 | \
               xargs --no-run-if-empty -0 -n1 basename | sort -n | uniq`; do
 		if dpkg --compare-versions $dbc_oldversion lt $f; then
-			upgrades_pending="$upgrades_pending $f"
+			pending="$pending $f"
 		fi
 	done
 
-	echo $upgrades_pending
+	# for each pending update
+	for f in $pending; do
+		# if the sorted list is empty
+		if [ ! "$sorted" ]; then
+			sorted="$f"
+		else
+			# a scratch list for a sorted insert of the next version
+			tlist=""
+			# for each already sorted version
+			for s in $sorted; do
+				# if we haven't already placed it
+				if [ ! "$placed" ]; then
+					# if the this version is less than the next sorted one
+					if dpkg --compare-versions $f lt $s; then
+						# insert it here
+						tlist="$tlist $f $s"
+						placed="yes"
+					else
+						# it's not less, so append the sorted one and continue
+						tlist="$tlist $s"
+					fi
+				fi
+			done
+			# if we still haven't placed it, tack it on to the end of the list
+			if [ ! "$placed" ]; then
+				tlist="$tlist $f"
+			fi
+			# and now reset the placed variable, and update the sorted list
+			placed=""
+			sorted="$tlist"
+		fi
+	done
+
+	echo $sorted
 }
 
 ##

Modified: branches/sqlite/dpkg/postrm
===================================================================
--- branches/sqlite/dpkg/postrm	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/dpkg/postrm	2006-06-11 03:06:00 UTC (rev 253)
@@ -6,7 +6,10 @@
 	dbc_debug "(postrm) dbc_go() $@"
 	dbc_config $@
 
-	if [ "$dbc_command" = "purge" ]; then
+	if [ "$dbc_command" = "upgrade" ]; then
+		dbc_read_package_config
+		dbc_preseed_package_debconf
+	elif [ "$dbc_command" = "purge" ]; then
 		# remove the dbc configuration file
 		rm -f /etc/dbconfig-common/$dbc_package.conf || true
 		ucf -p "/etc/dbconfig-common/$dbc_package.conf" || true

Modified: branches/sqlite/dpkg/prerm
===================================================================
--- branches/sqlite/dpkg/prerm	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/dpkg/prerm	2006-06-11 03:06:00 UTC (rev 253)
@@ -13,6 +13,8 @@
 	### get all the settings we need
 	###
 	dbc_read_package_config
+	# and re-run config for db-specific settings
+	dbc_set_dbtype_defaults $dbc_dbtype
 
 	if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
 		need_admin_pw="yup"
@@ -63,8 +65,8 @@
 			if [ ! -f $dumpfile ]; then
 				dbc_remove_error "creating temporary file for database dump"
 			fi
-			dbc_logline "dbconfig-common: dumping $dbc_dbtype database $dbc_dbname to $_dbc_dbfile"
-			$dbc_dump_cmd > $dumpfile || dbc_remove_error "dumping database"
+			dbc_logline "dbconfig-common: dumping $dbc_dbtype database $dbc_dbname to $dumpfile"
+			$dbc_dump_cmd $dumpfile || dbc_remove_error "dumping database"
 			dbc_logline "dbconfig-common: dropping $dbc_dbtype database $dbc_dbname"
 			$dbc_dropdb_cmd || dbc_remove_error "dropping database"
 			[ "$dbc_tried_again" ] && return 0

Modified: branches/sqlite/examples/db-test-pgsql-2.0/debian/config
===================================================================
--- branches/sqlite/examples/db-test-pgsql-2.0/debian/config	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/examples/db-test-pgsql-2.0/debian/config	2006-06-11 03:06:00 UTC (rev 253)
@@ -6,5 +6,5 @@
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/config.pgsql 
 
-dbc_authmethod_user="password"
+#dbc_authmethod_user="password"
 dbc_go db-test-pgsql $@

Modified: branches/sqlite/internal/mysql
===================================================================
--- branches/sqlite/internal/mysql	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/internal/mysql	2006-06-11 03:06:00 UTC (rev 253)
@@ -345,12 +345,13 @@
 ## perform mysqldump
 ##
 dbc_mysql_dump(){
-	local mycnf	dumperr db
+	local mycnf	dumperr db dumpfile
 	_dbc_sanity_check dbname dbadmin mysql || return 1
 	_dbc_mysql_check_connect || return 1
+	dumpfile=$1
 	dumperr=0
 	mycnf=`_dbc_generate_mycnf`
-	dbc_error=`mysqldump --defaults-file="$mycnf" $dbc_dbname` || dumperr=1
+	dbc_error=`mysqldump --defaults-file="$mycnf" $dbc_dbname 2>&1 >$dumpfile` || dumperr=1
 	rm -f $mycnf
 	return $dumperr
 }

Modified: branches/sqlite/internal/pgsql
===================================================================
--- branches/sqlite/internal/pgsql	2006-06-10 06:40:24 UTC (rev 252)
+++ branches/sqlite/internal/pgsql	2006-06-11 03:06:00 UTC (rev 253)
@@ -10,20 +10,24 @@
 
 _dbc_psql_local_username(){
 	# determine proper local system user as whom to run commands.
-	#	- if _dbc_asuser set and ident/localhost,  $dbc_dbuser
+	#	- if _dbc_asuser set and ident/localhost,  
+	#	  - if $dbc_dbuser exists as a system account, use it
 	#	- else ident/localhost: $dbc_dbadmin
 	#	- all others: no change (root)
 	if [ "$_dbc_asuser" ]; then
 		if [ "$dbc_authmethod_user" = "ident" -a ! "$dbc_dbserver" ]; then
-			echo $dbc_dbuser
-		else
-			echo root
+			if id $dbc_dbuser >/dev/null 2>&1; then
+				echo $dbc_dbuser
+				return 0
+			else
+				dbc_logline "warning: ident method specified but local account doesn't exist"
+			fi
 		fi
 	elif [ "$dbc_authmethod_admin" = "ident" -a ! "$dbc_dbserver" ]; then
 		echo $dbc_dbadmin
-	else
-		echo root
+		return 0
 	fi
+	echo root
 }
 
 _dbc_psql_remote_username(){
@@ -50,13 +54,11 @@
 		method="$dbc_authmethod_user"
 		remotepass="$dbc_dbpass"
 	fi
-	if [ "$method" = "password" ]; then
-		touch "${_dbc_pgsql_tmpdir}/.pgpass"
-		chmod 600 ${_dbc_pgsql_tmpdir}/.pgpass
-		cat << EOF > ${_dbc_pgsql_tmpdir}/.pgpass
+	touch "${_dbc_pgsql_tmpdir}/.pgpass"
+	chmod 600 ${_dbc_pgsql_tmpdir}/.pgpass
+	cat << EOF > ${_dbc_pgsql_tmpdir}/.pgpass
 *:*:*:$remoteuser:$remotepass
 EOF
-	fi
 	if [ "$localuser" -a "$localuser" != "root" ]; then
 		chown -R "$localuser" $_dbc_pgsql_tmpdir
 	fi
@@ -134,16 +136,8 @@
 	if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
 	if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
 	if [ "$dbc_dbadmin" ]; then extra="$extra -U '$dbc_dbadmin'"; fi
-	if [ "$dbc_authmethod_user" != "ident" ]; then 
-		dbc_dbname="template1"
-		_dbc_pgsql_exec_command "CREATE USER \"$dbc_dbuser\" WITH PASSWORD '$dbc_dbpass'"
-		retval=$?
-	else
-		# postgres 8 and later also defines roles, which we disable in
-		# the users that we create.
-		if [ `_dbc_createuser_majorversion` -ge 8 ]; then extra="$extra -R"; fi
-		dbc_error=`su -s /bin/sh $localuser -c "env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' createuser -A -D -q $extra $dbc_dbuser" 2>&1` || retval=$?
-	fi
+	dbc_dbname="template1"
+	_dbc_pgsql_exec_command "CREATE USER \"$dbc_dbuser\" WITH PASSWORD '$dbc_dbpass'" || retval=$?
 	_dbc_psql_cmd_cleanup
 	return $retval
 }
@@ -164,8 +158,11 @@
 }
 
 _dbc_pg_dump(){
-	local extra retval PGSSLMODE localuser _dbc_asuser
+	local extra retval PGSSLMODE localuser _dbc_asuser dumpfile
+	dumpfile=$1
+	extra="-f $dumpfile"
 	localuser=`_dbc_psql_local_username`
+	chown $localuser $dumpfile
 	PGSSLMODE="prefer"
 	retval=0
 	_dbc_psql_cmd_setup
@@ -173,7 +170,7 @@
 	if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
 	if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
 	if [ "$dbc_dbadmin" ]; then extra="$extra -U '$dbc_dbadmin'"; fi
-	dbc_error=`su -s /bin/sh $localuser -c "env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' pg_dump $extra $*" 2>&1` || retval=$?
+	dbc_error=`su -s /bin/sh $localuser -c "env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' pg_dump $extra $dbc_dbname" 2>&1` || retval=$?
 	_dbc_psql_cmd_cleanup
 	return $retval
 }
@@ -445,7 +442,9 @@
 ## perform pg_dump
 ##
 dbc_pgsql_dump(){
+	local dumpfile
+	dumpfile=$1
 	_dbc_sanity_check dbuser dbname dbadmin pg_dump || return 1
 	_dbc_pgsql_check_connect || return 1
-	_dbc_pg_dump $dbc_dbname
+	_dbc_pg_dump $dumpfile
 }


