[Dbconfig-common-changes] [dbconfig-common] r227 - in trunk: debian debian/po dpkg

Wed May 24 21:49:20 CEST 2006

Author: seanius
Date: 2006-05-24 19:48:54 +0000 (Wed, 24 May 2006)
New Revision: 227

Modified:
   trunk/debian/dbconfig-common.templates
   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
   trunk/dpkg/common
   trunk/dpkg/prerm
Log:
cleanup in prerm script

Modified: trunk/debian/dbconfig-common.templates
===================================================================

--- trunk/debian/dbconfig-common.templates	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/dbconfig-common.templates	2006-05-24 19:48:54 UTC (rev 227)
@@ -46,10 +46,6 @@
  /var/cache/dbconfig-common/backups, from which which the database can
  be restored in the case of problems.
 
-Template: dbconfig-common/performing_upgrade
-Type: boolean
-Default: false
-
 Template: dbconfig-common/dbconfig-remove
 Type: boolean
 Default: true

Modified: trunk/debian/po/ca.po
===================================================================
--- trunk/debian/po/ca.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/ca.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: dbconfigcommon1.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+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"
@@ -145,13 +145,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -161,7 +161,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Si voleu, el dbconfig-common pot encarregar-se del procÃ©s d'esborrar la base "
@@ -169,7 +169,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -180,19 +180,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr "En altre cas, escolliu aquesta opciÃ³."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid "Database type to be used by ${pkg}:"
 msgstr "Tipus de base de dades que utilitzarÃ  ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -202,13 +202,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 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:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -218,7 +218,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -230,13 +230,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 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:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -250,25 +250,25 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "Confirmeu la contrasenya:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "Les contrasenyes no coincideixen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Les contrasenyes que heu introduÃ¯t no coincideixen. Torneu a provar."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "S'ha produÃ¯t un error al actualitzar la base de dades d ${pkg}. Voleu "
@@ -276,7 +276,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -286,7 +286,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -296,19 +296,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "S'ha produÃ¯t un error a l'instalÂ·lar la base de dades per ${pkg}. Voleu "
@@ -316,7 +316,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -326,7 +326,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -349,19 +349,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "S'ha produÃ¯t un error esborrant la base de dades de ${pkg}. Voleu reintentar-"
@@ -369,13 +369,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
 "to remove the database for ${pkg}.  At this point you have two options: you "
@@ -393,13 +393,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -419,7 +419,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr ""
 "IntroduÃ¯u el nom del ordinador que executa el servidor de base de dades "
@@ -427,7 +427,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -437,13 +437,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "IntroduÃ¯u el nÃºmero de port del servei ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -455,7 +455,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 "IntroduÃ¯u el nom del ordinador que executa el servidor de ${dbvendor} pel "
@@ -463,13 +463,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -479,13 +479,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 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:199
+#: ../dbconfig-common.templates:195
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -493,13 +493,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "IntroduÃ¯u el nom d 'usuari ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -512,7 +512,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -524,13 +524,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -544,13 +544,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "IntroduÃ¯u la contrasenya de l'aplicaciÃ³ MySQL per ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -560,7 +560,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -570,7 +570,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -580,31 +580,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -618,13 +618,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "IntroduÃ¯u la contrasenya de l'aplicaciÃ³ PostgreSQL per ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -637,13 +637,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -655,13 +655,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 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:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -675,13 +675,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'administrador PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -693,25 +693,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'usuari PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -723,7 +723,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -733,7 +733,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -744,7 +744,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -758,7 +758,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -768,13 +768,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Voleu escollir un mÃ¨tode diferent de connexiÃ³ a PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -786,7 +786,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -800,13 +800,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Voleu canviar la configuraciÃ³ de PostgreSQL automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -823,13 +823,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Voleu desfer la configuraciÃ³ de PostgreSQL automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -849,19 +849,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Canvieu el /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -873,19 +873,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL no suporta contrassenyes buides."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common intentarÃ  carregar els parÃ metres existents"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/cs.po
===================================================================
--- trunk/debian/po/cs.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/cs.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+0200\n"
 "PO-Revision-Date: 2006-05-06 18:25+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -136,13 +136,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Odstranit databÃ¡zi pro ${pkg} pomocÃ dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -152,13 +152,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -168,19 +168,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:71
+#: ../dbconfig-common.templates:67
 msgid "Database type to be used by ${pkg}:"
 msgstr "Typ databÃ¡ze, kterÃ½ mÃ¡ ${pkg} pouÅ¾Ãt:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -190,13 +190,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Chcete smazat databÃ¡zi balÃku ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -205,7 +205,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -217,13 +217,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 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:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -237,31 +237,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "PotvrzenÃ hesla:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "Hesla nesouhlasÃ."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "ZadanÃ¡ hesla nesouhlasÃ. Zkuste to znovu."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i aktualizaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -271,7 +271,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -281,25 +281,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr "opakovat (pÅ™eskoÄit otÃ¡zky)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr "ignorovat"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i instalaci databÃ¡ze pro ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -309,7 +309,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -333,31 +333,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr "pÅ™eruÅ¡it"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr "opakovat"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Chyba pÅ™i odstranÄ›nÃ databÃ¡ze ${pkg}. Zkusit znovu?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
 "to remove the database for ${pkg}.  At this point you have two options: you "
@@ -374,13 +374,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -400,13 +400,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 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:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -416,13 +416,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "ÄŒÃslo portu pro sluÅ¾bu ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -434,19 +434,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -456,26 +456,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "JmÃ©no ${dbvendor} databÃ¡ze pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 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:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no v ${dbvendor} pro ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -488,7 +488,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -500,13 +500,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -520,13 +520,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "AplikaÄnÃ MySQL heslo pro balÃk ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -536,7 +536,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -546,7 +546,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -556,31 +556,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr "unixovÃ½ socket"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -594,13 +594,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "AplikaÄnÃ PostgreSQL heslo pro balÃk ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -612,13 +612,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 msgid "Name of your database's administrative user:"
 msgstr "JmÃ©no administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -629,13 +629,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid "Password of your database's administrative user:"
 msgstr "Heslo administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -648,13 +648,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "ZpÅ¯sob autentizace administrÃ¡tora PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -666,25 +666,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr "password"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "ZpÅ¯sob autentizace uÅ¾ivatele PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -696,7 +696,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -706,7 +706,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -716,7 +716,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -729,7 +729,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -739,13 +739,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Zvolit jinÃ½ zpÅ¯sob pÅ™ipojenÃ k PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -756,7 +756,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -769,13 +769,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "ZmÄ›nit nastavenÃ PostgreSQL automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -792,13 +792,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "VrÃ¡tit nastavenÃ PostgreSQL automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -818,19 +818,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Upravte prosÃm /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -842,19 +842,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL nepodporuje prÃ¡zdnÃ¡ hesla."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common se pokusÃ nahrÃ¡t stÃ¡vajÃcÃ nastavenÃ"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/da.po
===================================================================
--- trunk/debian/po/da.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/da.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+0200\n"
 "PO-Revision-Date: 2005-12-16 12:49+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h at image.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -139,13 +139,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Afkonfigurér ${pkg}s database med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -155,13 +155,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -171,19 +171,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr "Ellers bør du vælge denne valgmulighed."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid "Database type to be used by ${pkg}:"
 msgstr "Databasetype, der skal bruges af ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -193,13 +193,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 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:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -209,7 +209,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -222,13 +222,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 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:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -242,31 +242,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "Bekræft adgangskode:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "Adgangskoder var ikke ens."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Du adgangskoder, du angav, var ikke ens. Prøv igen."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Fejl under opgradering af ${pkg}'s database. Forøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -276,7 +276,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -286,25 +286,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr "prøv igen (spring over spørgsmål)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr "ignorér"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Fejl under installationen af ${pkg}'s database. Forsøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -314,7 +314,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -338,31 +338,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr "afbryd"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr "prøv igen"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Fejl under afinstallation af ${pkg}'s database. Forsøg igen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
 "to remove the database for ${pkg}.  At this point you have two options: you "
@@ -379,13 +379,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -405,13 +405,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Værtsnavn for ${pkg}s ${dbvendor}-databaseserver:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -421,13 +421,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "${dbvendor}-servicens portnummer:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -439,19 +439,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Værten, der kører ${dbvendor}-serveren for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -461,26 +461,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor}-databasenavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 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:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor}-brugernavn for ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -492,7 +492,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -504,13 +504,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Forbindelsesmetode for ${pkg}s MySQL-database:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -524,13 +524,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL-programadgangskode for ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -541,7 +541,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -551,7 +551,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -561,31 +561,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr "unix-sokkel"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Forbindelsesmetode for ${pkg}s PostgreSQL-database:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -599,13 +599,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL-programadgangskode for ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -618,13 +618,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 msgid "Name of your database's administrative user:"
 msgstr "Navnet på din databases administrationsbruger:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -635,13 +635,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid "Password of your database's administrative user:"
 msgstr "Din databases administrationsbrugers adgangskode:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -655,13 +655,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Måde at autentificere PostgreSQL-administratoren på:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -673,25 +673,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr "adgangskode"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Måde at autentificere PostgreSQL-bruger på:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -703,7 +703,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -713,7 +713,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -723,7 +723,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -738,7 +738,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -748,13 +748,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Vil du vælge en anden PostgreSQL-forbindelsesmetode?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -766,7 +766,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -780,13 +780,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Ret PostgreSQL-opsætningen automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -803,13 +803,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Genskab den gamle PostgreSQL-opsætning automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -828,19 +828,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Ret venligst /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -852,19 +852,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL understøtter ikke tomme adgangskoder."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common vil forsøge at indlæse de eksisterende indstillinger"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/de.po
===================================================================
--- trunk/debian/po/de.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/de.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+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"
@@ -143,13 +143,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Dekonfigurieren der Datenbank für ${pkg} mit dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -159,7 +159,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Falls gewünscht, kann das Löschen der Datenbank mit Hilfe von dbconfig-"
@@ -167,7 +167,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -177,19 +177,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr "Andernfalls sollte diese Option gewählt werden."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid "Database type to be used by ${pkg}:"
 msgstr "Datenbanktyp, der durch das Paket ${pkg} benutzt werden soll:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -200,13 +200,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 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:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -216,7 +216,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -229,7 +229,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "Soll ein Backup der Datenbank für ${pkg} vor der Aktualisierung durchgeführt "
@@ -237,7 +237,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -252,19 +252,19 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "Passwort Bestätigung:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "Die eingegebenen Passwörter stimmen nicht überein. Bitte versuchen Sie es "
@@ -272,13 +272,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Fehler beim Aktualisieren der Datenbank von ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -288,7 +288,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -298,25 +298,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Fehler bei der Installation der Datenbank für ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -326,7 +326,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -350,31 +350,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Fehler beim Löschen der Datenbank von ${pkg}.  Wiederholen?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
 "to remove the database for ${pkg}.  At this point you have two options: you "
@@ -392,13 +392,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -419,13 +419,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "Rechnername des ${dbvendor} Datenbankservers für ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -435,13 +435,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Portnummer für den ${dbvendor} Service:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -454,20 +454,20 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -478,13 +478,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor} Datenbankname für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -493,13 +493,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor} Nutzernamen für ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -512,7 +512,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -525,13 +525,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Verbindungsmethode an die MySQL Datenbank von ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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,13 +546,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL Anwendungspasswort für ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -563,7 +563,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -573,7 +573,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -583,31 +583,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Verbindungsmethode für die PostgreSQL Datenbank von ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -622,13 +622,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL Anwendungspasswort für ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -641,13 +641,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 msgid "Name of your database's administrative user:"
 msgstr "Login-Name des Datenbank-Administrators:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -659,13 +659,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid "Password of your database's administrative user:"
 msgstr "Passwort des Datenbank-Administrators:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -679,13 +679,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Authentifizierungsmethode des PostgreSQL Administrators:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -697,25 +697,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Authentifizierungsmethode des PostgreSQL Nutzers:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -727,7 +727,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -737,7 +737,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -748,7 +748,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -762,7 +762,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -772,13 +772,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Eine andere Verbindungsmethode für PostgreSQL wählen?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -790,7 +790,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -804,13 +804,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Soll die PostgreSQL Konfiguration automatisch geändert werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -828,13 +828,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Soll die PostgreSQL Konfiguration automatisch geändert werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -856,19 +856,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -880,19 +880,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL unterstützt keine leeren Passwörter."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common wird versuchen, existierende Einstellungen zu setzen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/es.po
===================================================================
--- trunk/debian/po/es.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/es.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -35,7 +35,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+0200\n"
 "PO-Revision-Date: 2005-04-01 13:03+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs at debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -166,14 +166,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -183,7 +183,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Si lo desea, «dbconfig-common» puede gestionar la eliminación de la base de "
@@ -191,7 +191,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -201,19 +201,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr "En cualquier otro caso debería seleccionar esta opción."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 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:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -223,13 +223,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 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:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -238,7 +238,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -250,7 +250,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "¿Desea realizar una copia de seguridad de la base de datos de ${pkg} antes "
@@ -258,7 +258,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -273,19 +273,19 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "Confirmación de contraseña:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "Las contraseñas que ha proporcionado no coinciden. Por favor, inténtelo de "
@@ -293,14 +293,14 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 #, fuzzy
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Se produjo un error al actualizar la base de datos para ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 #, fuzzy
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
@@ -310,7 +310,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -320,26 +320,26 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 #, fuzzy
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Se produjo un error al instalar la base de datos para ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 #, fuzzy
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
@@ -349,7 +349,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -364,32 +364,32 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 #, fuzzy
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Se produjo un error al eliminar la base de datos par ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 #, fuzzy
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
@@ -407,13 +407,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -426,13 +426,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 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:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -442,13 +442,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Número de puerto del servicio ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -460,13 +460,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Por favor, indique el nombre del servidor que tiene el servidor remoto "
@@ -474,7 +474,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -484,13 +484,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nombre de la base de datos ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -499,13 +499,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nombre de usuario ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -518,7 +518,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -530,13 +530,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -550,13 +550,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "Contraseña de aplicación MySQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
@@ -568,7 +568,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -578,7 +578,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -588,31 +588,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -626,13 +626,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Contraseña de aplicación PostgreSQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
@@ -645,13 +645,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -663,13 +663,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 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:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -683,13 +683,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Método de autenticación para el administrador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -701,25 +701,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Método de autenticación del usuario de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -731,7 +731,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -741,7 +741,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -751,7 +751,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -766,7 +766,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -776,13 +776,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -791,7 +791,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -805,13 +805,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "¿Desea modificar automáticamente la configuración de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -823,14 +823,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "¿Desea modificar automáticamente la configuración de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -843,19 +843,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor, modifique «/etc/postgresql/pg_hba.conf»"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -867,19 +867,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/eu.po
===================================================================
--- trunk/debian/po/eu.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/eu.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common-templates-eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+0200\n"
 "PO-Revision-Date: 2005-04-01 00:08+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <eu at li.org>\n"
@@ -142,13 +142,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-ren database ezabatzea dbconfig-common bidez egin?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -158,14 +158,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -175,19 +175,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr "Bestela aukera hau erabili ezazu."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid "Database type to be used by ${pkg}:"
 msgstr "${pkg}-ek erabiliko duen database mota:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -197,13 +197,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 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:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -212,7 +212,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -224,14 +224,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 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:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -245,32 +245,32 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "Pasahitz berrespena:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "Pasahitzak ez dira berdinak."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Emandako pasahitzak ez dira berdinak. Saiatu berriro mesedez."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 #, fuzzy
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-ren databasea eguneratzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 #, fuzzy
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
@@ -279,7 +279,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -288,26 +288,26 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 #, fuzzy
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-rentzat databasea instalatzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 #, fuzzy
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
@@ -316,7 +316,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -331,32 +331,32 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 #, fuzzy
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Errorea ${pkg}-ren databasea ezabatzerakoan."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 #, fuzzy
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
@@ -373,13 +373,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -392,13 +392,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} zerbitzariaren ostalari izena:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -408,13 +408,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "${dbvendor} zerbitzuaren ataka zenbakia:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -426,19 +426,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} zerbitzaria duen  ostalari izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr "Ezarri urruneko ${dbvendor} zerbitzariaren ostalari izena."
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -448,13 +448,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} database izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -462,13 +462,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${pkg}-ren ${dbvendor} erabiltzaile izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -481,7 +481,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -493,13 +493,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "${pkg}-ren MySQL-rekiko konexio metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -513,13 +513,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "${pkg}-ren MySQL aplikazio pasahitza:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
@@ -530,7 +530,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -540,7 +540,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -550,31 +550,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "${pkg}-ren PostgreSQL-rekiko konexio metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -588,13 +588,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "${pkg}-ren PostgreSQL aplikazio pasahitza:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
@@ -607,13 +607,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 msgid "Name of your database's administrative user:"
 msgstr "Database kudeatzaile erabiltzaile izena:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -625,13 +625,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid "Password of your database's administrative user:"
 msgstr "Databasearen kudeatzaile erabiltzaileran pasahitza:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -645,13 +645,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "PostgreSQL kudeatzaile egiaztapen metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -662,25 +662,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "PostgreSQL erabiltzaile egiaztapen metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -692,7 +692,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -702,7 +702,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -713,7 +713,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -727,7 +727,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -737,13 +737,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -752,7 +752,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -766,13 +766,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "PostgreSQL konfigurazioa automatikoki aldatu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -784,14 +784,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "PostgreSQL konfigurazioa automatikoki aldatu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -804,19 +804,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Mesedez /etc/postgresql/pg_hba.conf aldatu"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -828,19 +828,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/fr.po
===================================================================
--- trunk/debian/po/fr.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/fr.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+0200\n"
 "PO-Revision-Date: 2005-11-09 23:35+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -149,14 +149,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr ""
 "Faut-il récupérer la configuration initiale de ${pkg} avec dbconfig-common ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -166,14 +166,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Si vous le souhaitez, dbconfig-common peut supprimer la base de données."
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -183,19 +183,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr "Autrement, vous devriez choisir cette option."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 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:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -206,13 +206,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Faut-il purger la base de données de ${pkg} ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -222,7 +222,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -234,14 +234,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "Faut-il sauvegarder la base de données de ${pkg} avant la mise à jour ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -255,19 +255,19 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "Confirmation du mot de passe :"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "Les mots de passe ne correspondent pas"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "Les mots de passe que vous avez indiqués ne correspondent pas. Veuillez "
@@ -275,7 +275,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de la mise à jour de la base de données pour ${pkg}. Action "
@@ -283,7 +283,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -293,7 +293,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -303,19 +303,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr "Recommencer avec les mêmes réglages"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr "Ignorer"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de l'installation de la base de données pour ${pkg}. Action "
@@ -323,7 +323,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -333,7 +333,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -355,19 +355,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr "Abandonner"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr "Recommencer"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 "Erreur lors de la suppression de la base de données de ${pkg}. Action "
@@ -375,7 +375,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "An error seems to have occurred while removing the database."
 msgstr ""
 "Une erreur semble s'être produite lors de la suppression de la base de "
@@ -383,7 +383,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
 "to remove the database for ${pkg}.  At this point you have two options: you "
@@ -401,13 +401,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -427,13 +427,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 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:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -443,13 +443,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Numéro de port pour le service ${dbvendor} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -461,19 +461,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Nom d'hôte du serveur ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -483,13 +483,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nom de la base de données ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -498,13 +498,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Identifiant ${dbvendor} pour ${pkg} :"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -517,7 +517,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -530,13 +530,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -550,13 +550,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "Mot de passe de connexion MySQL pour ${pkg} :"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -567,7 +567,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -577,7 +577,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -587,31 +587,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr "Socket UNIX"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr "TCP/IP"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr "TCP/IP + SSL"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -625,13 +625,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Mot de passe de connexion PostgreSQL pour ${pkg} :"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -644,13 +644,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -662,13 +662,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 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:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -682,13 +682,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Méthode d'authentification de l'administrateur PostgreSQL :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -700,25 +700,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr "Ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr "Mot de passe"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Méthode d'authentification pour l'utilisateur de PostgreSQL :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -730,7 +730,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -740,7 +740,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -751,7 +751,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -764,7 +764,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -774,14 +774,14 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 "Faut-il choisir une méthode différente pour la connexion à PostgreSQL ?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -793,7 +793,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -807,13 +807,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Faut-il modifier la configuration de PostgreSQL automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -830,13 +830,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Faut-il restaurer la configuration de PostgreSQL automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -856,19 +856,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Modification de /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -880,19 +880,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL n'accepte pas les mots de passe vides."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "Tentative de récupération des réglages actuels"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/it.po
===================================================================
--- trunk/debian/po/it.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/it.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+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"
@@ -129,13 +129,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Eliminare la configurazione di dbconfig-common per ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -145,14 +145,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -162,19 +162,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr "Altrimenti la si accetti."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid "Database type to be used by ${pkg}:"
 msgstr "Tipo di database da usare con ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -184,13 +184,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Si vuole eliminare il database di ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -200,7 +200,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -212,14 +212,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 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:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -233,31 +233,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "Conferma della password:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "Le password non coincidono."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Le password fornite non coincidono. Riprovare."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Errore aggiornando il database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -267,7 +267,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -277,25 +277,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Errore nell'installazione del database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -304,7 +304,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 #, fuzzy
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
@@ -327,31 +327,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Errore eliminando il database di ${pkg}. Riprovare?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
 "to remove the database for ${pkg}.  At this point you have two options: you "
@@ -369,13 +369,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -395,13 +395,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 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:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -411,13 +411,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Numero della porta del servizio ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -429,19 +429,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -451,26 +451,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome del database ${dbvendor} per ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 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:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Utente ${dbvendor} di ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -482,7 +482,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -494,13 +494,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Metodo di connessione al database MySQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -514,13 +514,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "Password applicativa per MySQL per ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -530,7 +530,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -540,7 +540,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -550,31 +550,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Metodo di connessione al database PostgreSQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -588,13 +588,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Password applicativa di ${pkg} per PostgreSQL:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -607,13 +607,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 msgid "Name of your database's administrative user:"
 msgstr "Node dell'utente amministratore del database:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -625,13 +625,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid "Password of your database's administrative user:"
 msgstr "Password per l'utente amministratore del database:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -645,13 +645,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Modalità di autenticazione dell'amministratore PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -663,25 +663,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Modalità di autenticazione dell'utente PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -693,7 +693,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -703,7 +703,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -714,7 +714,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -728,7 +728,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -738,13 +738,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Scegliere un diverso metodo di connessione a PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -756,7 +756,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -770,13 +770,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Modificare la configurazione di PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -788,14 +788,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Modificare la configurazione di PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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,19 +808,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Modificare /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -832,19 +832,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL non permette le password vuote."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common cercherà di carica le impostazioni esistenti"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/nl.po
===================================================================
--- trunk/debian/po/nl.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/nl.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+0200\n"
 "PO-Revision-Date: 2006-02-19 19:12+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -142,13 +142,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "${pkg}-database de-configureren via dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -158,14 +158,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Wilt u dat dbconfig-common het verwijderen van de database voor u afhandelt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -175,19 +175,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:71
+#: ../dbconfig-common.templates:67
 msgid "Database type to be used by ${pkg}:"
 msgstr "Welk type database dient ${pkg} te gebruiken?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -197,13 +197,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Wilt u de ${pkg}-database wissen?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -213,7 +213,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -225,7 +225,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "Wilt u dat er een reservekopie gemaakt wordt van de ${pkg}-database alvorens "
@@ -233,7 +233,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -247,19 +247,19 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "Bevestiging wachtwoord (nogmaals intikken):"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "De door u ingevoerde wachtwoorden komen niet overeen. Gelieve opnieuw te "
@@ -267,7 +267,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 "Fout bij het opwaarderen van de ${pkg}-database. Wilt u dit nogmaals "
@@ -275,7 +275,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -285,7 +285,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -295,19 +295,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr "opnieuw proberen (vragen overslaan)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr "negeren"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 "Fout bij het installeren van de ${pkg}-database. Wilt u dit nogmaals "
@@ -315,7 +315,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -325,7 +325,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -350,32 +350,32 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr "afbreken"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr "opnieuw proberen"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
 "to remove the database for ${pkg}.  At this point you have two options: you "
@@ -393,13 +393,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -421,7 +421,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr ""
 "Wat is de computernaam van de door ${pkg} te gebruiken ${dbvendor}-database-"
@@ -429,7 +429,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -439,13 +439,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 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:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -457,7 +457,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 "Wat is de computernaam van de door ${pkg} te gebruiken ${dbvendor}-database-"
@@ -465,7 +465,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Gelieve hier de computernaam van de (niet-lokale) ${dbvendor}-server in te "
@@ -473,7 +473,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -483,14 +483,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr ""
 "Wat is/wordt de naam van de door ${pkg} te gebruiken ${dbvendor}-database?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -499,14 +499,14 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr ""
 "Met welke gebruikersnaam dient ${pkg} zich bij ${dbvendor} aan te melden?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -519,7 +519,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -532,14 +532,14 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -553,14 +553,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr ""
 "Wat is het wachtwoord waarmee ${pkg} zich bij MySQL dient aan te melden?"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -571,7 +571,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -581,7 +581,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -591,32 +591,32 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr "unix socket"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -630,14 +630,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 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:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -650,13 +650,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 msgid "Name of your database's administrative user:"
 msgstr "Wat is de naam van de beheers-account voor uw database?"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -667,13 +667,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 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:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -687,14 +687,14 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr ""
 "Welke authenticatiemethode wordt gebruikt door de PostgreSQL-beheerder?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -706,26 +706,26 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr "wachtwoord"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr ""
 "Welke authenticatiemethode wordt gebruikt door de PostgreSQL-gebruiker?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -738,7 +738,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -748,7 +748,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -759,7 +759,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -773,7 +773,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -783,13 +783,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Een andere PostgreSQL verbindingsmethode kiezen?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -801,7 +801,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -815,13 +815,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Wilt u dat de PostgreSQL-configuratie automatisch aangepast wordt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -839,13 +839,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Wilt u dat de PostgreSQL-configuratie automatisch teruggezet wordt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -865,19 +865,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Gelieve /etc/postgresql/pg_hba.conf aan te passen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -889,19 +889,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL ondersteunt geen lege wachtwoorden."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "dbconfig-common zal proberen bestaande instellingen te laden"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/pt.po
===================================================================
--- trunk/debian/po/pt.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/pt.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+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"
@@ -133,13 +133,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -149,7 +149,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Se vocÃª desejar, a remoÃ§Ã£o da base de dados pode ser lidada pelo dbconfig-"
@@ -157,7 +157,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -167,19 +167,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr "Caso contrÃ¡rio, deve escolher esta opÃ§Ã£o."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 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:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -189,13 +189,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 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:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -205,7 +205,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -218,13 +218,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 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:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -239,32 +239,32 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "ConfirmaÃ§Ã£o da password:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "As passwords nÃ£o coincidem."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 "As passwords que vocÃª disponibizou nÃ£o coincidem.  Por favor tente novamente."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 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:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -274,7 +274,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -284,25 +284,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr "tentar novamente (saltar perguntas)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr "ignorar"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 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:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -312,7 +312,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -336,31 +336,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr "abortar"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr "tentar novamente"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
 "to remove the database for ${pkg}.  At this point you have two options: you "
@@ -378,13 +378,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -405,13 +405,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 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:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -421,13 +421,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "NÃºmero do port que corre o serviÃ§o ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -439,13 +439,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr "Host que corre o servidor ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 "Por favor disponibilize o nome de uma mÃ¡quina remota com o servidor "
@@ -453,7 +453,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -463,13 +463,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome de base de dados ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -478,13 +478,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nome de utilizador de ${dbvendor} para ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -497,7 +497,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -509,13 +509,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -529,13 +529,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "Password da aplicaÃ§Ã£o MySQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -546,7 +546,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -556,7 +556,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -566,31 +566,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr "socket unix"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -604,13 +604,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Password da aplicaÃ§Ã£o PostgreSQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -623,13 +623,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 msgid "Name of your database's administrative user:"
 msgstr "Nome do utilizador administrativo da sua base de dados:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -641,13 +641,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid "Password of your database's administrative user:"
 msgstr "Password do utilizador administrativo da sua base de dados:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -661,13 +661,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "MÃ©todo para autenticar o administrador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -679,25 +679,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr "password"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "MÃ©todo para autenticar o utilizador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -709,7 +709,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -719,7 +719,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -729,7 +729,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -743,7 +743,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -753,13 +753,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Escolher um mÃ©todo de ligaÃ§Ã£o de PostgreSQL diferente?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -771,7 +771,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -784,13 +784,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Alterar a configuraÃ§Ã£o de PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -808,13 +808,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Reverter automaticamente a configuraÃ§Ã£o de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -834,19 +834,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor altere /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -858,19 +858,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr "O PostgreSQL nÃ£o suporta passwords vazias."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "o dbconfig-common irÃ¡ tentar carregar as definiÃ§Ãµes existentes"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/pt_BR.po
===================================================================
--- trunk/debian/po/pt_BR.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/pt_BR.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+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."
@@ -141,13 +141,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -157,7 +157,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 "Se você quiser, a remoção da base de dados pode ser feita pelo dbconfig-"
@@ -165,7 +165,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -175,19 +175,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr "Se não, escolha essa opção."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid "Database type to be used by ${pkg}:"
 msgstr "Banco de dados usado pelo pacote ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -198,13 +198,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 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:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -214,7 +214,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -227,7 +227,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 "Você quer fazer uma cópia de segurança da base de dados do pacote ${pkg} "
@@ -235,7 +235,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -250,32 +250,32 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "Confirmação de senha:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "As senhas não batem."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "As senhas que você forneceu não batem. Por favor, tente de novo."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 #, fuzzy
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr "Erro atualizando base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 #, fuzzy
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
@@ -284,7 +284,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -294,26 +294,26 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 #, fuzzy
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr "Erro instalando base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 #, fuzzy
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
@@ -322,7 +322,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -337,32 +337,32 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 #, fuzzy
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr "Erro removendo base de dados para o pacote ${pkg}."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 #, fuzzy
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
@@ -380,13 +380,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -399,13 +399,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 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:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -415,13 +415,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Número de porta para o serviço ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -433,19 +433,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -455,13 +455,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "Nome da base de dados ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
@@ -470,13 +470,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "Nome de usuário ${dbvendor} para o pacote ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -489,7 +489,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -501,13 +501,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -521,13 +521,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "Senha MySQL da aplicação para o pacote ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
@@ -538,7 +538,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -548,7 +548,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -558,31 +558,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -596,13 +596,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Senha da aplicação PostgreSQL para o pacote ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
@@ -615,13 +615,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 msgid "Name of your database's administrative user:"
 msgstr "Nome do usuário administrativo do banco de dados:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -632,13 +632,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid "Password of your database's administrative user:"
 msgstr "Senha do usuário administrativo do banco de dados:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -651,13 +651,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Método para autenticar o administrador do PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -669,25 +669,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Método para autenticar o usuário PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -699,7 +699,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -709,7 +709,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -719,7 +719,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -733,7 +733,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -743,13 +743,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -758,7 +758,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -773,13 +773,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Mudar a configuração do PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -791,14 +791,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Mudar a configuração do PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -811,19 +811,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor modifique o /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -835,19 +835,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/sv.po
===================================================================
--- trunk/debian/po/sv.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/sv.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.8.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+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"
@@ -132,13 +132,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr "Avkonfigurera databasen fÃ¶r ${pkg} med dbconfig-common?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -148,14 +148,14 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -165,19 +165,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr "Om inte, bÃ¶r du vÃ¤lja denna Ã¥tgÃ¤rd."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid "Database type to be used by ${pkg}:"
 msgstr "Databastyp att anvÃ¤nda fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -187,13 +187,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr "Vill du rensa databasen fÃ¶r ${pkg}?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -203,7 +203,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -215,13 +215,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 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:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -235,31 +235,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "BekrÃ¤ftelse av lÃ¶senord:"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "LÃ¶senorden stÃ¤mmer inte Ã¶verens."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "LÃ¶senorden du angav stÃ¤mde inte Ã¶verens. VÃ¤nligen fÃ¶rsÃ¶k igen."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 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:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -269,7 +269,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -279,25 +279,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr "fÃ¶rsÃ¶k igen (hoppa Ã¶ver frÃ¥gor)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr "ignorera"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 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:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -307,7 +307,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -331,31 +331,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr "avbryt"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr "fÃ¶rsÃ¶k igen"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
 "to remove the database for ${pkg}.  At this point you have two options: you "
@@ -373,13 +373,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -399,13 +399,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 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:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -415,13 +415,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Portnummer fÃ¶r ${dbvendor}-tjÃ¤nsten:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -433,19 +433,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -456,26 +456,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "${dbvendor}-databasnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 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:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "${dbvendor}-anvÃ¤ndarnamn fÃ¶r ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -487,7 +487,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -499,13 +499,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Anslutningsmetod fÃ¶r MySQL-databasen fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -519,13 +519,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL-lÃ¶senord fÃ¶r ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -535,7 +535,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -545,7 +545,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -555,31 +555,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr "unix socket"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Anslutningsmetod fÃ¶r PostgreSQL-databasen fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -593,13 +593,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL-lÃ¶senord fÃ¶r ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -612,13 +612,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 msgid "Name of your database's administrative user:"
 msgstr "Namnet pÃ¥ din databasadministratÃ¶rs anvÃ¤ndare:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -630,13 +630,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid "Password of your database's administrative user:"
 msgstr "LÃ¶senord fÃ¶r din databasadministratÃ¶rs anvÃ¤ndare:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -649,13 +649,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Metod fÃ¶r att autentisera PostgreSQL-administratÃ¶ren:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -667,25 +667,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr "lÃ¶senord"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Metod fÃ¶r att autentisera PostgreSQL-anvÃ¤ndare:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -697,7 +697,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -707,7 +707,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -717,7 +717,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -731,7 +731,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -741,13 +741,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "VÃ¤lja en annan anslutningsmetod fÃ¶r PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -759,7 +759,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -772,13 +772,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Ã„ndra konfiguration fÃ¶r PostgreSQL automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -795,13 +795,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Ã…terstÃ¤ll PostgreSQL-konfigurationen automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -821,19 +821,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "VÃ¤nligen Ã¤ndra /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -845,20 +845,20 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL har inte stÃ¶d fÃ¶r blanka lÃ¶senord."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr ""
 "dbconfig-common kommer att fÃ¶rsÃ¶ka att lÃ¤sa in existerande instÃ¤llningar"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/templates.pot	2006-05-24 19:48:54 UTC (rev 227)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+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"
@@ -116,13 +116,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Deconfigure database for ${pkg} with dbconfig-common?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -130,13 +130,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "If you like, database removal can be handled with dbconfig-common."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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."
@@ -144,19 +144,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 msgid "Otherwise, you should choose this option."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid "Database type to be used by ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -164,13 +164,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid "Do you want to purge the database for ${pkg}?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -178,7 +178,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 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 "
@@ -187,13 +187,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 msgid "Do you want to backup the database for ${pkg} before upgrading?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 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 "
@@ -203,31 +203,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid "Error upgrading database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -235,7 +235,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -243,25 +243,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid "Error installing database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -269,7 +269,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 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 "
@@ -284,31 +284,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "Error removing database for ${pkg}.  Retry?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "An error seems to have occurred while removing the database."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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 "
@@ -320,13 +320,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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 "
@@ -339,13 +339,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid "Host name of the ${dbvendor} database server for ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -353,13 +353,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 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 "
@@ -368,19 +368,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Host running the ${dbvendor} server for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid "Please provide the hostname of a remote ${dbvendor} server."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -388,26 +388,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid ""
 "Please provide a name for the ${dbvendor} database to be used by ${pkg}."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 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 "
@@ -416,7 +416,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 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 "
@@ -425,13 +425,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -441,13 +441,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -455,7 +455,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -463,7 +463,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -471,31 +471,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -505,13 +505,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -520,13 +520,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 msgid "Name of your database's administrative user:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -535,13 +535,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid "Password of your database's administrative user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -551,13 +551,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -566,25 +566,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid "Method for authenticating PostgreSQL user:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -593,7 +593,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -601,7 +601,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -609,7 +609,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -619,7 +619,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -627,13 +627,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -642,7 +642,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -652,13 +652,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -670,13 +670,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -689,19 +689,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -710,19 +710,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/debian/po/vi.po
===================================================================
--- trunk/debian/po/vi.po	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/debian/po/vi.po	2006-05-24 19:48:54 UTC (rev 227)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.8.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 21:15+0200\n"
+"POT-Creation-Date: 2006-05-24 21:48+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"
@@ -132,13 +132,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "Since you are removing ${pkg}, it's possible that you no longer want the "
 "underlying database that it has been configured to use."
@@ -148,13 +148,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:56
+#: ../dbconfig-common.templates:52
 msgid ""
 "If you know that you do want to keep this database, or if you want to handle "
 "the removal of this database manually, you should refuse this option."
@@ -164,19 +164,19 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:56
+#: ../dbconfig-common.templates:52
 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:71
+#: ../dbconfig-common.templates:67
 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:71
+#: ../dbconfig-common.templates:67
 msgid ""
 "${pkg} can be configured to use one of many database types. Below, you will "
 "be presented with the available choices."
@@ -186,13 +186,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 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:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If you no longer need the database for ${pkg}, this is your chance to remove "
 "them."
@@ -201,7 +201,7 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:78
+#: ../dbconfig-common.templates:74
 msgid ""
 "If no longer have need of the data being stored by ${pkg}, you should choose "
 "this option.  If you want to hold this data for another time, or if you "
@@ -213,13 +213,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:90
+#: ../dbconfig-common.templates:86
 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:90
+#: ../dbconfig-common.templates:86
 msgid ""
 "The underlying database for ${pkg} needs to be upgraded as part of the "
 "installation progress.  Just in case, the database can be backed up before "
@@ -233,31 +233,31 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:102
+#: ../dbconfig-common.templates:98
 msgid "Password confirmation:"
 msgstr "XÃ¡c nháºn máºt kháº©u :"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "Passwords do not match."
 msgstr "Hai máºt kháº©u khÃ´ng trÃ¹ng nhau."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:106
+#: ../dbconfig-common.templates:102
 msgid "The passwords you supplied do not match.  Please try again."
 msgstr "Báº¡n Ä‘Ã£ gÃµ hai máºt kháº©u khÃ´ng trÃ¹ng nhau: hÃ£y thá» láº¡i."
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 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:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "An error seems to have occurred while upgrading the database. If it's of any "
 "help, this was the error encountered:"
@@ -267,7 +267,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:113
+#: ../dbconfig-common.templates:109
 msgid ""
 "Fortunately, there should be a backup of the database made just before the "
 "upgrade in ${dbfile}."
@@ -277,25 +277,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "retry (skip questions)"
 msgstr "thá» láº¡i (bá» qua cÃ¡c cÃ¢u há»i)"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:132
+#: ../dbconfig-common.templates:128
 msgid "ignore"
 msgstr "bá» qua"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 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:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "An error seems to have occurred while installing the database. If it's of "
 "any help, this was the error encountered:"
@@ -305,7 +305,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:134
+#: ../dbconfig-common.templates:130
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -330,31 +330,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "abort"
 msgstr "há»§y bá»"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:152
+#: ../dbconfig-common.templates:148
 msgid "retry"
 msgstr "thá» láº¡i"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 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:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "For some reason it was not possible to perform some of the actions necessary "
 "to remove the database for ${pkg}.  At this point you have two options: you "
@@ -371,13 +371,13 @@
 # Variable: do not translate/ biáº¿n: Ä‘á»«ng dá»‹ch
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:154
+#: ../dbconfig-common.templates:150
 msgid ""
 "At this point, you have the option to retry or abort the operation. If you "
 "choose \"retry\", you will be prompted with all the configuration questions "
@@ -399,13 +399,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:177
+#: ../dbconfig-common.templates:173
 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:177
+#: ../dbconfig-common.templates:173
 msgid ""
 "Please select the remote hostname to use, or select \"new host\" to enter a "
 "new host."
@@ -414,13 +414,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid "Port number for the ${dbvendor} service:"
 msgstr "Sá»‘ hiá»‡u cá»•ng cho dá»‹ch vá»¥ ${dbvendor}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:183
+#: ../dbconfig-common.templates:179
 msgid ""
 "If the ${dbvendor} database on the remote host is running on a non-standard "
 "port, this is your opportunity to specify what it is.  To use the default "
@@ -431,19 +431,19 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 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:190
+#: ../dbconfig-common.templates:186
 msgid ""
 "Note: you must have already arranged for the administrative account to be "
 "able to remotely create databases and grant privileges."
@@ -453,26 +453,26 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 msgid "${dbvendor} database name for ${pkg}:"
 msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:199
+#: ../dbconfig-common.templates:195
 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:204
+#: ../dbconfig-common.templates:200
 msgid "${dbvendor} username for ${pkg}:"
 msgstr "TÃªn dÃ¹ng ${dbvendor} cho ${pkg}:"
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "Please provide a ${dbvendor} username for ${pkg} to register with the "
 "database server.  A ${dbvendor} user is not necessarily the same as a system "
@@ -484,7 +484,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:204
+#: ../dbconfig-common.templates:200
 msgid ""
 "This is the user which will own the database, tables and other objects to be "
 "created by this installation.  This user will have complete freedom to "
@@ -496,13 +496,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:217
+#: ../dbconfig-common.templates:213
 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:217
+#: ../dbconfig-common.templates:213
 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 "
@@ -516,13 +516,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid "MySQL application password for ${pkg}:"
 msgstr "Máºt kháº©u á»©ng dá»¥ng MySQL cho ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:225
+#: ../dbconfig-common.templates:221
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -532,7 +532,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:233
+#: ../dbconfig-common.templates:229
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -542,7 +542,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:243
+#: ../dbconfig-common.templates:239
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -552,31 +552,31 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "unix socket"
 msgstr "á»• cáº¯m UNIX"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip"
 msgstr "TCP/IP"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:249
+#: ../dbconfig-common.templates:245
 msgid "tcp/ip + ssl"
 msgstr "TCP/IP + SSL"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:251
+#: ../dbconfig-common.templates:247
 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:251
+#: ../dbconfig-common.templates:247
 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 "
@@ -590,13 +590,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Máºt kháº©u á»©ng dá»¥ng PostgreSQL cho ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:259
+#: ../dbconfig-common.templates:255
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you. PostgreSQL "
@@ -609,13 +609,13 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:268
+#: ../dbconfig-common.templates:264
 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:268
+#: ../dbconfig-common.templates:264
 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 "
@@ -626,13 +626,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:275
+#: ../dbconfig-common.templates:271
 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:275
+#: ../dbconfig-common.templates:271
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -645,13 +645,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:285
+#: ../dbconfig-common.templates:281
 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:285
+#: ../dbconfig-common.templates:281
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -663,25 +663,25 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "ident"
 msgstr "ident"
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:306
+#: ../dbconfig-common.templates:302
 msgid "password"
 msgstr "máºt kháº©u"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 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:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -693,7 +693,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -703,7 +703,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -713,7 +713,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -727,7 +727,7 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:307
+#: ../dbconfig-common.templates:303
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -737,13 +737,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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:328
+#: ../dbconfig-common.templates:324
 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 +755,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:328
+#: ../dbconfig-common.templates:324
 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 "
@@ -769,13 +769,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Tá»± Ä‘á»™ng thay Ä‘á»•i cáº¥u hÃ¬nh PostgreSQL khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:341
+#: ../dbconfig-common.templates:337
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -792,13 +792,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 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:354
+#: ../dbconfig-common.templates:350
 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 "
@@ -818,19 +818,19 @@
 # Variable: don't translate / Biáº¿n: Ä‘á»«ng dá»‹ch
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:354
+#: ../dbconfig-common.templates:350
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:367
+#: ../dbconfig-common.templates:363
 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:367
+#: ../dbconfig-common.templates:363
 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 "
@@ -842,19 +842,19 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:374
+#: ../dbconfig-common.templates:370
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL khÃ´ng há»— trá»£ máºt kháº©u rá»—ng."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid "dbconfig-common will attempt to load existing settings"
 msgstr "TrÃ¬nh dbconfig-common sáº½ cá»‘ táº£i thiáº¿t láºp Ä‘Ã£ cÃ³."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:378
+#: ../dbconfig-common.templates:374
 msgid ""
 "dbconfig-common will now attempt to load the pre-existing settings of "
 "${pkg}.  Later, these settings will be validated, and if there is any "

Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/dpkg/common	2006-05-24 19:48:54 UTC (rev 227)
@@ -32,7 +32,7 @@
 	### some internal variables
 	###
 	# templates common to all database types
-	dbc_standard_templates="database-type dbconfig-install dbconfig-upgrade dbconfig-remove password-confirm app-password-confirm purge upgrade-backup passwords-do-not-match install-error upgrade-error remove-error import-oldsettings performing_upgrade internal/reconfiguring"
+	dbc_standard_templates="database-type dbconfig-install dbconfig-upgrade dbconfig-remove password-confirm app-password-confirm purge upgrade-backup passwords-do-not-match install-error upgrade-error remove-error import-oldsettings internal/reconfiguring"
 
 	# templates common to mysql database types
 	dbc_mysql_templates="mysql/method remote/host remote/newhost mysql/app-pass mysql/admin-user mysql/admin-pass remote/port db/dbname db/app-user"

Modified: trunk/dpkg/prerm
===================================================================
--- trunk/dpkg/prerm	2006-05-24 19:25:14 UTC (rev 226)
+++ trunk/dpkg/prerm	2006-05-24 19:48:54 UTC (rev 227)
@@ -11,14 +11,6 @@
 
 	need_admin_pw="yup"
 
-	if [ "$dbc_command" = "upgrade" ]; then
-		###
-		### make a note that we're upgrading so that the soon-to-come
-		### postinst call won't try and recreate users, etc
-		###
-		db_set $dbc_package/performing_upgrade true
-	fi
-
 	if [ "$dbc_command" = "remove" ]; then
 		###
 		### ask the admin if we should help with removal
@@ -30,8 +22,7 @@
 		db_fset $dbc_package/dbconfig-remove seen false
 		db_input high $dbc_package/dbconfig-remove || true
 		db_go || true
-		db_get $dbc_package/dbconfig-remove
-		dbc_remove="$RET"
+		db_get $dbc_package/dbconfig-remove && dbc_remove="$RET"
 
 		if [ "$dbc_remove" != "true" ]; then
 			return 0;


