[Dbconfig-common-changes] [dbconfig-common] r324 - in trunk/debian: . po

Sun Sep 10 12:08:03 CEST 2006

Author: seanius
Date: 2006-09-10 10:07:47 +0000 (Sun, 10 Sep 2006)
New Revision: 324

Modified:
   trunk/debian/changelog
   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:
updated pofiles

Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2006-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/changelog	2006-09-10 10:07:47 UTC (rev 324)
@@ -3,6 +3,7 @@
   [ sean finney ]
   * NOT RELEASED YET
   * updated danish translations by Claus Hindsgaul (closes: #385688).
+  * updated czech translations by Miroslav Kure (closes: #386022).
 
   translations 
   * Updated Dutch translations by Bart Cornelis

Modified: trunk/debian/po/ca.po
===================================================================
--- trunk/debian/po/ca.po	2006-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/ca.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\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:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 #, 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr ""
@@ -153,7 +153,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -164,7 +164,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr "En altre cas, escolliu aquesta opciÃ³."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 msgid "Database type to be used by ${pkg}:"
 msgstr "Tipus de base de dades que utilitzarÃ  ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:9001
+#: ../dbconfig-common.templates:113
 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:9001
+#: ../dbconfig-common.templates:113
 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,57 +315,25 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "Confirmeu la contrasenya:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "Les contrasenyes no coincideixen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "S'ha produÃ¯t un error al actualitzar la base de dades d ${pkg}. Voleu "
@@ -373,7 +341,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -383,18 +351,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -403,36 +360,20 @@
 "${dbfile}."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
 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:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -440,7 +381,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -450,7 +391,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -472,8 +413,20 @@
 "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:15002
+#: ../dbconfig-common.templates:177
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "S'ha produÃ¯t un error esborrant la base de dades de ${pkg}. Voleu reintentar-"
@@ -481,13 +434,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -505,7 +458,33 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 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 "
@@ -513,7 +492,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -523,13 +502,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "IntroduÃ¯u el nÃºmero de port del servei ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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,7 +520,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 "IntroduÃ¯u el nom del ordinador que executa el servidor de ${dbvendor} pel "
@@ -549,13 +528,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -565,13 +544,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 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:19001
+#: ../dbconfig-common.templates:222
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -579,13 +558,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "IntroduÃ¯u el nom d 'usuari ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -598,7 +577,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -610,14 +589,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "IntroduÃ¯u el nom d 'usuari ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -627,37 +606,21 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 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:22002
+#: ../dbconfig-common.templates:249
 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:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -671,48 +634,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -721,15 +650,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -739,19 +660,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -765,13 +698,23 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "IntroduÃ¯u la contrasenya de l'aplicaciÃ³ PostgreSQL per ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
+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:291
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -783,9 +726,33 @@
 "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:302
+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:302
+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:29001
+#: ../dbconfig-common.templates:309
+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:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -798,44 +765,56 @@
 "sistema.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'administrador PostgreSQL:"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'administrador PostgreSQL:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'usuari PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"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 de utilitzar l'usuari administrador "
-"quan es connecta al servidor."
+"connexions. Seleccioneu quin mÃ¨tode ha d'utilitzar l'usuari de la base de "
+"dades quan es connecta al servidor."
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -845,9 +824,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -858,9 +835,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -874,9 +849,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -884,33 +857,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Voleu escollir un mÃ¨tode diferent de connexiÃ³ a PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -922,7 +877,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -936,13 +891,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Voleu canviar la configuraciÃ³ de PostgreSQL automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -959,21 +914,13 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Voleu desfer la configuraciÃ³ de PostgreSQL automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -991,15 +938,21 @@
 "fer-ho manualment (o no), per favor, esborreu la lÃnia segÃ¼ent al vostre "
 "pg_hba.conf:"
 
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:388
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Canvieu el /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -1011,7 +964,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 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-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/cs.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -15,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-22 23:02+1200\n"
-"PO-Revision-Date: 2006-05-06 18:25+0200\n"
+"POT-Creation-Date: 2006-09-10 11:37+0200\n"
+"PO-Revision-Date: 2006-09-03 17:41+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,45 +25,51 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
-msgstr ""
+msgstr "Bude se tento server pouÅ¾Ãvat pro pÅ™Ãstup ke vzdÃ¡lenÃ½m databÃ¡zÃm?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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 ""
+"Pro typy databÃ¡zÃ, kterÃ© to podporujÃ, obsahuje dbconfig-common podporu pro "
+"nastavenÃ databÃ¡ze rovnou na vzdÃ¡lenÃ©m poÄÃtaÄi. PÅ™i instalaci databÃ¡ze "
+"nÄ›jakÃ©ho balÃku pomocÃ dbconfig-common jsou otÃ¡zky ohlednÄ› vzdÃ¡lenÃ©ho "
+"nastavenÃ dotazovÃ¡ny s nÃzkou prioritou, takÅ¾e se na vÄ›tÅ¡inÄ› systÃ©mÅ¯ "
+"nezobrazÃ."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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 ""
+"ZvolÃte-li tuto moÅ¾nost, zmÄ›nÃ se chovÃ¡nÃ tak, aby se pÅ™i instalaci novÃ½ch "
+"balÃkÅ¯ zobrazovaly otÃ¡zky spojenÃ© s nastavenÃm vzdÃ¡lenÃ© databÃ¡ze."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
-#, fuzzy
+#: ../dbconfig-common.templates:4
 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."
+msgstr "Pokud si nejste jisti, radÄ›ji tuto moÅ¾nost nevybÃrejte."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "UchovÃ¡vat databÃ¡zovÃ¡ administrÃ¡torskÃ¡ hesla v debconfu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -76,7 +82,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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 +95,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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 +107,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Nastavit databÃ¡zi pro ${pkg} pomocÃ dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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 +123,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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,50 +137,47 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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:4001
-#, fuzzy
+#: ../dbconfig-common.templates:53
 msgid "Re-install database for ${pkg}?"
-msgstr "Chyba pÅ™i instalaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
+msgstr "Znovu nainstalovat databÃ¡zi pro ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
-#, fuzzy
+#: ../dbconfig-common.templates:53
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
 "database which it uses."
 msgstr ""
-"ProtoÅ¾e odstraÅˆujete balÃk ${pkg}, je moÅ¾nÃ©, Å¾e jiÅ¾ nepotÅ™ebujete databÃ¡zi, "
-"kterou pouÅ¾Ãval pro uloÅ¾enÃ svÃ½ch dat."
+"ProtoÅ¾e znovu konfigurujete balÃk ${pkg}, je moÅ¾nÃ©, Å¾e takÃ© chcete znovu "
+"nainstalovat databÃ¡zi, kterou pouÅ¾ÃvÃ¡ pro uloÅ¾enÃ svÃ½ch dat."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
-#, fuzzy
+#: ../dbconfig-common.templates:53
 msgid ""
 "If you wish to re-install the database for ${pkg}, you should select this "
 "option.  If you do not wish to do so (if you are reconfiguring the package "
 "for unrelated reasons), you should not select this option."
 msgstr ""
-"JestliÅ¾e jiÅ¾ nepotÅ™ebujete data uloÅ¾enÃ¡ balÃkem ${pkg}, mÅ¯Å¾ete tuto moÅ¾nost "
-"vybrat. Chcete-li data uchovat pro pÅ™ÃÅ¡tÄ›, nebo pokud byste se radÄ›ji o "
-"odstranÄ›nÃ postarali ruÄnÄ›, moÅ¾nost zamÃtnÄ›te."
+"JestliÅ¾e si pÅ™ejete znovu nainstalovat databÃ¡zi pro ${pkg}, mÄ›li byste tuto "
+"moÅ¾nost vybrat. Nechcete-li znovu instalovat databÃ¡zi (protoÅ¾e mÄ›nÃte "
+"nastavenÃ balÃku z jinÃ½ch dÅ¯vodÅ¯), tuto moÅ¾nost zamÃtnÄ›te."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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 +188,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:5001
+#: ../dbconfig-common.templates:64
 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 +202,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Odstranit databÃ¡zi pro ${pkg} pomocÃ dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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 +218,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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 +234,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:7001
+#: ../dbconfig-common.templates:94
 msgid "Database type to be used by ${pkg}:"
 msgstr "Typ databÃ¡ze, kterÃ½ mÃ¡ ${pkg} pouÅ¾Ãt:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -253,13 +256,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Chcete smazat databÃ¡zi balÃku ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -268,7 +271,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 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 +283,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:9001
+#: ../dbconfig-common.templates:113
 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:9001
+#: ../dbconfig-common.templates:113
 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,63 +303,31 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "PotvrzenÃ hesla:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "Hesla nesouhlasÃ."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i aktualizaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -366,18 +337,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -386,42 +346,26 @@
 "tÄ›snÄ› pÅ™ed pokusem o aktualizaci."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
+msgstr "opakovat (pÅ™eskoÄit otÃ¡zky)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr "ignorovat"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i instalaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -431,7 +375,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -454,20 +398,32 @@
 "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:15002
+#: ../dbconfig-common.templates:177
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i odstranÄ›nÃ databÃ¡ze ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -484,13 +440,39 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 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:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -500,13 +482,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "ÄŒÃslo portu pro sluÅ¾bu ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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,19 +500,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -540,26 +522,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "JmÃ©no ${dbvendor} databÃ¡ze pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 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:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no v ${dbvendor} pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -572,7 +554,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -584,53 +566,39 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
-#, fuzzy
+#: ../dbconfig-common.templates:238
 msgid "${dbvendor} storage directory for ${pkg}:"
-msgstr "UÅ¾ivatelskÃ© jmÃ©no v ${dbvendor} pro ${pkg}:"
+msgstr "AdresÃ¡Å™, kam ${dbvendor} uloÅ¾Ã data z ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
-#, fuzzy
+#: ../dbconfig-common.templates:238
 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."
+msgstr ""
+"Zadejte prosÃm cestu, kam se mÃ¡ nainstalovat soubor s ${dbvendor} databÃ¡zÃ "
+"pro ${pkg}."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 msgstr ""
+"OprÃ¡vnÄ›nÃ k tomuto adresÃ¡Å™i budou nastavena tak, aby odpovÃdala oprÃ¡vnÄ›nÃm "
+"pro vytvoÅ™enÃ½ databÃ¡zovÃ½ soubor."
 
 #. 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:22002
+#: ../dbconfig-common.templates:249
 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:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -644,47 +612,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -693,15 +628,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -711,19 +638,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr "unixovÃ½ socket"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -737,26 +676,58 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "AplikaÄnÃ PostgreSQL heslo pro balÃk ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
-#, fuzzy
+#: ../dbconfig-common.templates:291
 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:291
+msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
 "not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
 "be reconfigured to allow password-authenticated access."
 msgstr ""
-"Zadejte heslo pro balÃk ${pkg}, kterÃ© se zaregistruje s databÃ¡zovÃ½m "
-"serverem. PonechÃ¡te-li pole prÃ¡zdnÃ©, vygeneruje se nÃ¡hodnÃ© heslo. MoÅ¾nÃ¡ bude "
-"potÅ™eba upravit pÅ™Ãstup k PostgreSQL tak, aby umoÅ¾Åˆoval autentizaci heslem."
+"PouÅ¾ÃvÃ¡te-li autentizaci zaloÅ¾enou na \"ident\", zadanÃ© heslo se nepouÅ¾ije a "
+"tedy mÅ¯Å¾ete ponechat pole prÃ¡zdnÃ©. V opaÄnÃ©m pÅ™ÃpadÄ› moÅ¾nÃ¡ bude potÅ™eba "
+"upravit pÅ™Ãstup k PostgreSQL tak, aby umoÅ¾Åˆoval autentizaci heslem."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+msgid "Name of your database's administrative user:"
+msgstr "JmÃ©no administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+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:29001
+#: ../dbconfig-common.templates:309
+msgid "Password of your database's administrative user:"
+msgstr "Heslo administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -768,44 +739,56 @@
 "protoÅ¾e autentizace se provÃ¡dÃ na systÃ©movÃ© Ãºrovni.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "ZpÅ¯sob autentizace administrÃ¡tora PostgreSQL:"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr "password"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "ZpÅ¯sob autentizace administrÃ¡tora PostgreSQL:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "ZpÅ¯sob autentizace uÅ¾ivatele PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"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, kdyÅ¾ se k "
-"serveru bude pÅ™ipojovat administrÃ¡tor."
+"mechanizmÅ¯. Vyberte, kterÃ½ ze zpÅ¯sobÅ¯ autentizace se mÃ¡ pouÅ¾Ãt pro pÅ™ipojenÃ "
+"databÃ¡zovÃ½ch uÅ¾ivatelÅ¯ k serveru."
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -815,9 +798,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -827,9 +808,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 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,9 +821,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -852,33 +829,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Zvolit jinÃ½ zpÅ¯sob pÅ™ipojenÃ k PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -889,7 +848,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -902,13 +861,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "ZmÄ›nit nastavenÃ PostgreSQL automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -925,21 +884,13 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "VrÃ¡tit nastavenÃ PostgreSQL automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -957,15 +908,21 @@
 "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:388
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Upravte prosÃm /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -977,7 +934,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 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-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/da.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\n"
 "PO-Revision-Date: 2006-09-02 10:15+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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "Opbevar databaseadministrations-adgangskoder i debconf?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Sæt databasen for ${pkg} op med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Otherwise, you should probably choose this option."
 msgstr "Eller bør du nok vælge denne indstilling."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 msgid "Re-install database for ${pkg}?"
 msgstr "Geninstallér databaserne for ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 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:4001
+#: ../dbconfig-common.templates:53
 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Afkonfigurér ${pkg}s database med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr "Ellers bør du vælge denne valgmulighed."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 msgid "Database type to be used by ${pkg}:"
 msgstr "Databasetype, der skal bruges af ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:9001
+#: ../dbconfig-common.templates:113
 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:9001
+#: ../dbconfig-common.templates:113
 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,63 +308,31 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "Bekræft adgangskode:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "Adgangskoder var ikke ens."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Fejl under opgradering af ${pkg}'s database. Forøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -374,18 +342,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -394,42 +351,26 @@
 "lavet umiddelbart før opgraderingen."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
+msgstr "prøv igen (spring over spørgsmål)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr "ignorér"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Fejl under installationen af ${pkg}'s database. Forsøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -439,7 +380,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -462,20 +403,32 @@
 "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:15002
+#: ../dbconfig-common.templates:177
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Fejl under afinstallation af ${pkg}'s database. Forsøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -492,13 +445,39 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Værtsnavn for ${pkg}s ${dbvendor}-databaseserver:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -508,13 +487,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "${dbvendor}-servicens portnummer:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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,19 +505,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Værten, der kører ${dbvendor}-serveren for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -548,25 +527,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor}-databasenavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
-msgid "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
+#: ../dbconfig-common.templates:222
+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:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor}-brugernavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -578,7 +558,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -590,21 +570,22 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "${dbvendor}-lagermappe for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
 "be installed into."
-msgstr "Angiv en sti, hvor ${dbvendor}-databasefilen til ${pkg}  skal installeres."
+msgstr ""
+"Angiv en sti, hvor ${dbvendor}-databasefilen til ${pkg}  skal installeres."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
@@ -613,30 +594,14 @@
 "databasefils."
 
 #. 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:22002
+#: ../dbconfig-common.templates:249
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Forbindelsesmetode for ${pkg}s MySQL-database:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -650,48 +615,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -700,15 +631,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -718,19 +641,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr "unix-sokkel"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Forbindelsesmetode for ${pkg}s PostgreSQL-database:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -744,14 +679,25 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL-programadgangskode for ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 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:291
+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."
@@ -761,9 +707,32 @@
 "være nødvendigt at sætte PostgreSQL-adgangen op igen, for at tillade adgang "
 "med adgangskode."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+msgid "Name of your database's administrative user:"
+msgstr "Navnet på din databases administrationsbruger:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+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:29001
+#: ../dbconfig-common.templates:309
+msgid "Password of your database's administrative user:"
+msgstr "Din databases administrationsbrugers adgangskode:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -776,44 +745,56 @@
 "systemniveau.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Måde at autentificere PostgreSQL-administratoren på:"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr "adgangskode"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Måde at autentificere PostgreSQL-administratoren på:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Måde at autentificere PostgreSQL-bruger på:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"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, den administrative bruger skal benytte for at "
-"forbinde sig til serveren."
+"på. Vælg hvilken metode, databasebrugeren skal benytte for at forbinde sig "
+"til serveren."
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -823,9 +804,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -835,9 +814,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -852,9 +829,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -862,33 +837,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Vil du vælge en anden PostgreSQL-forbindelsesmetode?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -900,7 +857,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -914,13 +871,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Ret PostgreSQL-opsætningen automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -937,21 +894,13 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Genskab den gamle PostgreSQL-opsætning automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -968,15 +917,21 @@
 "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:388
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Ret venligst /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -988,7 +943,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL understøtter ikke tomme adgangskoder."
 
@@ -1057,4 +1012,3 @@
 #~ msgstr ""
 #~ "Hvis du ikke vil besværes med at huske programadgangskoder, kan du vælge "
 #~ "denne indstilling. Ellers bør du afvise den."
-

Modified: trunk/debian/po/de.po
===================================================================
--- trunk/debian/po/de.po	2006-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/de.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\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:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 #, 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:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "\"Administrative\" Datenbank-Passwörter in debconf speichern?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Konfigurieren der Datenbank für ${pkg} mit dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Otherwise, you should probably choose this option."
 msgstr "Andernfalls sollte diese Option gewählt werden."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr "Fehler bei der Installation der Datenbank für ${pkg}.  Wiederholen?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -159,7 +159,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Dekonfigurieren der Datenbank für ${pkg} mit dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr "Andernfalls sollte diese Option gewählt werden."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 msgid "Database type to be used by ${pkg}:"
 msgstr "Datenbanktyp, der durch das Paket ${pkg} benutzt werden soll:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:9001
+#: ../dbconfig-common.templates:113
 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:9001
+#: ../dbconfig-common.templates:113
 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,65 +316,33 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "Passwort Bestätigung:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Fehler beim Aktualisieren der Datenbank von ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -384,18 +352,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -404,43 +361,26 @@
 "das unmittelbar vor der Aktualisierung erstellt wurde."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
 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:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Fehler bei der Installation der Datenbank für ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -450,7 +390,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -473,20 +413,32 @@
 "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:15002
+#: ../dbconfig-common.templates:177
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Fehler beim Löschen der Datenbank von ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -504,13 +456,40 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Rechnername des ${dbvendor} Datenbankservers für ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -520,13 +499,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Portnummer für den ${dbvendor} Service:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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 "
@@ -539,20 +518,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -563,13 +542,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor} Datenbankname für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -578,13 +557,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor} Nutzernamen für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -597,7 +576,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -610,14 +589,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "${dbvendor} Nutzernamen für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -628,37 +607,21 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 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:22002
+#: ../dbconfig-common.templates:249
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Verbindungsmethode an die MySQL Datenbank von ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -673,49 +636,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -724,15 +652,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -742,19 +662,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Verbindungsmethode für die PostgreSQL Datenbank von ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -769,13 +701,24 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL Anwendungspasswort für ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
+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:291
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -787,9 +730,33 @@
 "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:302
+msgid "Name of your database's administrative user:"
+msgstr "Login-Name des Datenbank-Administrators:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+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:29001
+#: ../dbconfig-common.templates:309
+msgid "Password of your database's administrative user:"
+msgstr "Passwort des Datenbank-Administrators:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -802,44 +769,56 @@
 "Authentifizierung auf Systemebene erfolgt.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Authentifizierungsmethode des PostgreSQL Administrators:"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Authentifizierungsmethode des PostgreSQL Administrators:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Authentifizierungsmethode des PostgreSQL Nutzers:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"connections.  Please select what method the database 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."
+"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: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -849,9 +828,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -862,9 +839,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -878,9 +853,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -888,33 +861,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Eine andere Verbindungsmethode für PostgreSQL wählen?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -926,7 +881,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -940,13 +895,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Soll die PostgreSQL Konfiguration automatisch geändert werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -964,21 +919,13 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Soll die PostgreSQL Konfiguration automatisch geändert werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -998,15 +945,21 @@
 "überhaupt nicht) durchzuführen, dann entfernen Sie bitte folgende Zeile aus "
 "der Datei ph_hba.conf:"
 
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:388
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -1018,7 +971,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 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-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/es.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\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,13 +47,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -68,7 +68,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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 "
@@ -80,13 +80,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr ""
 "¿Desea guardar las contraseñas de «administración» de la base de datos en "
@@ -94,7 +94,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -108,7 +108,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -122,7 +122,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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 "
@@ -134,13 +134,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -151,7 +151,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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 "
@@ -165,19 +165,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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:4001
+#: ../dbconfig-common.templates:53
 msgid "Re-install database for ${pkg}?"
 msgstr "¿Desea reinstalar la base de datos para ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
 "database which it uses."
@@ -187,7 +187,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 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 "
@@ -199,7 +199,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:5001
+#: ../dbconfig-common.templates:64
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr ""
 "¿Desea realizar las actualizaciones de la base de datos de ${pkg} con "
@@ -207,7 +207,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:5001
+#: ../dbconfig-common.templates:64
 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 "
@@ -220,7 +220,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:5001
+#: ../dbconfig-common.templates:64
 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 "
@@ -235,14 +235,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -252,7 +252,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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 "
@@ -260,7 +260,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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."
@@ -270,19 +270,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr "En cualquier otro caso debería seleccionar esta opción."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:7001
+#: ../dbconfig-common.templates:94
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -292,13 +292,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -307,7 +307,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 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 "
@@ -319,7 +319,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:9001
+#: ../dbconfig-common.templates:113
 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 "
@@ -327,7 +327,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:9001
+#: ../dbconfig-common.templates:113
 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 "
@@ -342,59 +342,27 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "Confirmación de contraseña:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "Se produjo un error al actualizar la base de datos para ${pkg}. ¿Desea "
@@ -402,7 +370,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -412,18 +380,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -432,37 +389,20 @@
 "realizada justo antes de la actualización en ${dbfile}."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
+msgstr "reintentar (omitir la pregunta)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr "ignorar"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "Se produjo un error al instalar la base de datos para ${pkg}. ¿Desea "
@@ -470,7 +410,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -480,7 +420,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -503,8 +443,20 @@
 "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:15002
+#: ../dbconfig-common.templates:177
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "Se produjo un error al eliminar la base de datos par ${pkg}. ¿Desea "
@@ -512,13 +464,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -536,13 +488,40 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 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:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -552,13 +531,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Número de puerto del servicio ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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 "
@@ -570,13 +549,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Por favor, indique el nombre del servidor que tiene el servidor remoto "
@@ -584,7 +563,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -594,13 +573,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nombre de la base de datos ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -609,13 +588,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nombre de usuario ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -628,7 +607,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -640,14 +619,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Nombre de usuario ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -658,37 +637,21 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 msgstr ""
 
 #. 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:22002
+#: ../dbconfig-common.templates:249
 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:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -702,49 +665,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -753,15 +681,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -771,19 +691,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr "socket unix"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -797,14 +729,25 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Contraseña de aplicación PostgreSQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 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:291
+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."
@@ -813,9 +756,33 @@
 "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:302
+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:302
+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:29001
+#: ../dbconfig-common.templates:309
+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:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -828,44 +795,56 @@
 "datos ya que la autenticación se hace a nivel del sistema.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Método de autenticación para el administrador de PostgreSQL:"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr "contraseña"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Método de autenticación para el administrador de PostgreSQL:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Método de autenticación del usuario de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"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 "
-"administrativo debería utilizar para conectarse al servidor."
+"autenticar las conexiones. Por favor, seleccione el método que el usuario de "
+"base de datos debería utilizar para conectarse al servidor."
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -875,9 +854,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -887,9 +864,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -904,9 +879,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -914,33 +887,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 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:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -952,7 +907,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -965,13 +920,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "¿Desea modificar automáticamente la configuración de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -988,21 +943,13 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "¿Desea revertir automáticamente la configuración de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -1020,15 +967,21 @@
 "manualmente (o no hacerlo) elimine la siguiente línea de su archivo de "
 "configuración pg_hba.conf:"
 
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:388
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor, modifique «/etc/postgresql/pg_hba.conf»"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -1040,7 +993,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 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-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/eu.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\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:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "Bestela aukera hau erabili ezazu."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "Mantendu database \"kudeatzaile\" pasahitzak debconf eremuan?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Otherwise, you should probably choose this option."
 msgstr "Bestela ziurrenik aukera hau erabili beharko zenuke."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr "Errorea ${pkg}-rentzat databasea instalatzerakoan."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -160,7 +160,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-ren database ezabatzea dbconfig-common bidez egin?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr "Bestela aukera hau erabili ezazu."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 msgid "Database type to be used by ${pkg}:"
 msgstr "${pkg}-ek erabiliko duen database mota:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:9001
+#: ../dbconfig-common.templates:113
 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:9001
+#: ../dbconfig-common.templates:113
 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,64 +308,32 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "Pasahitz berrespena:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "Pasahitzak ez dira berdinak."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 #, fuzzy
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-ren databasea eguneratzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:13002
+#: ../dbconfig-common.templates:136
 #, fuzzy
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
@@ -374,18 +342,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -393,36 +350,27 @@
 "Zorinez, databasearen babeskopia bat egin da ${dbfile} eguneratu aurretik."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 #, fuzzy
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-rentzat databasea instalatzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 #, fuzzy
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
@@ -431,7 +379,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -445,21 +393,33 @@
 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:15002
+#: ../dbconfig-common.templates:177
 #, fuzzy
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-ren databasea ezabatzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 #, fuzzy
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
@@ -476,13 +436,32 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} zerbitzariaren ostalari izena:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -492,13 +471,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "${dbvendor} zerbitzuaren ataka zenbakia:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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 "
@@ -510,19 +489,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} zerbitzaria duen  ostalari izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "Ezarri urruneko ${dbvendor} zerbitzariaren ostalari izena."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -532,13 +511,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} database izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -546,13 +525,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} erabiltzaile izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -565,7 +544,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -577,14 +556,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} erabiltzaile izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -594,37 +573,21 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 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:22002
+#: ../dbconfig-common.templates:249
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "${pkg}-ren MySQL-rekiko konexio metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -638,49 +601,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -689,15 +617,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -707,19 +627,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "${pkg}-ren PostgreSQL-rekiko konexio metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -733,15 +665,26 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "${pkg}-ren PostgreSQL aplikazio pasahitza:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 #, 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:291
+#, 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."
@@ -750,9 +693,33 @@
 "PostgreSQL sarrera berkonfiguratu egin behar da pasahitz egiaztapen sarrera "
 "baimentzeko."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+msgid "Name of your database's administrative user:"
+msgstr "Database kudeatzaile erabiltzaile izena:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+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:29001
+#: ../dbconfig-common.templates:309
+msgid "Password of your database's administrative user:"
+msgstr "Databasearen kudeatzaile erabiltzaileran pasahitza:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -765,43 +732,55 @@
 "da.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "PostgreSQL kudeatzaile egiaztapen metodoa:"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "PostgreSQL kudeatzaile egiaztapen metodoa:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "PostgreSQL erabiltzaile egiaztapen metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"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 kudeatzaileak zerbitzarira konektatzerakoan."
+"metodo erabili behar duen database erabiltzaileak zerbitzarira "
+"konektatzerakoan."
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -811,9 +790,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -824,9 +801,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -840,9 +815,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -850,33 +823,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -885,7 +840,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -899,13 +854,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "PostgreSQL konfigurazioa automatikoki aldatu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -917,22 +872,14 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "PostgreSQL konfigurazioa automatikoki aldatu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -943,15 +890,21 @@
 "pg_hba.conf:"
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:388
+msgid "${pghbaline}"
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Mesedez /etc/postgresql/pg_hba.conf aldatu"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -963,7 +916,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 

Modified: trunk/debian/po/fr.po
===================================================================
--- trunk/debian/po/fr.po	2006-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/fr.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\n"
 "PO-Revision-Date: 2006-08-23 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,13 +29,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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 ?"
+msgstr ""
+"Ce serveur sera-t-il utilisé pour accéder à des bases de données distantes ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 msgid ""
 "For the database types that support it, dbconfig-common includes support for "
 "configuring databases on remote systems.  When installing a package's "
@@ -51,7 +52,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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 "
@@ -63,19 +64,20 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
-msgstr "Faut-il garder les mots de passe des administrateurs des bases de données ?"
+msgstr ""
+"Faut-il garder les mots de passe des administrateurs des bases de données ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 msgid ""
 "By default, you will be prompted for all administrator-level database "
 "passwords when you configure, upgrade, or remove applications with dbconfig-"
@@ -89,7 +91,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 msgid ""
 "This behavior can be disabled, in which case the passwords will remain in "
 "the debconf password database.  The debconf password database is protected "
@@ -104,7 +106,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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 "
@@ -117,13 +119,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 msgid ""
 "${pkg} must have a database installed and configured before it can be used.  "
 "If you like, this can be handled with dbconfig-common."
@@ -134,7 +136,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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 "
@@ -149,19 +151,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 msgid "Otherwise, you should probably choose this option."
 msgstr "Autrement, vous devriez choisir cette option."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 msgid "Re-install database for ${pkg}?"
 msgstr "Faut-il réinstaller la base de données pour ${pkg} ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
 "database which it uses."
@@ -171,7 +173,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 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 "
@@ -183,25 +185,26 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:5001
+#: ../dbconfig-common.templates:64
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
-msgstr "Faut-il mettre à jour la base de données pour ${pkg} avec dbconfig-common ?"
+msgstr ""
+"Faut-il mettre à jour la base de données pour ${pkg} avec dbconfig-common ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:5001
+#: ../dbconfig-common.templates:64
 msgid ""
 "According to the maintainer for this package, database upgrade operations "
 "need to be formed on ${pkg}.  Typically this is due to changes in how a new "
 "upstream version of the package needs to store its data."
 msgstr ""
-"Selon le responsable de ce paquet, une mise à jour de la base de données pour "
-"${pkg} est nécessaire. Cela est habituellement dû à des changements dans la "
-"manière dont le nouveau paquet enregistre ses données."
+"Selon le responsable de ce paquet, une mise à jour de la base de données "
+"pour ${pkg} est nécessaire. Cela est habituellement dû à des changements "
+"dans la manière dont le nouveau paquet enregistre ses données."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:5001
+#: ../dbconfig-common.templates:64
 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 "
@@ -215,13 +218,15 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
-msgstr "Faut-il récupérer la configuration initiale du paquet ${pkg} avec dbconfig-common ?"
+msgstr ""
+"Faut-il récupérer la configuration initiale du paquet ${pkg} avec dbconfig-"
+"common ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -231,13 +236,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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."
+msgstr ""
+"Si vous le souhaitez, dbconfig-common peut supprimer la base de données."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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."
@@ -247,19 +253,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr "Autrement, vous devriez choisir cette option."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:7001
+#: ../dbconfig-common.templates:94
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -270,13 +276,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Faut-il purger la base de données pour ${pkg} ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -286,7 +292,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 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 "
@@ -298,13 +304,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:9001
+#: ../dbconfig-common.templates:113
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
-msgstr "Faut-il sauvegarder la base de données pour ${pkg} avant la mise à jour ?"
+msgstr ""
+"Faut-il sauvegarder la base de données pour ${pkg} avant la mise à jour ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:9001
+#: ../dbconfig-common.templates:113
 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 "
@@ -318,59 +325,27 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "Confirmation du mot de passe :"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "Les mots de passe ne correspondent pas"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de la mise à jour de la base de données pour ${pkg}. Action "
@@ -378,7 +353,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -388,18 +363,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -408,36 +372,20 @@
 "créée juste avant la mise à jour."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
+msgstr "Recommencer avec les mêmes réglages"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr "Ignorer"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de l'installation de la base de données pour ${pkg}. Action "
@@ -445,7 +393,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -455,7 +403,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -476,8 +424,20 @@
 "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:15002
+#: ../dbconfig-common.templates:177
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de la suppression de la base de données pour ${pkg}. Action "
@@ -485,7 +445,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -493,7 +453,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -511,13 +471,39 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 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:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -527,13 +513,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Numéro de port pour le service ${dbvendor} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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 "
@@ -545,19 +531,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Nom d'hôte du serveur ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -567,27 +553,28 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nom de la base de données ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
-msgid "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
+#: ../dbconfig-common.templates:222
+msgid ""
+"Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
 "Veuillez indiquer un nom pour la base de données ${dbvendor} à utiliser pour "
 "${pkg}."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Identifiant ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -600,7 +587,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -613,53 +600,39 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Répertoire pour la base de données ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
 "be installed into."
 msgstr ""
-"Veuillez indiquer le répertoire où sera placé le fichier de base de données ${dbvendor} à utiliser pour "
-"${pkg}."
+"Veuillez indiquer le répertoire où sera placé le fichier de base de données "
+"${dbvendor} à utiliser pour ${pkg}."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
-msgstr "Les permissions sur ce répertoire correspondront à celles de la base de données qui y sera créée."
+msgstr ""
+"Les permissions sur ce répertoire correspondront à celles de la base de "
+"données qui y sera créée."
 
 #. 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:22002
+#: ../dbconfig-common.templates:249
 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:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -673,49 +646,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -724,15 +662,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -742,19 +672,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr "Socket UNIX"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr "TCP/IP"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr "TCP/IP + SSL"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -768,14 +710,25 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Mot de passe de connexion PostgreSQL pour ${pkg} :"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 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:291
+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."
@@ -786,9 +739,33 @@
 "nécessite peut-être une reconfiguration afin de permettre l'authentification "
 "par mot de passe."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+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:302
+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:29001
+#: ../dbconfig-common.templates:309
+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:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -801,44 +778,56 @@
 "l'authentification du système est utilisée."
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Méthode d'authentification de l'administrateur PostgreSQL :"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr "Ident"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr "Mot de passe"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Méthode d'authentification de l'administrateur PostgreSQL :"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Méthode d'authentification pour l'utilisateur de PostgreSQL :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"connections.  Please select what method the database 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."
+"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: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -848,9 +837,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -861,9 +848,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -876,9 +861,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -886,33 +869,16 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
-msgstr "Faut-il choisir une méthode différente pour la connexion à PostgreSQL ?"
+msgstr ""
+"Faut-il choisir une méthode différente pour la connexion à PostgreSQL ?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -924,7 +890,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -938,13 +904,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Faut-il modifier la configuration de PostgreSQL automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -961,21 +927,13 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Faut-il restaurer la configuration de PostgreSQL automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -993,15 +951,21 @@
 "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:388
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Modification de /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -1013,7 +977,6 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 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-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/it.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\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:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 #, fuzzy
 msgid "If you are unsure, you should not select this option."
 msgstr "Altrimenti la si accetti."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "Mantenere le password di \"amministrazione\" in debconf?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Configurare il database di ${pkg} con dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Otherwise, you should probably choose this option."
 msgstr "Negli altri casi è meglio scegliere questa opzione."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr "Errore nell'installazione del database di ${pkg}. Riprovare?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -147,7 +147,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Eliminare la configurazione di dbconfig-common per ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr "Altrimenti la si accetti."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 msgid "Database type to be used by ${pkg}:"
 msgstr "Tipo di database da usare con ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:8001
+#: ../dbconfig-common.templates:101
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Si vuole eliminare il database di ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:9001
+#: ../dbconfig-common.templates:113
 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:9001
+#: ../dbconfig-common.templates:113
 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,63 +296,31 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "Conferma della password:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "Le password non coincidono."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Errore aggiornando il database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -362,18 +330,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -382,42 +339,26 @@
 "dell'aggiornamento in ${dbfile}."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
 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:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Errore nell'installazione del database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -426,7 +367,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -448,20 +389,32 @@
 "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:15002
+#: ../dbconfig-common.templates:177
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Errore eliminando il database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -479,13 +432,39 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 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:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -495,13 +474,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Numero della porta del servizio ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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 "
@@ -513,19 +492,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -535,26 +514,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome del database ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 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:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Utente ${dbvendor} di ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -566,7 +545,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -578,14 +557,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Utente ${dbvendor} di ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -594,37 +573,21 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 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:22002
+#: ../dbconfig-common.templates:249
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Metodo di connessione al database MySQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -638,48 +601,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -688,15 +617,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -706,19 +627,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Metodo di connessione al database PostgreSQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -732,13 +665,23 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Password applicativa di ${pkg} per PostgreSQL:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
+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:291
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -750,9 +693,33 @@
 "accesso al server PostgreSQL potrebbero richiedere delle modifiche per "
 "permettere l'autenticazione tramite password."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+msgid "Name of your database's administrative user:"
+msgstr "Node dell'utente amministratore del database:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+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:29001
+#: ../dbconfig-common.templates:309
+msgid "Password of your database's administrative user:"
+msgstr "Password per l'utente amministratore del database:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -765,44 +732,56 @@
 "a livello di sistema.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Modalità di autenticazione dell'amministratore PostgreSQL:"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Modalità di autenticazione dell'amministratore PostgreSQL:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Modalità di autenticazione dell'utente PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"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 amministratore deve "
-"utilizzare per collegarsi al server."
+"connessioni. Selezionare il metodo che l'utente del database deve utilizzare "
+"per collegarsi al server."
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -812,9 +791,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -825,9 +802,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -841,9 +816,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -851,33 +824,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Scegliere un diverso metodo di connessione a PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -889,7 +844,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -903,13 +858,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Modificare la configurazione di PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -921,22 +876,14 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Modificare la configurazione di PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -947,15 +894,21 @@
 "pg_hba.conf:"
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:388
+msgid "${pghbaline}"
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Modificare /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -967,7 +920,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 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-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/nl.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\n"
 "PO-Revision-Date: 2006-08-29 16:43+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,678 +26,971 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
-msgstr "Zal deze server gebruikt worden om toegang te verkrijgen op databases op andere systemen?"
+msgstr ""
+"Zal deze server gebruikt worden om toegang te verkrijgen op databases op "
+"andere systemen?"
 
 #. Type: boolean
 #. Description
-#: ../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 "Voor de databasetypes die dit toelaten ondersteund dbconfig-comon het instellen van databases op andere systemen. Tijdens de installatie van de databases van pakketten via dbconfig-common worden de vragen omtrent configureren van databases op andere systemen gesteld met een zodanige prioriteit dat ze op de meeste systemen overgeslagen worden."
+#: ../dbconfig-common.templates:4
+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 ""
+"Voor de databasetypes die dit toelaten ondersteund dbconfig-comon het "
+"instellen van databases op andere systemen. Tijdens de installatie van de "
+"databases van pakketten via dbconfig-common worden de vragen omtrent "
+"configureren van databases op andere systemen gesteld met een zodanige "
+"prioriteit dat ze op de meeste systemen overgeslagen worden."
 
 #. Type: boolean
 #. Description
-#: ../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 "Als u deze optie kiest, dan wordt u bij het installeren van nieuwe pakketten standaard vragen gesteld omtrent de instelling van de databases op andere systemen. "
+#: ../dbconfig-common.templates:4
+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 ""
+"Als u deze optie kiest, dan wordt u bij het installeren van nieuwe pakketten "
+"standaard vragen gesteld omtrent de instelling van de databases op andere "
+"systemen. "
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
-msgstr "Door de beheerder te gebruiken database-wachtwoorden bijhouden in debconf?"
+msgstr ""
+"Door de beheerder te gebruiken database-wachtwoorden bijhouden in debconf?"
 
 #. Type: boolean
 #. Description
-#: ../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-common.  These passwords will not be stored in debconf for any longer than they are needed."
-msgstr "Standaard zal u tijdens instellen, opwaarderen en verwijderen van applicaties met dbconfig-common om het wachtwoord gevraagd worden wanneer (database)beheerder-rechten nodig zijn. Deze wachtwoorden worden slechts in debconf bewaard zolang ze nodig zijn."
+#: ../dbconfig-common.templates:20
+msgid ""
+"By default, you will be prompted for all administrator-level database "
+"passwords when you configure, upgrade, or remove applications with dbconfig-"
+"common.  These passwords will not be stored in debconf for any longer than "
+"they are needed."
+msgstr ""
+"Standaard zal u tijdens instellen, opwaarderen en verwijderen van "
+"applicaties met dbconfig-common om het wachtwoord gevraagd worden wanneer "
+"(database)beheerder-rechten nodig zijn. Deze wachtwoorden worden slechts in "
+"debconf bewaard zolang ze nodig zijn."
 
 #. Type: boolean
 #. Description
-#: ../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 by unix file permissions, though this is less secure and thus not the default setting."
-msgstr "Deze beveiligingsmaatregel kan uitgeschakeld worden; in dat geval blijven de wachtwoorden bewaard in de debconf-wachtwoord-database. Deze is beschermd met unix-toegangsrechten, dit is niet de standaardinstelling omdat dit minder veilig is."
+#: ../dbconfig-common.templates:20
+msgid ""
+"This behavior can be disabled, in which case the passwords will remain in "
+"the debconf password database.  The debconf password database is protected "
+"by unix file permissions, though this is less secure and thus not the "
+"default setting."
+msgstr ""
+"Deze beveiligingsmaatregel kan uitgeschakeld worden; in dat geval blijven de "
+"wachtwoorden bewaard in de debconf-wachtwoord-database. Deze is beschermd "
+"met unix-toegangsrechten, dit is niet de standaardinstelling omdat dit "
+"minder veilig is."
 
 #. Type: boolean
 #. Description
-#: ../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 choose this option.  Otherwise, you should refuse this option."
-msgstr "Standaard zal u tijdens instellen, opwaarderen en verwijderen van applicaties met dbconfig-common om het wachtwoord gevraagd worden wanneer (database)beheerder-rechten nodig zijn. "
+#: ../dbconfig-common.templates:20
+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 "
+"choose this option.  Otherwise, you should refuse this option."
+msgstr ""
+"Standaard zal u tijdens instellen, opwaarderen en verwijderen van "
+"applicaties met dbconfig-common om het wachtwoord gevraagd worden wanneer "
+"(database)beheerder-rechten nodig zijn. "
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Database voor ${pkg} via dbconfig-common instellen?"
 
 #. Type: boolean
 #. Description
-#: ../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."
-msgstr "Om ${pkg} gebruiksklaar te maken dient er een database aangemaakt en ingesteld te worden. Wilt u dat dit door dbconfig-common gedaan wordt?"
+#: ../dbconfig-common.templates:38
+msgid ""
+"${pkg} must have a database installed and configured before it can be used.  "
+"If you like, this can be handled with dbconfig-common."
+msgstr ""
+"Om ${pkg} gebruiksklaar te maken dient er een database aangemaakt en "
+"ingesteld te worden. Wilt u dat dit door dbconfig-common gedaan wordt?"
 
 #. Type: boolean
 #. Description
-#: ../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 installed and configured, you should refuse this option.  Details on what needs to be done should most likely be provided in /usr/share/doc/${pkg}."
-msgstr "Indien u een gevorderde databasebeheerder bent en u deze configuratie handmatig wilt uitvoeren, of als u een reeds aangemaakte en ingestelde database heeft dient u hier te weigeren. Details omtrent wat gedaan moet worden vindt u normaliter in /usr/share/doc/${pkg}."
+#: ../dbconfig-common.templates:38
+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 "
+"installed and configured, you should refuse this option.  Details on what "
+"needs to be done should most likely be provided in /usr/share/doc/${pkg}."
+msgstr ""
+"Indien u een gevorderde databasebeheerder bent en u deze configuratie "
+"handmatig wilt uitvoeren, of als u een reeds aangemaakte en ingestelde "
+"database heeft dient u hier te weigeren. Details omtrent wat gedaan moet "
+"worden vindt u normaliter in /usr/share/doc/${pkg}."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 msgid "Otherwise, you should probably choose this option."
 msgstr "Zoniet kunt u deze optie best aanvaarden."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 msgid "Re-install database for ${pkg}?"
 msgstr "De database voor ${pkg} herinstalleren?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
-msgid "Since you are reconfiguring ${pkg}, you may also want to reinstall the database which it uses."
-msgstr "Aangezien u ${pkg}aan het herconfigureren bent, wilt u mogelijk de door het pakket gebruikte database herinstalleren."
+#: ../dbconfig-common.templates:53
+msgid ""
+"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
+"database which it uses."
+msgstr ""
+"Aangezien u ${pkg}aan het herconfigureren bent, wilt u mogelijk de door het "
+"pakket gebruikte database herinstalleren."
 
 #. Type: boolean
 #. Description
-#: ../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 for unrelated reasons), you should not select this option."
-msgstr "Als u de database voor ${pkg} wilt herinstalleren dient u deze optie te kiezen. Als u dit niet wilt (omdat u het pakket omwille van een niet-gerelateerde reden herconfigureert) , dient u hier te weigeren."
+#: ../dbconfig-common.templates:53
+msgid ""
+"If you wish to re-install the database for ${pkg}, you should select this "
+"option.  If you do not wish to do so (if you are reconfiguring the package "
+"for unrelated reasons), you should not select this option."
+msgstr ""
+"Als u de database voor ${pkg} wilt herinstalleren dient u deze optie te "
+"kiezen. Als u dit niet wilt (omdat u het pakket omwille van een niet-"
+"gerelateerde reden herconfigureert) , dient u hier te weigeren."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:5001
+#: ../dbconfig-common.templates:64
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-database opwaarderen met dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../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 upstream version of the package needs to store its data."
-msgstr "Volgens de pakketbeheerder dient de ${pkg}-database opgewaardeerd te worden. Meestal is dit het gevolg van veranderingen de manier waarop een nieuwere versie van de software in het pakket zijn gegevens bijhoudt. "
+#: ../dbconfig-common.templates:64
+msgid ""
+"According to the maintainer for this package, database upgrade operations "
+"need to be formed on ${pkg}.  Typically this is due to changes in how a new "
+"upstream version of the package needs to store its data."
+msgstr ""
+"Volgens de pakketbeheerder dient de ${pkg}-database opgewaardeerd te worden. "
+"Meestal is dit het gevolg van veranderingen de manier waarop een nieuwere "
+"versie van de software in het pakket zijn gegevens bijhoudt. "
 
 #. Type: boolean
 #. Description
-#: ../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 your database will be made in /var/cache/dbconfig-common/backups, from which which the database can be restored in the case of problems."
-msgstr "Als u dit proces handmatig wilt uitvoeren dient u hier te weigeren. Als u dit automatisch wilt laten doen dient u hier te aanvaarden. Gedurende de opwaardering wordt er een reservekopie gemaakt van uw database in /var/cache/dbconfig-common/backups. Mochten er problemen optreden, dan kunt u de database altijd van daar herstellen."
+#: ../dbconfig-common.templates:64
+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 "
+"your database will be made in /var/cache/dbconfig-common/backups, from which "
+"which the database can be restored in the case of problems."
+msgstr ""
+"Als u dit proces handmatig wilt uitvoeren dient u hier te weigeren. Als u "
+"dit automatisch wilt laten doen dient u hier te aanvaarden. Gedurende de "
+"opwaardering wordt er een reservekopie gemaakt van uw database in /var/cache/"
+"dbconfig-common/backups. Mochten er problemen optreden, dan kunt u de "
+"database altijd van daar herstellen."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-database de-configureren via dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../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."
-msgstr "Aangezien u ${pkg}aan het verwijderen bent is het mogelijk dat u de onderliggende database van dit pakket ook niet meer wilt bewaren."
+#: ../dbconfig-common.templates:79
+msgid ""
+"Since you are removing ${pkg}, it's possible that you no longer want the "
+"underlying database that it has been configured to use."
+msgstr ""
+"Aangezien u ${pkg}aan het verwijderen bent is het mogelijk dat u de "
+"onderliggende database van dit pakket ook niet meer wilt bewaren."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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?"
+msgstr ""
+"Wilt u dat dbconfig-common het verwijderen van de database voor u afhandelt?"
 
 #. Type: boolean
 #. Description
-#: ../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."
-msgstr "Als u deze database wilt behouden, of als u de verwijdering handmatig wilt doen dient u hier te weigeren."
+#: ../dbconfig-common.templates:79
+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."
+msgstr ""
+"Als u deze database wilt behouden, of als u de verwijdering handmatig wilt "
+"doen dient u hier te weigeren."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:7001
+#: ../dbconfig-common.templates:94
 msgid "Database type to be used by ${pkg}:"
 msgstr "Welk type database dient ${pkg} te gebruiken?"
 
 #. Type: select
 #. Description
-#: ../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."
-msgstr "${pkg} kan ingesteld worden om een van onderstaande databasetypes te gebruiken. U krijgt in wat volgt de beschikbare keuzes te zien."
+#: ../dbconfig-common.templates:94
+msgid ""
+"${pkg} can be configured to use one of many database types. Below, you will "
+"be presented with the available choices."
+msgstr ""
+"${pkg} kan ingesteld worden om een van onderstaande databasetypes te "
+"gebruiken. U krijgt in wat volgt de beschikbare keuzes te zien."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Wilt u de ${pkg}-database wissen?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
-msgid "If you no longer need the database for ${pkg}, this is your chance to remove them."
-msgstr "Als u de ${pkg}-database niet langer nodig heeft, is dit uw kans om deze te verwijderen."
+#: ../dbconfig-common.templates:101
+msgid ""
+"If you no longer need the database for ${pkg}, this is your chance to remove "
+"them."
+msgstr ""
+"Als u de ${pkg}-database niet langer nodig heeft, is dit uw kans om deze te "
+"verwijderen."
 
 #. Type: boolean
 #. Description
-#: ../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 would rather handle this process manually, you should refuse this option."
-msgstr "Als u de door ${pkg} opgeslagen gegevens niet langer nodig heeft kunt u hier best aanvaarden. Als u de opgeslagen gegevens wilt bewaren, of als u deze procedure liefst handmatig afhandelt dient u hier te weigeren."
+#: ../dbconfig-common.templates:101
+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 "
+"would rather handle this process manually, you should refuse this option."
+msgstr ""
+"Als u de door ${pkg} opgeslagen gegevens niet langer nodig heeft kunt u hier "
+"best aanvaarden. Als u de opgeslagen gegevens wilt bewaren, of als u deze "
+"procedure liefst handmatig afhandelt dient u hier te weigeren."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:9001
+#: ../dbconfig-common.templates:113
 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 op te waarderen?"
+msgstr ""
+"Wilt u dat er een reservekopie gemaakt wordt van de ${pkg}-database alvorens "
+"op te waarderen?"
 
 #. Type: boolean
 #. Description
-#: ../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 this is done, so that if something goes wrong, you can revert to the previous package version and repopulate your database."
-msgstr "Het installatieproces vereist dat de door ${pkg} gebruikte database opgewaardeerd wordt. Voor de zekerheid kunnen we een reservekopie van deze database maken. Op die manier kunt u, mocht het fout gaan, de vorige versie van dit pakket herinstalleren en uw database herstellen."
+#: ../dbconfig-common.templates:113
+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 "
+"this is done, so that if something goes wrong, you can revert to the "
+"previous package version and repopulate your database."
+msgstr ""
+"Het installatieproces vereist dat de door ${pkg} gebruikte database "
+"opgewaardeerd wordt. Voor de zekerheid kunnen we een reservekopie van deze "
+"database maken. Op die manier kunt u, mocht het fout gaan, de vorige versie "
+"van dit pakket herinstalleren en uw database herstellen."
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001
-#: ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "Bevestiging wachtwoord (nogmaals intikken):"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "The passwords you supplied do not match.  Please try again."
-msgstr "De door u ingevoerde wachtwoorden komen niet overeen. Gelieve opnieuw te proberen."
+msgstr ""
+"De door u ingevoerde wachtwoorden komen niet overeen. Gelieve opnieuw te "
+"proberen."
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:136
+msgid "Error upgrading database for ${pkg}.  Retry?"
+msgstr ""
+"Fout bij het opwaarderen van de ${pkg}-database. Wilt u dit nogmaals "
+"proberen?"
+
 #. Type: select
-#. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:13001
-#: ../dbconfig-common.templates:14001
-#: ../dbconfig-common.templates:15001
-msgid "abort"
-msgstr "afbreken"
+#. Description
+#: ../dbconfig-common.templates:136
+msgid ""
+"An error seems to have occurred while upgrading the database. If it's of any "
+"help, this was the error encountered:"
+msgstr ""
+"Er is een fout opgetreden tijdens het opwaarderen van de database. Mocht u "
+"geïnteresseerd zijnj, dit is de tegengekomen foutmelding:"
 
 #. 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"
+#. Description
+#: ../dbconfig-common.templates:136
+msgid ""
+"Fortunately, there should be a backup of the database made just before the "
+"upgrade in ${dbfile}."
+msgstr ""
+"Geen paniek, er is normaliter een reservekopie gemaakt van de database juist "
+"voor de opwaardering. Deze vindt u in ${dbfile}."
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:13001
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "retry (skip questions)"
 msgstr "opnieuw proberen (vragen overslaan)"
 
 #. Type: select
-#. Description
-#: ../dbconfig-common.templates:13002
-msgid "Error upgrading database for ${pkg}.  Retry?"
-msgstr "Fout bij het opwaarderen van de ${pkg}-database. Wilt u dit nogmaals proberen?"
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "ignore"
+msgstr "negeren"
 
 #. Type: select
 #. Description
-#: ../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:"
-msgstr "Er is een fout opgetreden tijdens het opwaarderen van de database. Mocht u geïnteresseerd zijnj, dit is de tegengekomen foutmelding:"
+#: ../dbconfig-common.templates:157
+msgid "Error installing database for ${pkg}.  Retry?"
+msgstr ""
+"Fout bij het installeren van de ${pkg}-database. Wilt u dit nogmaals "
+"proberen?"
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:13002
-#: ../dbconfig-common.templates:14002
-#: ../dbconfig-common.templates:15002
-msgid "${error}"
-msgstr "${error}"
+#: ../dbconfig-common.templates:157
+msgid ""
+"An error seems to have occurred while installing the database. If it's of "
+"any help, this was the error encountered:"
+msgstr ""
+"Er is een fout opgetreden tijdens het aanmaken van de database. Mocht u "
+"geïnteresseerd zijnj, dit is de tegengekomen foutmelding:"
 
 #. 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 "Geen paniek, er is normaliter een reservekopie gemaakt van de database juist voor de opwaardering. Deze vindt u in ${dbfile}."
+#: ../dbconfig-common.templates:157
+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.  If you choose \"ignore"
+"\", the operation will continue, ignoring further errors from dbconfig-"
+"common."
+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 onmiddellijk nogmaals "
+"uitgevoerd worden, zonder de vragen opnieuw te stellen. Als u 'afbreken' "
+"kiest 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. Als u 'negeren' kiest wordt er verdergegaan, en worden "
+"verdere foutmeldingen van dbconfig-common genegeerd. "
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:175
+msgid "abort"
+msgstr "afbreken"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
-msgid "ignore"
-msgstr "negeren"
+#: ../dbconfig-common.templates:175
+msgid "retry"
+msgstr "opnieuw proberen"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
-msgid "Error installing database for ${pkg}.  Retry?"
-msgstr "Fout bij het installeren van de ${pkg}-database. Wilt u dit nogmaals proberen?"
+#: ../dbconfig-common.templates:177
+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:14002
-msgid "An error seems to have occurred while installing the database. If it's of any help, this was the error encountered:"
-msgstr "Er is een fout opgetreden tijdens het aanmaken van de database. Mocht u geïnteresseerd zijnj, dit is de tegengekomen foutmelding:"
+#: ../dbconfig-common.templates:177
+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: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 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.  If you choose \"ignore\", the operation will continue, ignoring further errors from dbconfig-common."
-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 onmiddellijk nogmaals uitgevoerd worden, zonder de vragen opnieuw te stellen. Als u 'afbreken' kiest 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. Als u 'negeren' kiest wordt er verdergegaan, en worden verdere foutmeldingen van dbconfig-common genegeerd. "
+#: ../dbconfig-common.templates:177
+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 "
+"can find out what has caused this error and fix it, or you can refuse the "
+"offer for help removing the database (the latter implies you will have to "
+"remove the database manually).  If it's of any help, this was the error "
+"encountered:"
+msgstr ""
+"Het bleek onmogelijk om alle acties die nodig zijn voor het verwijderen van "
+"de $[pkg}-database uit te voeren. U heeft 2 mogelijkheden: u kunt "
+"onderzoeken wat de fout veroorzaakte en dit herstellen, of u kunt het offer "
+"om de database automatisch te verwijderen weigeren (dit houdt in dat u de "
+"database later handmatig dient te verwijderen). Mocht u geïnteresseerd "
+"zijnj, dit is de tegengekomen foutmelding:"
 
 #. Type: select
 #. Description
-#: ../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?"
+#: ../dbconfig-common.templates:177
+msgid "${error}"
+msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../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."
+#: ../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: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 can find out what has caused this error and fix it, or you can refuse the offer for help removing the database (the latter implies you will have to remove the database manually).  If it's of any help, this was the error encountered:"
-msgstr "Het bleek onmogelijk om alle acties die nodig zijn voor het verwijderen van de $[pkg}-database uit te voeren. U heeft 2 mogelijkheden: u kunt onderzoeken wat de fout veroorzaakte en dit herstellen, of u kunt het offer om de database automatisch te verwijderen weigeren (dit houdt in dat u de database later handmatig dient te verwijderen). Mocht u geïnteresseerd zijnj, dit is de tegengekomen foutmelding:"
-
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:16001
+#: ../dbconfig-common.templates:200
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
-msgstr "Wat is de computernaam van de door ${pkg} te gebruiken ${dbvendor}-database-server?"
+msgstr ""
+"Wat is de computernaam van de door ${pkg} te gebruiken ${dbvendor}-database-"
+"server?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
-msgid "Please select the remote hostname to use, or select \"new host\" to enter a new host."
-msgstr "Wat is de de computernaam van de server die u wilt gebruiken (selecteer 'Nieuwe server' om een niet weergegeven server in te voeren)?"
+#: ../dbconfig-common.templates:200
+msgid ""
+"Please select the remote hostname to use, or select \"new host\" to enter a "
+"new host."
+msgstr ""
+"Wat is de de computernaam van de server die u wilt gebruiken (selecteer "
+"'Nieuwe server' om een niet weergegeven server in te voeren)?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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: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 port, leave this field blank."
-msgstr "Als de ${dbvendor}-server niet op de standaard poort luistert kunt u hier de te gebruiken poort opgeven. Als de standaard poort gebruikt wordt hoeft u hier niets in te vullen."
+#: ../dbconfig-common.templates:206
+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 "
+"port, leave this field blank."
+msgstr ""
+"Als de ${dbvendor}-server niet op de standaard poort luistert kunt u hier de "
+"te gebruiken poort opgeven. Als de standaard poort gebruikt wordt hoeft u "
+"hier niets in te vullen."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Host running the ${dbvendor} server for ${pkg}:"
-msgstr "Wat is de computernaam van de door ${pkg} te gebruiken ${dbvendor}-database-server?"
+msgstr ""
+"Wat is de computernaam van de door ${pkg} te gebruiken ${dbvendor}-database-"
+"server?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Please provide the hostname of a remote ${dbvendor} server."
-msgstr "Gelieve hier de computernaam van de (niet-lokale) ${dbvendor}-server in te geven."
+msgstr ""
+"Gelieve hier de computernaam van de (niet-lokale) ${dbvendor}-server in te "
+"geven."
 
 #. Type: string
 #. Description
-#: ../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."
-msgstr "Opgelet: u dient er reeds voor gezorgd te hebben dat de beheers-account in staat is om van op afstand databases aan te maken en rechten toe te kennen."
+#: ../dbconfig-common.templates:213
+msgid ""
+"Note: you must have already arranged for the administrative account to be "
+"able to remotely create databases and grant privileges."
+msgstr ""
+"Opgelet: u dient er reeds voor gezorgd te hebben dat de beheers-account in "
+"staat is om van op afstand databases aan te maken en rechten toe te kennen."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
-msgstr "Wat is/wordt de naam van de door ${pkg} te gebruiken ${dbvendor}-database?"
+msgstr ""
+"Wat is/wordt de naam van de door ${pkg} te gebruiken ${dbvendor}-database?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
-msgid "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
-msgstr "Gelieve hier de naam op te geven van de door ${pkg} te gebruiken ${dbvendor}-database."
+#: ../dbconfig-common.templates:222
+msgid ""
+"Please provide a name for the ${dbvendor} database to be used by ${pkg}."
+msgstr ""
+"Gelieve hier de naam op te geven van de door ${pkg} te gebruiken ${dbvendor}-"
+"database."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
-msgstr "Met welke gebruikersnaam dient ${pkg} zich bij ${dbvendor} aan te melden?"
+msgstr ""
+"Met welke gebruikersnaam dient ${pkg} zich bij ${dbvendor} aan te melden?"
 
 #. Type: string
 #. Description
-#: ../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 login, especially if the database is on a remote server."
-msgstr "Gelieve hier de naam van de ${dbvendor}-gebruiker op te geven waarmee ${pkg} zich kan registreren bij de database-server. Een ${dbvendor}-gebruiker heeft niet noodzakelijk een aanmeldnaam op dit systeem (al helemaal zo als de database op een andere computer draait)."
+#: ../dbconfig-common.templates:227
+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 "
+"login, especially if the database is on a remote server."
+msgstr ""
+"Gelieve hier de naam van de ${dbvendor}-gebruiker op te geven waarmee ${pkg} "
+"zich kan registreren bij de database-server. Een ${dbvendor}-gebruiker heeft "
+"niet noodzakelijk een aanmeldnaam op dit systeem (al helemaal zo als de "
+"database op een andere computer draait)."
 
 #. Type: string
 #. Description
-#: ../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 "Deze gebruiker zal de 'eigenaar' zijn van de database, tabellen en andere objecten die door de installatie aangemaakt worden. Deze gebruiker heeft bijgevolg alle vrijheid om dingen in de database toe te voegen, veranderen, of verwijderen."
+#: ../dbconfig-common.templates:227
+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 ""
+"Deze gebruiker zal de 'eigenaar' zijn van de database, tabellen en andere "
+"objecten die door de installatie aangemaakt worden. Deze gebruiker heeft "
+"bijgevolg alle vrijheid om dingen in de database toe te voegen, veranderen, "
+"of verwijderen."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Wat is de ${dbvendor}-opslagmap voor ${pkg}?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
-msgid "Please provide a path where the ${dbvendor} database file for ${pkg}  should be installed into."
-msgstr "Gelieve hier het pad op te geven van de map waarin het ${dbvendor}-databasebestand voor ${pkg} geïnstalleerd dient te worden."
+#: ../dbconfig-common.templates:238
+msgid ""
+"Please provide a path where the ${dbvendor} database file for ${pkg}  should "
+"be installed into."
+msgstr ""
+"Gelieve hier het pad op te geven van de map waarin het ${dbvendor}-"
+"databasebestand voor ${pkg} geïnstalleerd dient te worden."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
-msgid "The permissions for this directory will be set to match the permissions for the generated database file."
-msgstr "De rechten op deze map worden ingesteld om overeen te komen met de rechten op het aangemaakte databasebestand."
+#: ../dbconfig-common.templates:238
+msgid ""
+"The permissions for this directory will be set to match the permissions for "
+"the generated database file."
+msgstr ""
+"De rechten op deze map worden ingesteld om overeen te komen met de rechten "
+"op het aangemaakte databasebestand."
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:249
+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:249
+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 "
+"to connect with a different method, or to a different server entirely, "
+"select an option from the choices below."
+msgstr ""
+"Omdat dit de beste performance geeft zal ${pkg} standaard verbinding maken "
+"met de ${dbvendor}-server via een lokale unix-socket. Als een andere "
+"verbindingsmethode gewenst is, of u met een compleet andere server wil "
+"verbinden dient u één van onderstaande opties te kiezen."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:257
+msgid "MySQL application password for ${pkg}:"
+msgstr ""
+"Wat is het wachtwoord waarmee ${pkg} zich bij MySQL dient aan te melden?"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:265
+msgid ""
+"For MySQL, this is almost always \"root\".  Note that this is NOT the same "
+"as the UNIX login 'root'."
+msgstr ""
+"Voor MySQL is dit bijna altijd 'root' (Merk op dat deze niet hetzelfde als "
+"de UNIX-beheerdersaccount 'root')."
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:275
+msgid ""
+"What is the password for the administrative account with which this package "
+"should create its MySQL database and user?"
+msgstr ""
+"Wat is het wachtwoord voor de beheerdersaccount waarmee dit pakket de "
+"benodigde MySQL-database en -gebruiker kan aanmaken?"
+
+#. Type: select
 #. Choices
-#: ../dbconfig-common.templates:22001
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
 msgid "unix socket"
 msgstr "unix socket"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:22001
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip + ssl"
+msgstr "tcp/ip + ssl"
+
+#. Type: select
 #. Description
-#: ../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?"
+#: ../dbconfig-common.templates:283
+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: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 to connect with a different method, or to a different server entirely, select an option from the choices below."
-msgstr "Omdat dit de beste performance geeft zal ${pkg} standaard verbinding maken met de ${dbvendor}-server via een lokale unix-socket. Als een andere verbindingsmethode gewenst is, of u met een compleet andere server wil verbinden dient u één van onderstaande opties te kiezen."
+#: ../dbconfig-common.templates:283
+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 "
+"would like to connect with a different method, or to a different server "
+"entirely, select an option from the choices below."
+msgstr ""
+"Omdat dit de beste performance geeft zal ${pkg} standaard verbinding maken "
+"met de ${dbvendor}-server via een lokale unix-socket. Als een andere "
+"verbindingsmethode gewenst is, of u met een compleet andere server wil "
+"verbinden dient u één van onderstaande opties te kiezen."
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
-msgid "MySQL application password for ${pkg}:"
-msgstr "Wat is het wachtwoord waarmee ${pkg} zich bij MySQL dient aan te melden?"
+#: ../dbconfig-common.templates:291
+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:291
+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: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."
+#: ../dbconfig-common.templates:291
+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 ""
+"Wanneer u gebruik maakt van 'ident'-gebaseerde authenticatie wordt het "
+"opgegeven wachtwoord niet gebruikt en kunt u dit leeg laten. Anders dient de "
+"PostgreSQL-toegang mogelijk opnieuw ingesteld te worden om wachtwoord-"
+"authenticatie toe te laten."
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:24001
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:302
 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?"
+#: ../dbconfig-common.templates:302
+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 "Voor MySQL is dit bijna altijd 'root' (Merk op dat deze niet hetzelfde als de UNIX-beheerdersaccount 'root')."
-
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:25001
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:309
 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?"
-msgstr "Wat is het wachtwoord voor de beheerdersaccount waarmee dit pakket de benodigde MySQL-database en -gebruiker kan aanmaken?"
+#: ../dbconfig-common.templates:309
+msgid ""
+"What is the password for the account with which this package should perform "
+"administrative actions?  (For a normal Debian PostgreSQL installation, a "
+"database password is not required, since authentication is done at the "
+"system level.)"
+msgstr ""
+"Wat is het wachtwoord van de account waarmee dit pakket beheeracties dient "
+"uit te voeren? (voor een standaard Debian PostgreSQL installatie is een "
+"databasewachtwoord niet vereist, aangezien authenticatie op systeemniveau "
+"plaats vindt) "
 
 #. Type: select
-#. Choices
-#: ../dbconfig-common.templates:26001
-msgid "tcp/ip + ssl"
-msgstr "tcp/ip + ssl"
-
-#. Type: select
 #. Description
-#: ../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?"
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr ""
+"Welke authenticatiemethode wordt gebruikt door de PostgreSQL-beheerder?"
 
 #. Type: select
 #. Description
-#: ../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 would like to connect with a different method, or to a different server entirely, select an option from the choices below."
-msgstr "Omdat dit de beste performance geeft zal ${pkg} standaard verbinding maken met de ${dbvendor}-server via een lokale unix-socket. Als een andere verbindingsmethode gewenst is, of u met een compleet andere server wil verbinden dient u één van onderstaande opties te kiezen."
+#: ../dbconfig-common.templates:319
+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: password
-#. Description
-#: ../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:27001
-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 "Wanneer u gebruik maakt van 'ident'-gebaseerde authenticatie wordt het opgegeven wachtwoord niet gebruikt en kunt u dit leeg laten. Anders dient de PostgreSQL-toegang mogelijk opnieuw ingesteld te worden om wachtwoord-authenticatie toe te laten."
-
-#. Type: password
-#. Description
-#: ../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 database password is not required, since authentication is done at the system level.)"
-msgstr "Wat is het wachtwoord van de account waarmee dit pakket beheeracties dient uit te voeren? (voor een standaard Debian PostgreSQL installatie is een databasewachtwoord niet vereist, aangezien authenticatie op systeemniveau plaats vindt) "
-
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr "wachtwoord"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Welke authenticatiemethode wordt gebruikt door de PostgreSQL-beheerder?"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr ""
+"Welke authenticatiemethode wordt gebruikt door de PostgreSQL-gebruiker?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-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?"
+#: ../dbconfig-common.templates:341
+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: select
 #. Description
-#. 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."
-msgstr "Bij gebruik van 'ident'-authenticatie op de lokale machine gaat de server na of de eigenaar van de gebruikte unix-socket verbinding mag maken."
+#: ../dbconfig-common.templates:341
+msgid ""
+"With \"ident\" authentication on the local machine, the server will check "
+"that the owner of the unix socket is allowed to connect."
+msgstr ""
+"Bij gebruik van 'ident'-authenticatie op de lokale machine gaat de server na "
+"of de eigenaar van de gebruikte unix-socket verbinding mag maken."
 
 #. Type: select
 #. Description
-#. 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)."
-msgstr "Bij gebruik van 'ident'-authenticatie op niet-lokale machines wordt op RFC 1413 gebaseerde ident gebruikt (Opgelet: dit wordt beschouwd als een veiligheidsrisico)."
+#: ../dbconfig-common.templates:341
+msgid ""
+"With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
+"(note this can be considered a security risk)."
+msgstr ""
+"Bij gebruik van 'ident'-authenticatie op niet-lokale machines wordt op RFC "
+"1413 gebaseerde ident gebruikt (Opgelet: dit wordt beschouwd als een "
+"veiligheidsrisico)."
 
 #. Type: select
 #. Description
-#. 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 that the password is still passed in the clear across network-based connections if your connection is not configured to use SSL."
-msgstr "Bij gebruik van 'wachtwoord'-authenticatie wordt er een wachtwoord doorgegeven naar de server via een of ander authenticatie-backend (zals 'md5' of 'pam'). Merk op dat wachtwoorden als gewone tekst over het netwerk gestuurd worden tenzij u uw verbinding heeft ingesteld om SSL te gebruiken."
+#: ../dbconfig-common.templates:341
+msgid ""
+"With \"password\" authentication, a password will be passed to the server "
+"for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
+"that the password is still passed in the clear across network-based "
+"connections if your connection is not configured to use SSL."
+msgstr ""
+"Bij gebruik van 'wachtwoord'-authenticatie wordt er een wachtwoord "
+"doorgegeven naar de server via een of ander authenticatie-backend (zals "
+"'md5' of 'pam'). Merk op dat wachtwoorden als gewone tekst over het netwerk "
+"gestuurd worden tenzij u uw verbinding heeft ingesteld om SSL te gebruiken."
 
 #. Type: select
 #. Description
-#. 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 "Voor een standaard Debian ${dbvendor}-installatie op de lokale machine kunt u best 'ident' gebruiken."
+#: ../dbconfig-common.templates:341
+msgid ""
+"For a default Debian PostgreSQL installation running on the same host, you "
+"probably want \"ident\"."
+msgstr ""
+"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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Een andere PostgreSQL verbindingsmethode kiezen?"
 
 #. Type: note
 #. Description
-#: ../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 local user that does not exist."
-msgstr "Spijtig genoeg lijkt het erop dat de databaseverbindingsmethode die u geselecteerd heeft voor ${pkg} niet zal werken omdat deze het bestaan van een lokale gebruiker vereist die er niet is."
+#: ../dbconfig-common.templates:362
+msgid ""
+"Unfortunately, it seems that the database connection method you have "
+"selected for ${pkg} will not work, because it requires the existence of a "
+"local user that does not exist."
+msgstr ""
+"Spijtig genoeg lijkt het erop dat de databaseverbindingsmethode die u "
+"geselecteerd heeft voor ${pkg} niet zal werken omdat deze het bestaan van "
+"een lokale gebruiker vereist die er niet is."
 
 #. Type: note
 #. Description
-#: ../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 will work and you want to continue without changing your choice, you should refuse this option."
-msgstr "Als u uw applicatie opnieuw wilt instellen om een andere methode te gebruiken, dient u deze optie te kiezen. Als u zeker weet dat deze methode zal werken en u door wilt gaan zonder uw keuze te veranderen, dient u deze optie te weigeren."
+#: ../dbconfig-common.templates:362
+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 "
+"will work and you want to continue without changing your choice, you should "
+"refuse this option."
+msgstr ""
+"Als u uw applicatie opnieuw wilt instellen om een andere methode te "
+"gebruiken, dient u deze optie te kiezen. Als u zeker weet dat deze methode "
+"zal werken en u door wilt gaan zonder uw keuze te veranderen, dient u deze "
+"optie te weigeren."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Wilt u dat de PostgreSQL-configuratie automatisch aangepast wordt?"
 
 #. Type: boolean
 #. Description
-#: ../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 server's access controls.  It is suggested that this be done by dbconfig-common when your package is installed.  If you would prefer that this be done manually (or not at all), please add the following line to your pg_hba.conf:"
-msgstr "Er is vastgesteld dat de databaseinstallatie voor ${pkg} niet automatisch uitgevoerd kan worden zonder aanpassingen te maken aan de toegangscontrole van uw PostgreSQL server. Het is aan te raden om dit te doen via dbconfig-common wanneer uw pakket geïnstalleerd is. Als u verkiest om dit handmatig te doen (of helemaal niet), dient u de volgende regel toe te voegen aan uw 'pg_hba.conf'-bestand:"
+#: ../dbconfig-common.templates:375
+msgid ""
+"It has been determined that the database installation for ${pkg} can not be "
+"automatically accomplished without making changes to your PostgreSQL "
+"server's access controls.  It is suggested that this be done by dbconfig-"
+"common when your package is installed.  If you would prefer that this be "
+"done manually (or not at all), please add the following line to your pg_hba."
+"conf:"
+msgstr ""
+"Er is vastgesteld dat de databaseinstallatie voor ${pkg} niet automatisch "
+"uitgevoerd kan worden zonder aanpassingen te maken aan de toegangscontrole "
+"van uw PostgreSQL server. Het is aan te raden om dit te doen via dbconfig-"
+"common wanneer uw pakket geïnstalleerd is. Als u verkiest om dit handmatig "
+"te doen (of helemaal niet), dient u de volgende regel toe te voegen aan uw "
+"'pg_hba.conf'-bestand:"
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001
-#: ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
+#: ../dbconfig-common.templates:388
+msgid "Revert PostgreSQL configuration automatically?"
+msgstr "Wilt u dat de PostgreSQL-configuratie automatisch teruggezet wordt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
-msgid "Revert PostgreSQL configuration automatically?"
-msgstr "Wilt u dat de PostgreSQL-configuratie automatisch teruggezet wordt?"
+#: ../dbconfig-common.templates:388
+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 "
+"keeping such an entry will not break any software on your system, it may be "
+"seen as a potential security concern.  It is suggested that this be done by "
+"dbconfig-common when your package is removed.  If you would prefer that this "
+"be done manually (or not at all), please remove the following line from your "
+"pg_hba.conf:"
+msgstr ""
+"Aangezien ${pkg} nu verwijderd wordt, is het misschien niet meer nodig om "
+"een toegangscontrole-ingang in uw PostgreSQL-servers configuratie te hebben. "
+"Hoewel het behouden van die ingang geen software op uw systeem zal breken, "
+"kan het gezien worden als een beveiligingsrisico. Het is aangeraden om deze "
+"ingang door dbconfig-common t elaten verwijderen wanneer het pakket "
+"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: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 keeping such an entry will not break any software on your system, it may be seen as a potential security concern.  It is suggested that this be done by dbconfig-common when your package is removed.  If you would prefer that this be done manually (or not at all), please remove the following line from your pg_hba.conf:"
-msgstr "Aangezien ${pkg} nu verwijderd wordt, is het misschien niet meer nodig om een toegangscontrole-ingang in uw PostgreSQL-servers configuratie te hebben. Hoewel het behouden van die ingang geen software op uw systeem zal breken, kan het gezien worden als een beveiligingsrisico. Het is aangeraden om deze ingang door dbconfig-common t elaten verwijderen wanneer het pakket 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:"
+#: ../dbconfig-common.templates:388
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Gelieve /etc/postgresql/pg_hba.conf aan te passen."
 
 #. Type: note
 #. Description
-#: ../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 file /usr/share/doc/${pkg}/README.Debian."
-msgstr "Om de database voor ${pkg} op te zetten dient de configuratie van uw PostgreSQL-server aangepast te worden. U vindt wellicht meer uitleg over wat er dient te gebeuren in het bestand /usr/share/doc/${pkg}/README.Debian."
+#: ../dbconfig-common.templates:401
+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 "
+"file /usr/share/doc/${pkg}/README.Debian."
+msgstr ""
+"Om de database voor ${pkg} op te zetten dient de configuratie van uw "
+"PostgreSQL-server aangepast te worden. U vindt wellicht meer uitleg over wat "
+"er dient te gebeuren in het bestand /usr/share/doc/${pkg}/README.Debian."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL ondersteunt geen lege wachtwoorden."
 
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr "dbconfig-common zal proberen bestaande instellingen te laden"
+
 #~ msgid ""
 #~ "dbconfig-common will now attempt to load the pre-existing settings of "
 #~ "${pkg}.  Later, these settings will be validated, and if there is any "
@@ -708,6 +1001,7 @@
 #~ "te laden. Later zullen deze instellingen worden geverifieerd. en als er "
 #~ "een probleem is met het laden of gebruiken hiervan, zult u de "
 #~ "mogelijkheid krijgen ze later opnieuw in te voeren."
+
 #~ msgid ""
 #~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
 #~ "configuration of PostgreSQL has to be changed.  It is suggested that this "
@@ -716,4 +1010,3 @@
 #~ "Om het opzetten van de PostgreSQL-database voor ${pkg} toe te laten dient "
 #~ "de PostgreSQL-configuratie aangepast te worden. U wordt aangeraden om dit "
 #~ "te laten doen door dbconfig-common tijdens de installatie van dit pakket."
-

Modified: trunk/debian/po/pt.po
===================================================================
--- trunk/debian/po/pt.po	2006-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/pt.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\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:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 #, 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:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "Manter passwords \"administrativas\" das base de dados no debconf?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:4001
+#: ../dbconfig-common.templates:53
 #, 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:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -148,7 +148,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr "Caso contrÃ¡rio, deve escolher esta opÃ§Ã£o."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:7001
+#: ../dbconfig-common.templates:94
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:9001
+#: ../dbconfig-common.templates:113
 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:9001
+#: ../dbconfig-common.templates:113
 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,64 +303,32 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "ConfirmaÃ§Ã£o da password:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "As passwords nÃ£o coincidem."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 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:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -370,18 +338,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -390,43 +347,26 @@
 "actualizaÃ§Ã£o, em ${dbfile}."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
+msgstr "tentar novamente (saltar perguntas)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr "ignorar"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -436,7 +376,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -459,20 +399,32 @@
 "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:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -490,13 +442,40 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 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:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -506,13 +485,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "NÃºmero do port que corre o serviÃ§o ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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 "
@@ -524,13 +503,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Host que corre o servidor ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Por favor disponibilize o nome de uma mÃ¡quina remota com o servidor "
@@ -538,7 +517,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -548,13 +527,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome de base de dados ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -563,13 +542,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nome de utilizador de ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -582,7 +561,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -594,14 +573,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Nome de utilizador de ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -612,37 +591,21 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 msgstr ""
 
 #. 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:22002
+#: ../dbconfig-common.templates:249
 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:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -656,49 +619,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -707,15 +635,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -725,19 +645,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr "socket unix"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -751,13 +683,24 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Password da aplicaÃ§Ã£o PostgreSQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
+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:291
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -769,9 +712,33 @@
 "para si. O acesso ao PostgreSQL pode ter de ser reconfigurado para permitir "
 "acesso autenticado por password."
 
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+msgid "Name of your database's administrative user:"
+msgstr "Nome do utilizador administrativo da sua base de dados:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+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:29001
+#: ../dbconfig-common.templates:309
+msgid "Password of your database's administrative user:"
+msgstr "Password do utilizador administrativo da sua base de dados:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -784,44 +751,56 @@
 "autenticaÃ§Ã£o Ã© feita a nÃvel do sistema.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "MÃ©todo para autenticar o administrador de PostgreSQL:"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr "password"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "MÃ©todo para autenticar o administrador de PostgreSQL:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "MÃ©todo para autenticar o utilizador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"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 de ligaÃ§Ãµes.  Por favor escolha o mÃ©todo que o utilizador "
-"administrador deve utilizar quando se liga ao servidor."
+"autenticaÃ§Ã£o das ligaÃ§Ãµes.  Por favor escolha utilizador da base de dados "
+"que deve utilizar quando se liga ao servidor."
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -831,9 +810,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -843,9 +820,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -859,9 +834,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -869,33 +842,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Escolher um mÃ©todo de ligaÃ§Ã£o de PostgreSQL diferente?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -907,7 +862,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -920,13 +875,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Alterar a configuraÃ§Ã£o de PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -944,21 +899,13 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Reverter automaticamente a configuraÃ§Ã£o de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -976,15 +923,21 @@
 "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:388
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor altere /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -996,7 +949,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 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-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/pt_BR.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\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:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 #, 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Configurar banco de dados para ${pkg} com dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid "Re-install database for ${pkg}?"
 msgstr "Erro instalando base de dados para o pacote ${pkg}."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -159,7 +159,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr "Se não, escolha essa opção."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 msgid "Database type to be used by ${pkg}:"
 msgstr "Banco de dados usado pelo pacote ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:9001
+#: ../dbconfig-common.templates:113
 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:9001
+#: ../dbconfig-common.templates:113
 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,64 +314,32 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "Confirmação de senha:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "As senhas não batem."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 #, fuzzy
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Erro atualizando base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:13002
+#: ../dbconfig-common.templates:136
 #, fuzzy
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
@@ -380,18 +348,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -400,36 +357,27 @@
 "antes da atualização, em ${dbfile}."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 #, fuzzy
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Erro instalando base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 #, fuzzy
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
@@ -438,7 +386,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -452,21 +400,33 @@
 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:15002
+#: ../dbconfig-common.templates:177
 #, fuzzy
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Erro removendo base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 #, fuzzy
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
@@ -484,13 +444,32 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 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:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -500,13 +479,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Número de porta para o serviço ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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,19 +497,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -540,13 +519,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome da base de dados ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -555,13 +534,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nome de usuário ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -574,7 +553,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -586,14 +565,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "Nome de usuário ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -604,37 +583,21 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 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:22002
+#: ../dbconfig-common.templates:249
 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:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -648,48 +611,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -698,15 +627,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -716,19 +637,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -742,15 +675,26 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Senha da aplicação PostgreSQL para o pacote ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 #, 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:291
+#, 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."
@@ -759,9 +703,32 @@
 "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:302
+msgid "Name of your database's administrative user:"
+msgstr "Nome do usuário administrativo do banco de dados:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+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:29001
+#: ../dbconfig-common.templates:309
+msgid "Password of your database's administrative user:"
+msgstr "Senha do usuário administrativo do banco de dados:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -773,44 +740,56 @@
 "não é necessária, já que a autenticação é feita em nível de sistema.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Método para autenticar o administrador do PostgreSQL:"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Método para autenticar o administrador do PostgreSQL:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Método para autenticar o usuário PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"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 administrativo deve usar "
-"quando conectar ao servidor."
+"conexões. Por favor selecione qual método o usuário da base deve usar quando "
+"conectar ao servidor."
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -820,9 +799,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -832,9 +809,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -848,9 +823,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -858,33 +831,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -893,7 +848,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -908,13 +863,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Mudar a configuração do PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -926,22 +881,14 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Mudar a configuração do PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -952,15 +899,21 @@
 "pg_hba.conf:"
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:388
+msgid "${pghbaline}"
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor modifique o /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -972,7 +925,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 

Modified: trunk/debian/po/sv.po
===================================================================
--- trunk/debian/po/sv.po	2006-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/sv.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\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:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 #, 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:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr "BehÃ¥lla administrativa databaslÃ¶senord i debconf?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr "Konfigurera databas fÃ¶r ${pkg} med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:4001
+#: ../dbconfig-common.templates:53
 #, 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:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -150,7 +150,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Avkonfigurera databasen fÃ¶r ${pkg} med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr "Om inte, bÃ¶r du vÃ¤lja denna Ã¥tgÃ¤rd."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 msgid "Database type to be used by ${pkg}:"
 msgstr "Databastyp att anvÃ¤nda fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:8001
+#: ../dbconfig-common.templates:101
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Vill du rensa databasen fÃ¶r ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:9001
+#: ../dbconfig-common.templates:113
 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:9001
+#: ../dbconfig-common.templates:113
 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,63 +298,31 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "BekrÃ¤ftelse av lÃ¶senord:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "LÃ¶senorden stÃ¤mmer inte Ã¶verens."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 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:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -364,18 +332,7 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -384,42 +341,26 @@
 "fÃ¶re uppgraderingen i ${dbfile}."
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
+msgstr "fÃ¶rsÃ¶k igen (hoppa Ã¶ver frÃ¥gor)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr "ignorera"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -429,7 +370,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -452,20 +393,32 @@
 "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:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -483,13 +436,39 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 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:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -499,13 +478,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Portnummer fÃ¶r ${dbvendor}-tjÃ¤nsten:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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 "
@@ -517,19 +496,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -540,26 +519,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor}-databasnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 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:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor}-anvÃ¤ndarnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -571,7 +550,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -583,14 +562,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "${dbvendor}-anvÃ¤ndarnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -599,37 +578,21 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 msgstr ""
 
 #. 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:22002
+#: ../dbconfig-common.templates:249
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Anslutningsmetod fÃ¶r MySQL-databasen fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -643,48 +606,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -693,15 +622,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -711,19 +632,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr "unix socket"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr "tcp/ip"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Anslutningsmetod fÃ¶r PostgreSQL-databasen fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -737,13 +670,23 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL-lÃ¶senord fÃ¶r ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
+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:291
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -755,9 +698,33 @@
 "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:302
+msgid "Name of your database's administrative user:"
+msgstr "Namnet pÃ¥ din databasadministratÃ¶rs anvÃ¤ndare:"
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+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:29001
+#: ../dbconfig-common.templates:309
+msgid "Password of your database's administrative user:"
+msgstr "LÃ¶senord fÃ¶r din databasadministratÃ¶rs anvÃ¤ndare:"
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -769,44 +736,56 @@
 "krÃ¤vs inte ett databaslÃ¶senord eftersom autentisering gÃ¶rs pÃ¥ systemnivÃ¥.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr "Metod fÃ¶r att autentisera PostgreSQL-administratÃ¶ren:"
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr "lÃ¶senord"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "Metod fÃ¶r att autentisera PostgreSQL-administratÃ¶ren:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
+msgstr "Metod fÃ¶r att autentisera PostgreSQL-anvÃ¤ndare:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"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 den administrativa anvÃ¤ndaren bÃ¶r "
-"anvÃ¤nda nÃ¤r anslutningar gÃ¶rs mot servern."
+"anslutningar. VÃ¤nligen vÃ¤lj den metod som databasanvÃ¤ndaren bÃ¶r anvÃ¤nda nÃ¤r "
+"anslutningar gÃ¶rs mot servern."
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -816,9 +795,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -828,9 +805,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -844,9 +819,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -854,33 +827,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "VÃ¤lja en annan anslutningsmetod fÃ¶r PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -892,7 +847,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -905,13 +860,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Ã„ndra konfiguration fÃ¶r PostgreSQL automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -928,21 +883,13 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Ã…terstÃ¤ll PostgreSQL-konfigurationen automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -960,15 +907,21 @@
 "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:388
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "VÃ¤nligen Ã¤ndra /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -980,7 +933,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 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-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/templates.pot	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\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:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 msgid "If you are unsure, you should not select this option."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 msgid "Keep \"administrative\" database passwords in debconf?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Configure database for ${pkg} with dbconfig-common?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 msgid "Otherwise, you should probably choose this option."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 msgid "Re-install database for ${pkg}?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 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:4001
+#: ../dbconfig-common.templates:53
 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:5001
+#: ../dbconfig-common.templates:64
 msgid "Perform upgrade on database for ${pkg} with dbconfig-common?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 msgid "Otherwise, you should choose this option."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 msgid "Database type to be used by ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:7001
+#: ../dbconfig-common.templates:94
 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:8001
+#: ../dbconfig-common.templates:101
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:9001
+#: ../dbconfig-common.templates:113
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:9001
+#: ../dbconfig-common.templates:113
 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,63 +249,31 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -313,53 +281,33 @@
 
 #. Type: select
 #. Description
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
 msgstr ""
 
 #. Type: select
-#. 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."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -367,7 +315,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -381,20 +329,32 @@
 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:15002
+#: ../dbconfig-common.templates:177
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 msgid "An error seems to have occurred while removing the database."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -406,13 +366,32 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../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
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -420,13 +399,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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 "
@@ -435,19 +414,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -455,26 +434,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -483,7 +462,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -492,13 +471,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
 "be installed into."
@@ -506,37 +485,21 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 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:22002
+#: ../dbconfig-common.templates:249
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -546,58 +509,21 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -605,19 +531,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -627,22 +565,51 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 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:291
+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:302
+msgid "Name of your database's administrative user:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../dbconfig-common.templates:302
+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:29001
+#: ../dbconfig-common.templates:309
+msgid "Password of your database's administrative user:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../dbconfig-common.templates:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -651,41 +618,50 @@
 msgstr ""
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+msgid "Method for authenticating PostgreSQL administrator:"
+msgstr ""
+
 #. Type: select
+#. Description
+#: ../dbconfig-common.templates:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
+#: ../dbconfig-common.templates:341
+msgid "Method for authenticating PostgreSQL user:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"connections.  Please select what method the database user should use when "
+"connecting to the server."
 msgstr ""
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -693,9 +669,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -703,9 +677,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -715,38 +687,21 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 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:32001
+#: ../dbconfig-common.templates:362
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -755,7 +710,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -765,13 +720,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -783,21 +738,13 @@
 
 #. Type: boolean
 #. Description
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -808,15 +755,21 @@
 "pg_hba.conf:"
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../dbconfig-common.templates:388
+msgid "${pghbaline}"
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -825,6 +778,6 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""

Modified: trunk/debian/po/vi.po
===================================================================
--- trunk/debian/po/vi.po	2006-09-02 19:36:58 UTC (rev 323)
+++ trunk/debian/po/vi.po	2006-09-10 10:07:47 UTC (rev 324)
@@ -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-22 23:02+1200\n"
+"POT-Creation-Date: 2006-09-10 12:06+0200\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:1001
+#: ../dbconfig-common.templates:4
 msgid "Will this server be used to access remote databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 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:1001
+#: ../dbconfig-common.templates:4
 #, 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:2001
+#: ../dbconfig-common.templates:20
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:3001
+#: ../dbconfig-common.templates:38
 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:4001
+#: ../dbconfig-common.templates:53
 #, 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:4001
+#: ../dbconfig-common.templates:53
 #, fuzzy
 msgid ""
 "Since you are reconfiguring ${pkg}, you may also want to reinstall the "
@@ -151,7 +151,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:4001
+#: ../dbconfig-common.templates:53
 #, 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:5001
+#: ../dbconfig-common.templates:64
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:6001
+#: ../dbconfig-common.templates:79
 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:7001
+#: ../dbconfig-common.templates:94
 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:7001
+#: ../dbconfig-common.templates:94
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:8001
+#: ../dbconfig-common.templates:101
 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:9001
+#: ../dbconfig-common.templates:113
 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:9001
+#: ../dbconfig-common.templates:113
 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,63 +296,31 @@
 
 #. Type: password
 #. Description
-#. Type: password
-#. Description
-#: ../dbconfig-common.templates:10001 ../dbconfig-common.templates:11001
+#: ../dbconfig-common.templates:125
 msgid "Password confirmation:"
 msgstr "XÃ¡c nháºn máºt kháº©u :"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 msgid "Passwords do not match."
 msgstr "Hai máºt kháº©u khÃ´ng trÃ¹ng nhau."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:12001
+#: ../dbconfig-common.templates:129
 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:13002
+#: ../dbconfig-common.templates:136
 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:13002
+#: ../dbconfig-common.templates:136
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -360,21 +328,9 @@
 "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
-#. 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
+#: ../dbconfig-common.templates:136
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -383,44 +339,26 @@
 "ngay trÆ°á»›c khi nÃ¢ng cáº¥p."
 
 #. Type: select
-#. 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Ã³."
+#. Choices
+#: ../dbconfig-common.templates:155
+msgid "retry (skip questions)"
+msgstr "thá» láº¡i (bá» qua cÃ¡c cÃ¢u há»i)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:14001
+#: ../dbconfig-common.templates:155
 msgid "ignore"
 msgstr "bá» qua"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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:14002
+#: ../dbconfig-common.templates:157
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -430,7 +368,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:14002
+#: ../dbconfig-common.templates:157
 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 "
@@ -454,20 +392,32 @@
 "\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:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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:15002
+#: ../dbconfig-common.templates:177
 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 "
@@ -481,15 +431,44 @@
 "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:16001
+#: ../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
 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:16001
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -498,13 +477,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Sá»‘ hiá»‡u cá»•ng cho dá»‹ch vá»¥ ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:17001
+#: ../dbconfig-common.templates:206
 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 "
@@ -515,19 +494,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 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:18001
+#: ../dbconfig-common.templates:213
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -537,26 +516,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:19001
+#: ../dbconfig-common.templates:222
 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:20001
+#: ../dbconfig-common.templates:227
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "TÃªn dÃ¹ng ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -568,7 +547,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:20001
+#: ../dbconfig-common.templates:227
 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 "
@@ -580,14 +559,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid "${dbvendor} storage directory for ${pkg}:"
 msgstr "TÃªn dÃ¹ng ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 #, fuzzy
 msgid ""
 "Please provide a path where the ${dbvendor} database file for ${pkg}  should "
@@ -596,37 +575,21 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:21001
+#: ../dbconfig-common.templates:238
 msgid ""
 "The permissions for this directory will be set to match the permissions for "
 "the generated database file."
 msgstr ""
 
 #. 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:22002
+#: ../dbconfig-common.templates:249
 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:22002
+#: ../dbconfig-common.templates:249
 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 "
@@ -640,47 +603,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:23001
+#: ../dbconfig-common.templates:257
 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
-#. 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
+#: ../dbconfig-common.templates:265
 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 ""
@@ -689,15 +619,7 @@
 
 #. Type: password
 #. Description
-#. 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
+#: ../dbconfig-common.templates:275
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -707,19 +629,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:281
+msgid "unix socket"
+msgstr "á»• cáº¯m UNIX"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
+msgid "tcp/ip"
+msgstr "TCP/IP"
+
+#. Type: select
+#. Choices
+#: ../dbconfig-common.templates:281
 msgid "tcp/ip + ssl"
 msgstr "TCP/IP + SSL"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:26002
+#: ../dbconfig-common.templates:283
 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:26002
+#: ../dbconfig-common.templates:283
 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 "
@@ -733,13 +667,23 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Máºt kháº©u á»©ng dá»¥ng PostgreSQL cho ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:291
+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:291
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -751,9 +695,32 @@
 "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:302
+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:302
+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:29001
+#: ../dbconfig-common.templates:309
+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:309
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -765,44 +732,56 @@
 "cÆ¡ sá»Ÿ dá»¯ liá»‡u vÃ¬ xÃ¡c thá»©c táº¡i má»©c Ä‘á»™ há»‡ thá»‘ng.)"
 
 #. Type: select
-#. Choices
+#. Description
+#: ../dbconfig-common.templates:319
+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:319
+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:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:340
 msgid "password"
 msgstr "máºt kháº©u"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:30002
-msgid "Method for authenticating PostgreSQL administrator:"
-msgstr "PhÆ°Æ¡ng phÃ¡p xÃ¡c thá»©c quáº£n trá»‹ PostgreSQL:"
+#: ../dbconfig-common.templates:341
+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:30002
+#: ../dbconfig-common.templates:341
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
-"connections.  Please select what method the administrative user should use "
-"when connecting to the server."
+"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 quáº£n trá»‹ 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 cÆ¡ sá»Ÿ dá»¯ liá»‡u nÃªn sá» dá»¥ng khi káº¿t "
+"ná»‘i Ä‘áº¿n mÃ¡y phá»¥c vá»¥."
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -812,9 +791,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -824,9 +801,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -840,9 +815,7 @@
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
+#: ../dbconfig-common.templates:341
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -850,33 +823,15 @@
 "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:32001
+#: ../dbconfig-common.templates:362
 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:32001
+#: ../dbconfig-common.templates:362
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -888,7 +843,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:32001
+#: ../dbconfig-common.templates:362
 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 "
@@ -902,13 +857,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Tá»± Ä‘á»™ng thay Ä‘á»•i cáº¥u hÃ¬nh PostgreSQL khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:375
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -923,24 +878,15 @@
 "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
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
-msgid "${pghbaline}"
-msgstr "${pghbaline}"
-
-#. Type: boolean
-#. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:388
 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:34001
+#: ../dbconfig-common.templates:388
 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 "
@@ -957,15 +903,22 @@
 "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:388
+msgid "${pghbaline}"
+msgstr "${pghbaline}"
+
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:401
 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:35001
+#: ../dbconfig-common.templates:401
 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 "
@@ -977,7 +930,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:408
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL khÃ´ng há»— trá»£ máºt kháº©u rá»—ng."
 


