[Dbconfig-common-changes] [dbconfig-common] r303 - trunk/debian/po

Tue Aug 15 10:59:29 CEST 2006

Author: mattb-guest
Date: 2006-08-15 08:58:56 +0000 (Tue, 15 Aug 2006)
New Revision: 303

Modified:
   trunk/debian/po/ca.po
   trunk/debian/po/cs.po
   trunk/debian/po/da.po
   trunk/debian/po/de.po
   trunk/debian/po/es.po
   trunk/debian/po/eu.po
   trunk/debian/po/fr.po
   trunk/debian/po/it.po
   trunk/debian/po/nl.po
   trunk/debian/po/pt.po
   trunk/debian/po/pt_BR.po
   trunk/debian/po/sv.po
   trunk/debian/po/templates.pot
   trunk/debian/po/vi.po
Log:
debconf-updatepo noise from the SQLite merge


Modified: trunk/debian/po/ca.po
===================================================================

--- trunk/debian/po/ca.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/ca.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -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-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+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"
@@ -28,13 +28,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -44,7 +44,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -53,14 +53,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "En altre cas, escolliu aquesta opciÃ³."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr ""
 "Voleu mantenir la base de dades de contrasenyes \"administratives\" a "
@@ -68,7 +68,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -82,7 +82,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -96,7 +96,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -108,13 +108,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Voleu configurar la base de dades de ${pkg} amb dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -124,7 +124,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -138,13 +138,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "En altre cas, probablement haurÃeu d'escollir aquesta opciÃ³."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr ""
@@ -153,7 +153,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -164,7 +164,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "If you wish to re-install the database for ${pkg}, you should select this "
@@ -177,13 +177,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -196,7 +196,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -210,13 +210,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -226,7 +226,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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 "
@@ -234,7 +234,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -245,19 +245,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr "En altre cas, escolliu aquesta opciÃ³."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid "Database type to be used by ${pkg}:"
 msgstr "Tipus de base de dades que utilitzarÃ  ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -267,13 +267,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -283,7 +283,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -295,13 +295,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -315,25 +315,57 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "Confirmeu la contrasenya:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "Les contrasenyes no coincideixen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 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
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "S'ha produÃ¯t un error al actualitzar la base de dades d ${pkg}. Voleu "
@@ -341,7 +373,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -351,7 +383,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -360,20 +403,36 @@
 "${dbfile}."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
 msgstr ""
+"En aquest punt, teniu l'opciÃ³ de reintentar o avortar l'operaciÃ³. Si "
+"escolliu Â«reintentarÂ», es preguntarÃ  totes les preguntes de configuraciÃ³ "
+"altra vegada i es farÃ  un altre intent de fer l'operaciÃ³. Â«reintentar (sense "
+"preguntar)Â» intentarÃ  altra vegada l'operaciÃ³ immediatament, sense fer les "
+"preguntes. Si escolliu Â«avortarÂ», l'operaciÃ³ fallarÃ  i haureu de "
+"desactualitzar, reinstalar, reconfigurar aquest paquet, o intervenir "
+"manualment per continuar utilitzant-lo."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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 "
@@ -381,7 +440,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -391,7 +450,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -413,20 +472,8 @@
 "manualment per continuar utilitzant-lo."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr ""
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "S'ha produÃ¯t un error esborrant la base de dades de ${pkg}. Voleu reintentar-"
@@ -434,13 +481,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -458,33 +505,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"En aquest punt, teniu l'opciÃ³ de reintentar o avortar l'operaciÃ³. Si "
-"escolliu Â«reintentarÂ», es preguntarÃ  totes les preguntes de configuraciÃ³ "
-"altra vegada i es farÃ  un altre intent de fer l'operaciÃ³. Â«reintentar (sense "
-"preguntar)Â» intentarÃ  altra vegada l'operaciÃ³ immediatament, sense fer les "
-"preguntes. Si escolliu Â«avortarÂ», l'operaciÃ³ fallarÃ  i haureu de "
-"desactualitzar, reinstalar, reconfigurar aquest paquet, o intervenir "
-"manualment per continuar utilitzant-lo."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 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 "
@@ -492,7 +513,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -502,13 +523,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "IntroduÃ¯u el nÃºmero de port del servei ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -520,7 +541,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 "IntroduÃ¯u el nom del ordinador que executa el servidor de ${dbvendor} pel "
@@ -528,13 +549,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -544,13 +565,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 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:222
+#: ../dbconfig-common.templates:19001
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -558,13 +579,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "IntroduÃ¯u el nom d 'usuari ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -577,7 +598,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -587,15 +608,48 @@
 "altres objectes que seran creats per aquesta instalÂ·laciÃ³. Aquest usuari "
 "tindrÃ  permissos per inserir, canviar o esborrar dades a la base de dades."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "IntroduÃ¯u el nom d 'usuari ${dbvendor} per ${pkg}:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr ""
+"IntroduÃ¯u un nom per la base de dades ${dbvendor} que utilitzarÃ  ${pkg}."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -609,14 +663,48 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "IntroduÃ¯u la contrasenya de l'aplicaciÃ³ MySQL per ${pkg}:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "IntroduÃ¯u l'usuari administrador de la vostra base de dades:"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"Quin Ã©s el nom del comte amb el qual aquest paquet executarÃ  les accions "
+"administratives? Aquest usuari Ã©s l'Ãºnic que pot crear nous usuaris a la "
+"base de dades."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -625,7 +713,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+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:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -635,31 +731,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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:274
+#: ../dbconfig-common.templates:26002
 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 "
@@ -673,23 +757,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "IntroduÃ¯u la contrasenya de l'aplicaciÃ³ PostgreSQL per ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
-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: password
-#. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -701,33 +775,9 @@
 "per vosaltres. Pot ser que necessiteu reconfigurar l'accÃ©s a PostgreSQL per "
 "permetre l'accÃ©s autenticat amb contrasenya."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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:293
-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 "
-"database users."
-msgstr ""
-"Quin Ã©s el nom del comte amb el qual aquest paquet executarÃ  les accions "
-"administratives? Aquest usuari Ã©s l'Ãºnic que pot crear nous usuaris a la "
-"base de dades."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-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:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -740,56 +790,44 @@
 "sistema.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'administrador PostgreSQL:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"Els servidors PostgreSQL proporcionen mecanismes distints per autenticar les "
-"connexions. Seleccioneu quin mÃ¨tode ha de utilitzar l'usuari administrador "
-"quan es connecta al servidor."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'usuari PostgreSQL:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'administrador PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "Els servidors PostgreSQL proporcionen mecanismes distints per autenticar les "
-"connexions. Seleccioneu quin mÃ¨tode ha d'utilitzar l'usuari de la base de "
-"dades quan es connecta al servidor."
+"connexions. Seleccioneu quin mÃ¨tode ha de utilitzar l'usuari administrador "
+"quan es connecta al servidor."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 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 +837,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -810,7 +850,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 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 +866,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -832,15 +876,33 @@
 "A una instalÂ·laciÃ³ local per defecte de PostgreSQL executant-se al mateix "
 "ordinador, segurament voldreu Â«identÂ»."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'usuari PostgreSQL:"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"Els servidors PostgreSQL proporcionen mecanismes distints per autenticar les "
+"connexions. Seleccioneu quin mÃ¨tode ha d'utilitzar l'usuari de la base de "
+"dades quan es connecta al servidor."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Voleu escollir un mÃ¨tode diferent de connexiÃ³ a PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 +914,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 +928,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Voleu canviar la configuraciÃ³ de PostgreSQL automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -889,13 +951,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Voleu desfer la configuraciÃ³ de PostgreSQL automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -913,21 +983,15 @@
 "fer-ho manualment (o no), per favor, esborreu la lÃnia segÃ¼ent al vostre "
 "pg_hba.conf:"
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Canvieu el /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -939,7 +1003,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL no suporta contrassenyes buides."
 

Modified: trunk/debian/po/cs.po
===================================================================
--- trunk/debian/po/cs.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/cs.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+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"
@@ -25,13 +25,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -41,7 +41,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -50,20 +50,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "V opaÄnÃ©m pÅ™ÃpadÄ› byste mÄ›li tuto moÅ¾nost vybrat."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "UchovÃ¡vat databÃ¡zovÃ¡ administrÃ¡torskÃ¡ hesla v debconfu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -76,7 +76,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -89,7 +89,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -101,13 +101,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Nastavit databÃ¡zi pro ${pkg} pomocÃ dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -117,7 +117,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -131,20 +131,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Ve vÅ¡ech ostatnÃch pÅ™Ãpadech byste mÄ›li tuto moÅ¾nost povolit."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr "Chyba pÅ™i instalaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -155,7 +155,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "If you wish to re-install the database for ${pkg}, you should select this "
@@ -168,13 +168,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -185,7 +185,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -199,13 +199,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Odstranit databÃ¡zi pro ${pkg} pomocÃ dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -215,13 +215,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -231,19 +231,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:94
+#: ../dbconfig-common.templates:7001
 msgid "Database type to be used by ${pkg}:"
 msgstr "Typ databÃ¡ze, kterÃ½ mÃ¡ ${pkg} pouÅ¾Ãt:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -253,13 +253,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Chcete smazat databÃ¡zi balÃku ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -268,7 +268,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -280,13 +280,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -300,31 +300,63 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "PotvrzenÃ hesla:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "Hesla nesouhlasÃ."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "ZadanÃ¡ hesla nesouhlasÃ. Zkuste to znovu."
 
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr "pÅ™eruÅ¡it"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr "opakovat"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr "opakovat (pÅ™eskoÄit otÃ¡zky)"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i aktualizaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -334,7 +366,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -343,26 +386,42 @@
 "tÄ›snÄ› pÅ™ed pokusem o aktualizaci."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
-msgstr "opakovat (pÅ™eskoÄit otÃ¡zky)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
+msgstr ""
+"V tomto okamÅ¾iku mÅ¯Å¾ete operaci zkusit zopakovat nebo pÅ™eruÅ¡it. ZvolÃte-li "
+"\"opakovat\", budete znovu dotÃ¡zÃ¡ni na vÅ¡echny konfiguraÄnÃ otÃ¡zky a potÃ© se "
+"pokusÃ znovu provÃ©st danÃ¡ operace. MoÅ¾nost \"opakovat (pÅ™eskoÄit otÃ¡zky)\" "
+"se pokusÃ operaci provÃ©st okamÅ¾itÄ› bez novÃ©ho koleÄka otÃ¡zek. ZvolÃte-li "
+"\"pÅ™eruÅ¡it\", operace selÅ¾e a abyste mohli pouÅ¾Ãvat balÃÄek i nadÃ¡le, musÃte "
+"se vrÃ¡tit ke starÅ¡Ã verzi balÃÄku, nebo jej zkusit pÅ™einstalovat, "
+"pÅ™ekonfigurovat nebo zasÃ¡hnout jinÃ½m zpÅ¯sobem."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr "ignorovat"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i instalaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -372,7 +431,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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,32 +454,20 @@
 "dbconfig-common."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr "pÅ™eruÅ¡it"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr "opakovat"
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i odstranÄ›nÃ databÃ¡ze ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -437,39 +484,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"V tomto okamÅ¾iku mÅ¯Å¾ete operaci zkusit zopakovat nebo pÅ™eruÅ¡it. ZvolÃte-li "
-"\"opakovat\", budete znovu dotÃ¡zÃ¡ni na vÅ¡echny konfiguraÄnÃ otÃ¡zky a potÃ© se "
-"pokusÃ znovu provÃ©st danÃ¡ operace. MoÅ¾nost \"opakovat (pÅ™eskoÄit otÃ¡zky)\" "
-"se pokusÃ operaci provÃ©st okamÅ¾itÄ› bez novÃ©ho koleÄka otÃ¡zek. ZvolÃte-li "
-"\"pÅ™eruÅ¡it\", operace selÅ¾e a abyste mohli pouÅ¾Ãvat balÃÄek i nadÃ¡le, musÃte "
-"se vrÃ¡tit ke starÅ¡Ã verzi balÃÄku, nebo jej zkusit pÅ™einstalovat, "
-"pÅ™ekonfigurovat nebo zasÃ¡hnout jinÃ½m zpÅ¯sobem."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 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:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -479,13 +500,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "ÄŒÃslo portu pro sluÅ¾bu ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -497,19 +518,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -519,26 +540,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "JmÃ©no ${dbvendor} databÃ¡ze pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 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:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no v ${dbvendor} pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -551,7 +572,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -561,15 +582,47 @@
 "bÄ›hem instalace. ZadanÃ½ uÅ¾ivatel bude mÃt takÃ© Ãºplnou kontrolu nad "
 "vklÃ¡dÃ¡nÃm, Ãºpravou a mazÃ¡nÃm dat v databÃ¡zi."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "UÅ¾ivatelskÃ© jmÃ©no v ${dbvendor} pro ${pkg}:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr "Zadejte jmÃ©no ${dbvendor} databÃ¡ze, kterÃ© bude ${pkg} pouÅ¾Ãvat."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr "unixovÃ½ socket"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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:240
+#: ../dbconfig-common.templates:22002
 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,14 +636,47 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "AplikaÄnÃ MySQL heslo pro balÃk ${pkg}:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "JmÃ©no administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"JakÃ© je jmÃ©no ÃºÄtu, pod kterÃ½m mÃ¡ tento balÃk provÃ¡dÄ›t administraÄnÃ Ãºkony? "
+"ZadanÃ½ uÅ¾ivatel musÃ mÃt oprÃ¡vnÄ›nÃ vytvÃ¡Å™et dalÅ¡Ã databÃ¡zovÃ© uÅ¾ivatele."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -599,7 +685,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+msgid "Password of your database's administrative user:"
+msgstr "Heslo administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -609,31 +703,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr "unixovÃ½ socket"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr "tcp/ip"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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:274
+#: ../dbconfig-common.templates:26002
 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 "
@@ -647,23 +729,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "AplikaÄnÃ PostgreSQL heslo pro balÃk ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
-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: password
-#. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -674,32 +746,9 @@
 "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:293
-msgid "Name of your database's administrative user:"
-msgstr "JmÃ©no administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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 "
-"database users."
-msgstr ""
-"JakÃ© je jmÃ©no ÃºÄtu, pod kterÃ½m mÃ¡ tento balÃk provÃ¡dÄ›t administraÄnÃ Ãºkony? "
-"ZadanÃ½ uÅ¾ivatel musÃ mÃt oprÃ¡vnÄ›nÃ vytvÃ¡Å™et dalÅ¡Ã databÃ¡zovÃ© uÅ¾ivatele."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-msgid "Password of your database's administrative user:"
-msgstr "Heslo administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
-
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -711,56 +760,44 @@
 "protoÅ¾e autentizace se provÃ¡dÃ na systÃ©movÃ© Ãºrovni.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "ZpÅ¯sob autentizace administrÃ¡tora PostgreSQL:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"PostgreSQL nabÃzÃ pro autentizaci pÅ™ÃchozÃch spojenÃ nÄ›kolik rÅ¯znÃ½ch "
-"mechanizmÅ¯. Vyberte, kterÃ½ ze zpÅ¯sobÅ¯ autentizace se mÃ¡ pouÅ¾Ãt, kdyÅ¾ se k "
-"serveru bude pÅ™ipojovat administrÃ¡tor."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "password"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "ZpÅ¯sob autentizace uÅ¾ivatele PostgreSQL:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "ZpÅ¯sob autentizace administrÃ¡tora PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "PostgreSQL nabÃzÃ pro autentizaci pÅ™ÃchozÃch spojenÃ nÄ›kolik rÅ¯znÃ½ch "
-"mechanizmÅ¯. Vyberte, kterÃ½ ze zpÅ¯sobÅ¯ autentizace se mÃ¡ pouÅ¾Ãt pro pÅ™ipojenÃ "
-"databÃ¡zovÃ½ch uÅ¾ivatelÅ¯ k serveru."
+"mechanizmÅ¯. Vyberte, kterÃ½ ze zpÅ¯sobÅ¯ autentizace se mÃ¡ pouÅ¾Ãt, kdyÅ¾ se k "
+"serveru bude pÅ™ipojovat administrÃ¡tor."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -770,7 +807,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -780,7 +819,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -793,7 +834,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -801,15 +844,33 @@
 "Pro bÄ›Å¾nou instalaci PostgreSQL na Debianu bÄ›Å¾ÃcÃ na stejnÃ©m poÄÃtaÄi "
 "pravdÄ›podobnÄ› chcete pouÅ¾Ãt \"ident\"."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "ZpÅ¯sob autentizace uÅ¾ivatele PostgreSQL:"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"PostgreSQL nabÃzÃ pro autentizaci pÅ™ÃchozÃch spojenÃ nÄ›kolik rÅ¯znÃ½ch "
+"mechanizmÅ¯. Vyberte, kterÃ½ ze zpÅ¯sobÅ¯ autentizace se mÃ¡ pouÅ¾Ãt pro pÅ™ipojenÃ "
+"databÃ¡zovÃ½ch uÅ¾ivatelÅ¯ k serveru."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Zvolit jinÃ½ zpÅ¯sob pÅ™ipojenÃ k PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 +881,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 "
@@ -833,13 +894,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "ZmÄ›nit nastavenÃ PostgreSQL automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -856,13 +917,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "VrÃ¡tit nastavenÃ PostgreSQL automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -880,21 +949,15 @@
 "zÃ¡znam odstranit ruÄnÄ›, odstraÅˆte prosÃm ze svÃ©ho pg_hba.conf nÃ¡sledujÃcÃ "
 "Å™Ã¡dek:"
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Upravte prosÃm /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -906,7 +969,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL nepodporuje prÃ¡zdnÃ¡ hesla."
 

Modified: trunk/debian/po/da.po
===================================================================
--- trunk/debian/po/da.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/da.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+1200\n"
 "PO-Revision-Date: 2006-07-18 21:44+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -26,13 +26,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr "Skal denne server bruges til at tilgå fjerne databaser?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -46,7 +46,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -57,19 +57,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "If you are unsure, you should not select this option."
 msgstr "Hvis du er usikker, bør du ikke vælge denne indstilling."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "Opbevar databaseadministrations-adgangskoder i debconf?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -83,7 +83,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -97,7 +97,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -109,13 +109,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Sæt databasen for ${pkg} op med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -125,7 +125,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -139,19 +139,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Eller bør du nok vælge denne indstilling."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 msgid "Re-install database for ${pkg}?"
 msgstr "Geninstallér databaserne for ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
 "database which it uses."
@@ -161,7 +161,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 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 "
@@ -173,13 +173,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -191,7 +191,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -205,13 +205,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Afkonfigurér ${pkg}s database med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -221,13 +221,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -237,19 +237,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr "Ellers bør du vælge denne valgmulighed."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid "Database type to be used by ${pkg}:"
 msgstr "Databasetype, der skal bruges af ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -259,13 +259,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -275,7 +275,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -288,13 +288,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -308,31 +308,63 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "Bekræft adgangskode:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "Adgangskoder var ikke ens."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Du adgangskoder, du angav, var ikke ens. Prøv igen."
 
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr "afbryd"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr "prøv igen"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr "prøv igen (spring over spørgsmål)"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Fejl under opgradering af ${pkg}'s database. Forøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -342,7 +374,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -351,26 +394,42 @@
 "lavet umiddelbart før opgraderingen."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
-msgstr "prøv igen (spring over spørgsmål)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
+msgstr ""
+"Du har nu mulighed for at gentage eller afbryde handlingen. Hvis du vælger "
+"\"gentag\", vil du blive stillet alle opsætningsspørgsmålene en gang til, og "
+"det vil blive gjort et nyt forsøg på at gennemføre handlingen. \"gentag "
+"(ingen spørgsmål\") vil gøre et nyt forsøg med det samme uden at gentage "
+"spørgsmålene. Hvis du vælger \"afbryd\", vil handlingen mislykkes og du "
+"bliver nødt til at nedgradere, geninstallere eller sætte pakken op igen "
+"eller på anden måde manuelt tage hånd om den for fortsat at kunne bruge den."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr "ignorér"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Fejl under installationen af ${pkg}'s database. Forsøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -380,7 +439,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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 "
@@ -403,32 +462,20 @@
 "dbconfig-common vil blive ignoreret."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr "afbryd"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr "prøv igen"
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Fejl under afinstallation af ${pkg}'s database. Forsøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -445,39 +492,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"Du har nu mulighed for at gentage eller afbryde handlingen. Hvis du vælger "
-"\"gentag\", vil du blive stillet alle opsætningsspørgsmålene en gang til, og "
-"det vil blive gjort et nyt forsøg på at gennemføre handlingen. \"gentag "
-"(ingen spørgsmål\") vil gøre et nyt forsøg med det samme uden at gentage "
-"spørgsmålene. Hvis du vælger \"afbryd\", vil handlingen mislykkes og du "
-"bliver nødt til at nedgradere, geninstallere eller sætte pakken op igen "
-"eller på anden måde manuelt tage hånd om den for fortsat at kunne bruge den."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Værtsnavn for ${pkg}s ${dbvendor}-databaseserver:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -487,13 +508,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "${dbvendor}-servicens portnummer:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -505,19 +526,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Værten, der kører ${dbvendor}-serveren for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -527,26 +548,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor}-databasenavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 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:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor}-brugernavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -558,7 +579,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -568,15 +589,47 @@
 "objekter, der bliver oprettet under denne installation. Denne bruger vil "
 "have fuld mulighed for at indsætte, ændre og slette data i databasen."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "${dbvendor}-brugernavn for ${pkg}:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr "Angiv navnet på den ${dbvendor}-database, der skal bruges af ${pkg}."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr "unix-sokkel"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Forbindelsesmetode for ${pkg}s MySQL-database:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -590,14 +643,48 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL-programadgangskode for ${pkg}:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "Navnet på din databases administrationsbruger:"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"Hvad er navnet på den konto, som pakken skal udføre administrationsarbejde "
+"gennem? Det er den bruger, der kan oprette nye databasebrugere."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -606,7 +693,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+msgid "Password of your database's administrative user:"
+msgstr "Din databases administrationsbrugers adgangskode:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -616,31 +711,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr "unix-sokkel"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr "tcp/ip"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Forbindelsesmetode for ${pkg}s PostgreSQL-database:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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,25 +737,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL-programadgangskode for ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 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: password
-#. Description
-#: ../dbconfig-common.templates:282
-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."
@@ -682,32 +754,9 @@
 "være nødvendigt at sætte PostgreSQL-adgangen op igen, for at tillade adgang "
 "med adgangskode."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-msgid "Name of your database's administrative user:"
-msgstr "Navnet på din databases administrationsbruger:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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 "
-"database users."
-msgstr ""
-"Hvad er navnet på den konto, som pakken skal udføre administrationsarbejde "
-"gennem? Det er den bruger, der kan oprette nye databasebrugere."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-msgid "Password of your database's administrative user:"
-msgstr "Din databases administrationsbrugers adgangskode:"
-
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -720,56 +769,44 @@
 "systemniveau.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Måde at autentificere PostgreSQL-administratoren på:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"PostgreSQL-servere har flere forskellige måder at autentificere forbindelser "
-"på. Vælg hvilken metode, den administrative bruger skal benytte for at "
-"forbinde sig til serveren."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "adgangskode"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "Måde at autentificere PostgreSQL-bruger på:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Måde at autentificere PostgreSQL-administratoren på:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "PostgreSQL-servere har flere forskellige måder at autentificere forbindelser "
-"på. Vælg hvilken metode, databasebrugeren skal benytte for at forbinde sig "
-"til serveren."
+"på. Vælg hvilken metode, den administrative bruger skal benytte for at "
+"forbinde sig til serveren."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -779,7 +816,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -789,7 +828,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -804,7 +845,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -812,15 +855,33 @@
 "For en almindelig Debian PostgreSQL-installation, der kører på samme "
 "maskine, bør du nok vælge \"ident\"."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Måde at autentificere PostgreSQL-bruger på:"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"PostgreSQL-servere har flere forskellige måder at autentificere forbindelser "
+"på. Vælg hvilken metode, databasebrugeren skal benytte for at forbinde sig "
+"til serveren."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Vil du vælge en anden PostgreSQL-forbindelsesmetode?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -832,7 +893,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 +907,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Ret PostgreSQL-opsætningen automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -869,13 +930,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Genskab den gamle PostgreSQL-opsætning automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -892,21 +961,15 @@
 "dbconfig-common, når din pakke er fjernet. Hvis du foretrækker at gøre dette "
 "selv (eller slet ikke), så fjern følgende linje fra din pg_hba.conf:"
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Ret venligst /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -918,7 +981,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL understøtter ikke tomme adgangskoder."
 

Modified: trunk/debian/po/de.po
===================================================================
--- trunk/debian/po/de.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/de.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -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-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+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"
@@ -25,13 +25,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -41,7 +41,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -50,20 +50,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "Andernfalls sollte diese Option gewählt werden."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "\"Administrative\" Datenbank-Passwörter in debconf speichern?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -77,7 +77,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -91,7 +91,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -103,13 +103,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Konfigurieren der Datenbank für ${pkg} mit dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -120,7 +120,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -135,20 +135,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Andernfalls sollte diese Option gewählt werden."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr "Fehler bei der Installation der Datenbank für ${pkg}.  Wiederholen?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -159,7 +159,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "If you wish to re-install the database for ${pkg}, you should select this "
@@ -173,13 +173,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -192,7 +192,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -207,13 +207,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Dekonfigurieren der Datenbank für ${pkg} mit dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -223,7 +223,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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-"
@@ -231,7 +231,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -241,19 +241,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr "Andernfalls sollte diese Option gewählt werden."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid "Database type to be used by ${pkg}:"
 msgstr "Datenbanktyp, der durch das Paket ${pkg} benutzt werden soll:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -264,13 +264,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -280,7 +280,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -293,7 +293,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -301,7 +301,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -316,33 +316,65 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "Passwort Bestätigung:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "Die eingegebenen Passwörter stimmen nicht überein. Bitte versuchen Sie es "
 "noch einmal!"
 
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Fehler beim Aktualisieren der Datenbank von ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -352,7 +384,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -361,26 +404,43 @@
 "das unmittelbar vor der Aktualisierung erstellt wurde."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
 msgstr ""
+"An diesem Punkt besteht die Möglichkeit, die Operation abzubrechen.  Falls "
+"die Option \"retry\" gewählt wird, werden alle Konfigurationsfragen noch "
+"einmal gestellt und ein erneuter Versuch vorgenommen, die Operation "
+"durchzuführen.  Die Option \"retry (skip questions)\" wird die Operation "
+"soffort starten und alle Fragen überspringen.  Wenn \"abort\" gewählt wird, "
+"bricht die Operation ab und der Nutzer muß dieses Packet per downgrade, "
+"reinstall, reconfigure oder sogar per manueller Intervention in Ordnung "
+"bringen, bevor es benutzt werden kann."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Fehler bei der Installation der Datenbank für ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -390,7 +450,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -413,32 +473,20 @@
 "bringen, bevor es benutzt werden kann."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr ""
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Fehler beim Löschen der Datenbank von ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -456,40 +504,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"An diesem Punkt besteht die Möglichkeit, die Operation abzubrechen.  Falls "
-"die Option \"retry\" gewählt wird, werden alle Konfigurationsfragen noch "
-"einmal gestellt und ein erneuter Versuch vorgenommen, die Operation "
-"durchzuführen.  Die Option \"retry (skip questions)\" wird die Operation "
-"soffort starten und alle Fragen überspringen.  Wenn \"abort\" gewählt wird, "
-"bricht die Operation ab und der Nutzer muß dieses Packet per downgrade, "
-"reinstall, reconfigure oder sogar per manueller Intervention in Ordnung "
-"bringen, bevor es benutzt werden kann."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Rechnername des ${dbvendor} Datenbankservers für ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -499,13 +520,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Portnummer für den ${dbvendor} Service:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -518,20 +539,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -542,13 +563,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor} Datenbankname für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -557,13 +578,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor} Nutzernamen für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -576,7 +597,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -587,15 +608,49 @@
 "alle Rechte, Daten in die Datenbank einzufügen, in ihr zu verändern oder aus "
 "ihr zu löschen."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "${dbvendor} Nutzernamen für ${pkg}:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr ""
+"Bitte einen Namen für die ${dbvendor} Datenbank, die vom Paket ${pkg} "
+"verwendet werden soll, eingeben."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Verbindungsmethode an die MySQL Datenbank von ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -610,14 +665,49 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL Anwendungspasswort für ${pkg}:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "Login-Name des Datenbank-Administrators:"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"Was ist der Anmeldename des Nutzers, mit dem das Paket administrative "
+"Aktionen durchführen soll?  Dieser Nutzer ist derjenige, der berechtigt ist "
+"neue Datenbank-Nutzer anzulegen."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -626,7 +716,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+msgid "Password of your database's administrative user:"
+msgstr "Passwort des Datenbank-Administrators:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -636,31 +734,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Verbindungsmethode für die PostgreSQL Datenbank von ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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 "
@@ -675,24 +761,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL Anwendungspasswort für ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
-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: password
-#. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -704,33 +779,9 @@
 "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:293
-msgid "Name of your database's administrative user:"
-msgstr "Login-Name des Datenbank-Administrators:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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 "
-"database users."
-msgstr ""
-"Was ist der Anmeldename des Nutzers, mit dem das Paket administrative "
-"Aktionen durchführen soll?  Dieser Nutzer ist derjenige, der berechtigt ist "
-"neue Datenbank-Nutzer anzulegen."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-msgid "Password of your database's administrative user:"
-msgstr "Passwort des Datenbank-Administrators:"
-
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -743,56 +794,44 @@
 "Authentifizierung auf Systemebene erfolgt.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Authentifizierungsmethode des PostgreSQL Administrators:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"PostgreSQL Server bieten unterschiedliche Mechanismen für die Anmeldung. "
-"Bitte wählen Sie die Methode aus, mit der sich der Administrator am Server "
-"anmelden soll."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "Authentifizierungsmethode des PostgreSQL Nutzers:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Authentifizierungsmethode des PostgreSQL Administrators:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
-"PostgreSQL Server bieten verschiedene unterschiedliche Mechanismen für die "
-"Anmeldung. Bitte wählen Sie die Methode aus, mit der sich der "
-"Datenbanknutzer am Server anmelden soll."
+"PostgreSQL Server bieten unterschiedliche Mechanismen für die Anmeldung. "
+"Bitte wählen Sie die Methode aus, mit der sich der Administrator am Server "
+"anmelden soll."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 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 +841,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -813,7 +854,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -827,7 +870,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -835,15 +880,33 @@
 "Für eine Standard PostgreSQL Installation, die auf ein und demselben Rechner "
 "läuft, ist sehr wahrscheinlich \"ident\" die Methode der Wahl."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Authentifizierungsmethode des PostgreSQL Nutzers:"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"PostgreSQL Server bieten verschiedene unterschiedliche Mechanismen für die "
+"Anmeldung. Bitte wählen Sie die Methode aus, mit der sich der "
+"Datenbanknutzer am Server anmelden soll."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Eine andere Verbindungsmethode für PostgreSQL wählen?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 +918,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 +932,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Soll die PostgreSQL Konfiguration automatisch geändert werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -893,13 +956,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Soll die PostgreSQL Konfiguration automatisch geändert werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -919,21 +990,15 @@
 "überhaupt nicht) durchzuführen, dann entfernen Sie bitte folgende Zeile aus "
 "der Datei ph_hba.conf:"
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -945,7 +1010,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL unterstützt keine leeren Passwörter."
 

Modified: trunk/debian/po/es.po
===================================================================
--- trunk/debian/po/es.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/es.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -37,7 +37,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+1200\n"
 "PO-Revision-Date: 2006-08-14 13:56+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs at debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -47,38 +47,46 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr "¿Se utilizará este servidor para acceder a bases de datos remotas?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
 "database via dbconfig-common, the questions related to remote configuration "
 "are asked with a priority such that they are skipped for most systems."
-msgstr "Dbconfig-common dispone de soporte para la configuración de bases de datos en sistemas remotos para aquellos tipos de bases de datos que lo soportan. Las preguntas relacionadas con la configuración de sistemas remotos se preguntarán con una prioridad tal que se omitirán en la mayoría de los sistemas cuando instale un base de datos a través de dbconfig-common."
+msgstr ""
+"Dbconfig-common dispone de soporte para la configuración de bases de datos "
+"en sistemas remotos para aquellos tipos de bases de datos que lo soportan. "
+"Las preguntas relacionadas con la configuración de sistemas remotos se "
+"preguntarán con una prioridad tal que se omitirán en la mayoría de los "
+"sistemas cuando instale un base de datos a través de dbconfig-common."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
 "packages."
-msgstr "El comportamiento por omisión será realizar las preguntas relacionados a la configuración de bases de datos en sistemas remotos cuando instale nuevos paquetes si selecciona esta opción."
+msgstr ""
+"El comportamiento por omisión será realizar las preguntas relacionados a la "
+"configuración de bases de datos en sistemas remotos cuando instale nuevos "
+"paquetes si selecciona esta opción."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "If you are unsure, you should not select this option."
 msgstr "No debería seleccionar esta opción si no está seguro."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr ""
 "¿Desea guardar las contraseñas de «administración» de la base de datos en "
@@ -86,7 +94,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -100,7 +108,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -114,7 +122,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -126,13 +134,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "¿Desea configurar la base de datos para ${pkg} con «dbconfig-common»?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -143,7 +151,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -157,19 +165,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Debería escoger esta opción en cualquier otro caso."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 msgid "Re-install database for ${pkg}?"
 msgstr "¿Desea reinstalar la base de datos para ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
 "database which it uses."
@@ -179,7 +187,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 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 "
@@ -191,7 +199,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr ""
 "¿Desea realizar las actualizaciones de la base de datos de ${pkg} con "
@@ -199,7 +207,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -212,7 +220,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -227,14 +235,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -244,7 +252,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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 "
@@ -252,7 +260,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -262,19 +270,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr "En cualquier otro caso debería seleccionar esta opción."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 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:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -284,13 +292,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -299,7 +307,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -311,7 +319,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -319,7 +327,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -334,27 +342,59 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "Confirmación de contraseña:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 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 "
 "nuevo."
 
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr "abortar"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr "reintentar"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr "reintentar (omitir la pregunta)"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "Se produjo un error al actualizar la base de datos para ${pkg}. ¿Desea "
@@ -362,7 +402,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -372,7 +412,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -381,20 +432,37 @@
 "realizada justo antes de la actualización en ${dbfile}."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
-msgstr "reintentar (omitir la pregunta)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
+msgstr ""
+"Puede elegir reintentar o abortar la operación en este punto. Si escoge "
+"\"reintentar\" se le volverán a hacer las preguntas de configuración y se "
+"realizará un nuevo intento de llevar a cabo la operación, si escoge "
+"\"reintentar (omitir preguntas)\" se reintentará la operación de forma "
+"inmediata sin hacer las preguntas. Si escoge \"abortar\" la operación "
+"fallará y tendrá que instalar una versión anterior, reinstalar, reconfigurar "
+"el paquete o bien realizar una intervención manual para poder continuar "
+"utilizándolo."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr "ignorar"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "Se produjo un error al instalar la base de datos para ${pkg}. ¿Desea "
@@ -402,7 +470,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -412,7 +480,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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 "
@@ -435,20 +503,8 @@
 "cualquier otro error dbconfig-common."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr "abortar"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr "reintentar"
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "Se produjo un error al eliminar la base de datos par ${pkg}. ¿Desea "
@@ -456,13 +512,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -480,40 +536,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"Puede elegir reintentar o abortar la operación en este punto. Si escoge "
-"\"reintentar\" se le volverán a hacer las preguntas de configuración y se "
-"realizará un nuevo intento de llevar a cabo la operación, si escoge "
-"\"reintentar (omitir preguntas)\" se reintentará la operación de forma "
-"inmediata sin hacer las preguntas. Si escoge \"abortar\" la operación "
-"fallará y tendrá que instalar una versión anterior, reinstalar, reconfigurar "
-"el paquete o bien realizar una intervención manual para poder continuar "
-"utilizándolo."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 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:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -523,13 +552,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Número de puerto del servicio ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -541,13 +570,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Por favor, indique el nombre del servidor que tiene el servidor remoto "
@@ -555,7 +584,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -565,13 +594,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nombre de la base de datos ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -580,13 +609,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nombre de usuario ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -599,7 +628,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -609,15 +638,49 @@
 "otros objetos que cree esta instalación. Este usuario debe tener permisos "
 "para insertar, crear y borrar datos en la base de datos."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "Nombre de usuario ${dbvendor} para ${pkg}:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr ""
+"Por favor, indique el nombre de la base de datos ${dbvendor} que va a "
+"utilizar ${pkg}."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr "socket unix"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -631,14 +694,49 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Contraseña de aplicación MySQL para ${pkg}:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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. Si deja este campo en blanco se generará un "
+"contraseña aleatoria."
+
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "Nombre del usuario de administración de base de datos:"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"¿Cuál es el nombre de la cuenta que este paquete debería utilizar para "
+"realizar tareas administrativas? Este usuario es el que se utilizará para "
+"crear nuevos usuarios de base de datos."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -647,7 +745,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+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:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -657,31 +763,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr "socket unix"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr "tcp/ip"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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:274
+#: ../dbconfig-common.templates:26002
 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,25 +789,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Contraseña de aplicación PostgreSQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 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. Si deja este campo en blanco se generará un "
-"contraseña aleatoria."
-
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:282
-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."
@@ -722,33 +805,9 @@
 "utilizando la autenticación basada en \"ident\". Si no es así deberá "
 "reconfigurar PostgreSQL para permitir el acceso por contraseña."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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:293
-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 "
-"database users."
-msgstr ""
-"¿Cuál es el nombre de la cuenta que este paquete debería utilizar para "
-"realizar tareas administrativas? Este usuario es el que se utilizará para "
-"crear nuevos usuarios de base de datos."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-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:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -761,56 +820,44 @@
 "datos ya que la autenticación se hace a nivel del sistema.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Método de autenticación para el administrador de PostgreSQL:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"Los servidores PostgreSQL pueden utilizar distintos mecanismos para "
-"autenticar las conexiones. Por favor, seleccione el método que el usuario "
-"administrativo debería utilizar para conectarse al servidor."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "contraseña"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "Método de autenticación del usuario de PostgreSQL:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Método de autenticación para el administrador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "Los servidores PostgreSQL pueden utilizar distintos mecanismos para "
-"autenticar las conexiones. Por favor, seleccione el método que el usuario de "
-"base de datos debería utilizar para conectarse al servidor."
+"autenticar las conexiones. Por favor, seleccione el método que el usuario "
+"administrativo debería utilizar para conectarse al servidor."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -820,7 +867,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -830,7 +879,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -845,7 +896,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -853,15 +906,33 @@
 "Para una instalación de PostgreSQL en Debian que se ejecute en el mismo "
 "sistema posiblemente quiera utilizar «ident»."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Método de autenticación del usuario de PostgreSQL:"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"Los servidores PostgreSQL pueden utilizar distintos mecanismos para "
+"autenticar las conexiones. Por favor, seleccione el método que el usuario de "
+"base de datos debería utilizar para conectarse al servidor."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "¿Desea elegir un método de conexión de PostgreSQL distinto?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -873,7 +944,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 "
@@ -886,13 +957,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "¿Desea modificar automáticamente la configuración de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -909,13 +980,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "¿Desea revertir automáticamente la configuración de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -933,21 +1012,15 @@
 "manualmente (o no hacerlo) elimine la siguiente línea de su archivo de "
 "configuración pg_hba.conf:"
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor, modifique «/etc/postgresql/pg_hba.conf»"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -959,7 +1032,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL no acepta contraseñas en blanco."
 

Modified: trunk/debian/po/eu.po
===================================================================
--- trunk/debian/po/eu.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/eu.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -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-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+1200\n"
 "PO-Revision-Date: 2005-04-01 00:08+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <eu at li.org>\n"
@@ -27,13 +27,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -43,7 +43,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -52,20 +52,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "Bestela aukera hau erabili ezazu."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "Mantendu database \"kudeatzaile\" pasahitzak debconf eremuan?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -79,7 +79,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -93,7 +93,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -105,14 +105,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr ""
 "${pkg}-rentzat databasea dbconfig-common erabiliaz konfiguratu nahi al duzu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -122,7 +122,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -136,20 +136,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Bestela ziurrenik aukera hau erabili beharko zenuke."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr "Errorea ${pkg}-rentzat databasea instalatzerakoan."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -160,7 +160,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "If you wish to re-install the database for ${pkg}, you should select this "
@@ -173,13 +173,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -191,7 +191,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -205,13 +205,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-ren database ezabatzea dbconfig-common bidez egin?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -221,14 +221,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -238,19 +238,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr "Bestela aukera hau erabili ezazu."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid "Database type to be used by ${pkg}:"
 msgstr "${pkg}-ek erabiliko duen database mota:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -260,13 +260,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -275,7 +275,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -287,14 +287,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -308,32 +308,64 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "Pasahitz berrespena:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "Pasahitzak ez dira berdinak."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Emandako pasahitzak ez dira berdinak. Saiatu berriro mesedez."
 
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 #, fuzzy
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-ren databasea eguneratzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 #, fuzzy
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
@@ -342,7 +374,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -350,27 +393,36 @@
 "Zorinez, databasearen babeskopia bat egin da ${dbfile} eguneratu aurretik."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 #, fuzzy
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-rentzat databasea instalatzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 #, fuzzy
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
@@ -379,7 +431,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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 "
@@ -393,33 +445,21 @@
 msgstr ""
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr ""
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 #, fuzzy
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-ren databasea ezabatzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 #, fuzzy
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
@@ -436,32 +476,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} zerbitzariaren ostalari izena:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -471,13 +492,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "${dbvendor} zerbitzuaren ataka zenbakia:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -489,19 +510,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} zerbitzaria duen  ostalari izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "Ezarri urruneko ${dbvendor} zerbitzariaren ostalari izena."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -511,13 +532,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} database izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -525,13 +546,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} erabiltzaile izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -544,7 +565,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -554,15 +575,48 @@
 "da. Erabiltzaile honek databasean datuak sartu, aldatu edo ezabatzeko "
 "baimena izango du."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "${pkg}-ren ${dbvendor} erabiltzaile izena:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr ""
+"Mesedez ezarri ${pkg}-ek erabiliko duen ${dbvendor} databasearen izena."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "${pkg}-ren MySQL-rekiko konexio metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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,14 +630,49 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "${pkg}-ren MySQL aplikazio pasahitza:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+#, 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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "Database kudeatzaile erabiltzaile izena:"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"Zein da pakete honek kudeaketa ekintzak aurrera eramateko erabiliko duen "
+"erabiltzaile kontuaren izena? Erabiltzaile hau database erabiltzaileak "
+"sortzeko baimena duena da."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -592,7 +681,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+msgid "Password of your database's administrative user:"
+msgstr "Databasearen kudeatzaile erabiltzaileran pasahitza:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -602,31 +699,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "${pkg}-ren PostgreSQL-rekiko konexio metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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 "
@@ -640,26 +725,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "${pkg}-ren PostgreSQL aplikazio pasahitza:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 #, 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: password
-#. Description
-#: ../dbconfig-common.templates:282
-#, 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."
@@ -668,33 +742,9 @@
 "PostgreSQL sarrera berkonfiguratu egin behar da pasahitz egiaztapen sarrera "
 "baimentzeko."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-msgid "Name of your database's administrative user:"
-msgstr "Database kudeatzaile erabiltzaile izena:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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 "
-"database users."
-msgstr ""
-"Zein da pakete honek kudeaketa ekintzak aurrera eramateko erabiliko duen "
-"erabiltzaile kontuaren izena? Erabiltzaile hau database erabiltzaileak "
-"sortzeko baimena duena da."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-msgid "Password of your database's administrative user:"
-msgstr "Databasearen kudeatzaile erabiltzaileran pasahitza:"
-
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -707,55 +757,43 @@
 "da.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "PostgreSQL kudeatzaile egiaztapen metodoa:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"PostgreSQL-ek zenbait metodo ditu konexioak egiaztatzeko. Hautatu zein "
-"metodo erabili behar duen kudeatzaileak zerbitzarira konektatzerakoan."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "PostgreSQL erabiltzaile egiaztapen metodoa:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "PostgreSQL kudeatzaile egiaztapen metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "PostgreSQL-ek zenbait metodo ditu konexioak egiaztatzeko. Hautatu zein "
-"metodo erabili behar duen database erabiltzaileak zerbitzarira "
-"konektatzerakoan."
+"metodo erabili behar duen kudeatzaileak zerbitzarira konektatzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -765,7 +803,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -776,7 +816,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -790,7 +832,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -798,15 +842,33 @@
 "Lehenespen bezala ostalari berdinean abiaraziriko Debian PostgreSQL "
 "batentzat, ziurrenik \"ident\" erabili beharko duzu."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "PostgreSQL erabiltzaile egiaztapen metodoa:"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"PostgreSQL-ek zenbait metodo ditu konexioak egiaztatzeko. Hautatu zein "
+"metodo erabili behar duen database erabiltzaileak zerbitzarira "
+"konektatzerakoan."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 +877,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -829,13 +891,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "PostgreSQL konfigurazioa automatikoki aldatu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -847,14 +909,22 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "PostgreSQL konfigurazioa automatikoki aldatu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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,21 +935,15 @@
 "pg_hba.conf:"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr ""
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Mesedez /etc/postgresql/pg_hba.conf aldatu"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -891,7 +955,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 

Modified: trunk/debian/po/fr.po
===================================================================
--- trunk/debian/po/fr.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/fr.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+1200\n"
 "PO-Revision-Date: 2006-06-18 10:58+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -29,14 +29,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 "Ce serveur sera-t-il utilisé pour accéder à des bases de données distantes ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -52,7 +52,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -64,20 +64,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "If you are unsure, you should not select this option."
 msgstr "Dans le doute, vous ne devriez pas choisir cette option."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr ""
 "Faut-il garder les mots de passe des administrateurs des bases de données ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -91,7 +91,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -106,7 +106,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -119,13 +119,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Faut-il configurer la base de données de ${pkg} avec dbconfig-common ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -136,7 +136,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -151,19 +151,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Autrement, vous devriez choisir cette option."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 msgid "Re-install database for ${pkg}?"
 msgstr "Faut-il réinstaller la base de données pour ${pkg} ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
 "database which it uses."
@@ -173,7 +173,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 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 "
@@ -185,14 +185,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -204,7 +204,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -218,14 +218,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -235,14 +235,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -252,19 +252,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr "Autrement, vous devriez choisir cette option."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 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:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -275,13 +275,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -291,7 +291,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -303,14 +303,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -324,27 +324,59 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "Confirmation du mot de passe :"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "Les mots de passe ne correspondent pas"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 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 "
 "réessayer."
 
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr "Abandonner"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr "Recommencer"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr "Recommencer avec les mêmes réglages"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de la mise à jour de la base de données pour ${pkg}. Action "
@@ -352,7 +384,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -362,7 +394,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -371,20 +414,36 @@
 "créée juste avant la mise à jour."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
-msgstr "Recommencer avec les mêmes réglages"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
+msgstr ""
+"Vous pouvez soit recommencer soit abandonner l'opération. Si vous choisissez "
+"« Recommencer », la mise à jour sera tentée à nouveau en vous posant à "
+"nouveau les questions de configuration. Avec l'option « Recommencer avec les "
+"mêmes réglages », la mise à jour sera tentée immédiatement. Enfin, avec le "
+"choix « Abandonner », la mise à jour échouera et vous devrez revenir à la "
+"version précédente, désinstaller et reconfigurer ce paquet, à moins "
+"d'effectuer vous-même les opérations nécessaires pour continuer à l'utiliser."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr "Ignorer"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de l'installation de la base de données pour ${pkg}. Action "
@@ -392,7 +451,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -402,7 +461,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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 "
@@ -423,20 +482,8 @@
 "d'effectuer vous-même les opérations nécessaires pour continuer à l'utiliser."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr "Abandonner"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr "Recommencer"
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de la suppression de la base de données de ${pkg}. Action "
@@ -444,7 +491,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -452,7 +499,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -470,39 +517,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"Vous pouvez soit recommencer soit abandonner l'opération. Si vous choisissez "
-"« Recommencer », la mise à jour sera tentée à nouveau en vous posant à "
-"nouveau les questions de configuration. Avec l'option « Recommencer avec les "
-"mêmes réglages », la mise à jour sera tentée immédiatement. Enfin, avec le "
-"choix « Abandonner », la mise à jour échouera et vous devrez revenir à la "
-"version précédente, désinstaller et reconfigurer ce paquet, à moins "
-"d'effectuer vous-même les opérations nécessaires pour continuer à l'utiliser."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 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:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -512,13 +533,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Numéro de port pour le service ${dbvendor} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -530,19 +551,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Nom d'hôte du serveur ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -552,13 +573,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nom de la base de données ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -567,13 +588,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Identifiant ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -586,7 +607,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -597,15 +618,49 @@
 "pourra à volonté insérer, changer ou supprimer des données dans la base de "
 "données."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "Identifiant ${dbvendor} pour ${pkg} :"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr ""
+"Veuillez indiquer un nom pour la base de données ${dbvendor} à utiliser pour "
+"${pkg}."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr "Socket UNIX"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr "TCP/IP"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -619,14 +674,49 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Mot de passe de connexion MySQL pour ${pkg} :"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "Nom de l'administrateur de la base de données :"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"Veuillez indiquer le nom du compte à utiliser pour les actions "
+"administratives. Cet identifiant possède les droits de création de nouveaux "
+"utilisateurs de la base de données."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -635,7 +725,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+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:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -645,31 +743,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr "Socket UNIX"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr "TCP/IP"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "TCP/IP + SSL"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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:274
+#: ../dbconfig-common.templates:26002
 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 "
@@ -683,25 +769,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Mot de passe de connexion PostgreSQL pour ${pkg} :"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 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: password
-#. Description
-#: ../dbconfig-common.templates:282
-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."
@@ -712,33 +787,9 @@
 "nécessite peut-être une reconfiguration afin de permettre l'authentification "
 "par mot de passe."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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:293
-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 "
-"database users."
-msgstr ""
-"Veuillez indiquer le nom du compte à utiliser pour les actions "
-"administratives. Cet identifiant possède les droits de création de nouveaux "
-"utilisateurs de la base de données."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-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:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -751,56 +802,44 @@
 "l'authentification du système est utilisée."
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Méthode d'authentification de l'administrateur PostgreSQL :"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"Les serveurs PostgreSQL disposent de plusieurs méthodes pour authentifier "
-"les connexions. Veuillez choisir la méthode que l'administrateur doit "
-"utiliser pour les connexions au serveur."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "Ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "Mot de passe"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "Méthode d'authentification pour l'utilisateur de PostgreSQL :"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Méthode d'authentification de l'administrateur PostgreSQL :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
-"Les serveurs PostgreSQL fournissent plusieurs mécanismes pour authentifier "
-"les connexions. Veuillez choisir la méthode qui sera utilisée pour la "
-"connexion au serveur."
+"Les serveurs PostgreSQL disposent de plusieurs méthodes pour authentifier "
+"les connexions. Veuillez choisir la méthode que l'administrateur doit "
+"utiliser pour les connexions au serveur."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -810,7 +849,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -821,7 +862,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -834,7 +877,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -842,16 +887,34 @@
 "Choisissez « ident » si vous utilisez une installation par défaut de "
 "PostgreSQL sur l'hôte local."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Méthode d'authentification pour l'utilisateur de PostgreSQL :"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"Les serveurs PostgreSQL fournissent plusieurs mécanismes pour authentifier "
+"les connexions. Veuillez choisir la méthode qui sera utilisée pour la "
+"connexion au serveur."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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:353
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -863,7 +926,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 "
@@ -877,13 +940,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Faut-il modifier la configuration de PostgreSQL automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -900,13 +963,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Faut-il restaurer la configuration de PostgreSQL automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -924,21 +995,15 @@
 "common une fois le paquet supprimé. Si vous préférez le faire vous-même, "
 "veuillez supprimer la ligne suivante de votre fichier pg_hba.conf :"
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Modification de /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -950,7 +1015,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL n'accepte pas les mots de passe vides."
 

Modified: trunk/debian/po/it.po
===================================================================
--- trunk/debian/po/it.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/it.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -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-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+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"
@@ -16,13 +16,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -32,7 +32,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -41,20 +41,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "Altrimenti la si accetti."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "Mantenere le password di \"amministrazione\" in debconf?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -67,7 +67,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -81,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -93,13 +93,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Configurare il database di ${pkg} con dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -109,7 +109,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -123,20 +123,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Negli altri casi è meglio scegliere questa opzione."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr "Errore nell'installazione del database di ${pkg}. Riprovare?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -147,7 +147,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "If you wish to re-install the database for ${pkg}, you should select this "
@@ -160,13 +160,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -178,7 +178,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -192,13 +192,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Eliminare la configurazione di dbconfig-common per ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -208,14 +208,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -225,19 +225,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr "Altrimenti la si accetti."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid "Database type to be used by ${pkg}:"
 msgstr "Tipo di database da usare con ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -247,13 +247,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Si vuole eliminare il database di ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -263,7 +263,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -275,14 +275,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -296,31 +296,63 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "Conferma della password:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "Le password non coincidono."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Le password fornite non coincidono. Riprovare."
 
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Errore aggiornando il database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -330,7 +362,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -339,26 +382,42 @@
 "dell'aggiornamento in ${dbfile}."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
 msgstr ""
+"A questo punto si ha la possibilità di ritentare l'operazione. Se si "
+"seleziona «retry» verranno poste nuovamente tutte le comande sulla "
+"configurazione e poi verrà tentata l'operazione. Se invece si seleziona "
+"«retry (skip questions)» l'operazione verrà tentata senza riporre tutte le "
+"domande. Infine selezionando «abort» l'operazione fallisce e si dovrà "
+"ripristinare il vecchio pacchetto, reinstallarlo e riconfigurarlo oppure "
+"intervenire manualmente per continuare ad usarlo."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Errore nell'installazione del database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -367,7 +426,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -389,32 +448,20 @@
 "intervenire manualmente per continuare ad usarlo."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr ""
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Errore eliminando il database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -432,39 +479,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"A questo punto si ha la possibilità di ritentare l'operazione. Se si "
-"seleziona «retry» verranno poste nuovamente tutte le comande sulla "
-"configurazione e poi verrà tentata l'operazione. Se invece si seleziona "
-"«retry (skip questions)» l'operazione verrà tentata senza riporre tutte le "
-"domande. Infine selezionando «abort» l'operazione fallisce e si dovrà "
-"ripristinare il vecchio pacchetto, reinstallarlo e riconfigurarlo oppure "
-"intervenire manualmente per continuare ad usarlo."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 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:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -474,13 +495,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Numero della porta del servizio ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -492,19 +513,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -514,26 +535,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome del database ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 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:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Utente ${dbvendor} di ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -545,7 +566,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -555,15 +576,47 @@
 "che verranno creati durante questa installazione. Questo utente avrà massima "
 "libertà di inserire, cambiare o cancellare i dati nel database."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "Utente ${dbvendor} di ${pkg}:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr "Inserire il nome del database ${dbvendor} da fare usare a ${pkg}."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Metodo di connessione al database MySQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -577,14 +630,48 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Password applicativa per MySQL per ${pkg}:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "Node dell'utente amministratore del database:"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"Qual è il nome dell'account che questo pacchetto deve utilizzare per "
+"svolgere operazioni amministrative? È in genere l'utente che può creare "
+"nuovi utenti del database."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -593,7 +680,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+msgid "Password of your database's administrative user:"
+msgstr "Password per l'utente amministratore del database:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -603,31 +698,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Metodo di connessione al database PostgreSQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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 "
@@ -641,23 +724,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Password applicativa di ${pkg} per PostgreSQL:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
-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: password
-#. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -669,33 +742,9 @@
 "accesso al server PostgreSQL potrebbero richiedere delle modifiche per "
 "permettere l'autenticazione tramite password."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-msgid "Name of your database's administrative user:"
-msgstr "Node dell'utente amministratore del database:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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 "
-"database users."
-msgstr ""
-"Qual è il nome dell'account che questo pacchetto deve utilizzare per "
-"svolgere operazioni amministrative? È in genere l'utente che può creare "
-"nuovi utenti del database."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-msgid "Password of your database's administrative user:"
-msgstr "Password per l'utente amministratore del database:"
-
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -708,56 +757,44 @@
 "a livello di sistema.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Modalità di autenticazione dell'amministratore PostgreSQL:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"Il server PostgreSQL offre diversi meccanismi per l'autenticazione delle "
-"connessioni. Selezionare il metodo che l'utente amministratore deve "
-"utilizzare per collegarsi al server."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "Modalità di autenticazione dell'utente PostgreSQL:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Modalità di autenticazione dell'amministratore PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "Il server PostgreSQL offre diversi meccanismi per l'autenticazione delle "
-"connessioni. Selezionare il metodo che l'utente del database deve utilizzare "
-"per collegarsi al server."
+"connessioni. Selezionare il metodo che l'utente amministratore deve "
+"utilizzare per collegarsi al server."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 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 +804,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -778,7 +817,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -792,7 +833,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -800,15 +843,33 @@
 "Per una installazione di PostgreSQL standard Debian, sulla stessa macchina, "
 "probabilmente la scelta migliore è \"ident\"."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Modalità di autenticazione dell'utente PostgreSQL:"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"Il server PostgreSQL offre diversi meccanismi per l'autenticazione delle "
+"connessioni. Selezionare il metodo che l'utente del database deve utilizzare "
+"per collegarsi al server."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Scegliere un diverso metodo di connessione a PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 +881,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 "
@@ -834,13 +895,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Modificare la configurazione di PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -852,14 +913,22 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Modificare la configurazione di PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -870,21 +939,15 @@
 "pg_hba.conf:"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr ""
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Modificare /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -896,7 +959,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL non permette le password vuote."
 

Modified: trunk/debian/po/nl.po
===================================================================
--- trunk/debian/po/nl.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/nl.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+1200\n"
 "PO-Revision-Date: 2006-07-03 14:59+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -26,7 +26,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 "Zal deze server gebruikt worden om toegang te verkrijgen op databases op "
@@ -34,7 +34,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -49,7 +49,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -61,20 +61,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "If you are unsure, you should not select this option."
 msgstr "Als u niet zeker bent, kunt u hier best weigeren."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr ""
 "Door de beheerder te gebruiken database-wachtwoorden bijhouden in debconf?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -88,7 +88,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -102,7 +102,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -114,13 +114,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Database voor ${pkg} via dbconfig-common instellen?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -130,7 +130,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -144,19 +144,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Zoniet kunt u deze optie best aanvaarden."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 msgid "Re-install database for ${pkg}?"
 msgstr "De database voor ${pkg} herinstalleren?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
 "database which it uses."
@@ -166,7 +166,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 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 "
@@ -178,13 +178,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-database opwaarderen met dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -196,7 +196,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -211,13 +211,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-database de-configureren via dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -227,14 +227,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -244,19 +244,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:94
+#: ../dbconfig-common.templates:7001
 msgid "Database type to be used by ${pkg}:"
 msgstr "Welk type database dient ${pkg} te gebruiken?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -266,13 +266,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Wilt u de ${pkg}-database wissen?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -282,7 +282,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -294,7 +294,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -302,7 +302,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -316,27 +316,59 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "Bevestiging wachtwoord (nogmaals intikken):"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "De door u ingevoerde wachtwoorden komen niet overeen. Gelieve opnieuw te "
 "proberen."
 
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr "afbreken"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr "opnieuw proberen"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr "opnieuw proberen (vragen overslaan)"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "Fout bij het opwaarderen van de ${pkg}-database. Wilt u dit nogmaals "
@@ -344,7 +376,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -354,7 +386,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -363,20 +406,38 @@
 "voor de opwaardering. Deze vindt u in ${dbfile}."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
-msgstr "opnieuw proberen (vragen overslaan)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
+msgstr ""
+"U heeft nu de mogelijkheid om de optie opnieuw te proberen of om de operatie "
+"af te breken. Als u voor opnieuw proberen kiest zult u alle "
+"configuratievragen nogmaals te zien krijgen, waarna een nieuwe poging "
+"gewaagd zal worden om de operatie uit te voeren. Als u voor 'Opnieuw "
+"proberen (vragen overslaan)' kiest zal de operatie onmiddelijk nogmaals "
+"uitgevoerd worden, zonder de vragen opnieuw te stellen. Als u kiest om af te "
+"breken dan faalt de operatie en zult u of een eerder versie van het pakket "
+"moeten herinstalleren en herconfigureren, of op een andere wijze handmatig "
+"moeten tussenkomen."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr "negeren"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "Fout bij het installeren van de ${pkg}-database. Wilt u dit nogmaals "
@@ -384,7 +445,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -394,7 +455,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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 "
@@ -418,33 +479,21 @@
 "verdere foutmeldingen van dbconfig-common genegeerd. "
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr "afbreken"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr "opnieuw proberen"
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -462,35 +511,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"U heeft nu de mogelijkheid om de optie opnieuw te proberen of om de operatie "
-"af te breken. Als u voor opnieuw proberen kiest zult u alle "
-"configuratievragen nogmaals te zien krijgen, waarna een nieuwe poging "
-"gewaagd zal worden om de operatie uit te voeren. Als u voor 'Opnieuw "
-"proberen (vragen overslaan)' kiest zal de operatie onmiddelijk nogmaals "
-"uitgevoerd worden, zonder de vragen opnieuw te stellen. Als u kiest om af te "
-"breken dan faalt de operatie en zult u of een eerder versie van het pakket "
-"moeten herinstalleren en herconfigureren, of op een andere wijze handmatig "
-"moeten tussenkomen."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr ""
 "Wat is de computernaam van de door ${pkg} te gebruiken ${dbvendor}-database-"
@@ -498,7 +519,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -508,13 +529,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -526,7 +547,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 "Wat is de computernaam van de door ${pkg} te gebruiken ${dbvendor}-database-"
@@ -534,7 +555,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Gelieve hier de computernaam van de (niet-lokale) ${dbvendor}-server in te "
@@ -542,7 +563,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -552,14 +573,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 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:222
+#: ../dbconfig-common.templates:19001
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -568,14 +589,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr ""
 "Met welke gebruikersnaam dient ${pkg} zich bij ${dbvendor} aan te melden?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -588,7 +609,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -599,16 +620,51 @@
 "bijgevolg alle vrijheid om dingen in de database toe te voegen, veranderen, "
 "of verwijderen."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr ""
+"Met welke gebruikersnaam dient ${pkg} zich bij ${dbvendor} aan te melden?"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr ""
+"Gelieve hier de naam op te geven van de door ${pkg} te gebruiken ${dbvendor}-"
+"database."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr "unix socket"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -622,15 +678,49 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr ""
 "Wat is het wachtwoord waarmee ${pkg} zich bij MySQL dient aan te melden?"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "Wat is de naam van de beheers-account voor uw database?"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"Wat is het wachtwoord voor de beheerdersaccount waarmee dit pakket de "
+"benodigde PostgreSQL-database en -gebruiker kan aanmaken?"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -639,7 +729,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+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:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -649,32 +747,20 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr "unix socket"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr "tcp/ip"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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:274
+#: ../dbconfig-common.templates:26002
 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,26 +774,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 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:282
+#: ../dbconfig-common.templates:27001
 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: password
-#. Description
-#: ../dbconfig-common.templates:282
-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."
@@ -717,32 +792,9 @@
 "PostgreSQL-toegang mogelijk opnieuw ingesteld te worden om wachtwoord-"
 "authenticatie toe te laten."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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:293
-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 "
-"database users."
-msgstr ""
-"Wat is het wachtwoord voor de beheerdersaccount waarmee dit pakket de "
-"benodigde PostgreSQL-database en -gebruiker kan aanmaken?"
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-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:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -755,59 +807,45 @@
 "plaats vindt) "
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr ""
-"Welke authenticatiemethode wordt gebruikt door de PostgreSQL-beheerder?"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"PostgreSQL-servers voorzien een aantal verschillende mechanismen om "
-"verbindingen te authenticeren. Welke van deze methoden dient de beheerder "
-"van de database te gebruiken bij het maken van een verbinding met de server?"
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "wachtwoord"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
 msgstr ""
-"Welke authenticatiemethode wordt gebruikt door de PostgreSQL-gebruiker?"
+"Welke authenticatiemethode wordt gebruikt door de PostgreSQL-beheerder?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "PostgreSQL-servers voorzien een aantal verschillende mechanismen om "
-"verbindingen te authenticeren. Welke van deze methoden dient de "
-"databasegebruiker te gebruiken bij het maken van een verbinding met de "
-"server?"
+"verbindingen te authenticeren. Welke van deze methoden dient de beheerder "
+"van de database te gebruiken bij het maken van een verbinding met de server?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -817,7 +855,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -828,7 +868,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -842,7 +884,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -850,15 +894,35 @@
 "Voor een standaard Debian ${dbvendor}-installatie op de lokale machine kunt "
 "u best 'ident' gebruiken."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr ""
+"Welke authenticatiemethode wordt gebruikt door de PostgreSQL-gebruiker?"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"PostgreSQL-servers voorzien een aantal verschillende mechanismen om "
+"verbindingen te authenticeren. Welke van deze methoden dient de "
+"databasegebruiker te gebruiken bij het maken van een verbinding met de "
+"server?"
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Een andere PostgreSQL verbindingsmethode kiezen?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -870,7 +934,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 "
@@ -884,13 +948,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Wilt u dat de PostgreSQL-configuratie automatisch aangepast wordt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -908,13 +972,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Wilt u dat de PostgreSQL-configuratie automatisch teruggezet wordt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -932,21 +1004,15 @@
 "verwijderd is. Als u verkiest om dit handmatig (of helemaal niet) te doen "
 "dient u de volgende regel te verwijderen in uw 'pg_hba.conf'-bestand:"
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Gelieve /etc/postgresql/pg_hba.conf aan te passen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -958,7 +1024,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL ondersteunt geen lege wachtwoorden."
 

Modified: trunk/debian/po/pt.po
===================================================================
--- trunk/debian/po/pt.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/pt.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -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-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+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"
@@ -15,13 +15,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -31,7 +31,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -40,20 +40,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "Caso contrÃ¡rio, deve escolher esta opÃ§Ã£o."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "Manter passwords \"administrativas\" das base de dados no debconf?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -67,7 +67,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -81,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -93,13 +93,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Configurar a base de dados para ${pkg} com dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -109,7 +109,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -124,20 +124,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Caso contrÃ¡rio, vocÃª deve provavelmente escolher esta opÃ§Ã£o."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, 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:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -148,7 +148,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "If you wish to re-install the database for ${pkg}, you should select this "
@@ -162,14 +162,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -182,7 +182,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -197,13 +197,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -213,7 +213,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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-"
@@ -221,7 +221,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -231,19 +231,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr "Caso contrÃ¡rio, deve escolher esta opÃ§Ã£o."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 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:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -253,13 +253,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -269,7 +269,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -282,13 +282,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -303,32 +303,64 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "ConfirmaÃ§Ã£o da password:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "As passwords nÃ£o coincidem."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 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
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr "abortar"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr "tentar novamente"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr "tentar novamente (saltar perguntas)"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 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:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -338,7 +370,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -347,26 +390,43 @@
 "actualizaÃ§Ã£o, em ${dbfile}."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
-msgstr "tentar novamente (saltar perguntas)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
+msgstr ""
+"Neste ponto, vocÃª tem a opÃ§Ã£o de tentar novamente ou abortar a operaÃ§Ã£o. Se "
+"vocÃª escolher \"retry\", ser-lhe-Ã£o perguntadas todas as questÃµes de "
+"configuraÃ§Ã£o mais uma vez e serÃ¡ feita outra tentativa para executar esta "
+"operaÃ§Ã£o. \"retry (skip questions)\" irÃ¡ tentar executar a operaÃ§Ã£o "
+"imediatamente, ignorando todas as questÃµes, Se escolher \"abort\", a "
+"operaÃ§Ã£o falharÃ¡ e vocÃª necessitarÃ¡ fazer um downgrade, re-instalar, re-"
+"configurar este pacote, ou caso contrÃ¡rio intervir manualmente para "
+"continuar a utiliza-lo."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr "ignorar"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -376,7 +436,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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,32 +459,20 @@
 "ignorando eventuais erros do dbconfig-common."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr "abortar"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr "tentar novamente"
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -442,40 +490,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"Neste ponto, vocÃª tem a opÃ§Ã£o de tentar novamente ou abortar a operaÃ§Ã£o. Se "
-"vocÃª escolher \"retry\", ser-lhe-Ã£o perguntadas todas as questÃµes de "
-"configuraÃ§Ã£o mais uma vez e serÃ¡ feita outra tentativa para executar esta "
-"operaÃ§Ã£o. \"retry (skip questions)\" irÃ¡ tentar executar a operaÃ§Ã£o "
-"imediatamente, ignorando todas as questÃµes, Se escolher \"abort\", a "
-"operaÃ§Ã£o falharÃ¡ e vocÃª necessitarÃ¡ fazer um downgrade, re-instalar, re-"
-"configurar este pacote, ou caso contrÃ¡rio intervir manualmente para "
-"continuar a utiliza-lo."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 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:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -485,13 +506,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "NÃºmero do port que corre o serviÃ§o ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -503,13 +524,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Host que corre o servidor ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Por favor disponibilize o nome de uma mÃ¡quina remota com o servidor "
@@ -517,7 +538,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -527,13 +548,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome de base de dados ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -542,13 +563,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nome de utilizador de ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -561,7 +582,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -571,15 +592,49 @@
 "serem criados por esta instalaÃ§Ã£o.  Este utilizador terÃ¡ completa liberdade "
 "para inserir, alterar ou apagar dados na base de dados."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "Nome de utilizador de ${dbvendor} para ${pkg}:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr ""
+"Por favor disponibilize um nome para a base de dados ${dbvendor} para ser "
+"utilizada por ${pkg}."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr "socket unix"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -593,14 +648,49 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Password da aplicaÃ§Ã£o MySQL para ${pkg}:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "Nome do utilizador administrativo da sua base de dados:"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"Qual Ã© o nome da conta com que este pacote deve executar as acÃ§Ãµes "
+"administrativas?  O utilizador Ã© o que for capaz de criar novos utilizadores "
+"de bases de dados."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -609,7 +699,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+msgid "Password of your database's administrative user:"
+msgstr "Password do utilizador administrativo da sua base de dados:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -619,31 +717,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr "socket unix"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr "tcp/ip"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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:274
+#: ../dbconfig-common.templates:26002
 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 "
@@ -657,24 +743,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Password da aplicaÃ§Ã£o PostgreSQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
-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: password
-#. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -686,33 +761,9 @@
 "para si. O acesso ao PostgreSQL pode ter de ser reconfigurado para permitir "
 "acesso autenticado por password."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-msgid "Name of your database's administrative user:"
-msgstr "Nome do utilizador administrativo da sua base de dados:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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 "
-"database users."
-msgstr ""
-"Qual Ã© o nome da conta com que este pacote deve executar as acÃ§Ãµes "
-"administrativas?  O utilizador Ã© o que for capaz de criar novos utilizadores "
-"de bases de dados."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-msgid "Password of your database's administrative user:"
-msgstr "Password do utilizador administrativo da sua base de dados:"
-
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -725,56 +776,44 @@
 "autenticaÃ§Ã£o Ã© feita a nÃvel do sistema.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "MÃ©todo para autenticar o administrador de PostgreSQL:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"Os servidores de PostgreSQL disponibilizam diferentes mecanismos para "
-"autenticaÃ§Ã£o de ligaÃ§Ãµes.  Por favor escolha o mÃ©todo que o utilizador "
-"administrador deve utilizar quando se liga ao servidor."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "password"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "MÃ©todo para autenticar o utilizador de PostgreSQL:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "MÃ©todo para autenticar o administrador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "Os servidores de PostgreSQL disponibilizam diferentes mecanismos para "
-"autenticaÃ§Ã£o das ligaÃ§Ãµes.  Por favor escolha utilizador da base de dados "
-"que deve utilizar quando se liga ao servidor."
+"autenticaÃ§Ã£o de ligaÃ§Ãµes.  Por favor escolha o mÃ©todo que o utilizador "
+"administrador deve utilizar quando se liga ao servidor."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -784,7 +823,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -794,7 +835,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -808,7 +851,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -816,15 +861,33 @@
 "Para uma instalaÃ§Ã£o por omissÃ£o de PostgreSQL em Debian a correr no mesmo "
 "host, vocÃª provavelmente deve querer \"ident\"."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "MÃ©todo para autenticar o utilizador de PostgreSQL:"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"Os servidores de PostgreSQL disponibilizam diferentes mecanismos para "
+"autenticaÃ§Ã£o das ligaÃ§Ãµes.  Por favor escolha utilizador da base de dados "
+"que deve utilizar quando se liga ao servidor."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Escolher um mÃ©todo de ligaÃ§Ã£o de PostgreSQL diferente?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -836,7 +899,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 "
@@ -849,13 +912,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Alterar a configuraÃ§Ã£o de PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -873,13 +936,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Reverter automaticamente a configuraÃ§Ã£o de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -897,21 +968,15 @@
 "removido.  Se preferir que isto seja feito manualmente (ou nÃ£o seja feito), "
 "por favor remova a seguinte linha do seu pg_hba.conf:"
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor altere /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -923,7 +988,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "O PostgreSQL nÃ£o suporta passwords vazias."
 

Modified: trunk/debian/po/pt_BR.po
===================================================================
--- trunk/debian/po/pt_BR.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/pt_BR.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -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-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+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."
@@ -26,13 +26,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -42,7 +42,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -51,20 +51,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "Se não, escolha essa opção."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "Manter senhas de administração dos bancos de dados no debconf?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -78,7 +78,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -93,7 +93,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -105,13 +105,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Configurar banco de dados para ${pkg} com dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -121,7 +121,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -135,20 +135,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Se não, você deve provavelmente escolher essa opção."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr "Erro instalando base de dados para o pacote ${pkg}."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -159,7 +159,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "If you wish to re-install the database for ${pkg}, you should select this "
@@ -173,13 +173,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -191,7 +191,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -205,13 +205,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -221,7 +221,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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-"
@@ -229,7 +229,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -239,19 +239,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr "Se não, escolha essa opção."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid "Database type to be used by ${pkg}:"
 msgstr "Banco de dados usado pelo pacote ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -262,13 +262,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -278,7 +278,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -291,7 +291,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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} "
@@ -299,7 +299,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -314,32 +314,64 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "Confirmação de senha:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "As senhas não batem."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 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
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 #, fuzzy
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Erro atualizando base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 #, fuzzy
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
@@ -348,7 +380,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -357,27 +400,36 @@
 "antes da atualização, em ${dbfile}."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 #, fuzzy
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Erro instalando base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 #, fuzzy
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
@@ -386,7 +438,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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,33 +452,21 @@
 msgstr ""
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr ""
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 #, fuzzy
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Erro removendo base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 #, fuzzy
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
@@ -444,32 +484,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 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:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -479,13 +500,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Número de porta para o serviço ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -497,19 +518,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -519,13 +540,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome da base de dados ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -534,13 +555,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nome de usuário ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -553,7 +574,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -563,15 +584,49 @@
 "objetos a serem criados por essa instalação. Esse usuário terá liberdade "
 "completa para inserir, mudar ou excluir dados na base de dados."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "Nome de usuário ${dbvendor} para o pacote ${pkg}:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr ""
+"Por favor forneça um nome para a base de dados ${dbvendor} a ser usada pelo "
+"pacote ${pkg}."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -585,14 +640,48 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Senha MySQL da aplicação para o pacote ${pkg}:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+#, 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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "Nome do usuário administrativo do banco de dados:"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"Qual é o nome da conta com que esse pacote deve executar ações "
+"administrativas? Esse usuário é o que poderá criar novos usuários de bases."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -601,7 +690,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+msgid "Password of your database's administrative user:"
+msgstr "Senha do usuário administrativo do banco de dados:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -611,31 +708,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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:274
+#: ../dbconfig-common.templates:26002
 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,26 +734,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Senha da aplicação PostgreSQL para o pacote ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 #, 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: password
-#. Description
-#: ../dbconfig-common.templates:282
-#, 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."
@@ -677,32 +751,9 @@
 "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:293
-msgid "Name of your database's administrative user:"
-msgstr "Nome do usuário administrativo do banco de dados:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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 "
-"database users."
-msgstr ""
-"Qual é o nome da conta com que esse pacote deve executar ações "
-"administrativas? Esse usuário é o que poderá criar novos usuários de bases."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-msgid "Password of your database's administrative user:"
-msgstr "Senha do usuário administrativo do banco de dados:"
-
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -714,56 +765,44 @@
 "não é necessária, já que a autenticação é feita em nível de sistema.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Método para autenticar o administrador do PostgreSQL:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"Servidores PostgreSQL fornecem vários mecanismos diferentes para autenticar "
-"conexões. Por favor selecione qual método o usuário administrativo deve usar "
-"quando conectar ao servidor."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "Método para autenticar o usuário PostgreSQL:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Método para autenticar o administrador do PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "Servidores PostgreSQL fornecem vários mecanismos diferentes para autenticar "
-"conexões. Por favor selecione qual método o usuário da base deve usar quando "
-"conectar ao servidor."
+"conexões. Por favor selecione qual método o usuário administrativo deve usar "
+"quando conectar ao servidor."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 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 +812,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -783,7 +824,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -797,7 +840,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -805,15 +850,33 @@
 "Para uma instalação padrão do PostgreSQL do Debian rodando no mesmo host "
 "você provavelmente quer \"ident\"."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Método para autenticar o usuário PostgreSQL:"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"Servidores PostgreSQL fornecem vários mecanismos diferentes para autenticar "
+"conexões. Por favor selecione qual método o usuário da base deve usar quando "
+"conectar ao servidor."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -822,7 +885,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -837,13 +900,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Mudar a configuração do PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -855,14 +918,22 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Mudar a configuração do PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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,21 +944,15 @@
 "pg_hba.conf:"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr ""
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor modifique o /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -899,7 +964,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 

Modified: trunk/debian/po/sv.po
===================================================================
--- trunk/debian/po/sv.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/sv.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -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-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+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"
@@ -19,13 +19,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -35,7 +35,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -44,20 +44,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "Om inte, bÃ¶r du vÃ¤lja denna Ã¥tgÃ¤rd."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "BehÃ¥lla administrativa databaslÃ¶senord i debconf?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -71,7 +71,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -84,7 +84,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -96,13 +96,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Konfigurera databas fÃ¶r ${pkg} med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -112,7 +112,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -126,20 +126,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "Annars bÃ¶r du antagligen vÃ¤lja denna instÃ¤llning."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, 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:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -150,7 +150,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "If you wish to re-install the database for ${pkg}, you should select this "
@@ -163,13 +163,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -181,7 +181,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -195,13 +195,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Avkonfigurera databasen fÃ¶r ${pkg} med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -211,14 +211,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -228,19 +228,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr "Om inte, bÃ¶r du vÃ¤lja denna Ã¥tgÃ¤rd."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid "Database type to be used by ${pkg}:"
 msgstr "Databastyp att anvÃ¤nda fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -250,13 +250,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Vill du rensa databasen fÃ¶r ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -266,7 +266,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -278,13 +278,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -298,31 +298,63 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "BekrÃ¤ftelse av lÃ¶senord:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "LÃ¶senorden stÃ¤mmer inte Ã¶verens."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 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
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr "avbryt"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr "fÃ¶rsÃ¶k igen"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr "fÃ¶rsÃ¶k igen (hoppa Ã¶ver frÃ¥gor)"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 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:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -332,7 +364,18 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -341,26 +384,42 @@
 "fÃ¶re uppgraderingen i ${dbfile}."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
-msgstr "fÃ¶rsÃ¶k igen (hoppa Ã¶ver frÃ¥gor)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
+msgstr ""
+"Just nu har du mÃ¶jlighet att fÃ¶rsÃ¶ka igen eller avbryta operationen. Om du "
+"vÃ¤ljer \"retry\" kommer du bli frÃ¥gad med alla konfigurationsfrÃ¥gorna en "
+"gÃ¥ng till och ett fÃ¶rsÃ¶k kommer att gÃ¶ras att genomfÃ¶ra operationen. \"retry "
+"(skip questions)\" kommer omedelbart att fÃ¶rsÃ¶ka operationen igen och hoppa "
+"Ã¶ver frÃ¥gorna. Om du vÃ¤ljer \"abort\" kommer operationen att misslyckas och "
+"du kommer att behÃ¶va nedgradera, ominstallera, omkonfigurera paketet eller "
+"annars manuellt ingripa fÃ¶r att fortsÃ¤tta anvÃ¤nda det."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr "ignorera"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -370,7 +429,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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 "
@@ -393,32 +452,20 @@
 "fortsÃ¤tta och ignorera ytterligare fel frÃ¥n dbconfig-common."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr "avbryt"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr "fÃ¶rsÃ¶k igen"
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -436,39 +483,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"Just nu har du mÃ¶jlighet att fÃ¶rsÃ¶ka igen eller avbryta operationen. Om du "
-"vÃ¤ljer \"retry\" kommer du bli frÃ¥gad med alla konfigurationsfrÃ¥gorna en "
-"gÃ¥ng till och ett fÃ¶rsÃ¶k kommer att gÃ¶ras att genomfÃ¶ra operationen. \"retry "
-"(skip questions)\" kommer omedelbart att fÃ¶rsÃ¶ka operationen igen och hoppa "
-"Ã¶ver frÃ¥gorna. Om du vÃ¤ljer \"abort\" kommer operationen att misslyckas och "
-"du kommer att behÃ¶va nedgradera, ominstallera, omkonfigurera paketet eller "
-"annars manuellt ingripa fÃ¶r att fortsÃ¤tta anvÃ¤nda det."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 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:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -478,13 +499,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Portnummer fÃ¶r ${dbvendor}-tjÃ¤nsten:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -496,19 +517,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -519,26 +540,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor}-databasnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 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:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor}-anvÃ¤ndarnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -550,7 +571,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -560,15 +581,47 @@
 "som skapas av denna installation. Denna anvÃ¤ndare kommer att ha total frihet "
 "att lÃ¤gga till, Ã¤ndra och ta bort data i databasen."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "${dbvendor}-anvÃ¤ndarnamn fÃ¶r ${pkg}:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr "Ange ett namn fÃ¶r ${dbvendor}-databasen som ska anvÃ¤ndas av ${pkg}."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr "unix socket"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Anslutningsmetod fÃ¶r MySQL-databasen fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -582,14 +635,48 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL-lÃ¶senord fÃ¶r ${pkg}:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr "Namnet pÃ¥ din databasadministratÃ¶rs anvÃ¤ndare:"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"Vad Ã¤r namnet pÃ¥ kontot som vilken detta paket ska genomfÃ¶ra administrativa "
+"Ã¥tgÃ¤rder med?  Denna anvÃ¤ndare Ã¤r den som har mÃ¶jligheten att skapa nya "
+"databasanvÃ¤ndare."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -598,7 +685,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+msgid "Password of your database's administrative user:"
+msgstr "LÃ¶senord fÃ¶r din databasadministratÃ¶rs anvÃ¤ndare:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -608,31 +703,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr "unix socket"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr "tcp/ip"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Anslutningsmetod fÃ¶r PostgreSQL-databasen fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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 "
@@ -646,23 +729,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL-lÃ¶senord fÃ¶r ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
-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: password
-#. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -674,33 +747,9 @@
 "Omkonfiguration fÃ¶r tillgÃ¥ng till PostgreSQL kan behÃ¶vas gÃ¶ras fÃ¶r att "
 "tillÃ¥ta lÃ¶senordsautentisering."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-msgid "Name of your database's administrative user:"
-msgstr "Namnet pÃ¥ din databasadministratÃ¶rs anvÃ¤ndare:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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 "
-"database users."
-msgstr ""
-"Vad Ã¤r namnet pÃ¥ kontot som vilken detta paket ska genomfÃ¶ra administrativa "
-"Ã¥tgÃ¤rder med?  Denna anvÃ¤ndare Ã¤r den som har mÃ¶jligheten att skapa nya "
-"databasanvÃ¤ndare."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-msgid "Password of your database's administrative user:"
-msgstr "LÃ¶senord fÃ¶r din databasadministratÃ¶rs anvÃ¤ndare:"
-
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -712,56 +761,44 @@
 "krÃ¤vs inte ett databaslÃ¶senord eftersom autentisering gÃ¶rs pÃ¥ systemnivÃ¥.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Metod fÃ¶r att autentisera PostgreSQL-administratÃ¶ren:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"PostgreSQL-servrar erbjuder ett flertal olika mekanismer fÃ¶r att autentisera "
-"anslutningar. VÃ¤nligen vÃ¤lj den metod som den administrativa anvÃ¤ndaren bÃ¶r "
-"anvÃ¤nda nÃ¤r anslutningar gÃ¶rs mot servern."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "lÃ¶senord"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "Metod fÃ¶r att autentisera PostgreSQL-anvÃ¤ndare:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Metod fÃ¶r att autentisera PostgreSQL-administratÃ¶ren:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "PostgreSQL-servrar erbjuder ett flertal olika mekanismer fÃ¶r att autentisera "
-"anslutningar. VÃ¤nligen vÃ¤lj den metod som databasanvÃ¤ndaren bÃ¶r anvÃ¤nda nÃ¤r "
-"anslutningar gÃ¶rs mot servern."
+"anslutningar. VÃ¤nligen vÃ¤lj den metod som den administrativa anvÃ¤ndaren bÃ¶r "
+"anvÃ¤nda nÃ¤r anslutningar gÃ¶rs mot servern."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 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 +808,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -781,7 +820,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 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 +836,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -803,15 +846,33 @@
 "FÃ¶r en standardinstÃ¤lld PostgreSQL-installation pÃ¥ Debian som kÃ¶rs pÃ¥ samma "
 "vÃ¤rd vill du antagligen anvÃ¤nda \"ident\"."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Metod fÃ¶r att autentisera PostgreSQL-anvÃ¤ndare:"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"PostgreSQL-servrar erbjuder ett flertal olika mekanismer fÃ¶r att autentisera "
+"anslutningar. VÃ¤nligen vÃ¤lj den metod som databasanvÃ¤ndaren bÃ¶r anvÃ¤nda nÃ¤r "
+"anslutningar gÃ¶rs mot servern."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "VÃ¤lja en annan anslutningsmetod fÃ¶r PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -823,7 +884,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 "
@@ -836,13 +897,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Ã„ndra konfiguration fÃ¶r PostgreSQL automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -859,13 +920,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Ã…terstÃ¤ll PostgreSQL-konfigurationen automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -883,21 +952,15 @@
 "ditt paket tas bort.  Om du fÃ¶redrar att detta gÃ¶rs manuellt (eller inte "
 "alls), vÃ¤nligen ta bort fÃ¶ljande rad frÃ¥n din pg_hba.conf:"
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "VÃ¤nligen Ã¤ndra /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -909,7 +972,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL har inte stÃ¶d fÃ¶r blanka lÃ¶senord."
 

Modified: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/templates.pot	2006-08-15 08:58:56 UTC (rev 303)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+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"
@@ -18,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -34,7 +34,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -43,19 +43,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "If you are unsure, you should not select this option."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -65,7 +65,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -75,7 +75,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -84,13 +84,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -98,7 +98,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -108,19 +108,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 msgid "Re-install database for ${pkg}?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
 "database which it uses."
@@ -128,7 +128,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 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 "
@@ -137,13 +137,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -152,7 +152,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -162,13 +162,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -176,13 +176,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -190,19 +190,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 msgid "Otherwise, you should choose this option."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid "Database type to be used by ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -210,13 +210,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -224,7 +224,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -233,13 +233,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -249,31 +249,63 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -281,33 +313,53 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
 msgstr ""
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -315,7 +367,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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 "
@@ -329,32 +381,20 @@
 msgstr ""
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr ""
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 msgid "An error seems to have occurred while removing the database."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -366,32 +406,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -399,13 +420,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -414,19 +435,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -434,26 +455,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -462,22 +483,52 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
 "insert, change or delete data in the database."
 msgstr ""
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr ""
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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 "
@@ -487,21 +538,58 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr ""
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+msgid "Name of your database's administrative user:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+msgid "Password of your database's administrative user:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -509,31 +597,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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 "
@@ -543,51 +619,22 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 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: password
-#. Description
-#: ../dbconfig-common.templates:282
-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:293
-msgid "Name of your database's administrative user:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:293
-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 "
-"database users."
-msgstr ""
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-msgid "Password of your database's administrative user:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -596,50 +643,41 @@
 msgstr ""
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr ""
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
+#: ../dbconfig-common.templates:30002
+msgid "Method for authenticating PostgreSQL administrator:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -647,7 +685,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -655,7 +695,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -665,21 +707,38 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
 msgstr ""
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid "Method for authenticating PostgreSQL user:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -688,7 +747,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 "
@@ -698,13 +757,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -716,13 +775,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -733,21 +800,15 @@
 "pg_hba.conf:"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr ""
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -756,6 +817,6 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""

Modified: trunk/debian/po/vi.po
===================================================================
--- trunk/debian/po/vi.po	2006-08-15 08:50:09 UTC (rev 302)
+++ trunk/debian/po/vi.po	2006-08-15 08:58:56 UTC (rev 303)
@@ -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-08-01 22:33-0700\n"
+"POT-Creation-Date: 2006-08-15 21:00+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"
@@ -18,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -34,7 +34,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 msgid ""
 "If you select this option, the default behaviour will be to prompt you with "
 "questions related to remote database configuration when you install new "
@@ -43,21 +43,21 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4
+#: ../dbconfig-common.templates:1001
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "KhÃ´ng thÃ¬ hÃ£y hiá»‡u lá»±c tÃ¹y chá»n nÃ y."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr ""
 "CÃ³ giá»¯ cÃ¡c máºt kháº©u cÆ¡ sá»Ÿ dá»¯ liá»‡u kiá»ƒu Â« quáº£n trá»‹ Â» trong debconf khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -71,7 +71,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -85,7 +85,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:20
+#: ../dbconfig-common.templates:2001
 msgid ""
 "If you would rather not be bothered by for an administrative password every "
 "time you upgrade a database application with dbconfig-common, you should "
@@ -97,13 +97,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Cáº¥u hÃ¬nh cÆ¡ sá»Ÿ dá»¯ liá»‡u cho ${pkg} báº±ng dbconfig-common khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -113,7 +113,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid ""
 "If you are an advanced database administrator and know that you want to "
 "perform this configuration manually, or if your database has already been "
@@ -127,20 +127,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:38
+#: ../dbconfig-common.templates:3001
 msgid "Otherwise, you should probably choose this option."
 msgstr "KhÃ´ng thÃ¬ báº¡n hÃ£y hiá»‡u lá»±c tÃ¹y chá»n nÃ y."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, 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:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -151,7 +151,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:53
+#: ../dbconfig-common.templates:4001
 #, fuzzy
 msgid ""
 "If you wish to re-install the database for ${pkg}, you should select this "
@@ -164,13 +164,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -181,7 +181,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:64
+#: ../dbconfig-common.templates:5001
 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 "
@@ -195,13 +195,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -211,13 +211,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:79
+#: ../dbconfig-common.templates:6001
 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."
@@ -227,19 +227,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:79
+#: ../dbconfig-common.templates:6001
 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:94
+#: ../dbconfig-common.templates:7001
 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:94
+#: ../dbconfig-common.templates:7001
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -249,13 +249,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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:101
+#: ../dbconfig-common.templates:8001
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -264,7 +264,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:101
+#: ../dbconfig-common.templates:8001
 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 "
@@ -276,13 +276,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:9001
 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:113
+#: ../dbconfig-common.templates:9001
 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 "
@@ -296,31 +296,63 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:125
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
 msgid "Password confirmation:"
 msgstr "XÃ¡c nháºn máºt kháº©u :"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 msgid "Passwords do not match."
 msgstr "Hai máºt kháº©u khÃ´ng trÃ¹ng nhau."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:129
+#: ../dbconfig-common.templates:12001
 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
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "abort"
+msgstr "há»§y bá»"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:15001
+msgid "retry"
+msgstr "thá» láº¡i"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:13001 ../dbconfig-common.templates:14001
+msgid "retry (skip questions)"
+msgstr "thá» láº¡i (bá» qua cÃ¡c cÃ¢u há»i)"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#: ../dbconfig-common.templates:13002
 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:136
+#: ../dbconfig-common.templates:13002
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -328,9 +360,21 @@
 "HÃ¬nh nhÆ° lá»—i Ä‘Ã£ xáº£y ra khi nÃ¢ng cáº¥p cÆ¡ sá»Ÿ dá»¯ liá»‡u. Náº¿u cÃ³ Ãch, Ä‘Ã¢y lÃ  lá»—i "
 "Ä‘Æ°á»£c gáº·p:"
 
+# Variable: do not translate/ biáº¿n: Ä‘á»«ng dá»‹ch
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:136
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:15002
+msgid "${error}"
+msgstr "${error}"
+
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -339,26 +383,44 @@
 "ngay trÆ°á»›c khi nÃ¢ng cáº¥p."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:155
-msgid "retry (skip questions)"
-msgstr "thá» láº¡i (bá» qua cÃ¡c cÃ¢u há»i)"
+#. Description
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:13002 ../dbconfig-common.templates:15002
+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 "
+"once more and another attempt will be made at performing the operation. "
+"\"retry (skip questions)\" will immediately attempt the operation again, "
+"skipping all questions.  If you choose \"abort\", the operation will fail "
+"and you will need to downgrade, reinstall, reconfigure this package, or "
+"otherwise manually intervene to continue using it."
+msgstr ""
+"Táº¡i Ä‘iá»ƒm nÃ y trong tiáº¿n trÃ¬nh, báº¡n tÃ¹y chá»n cÃ³ thá»ƒ thá» láº¡i, hoáº·c há»§y bá» thao "
+"tÃ¡c nÃ y. TÃ¹y chá»n:\n"
+" â€¢ Thá» láº¡i\n"
+"\t\tsáº½ nháº¯c láº¡i báº¡n vá»›i má»i cÃ¢u há»i cáº¥u hÃ¬nh, vÃ  trÃ¬nh nÃ y sáº½ cá»‘ thá»±c hiá»‡n "
+"láº¡i thao tÃ¡c nÃ y. â€¢ Thá» láº¡i (bá» qua cÃ¡c cÃ¢u há»i)\t\n"
+"\t\tngay cá»‘ thá»±c hiá»‡n láº¡i thao tÃ¡c nÃ y, mÃ  sáº½ khÃ´ng há»i cÃ¢u nÃ o.\n"
+" â€¢ Há»§y bá»\n"
+"\t\tsáº½ lÃ m cho thao tÃ¡c bá»‹ lá»—i, vÃ  báº¡n sáº½ cáº§n pháº£i háº¡ cáº¥p, cÃ i Ä‘áº·t láº¡i, cáº¥u "
+"hÃ¬nh láº¡i gÃ³i nÃ y, hoáº·c tá»± lÃ m gÃ¬ cÃ¡ch khÃ¡c, Ä‘á»ƒ tiáº¿p tá»¥c sá» dá»¥ng nÃ³."
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:155
+#: ../dbconfig-common.templates:14001
 msgid "ignore"
 msgstr "bá» qua"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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:157
+#: ../dbconfig-common.templates:14002
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -368,7 +430,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:157
+#: ../dbconfig-common.templates:14002
 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,32 +454,20 @@
 "\t\tsáº½ tiáº¿p tá»¥c thao tÃ¡c nÃ y, bá» qua lá»—i ná»¯a nÃ o tá»« trÃ¬nh dbconfig-common."
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "abort"
-msgstr "há»§y bá»"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:175
-msgid "retry"
-msgstr "thá» láº¡i"
-
-#. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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:177
+#: ../dbconfig-common.templates:15002
 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 "
@@ -431,44 +481,15 @@
 "biáº¿t nguyÃªn nhÃ¢n cá»§a lá»—i nÃ y, vÃ  sá»a nÃ³, hoáº·c khÃ´ng cho phÃ©p trÃ¬nh nÃ y giÃºp "
 "gá»¡ bá» cÆ¡ sá»Ÿ dá»¯ liá»‡u (thÃ¬ pháº£i tá»± gá»¡ bá» nÃ³). Náº¿u cÃ³ Ãch, Ä‘Ã¢y lÃ  lá»—i Ä‘Æ°á»£c gáº·p:"
 
-# Variable: do not translate/ biáº¿n: Ä‘á»«ng dá»‹ch
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
-msgid "${error}"
-msgstr "${error}"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:177
-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 "
-"once more and another attempt will be made at performing the operation. "
-"\"retry (skip questions)\" will immediately attempt the operation again, "
-"skipping all questions.  If you choose \"abort\", the operation will fail "
-"and you will need to downgrade, reinstall, reconfigure this package, or "
-"otherwise manually intervene to continue using it."
-msgstr ""
-"Táº¡i Ä‘iá»ƒm nÃ y trong tiáº¿n trÃ¬nh, báº¡n tÃ¹y chá»n cÃ³ thá»ƒ thá» láº¡i, hoáº·c há»§y bá» thao "
-"tÃ¡c nÃ y. TÃ¹y chá»n:\n"
-" â€¢ Thá» láº¡i\n"
-"\t\tsáº½ nháº¯c láº¡i báº¡n vá»›i má»i cÃ¢u há»i cáº¥u hÃ¬nh, vÃ  trÃ¬nh nÃ y sáº½ cá»‘ thá»±c hiá»‡n "
-"láº¡i thao tÃ¡c nÃ y. â€¢ Thá» láº¡i (bá» qua cÃ¡c cÃ¢u há»i)\t\n"
-"\t\tngay cá»‘ thá»±c hiá»‡n láº¡i thao tÃ¡c nÃ y, mÃ  sáº½ khÃ´ng há»i cÃ¢u nÃ o.\n"
-" â€¢ Há»§y bá»\n"
-"\t\tsáº½ lÃ m cho thao tÃ¡c bá»‹ lá»—i, vÃ  báº¡n sáº½ cáº§n pháº£i háº¡ cáº¥p, cÃ i Ä‘áº·t láº¡i, cáº¥u "
-"hÃ¬nh láº¡i gÃ³i nÃ y, hoáº·c tá»± lÃ m gÃ¬ cÃ¡ch khÃ¡c, Ä‘á»ƒ tiáº¿p tá»¥c sá» dá»¥ng nÃ³."
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:200
+#: ../dbconfig-common.templates:16001
 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:200
+#: ../dbconfig-common.templates:16001
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -477,13 +498,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Sá»‘ hiá»‡u cá»•ng cho dá»‹ch vá»¥ ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:206
+#: ../dbconfig-common.templates:17001
 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 "
@@ -494,19 +515,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 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:213
+#: ../dbconfig-common.templates:18001
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -516,26 +537,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:222
+#: ../dbconfig-common.templates:19001
 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:227
+#: ../dbconfig-common.templates:20001
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "TÃªn dÃ¹ng ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -547,7 +568,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:227
+#: ../dbconfig-common.templates:20001
 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 "
@@ -557,15 +578,47 @@
 "táº¡o trong khi cÃ i Ä‘áº·t. NgÆ°á»i dÃ¹ng nÃ y sáº½ cÃ³ má»i quyá»n chÃ¨n, thay Ä‘á»•i vÃ  xÃ³a "
 "bá» dá»¯ liá»‡u trong cÆ¡ sá»Ÿ dá»¯ liá»‡u."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid "${dbvendor} storage directory for ${pkg}:"
+msgstr "TÃªn dÃ¹ng ${dbvendor} cho ${pkg}:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:21001
+#, fuzzy
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr "HÃ£y nháºp tÃªn cho cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} mÃ  ${pkg} sáº½ dÃ¹ng."
+
 #. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "unix socket"
+msgstr "á»• cáº¯m UNIX"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
+msgid "tcp/ip"
+msgstr "TCP/IP"
+
+#. Type: select
 #. Description
-#: ../dbconfig-common.templates:240
+#: ../dbconfig-common.templates:22002
 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:240
+#: ../dbconfig-common.templates:22002
 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,14 +632,47 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:248
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Máºt kháº©u á»©ng dá»¥ng MySQL cho ${pkg}:"
 
+#. Type: password
+#. Description
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
+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:256
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+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
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 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 "
+"database users."
+msgstr ""
+"GÃ³i nÃ y nÃªn thá»±c hiá»‡n cÃ¡c hÃ nh Ä‘á»™ng quáº£n trá»‹ báº±ng tÃ i khoáº£n tÃªn nÃ o? NgÆ°á»i "
+"dÃ¹ng nÃ y lÃ  ngÆ°á»i cÃ³ thá»ƒ táº¡o ngÆ°á»i dÃ¹ng má»›i cho cÆ¡ sá»Ÿ dá»¯ liá»‡u."
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:24001
+msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
 msgstr ""
@@ -595,7 +681,15 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:266
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+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:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -605,31 +699,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:272
-msgid "unix socket"
-msgstr "á»• cáº¯m UNIX"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
-msgid "tcp/ip"
-msgstr "TCP/IP"
-
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:272
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "TCP/IP + SSL"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:274
+#: ../dbconfig-common.templates:26002
 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:274
+#: ../dbconfig-common.templates:26002
 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 "
@@ -643,23 +725,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Máºt kháº©u á»©ng dá»¥ng PostgreSQL cho ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:282
-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: password
-#. Description
-#: ../dbconfig-common.templates:282
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -671,32 +743,9 @@
 "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:293
-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:293
-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 "
-"database users."
-msgstr ""
-"GÃ³i nÃ y nÃªn thá»±c hiá»‡n cÃ¡c hÃ nh Ä‘á»™ng quáº£n trá»‹ báº±ng tÃ i khoáº£n tÃªn nÃ o? NgÆ°á»i "
-"dÃ¹ng nÃ y lÃ  ngÆ°á»i cÃ³ thá»ƒ táº¡o ngÆ°á»i dÃ¹ng má»›i cho cÆ¡ sá»Ÿ dá»¯ liá»‡u."
-
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:300
-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:300
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -708,56 +757,44 @@
 "cÆ¡ sá»Ÿ dá»¯ liá»‡u vÃ¬ xÃ¡c thá»©c táº¡i má»©c Ä‘á»™ há»‡ thá»‘ng.)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "PhÆ°Æ¡ng phÃ¡p xÃ¡c thá»©c quáº£n trá»‹ PostgreSQL:"
-
+#. Choices
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:310
-msgid ""
-"PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
-msgstr ""
-"MÃ¡y phá»¥c vá»¥ PostgreSQL cung cáº¥p vÃ i cÆ¡ cháº¿ khÃ¡c Ä‘á»ƒ xÃ¡c thá»©c trong khi káº¿t "
-"ná»‘i. HÃ£y chá»n phÆ°Æ¡ng phÃ¡p nÃ o ngÆ°á»i dÃ¹ng quáº£n trá»‹ nÃªn sá» dá»¥ng khi káº¿t ná»‘i "
-"Ä‘áº¿n mÃ¡y phá»¥c vá»¥."
-
-#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:331
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "máºt kháº©u"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
-msgid "Method for authenticating PostgreSQL user:"
-msgstr "PhÆ°Æ¡ng phÃ¡p xÃ¡c thá»©c ngÆ°á»i dÃ¹ng PostgreSQL:"
+#: ../dbconfig-common.templates:30002
+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:332
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the database user should use when "
-"connecting to the server."
+"connections.  Please select what method the administrative user should use "
+"when connecting to the server."
 msgstr ""
 "MÃ¡y phá»¥c vá»¥ PostgreSQL cung cáº¥p vÃ i cÆ¡ cháº¿ khÃ¡c Ä‘á»ƒ xÃ¡c thá»©c trong khi káº¿t "
-"ná»‘i. HÃ£y chá»n phÆ°Æ¡ng phÃ¡p nÃ o ngÆ°á»i dÃ¹ng cÆ¡ sá»Ÿ dá»¯ liá»‡u nÃªn sá» dá»¥ng khi káº¿t "
-"ná»‘i Ä‘áº¿n mÃ¡y phá»¥c vá»¥."
+"ná»‘i. HÃ£y chá»n phÆ°Æ¡ng phÃ¡p nÃ o ngÆ°á»i dÃ¹ng quáº£n trá»‹ nÃªn sá» dá»¥ng khi káº¿t ná»‘i "
+"Ä‘áº¿n mÃ¡y phá»¥c vá»¥."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 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 +804,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -777,7 +816,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 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 +832,9 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:332
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -799,15 +842,33 @@
 "Náº¿u báº£n cÃ³ má»™t báº£n cÃ i Ä‘áº·t PostgreSQL Debian máº·c Ä‘inh cháº¡y trÃªn cÃ¹ng mÃ¡y, "
 "thÃ¬ ráº¥t cÃ³ thá»ƒ lÃ  báº¡n muá»‘n \"ident\"."
 
+#. Type: select
+#. Description
+#: ../dbconfig-common.templates:31002
+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:31002
+msgid ""
+"PostgreSQL servers provide several different mechanisms for authenticating "
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
+msgstr ""
+"MÃ¡y phá»¥c vá»¥ PostgreSQL cung cáº¥p vÃ i cÆ¡ cháº¿ khÃ¡c Ä‘á»ƒ xÃ¡c thá»©c trong khi káº¿t "
+"ná»‘i. HÃ£y chá»n phÆ°Æ¡ng phÃ¡p nÃ o ngÆ°á»i dÃ¹ng cÆ¡ sá»Ÿ dá»¯ liá»‡u nÃªn sá» dá»¥ng khi káº¿t "
+"ná»‘i Ä‘áº¿n mÃ¡y phá»¥c vá»¥."
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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:353
+#: ../dbconfig-common.templates:32001
 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 +880,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:353
+#: ../dbconfig-common.templates:32001
 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 "
@@ -833,13 +894,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Tá»± Ä‘á»™ng thay Ä‘á»•i cáº¥u hÃ¬nh PostgreSQL khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:366
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -854,15 +915,24 @@
 "hay khÃ´ng muá»‘n nÃ³ xáº£y ra báº±ng cÃ¡ch nÃ o, hÃ£y thÃªm dÃ²ng theo Ä‘Ã¢y vÃ o táºp tin Â« "
 "pg_hba.conf Â» cá»§a báº¡n:"
 
+# Variable: don't translate / Biáº¿n: Ä‘á»«ng dá»‹ch
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:379
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:34001
 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:379
+#: ../dbconfig-common.templates:34001
 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 "
@@ -879,22 +949,15 @@
 "gÃ³i. Náº¿u báº¡n muá»‘n tá»± lÃ m nhÆ° tháº¿, hay khÃ´ng muá»‘n nÃ³ xáº£y ra báº±ng cÃ¡ch nÃ o, "
 "hÃ£y gá»¡ bá» dÃ²ng theo Ä‘Ã¢y ra táºp tin <pg_hba.conf> cá»§a báº¡n:"
 
-# Variable: don't translate / Biáº¿n: Ä‘á»«ng dá»‹ch
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:379
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:392
+#: ../dbconfig-common.templates:35001
 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:392
+#: ../dbconfig-common.templates:35001
 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 "
@@ -906,7 +969,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:399
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL khÃ´ng há»— trá»£ máºt kháº©u rá»—ng."
 


