[Dbconfig-common-changes] [dbconfig-common] r293 - in branches/sqlite: debian debian/po doc dpkg internal

Wed Aug 9 14:43:21 CEST 2006

Author: mattb-guest
Date: 2006-08-09 12:42:35 +0000 (Wed, 09 Aug 2006)
New Revision: 293

Modified:
   branches/sqlite/debian/dbconfig-common.templates
   branches/sqlite/debian/po/ca.po
   branches/sqlite/debian/po/cs.po
   branches/sqlite/debian/po/da.po
   branches/sqlite/debian/po/de.po
   branches/sqlite/debian/po/es.po
   branches/sqlite/debian/po/eu.po
   branches/sqlite/debian/po/fr.po
   branches/sqlite/debian/po/it.po
   branches/sqlite/debian/po/nl.po
   branches/sqlite/debian/po/pt.po
   branches/sqlite/debian/po/pt_BR.po
   branches/sqlite/debian/po/sv.po
   branches/sqlite/debian/po/templates.pot
   branches/sqlite/debian/po/vi.po
   branches/sqlite/doc/dbconfig-common.sgml
   branches/sqlite/dpkg/common
   branches/sqlite/dpkg/config
   branches/sqlite/internal/sqlite
Log:
Remove debconf questions about the owner and mode of the sqlite database
file and default to root:root 0640 as discussed with sean on the mailing
list.


Modified: branches/sqlite/debian/dbconfig-common.templates
===================================================================

--- branches/sqlite/debian/dbconfig-common.templates	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/dbconfig-common.templates	2006-08-09 12:42:35 UTC (rev 293)
@@ -239,23 +239,6 @@
  Please provide a path where the ${dbvendor} database file for ${pkg} 
  should be installed into. 
 
-Template: dbconfig-common/db/owner
-Type: string
-_Description: ${dbvendor} database ownership for ${pkg}:
- Please specify the filesystem ownership that you would like to set on the
- ${dbvendor} database for ${pkg}. 
- .
- This should be specified in the format owner:group.
-
-Template: dbconfig-common/db/mode
-Type: string
-_Description: ${dbvendor} database permissions for ${pkg}:
- Please specify the filesystem permissions that you would like to set on the
- ${dbvendor} database for ${pkg}. 
- .
- This should be specified in octal format as would be passed to the chmod 
- unix command. eg. 0644.
-
 Template: dbconfig-common/mysql/method
 Type: select
 __Choices: unix socket, tcp/ip

Modified: branches/sqlite/debian/po/ca.po
===================================================================
--- branches/sqlite/debian/po/ca.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/ca.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: dbconfigcommon1.8.6\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2005-10-19 22:16+0200\n"
 "Last-Translator: Miguel Gea Milvaques\n"
 "Language-Team:  <ca at li.org>\n"
@@ -625,55 +625,11 @@
 msgstr ""
 "IntroduÃ¯u un nom per la base de dades ${dbvendor} que utilitzarÃ  ${pkg}."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "IntroduÃ¯u el nom de la base de dades ${dbvendor} per ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "IntroduÃ¯u el nom de la base de dades ${dbvendor} per ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr ""
 
@@ -681,19 +637,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "MÃ¨tode de connexiÃ³ per la base de dades MySQL del ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -707,7 +663,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "IntroduÃ¯u la contrasenya de l'aplicaciÃ³ MySQL per ${pkg}:"
 
@@ -715,7 +671,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -727,7 +683,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "IntroduÃ¯u l'usuari administrador de la vostra base de dades:"
 
@@ -735,7 +691,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -747,7 +703,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -759,13 +715,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "IntroduÃ¯u la contrasenya del usuari administrador de la base de dades:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -775,19 +731,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "MÃ¨tode de connexiÃ³ per la base de dades PostgreSQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -801,13 +757,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "IntroduÃ¯u la contrasenya de l'aplicaciÃ³ PostgreSQL per ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -821,7 +777,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -837,7 +793,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
@@ -845,19 +801,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'administrador PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -871,7 +827,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -883,7 +839,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -896,7 +852,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -912,7 +868,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -922,13 +878,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "IntroduÃ¯u el mÃ¨tode d'autenticaciÃ³ per l'usuari PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -940,13 +896,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Voleu escollir un mÃ¨tode diferent de connexiÃ³ a PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -958,7 +914,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -972,13 +928,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Voleu canviar la configuraciÃ³ de PostgreSQL automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -997,19 +953,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Voleu desfer la configuraciÃ³ de PostgreSQL automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -1029,13 +985,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Canvieu el /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1047,10 +1003,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL no suporta contrassenyes buides."
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "IntroduÃ¯u el nom de la base de dades ${dbvendor} per ${pkg}:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "IntroduÃ¯u el nom de la base de dades ${dbvendor} per ${pkg}:"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr "dbconfig-common intentarÃ  carregar els parÃ metres existents"
 

Modified: branches/sqlite/debian/po/cs.po
===================================================================
--- branches/sqlite/debian/po/cs.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/cs.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2006-05-06 18:25+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -598,55 +598,11 @@
 "be installed into."
 msgstr "Zadejte jmÃ©no ${dbvendor} databÃ¡ze, kterÃ© bude ${pkg} pouÅ¾Ãvat."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "JmÃ©no ${dbvendor} databÃ¡ze pro ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "JmÃ©no ${dbvendor} databÃ¡ze pro ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr "unixovÃ½ socket"
 
@@ -654,19 +610,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "ZpÅ¯sob pÅ™ipojenÃ k MySQL databÃ¡zi pro balÃk ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -680,7 +636,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "AplikaÄnÃ MySQL heslo pro balÃk ${pkg}:"
 
@@ -688,7 +644,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -700,7 +656,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "JmÃ©no administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
 
@@ -708,7 +664,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -719,7 +675,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -731,13 +687,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Heslo administrativnÃho databÃ¡zovÃ©ho uÅ¾ivatele:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -747,19 +703,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "ZpÅ¯sob pÅ™ipojenÃ k PostgreSQL databÃ¡zi pro balÃk ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -773,13 +729,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "AplikaÄnÃ PostgreSQL heslo pro balÃk ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -792,7 +748,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -807,7 +763,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
@@ -815,19 +771,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "password"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "ZpÅ¯sob autentizace administrÃ¡tora PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -841,7 +797,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -853,7 +809,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -865,7 +821,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -880,7 +836,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -890,13 +846,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "ZpÅ¯sob autentizace uÅ¾ivatele PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -908,13 +864,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Zvolit jinÃ½ zpÅ¯sob pÅ™ipojenÃ k PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -925,7 +881,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -938,13 +894,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "ZmÄ›nit nastavenÃ PostgreSQL automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -963,19 +919,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "VrÃ¡tit nastavenÃ PostgreSQL automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -995,13 +951,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Upravte prosÃm /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1013,10 +969,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL nepodporuje prÃ¡zdnÃ¡ hesla."
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "JmÃ©no ${dbvendor} databÃ¡ze pro ${pkg}:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "JmÃ©no ${dbvendor} databÃ¡ze pro ${pkg}:"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr "dbconfig-common se pokusÃ nahrÃ¡t stÃ¡vajÃcÃ nastavenÃ"
 

Modified: branches/sqlite/debian/po/da.po
===================================================================
--- branches/sqlite/debian/po/da.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/da.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2006-07-18 21:44+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -605,55 +605,11 @@
 "be installed into."
 msgstr "Angiv navnet på den ${dbvendor}-database, der skal bruges af ${pkg}."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "${dbvendor}-databasenavn for ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "${dbvendor}-databasenavn for ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr "unix-sokkel"
 
@@ -661,19 +617,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Forbindelsesmetode for ${pkg}s MySQL-database:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -687,7 +643,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL-programadgangskode for ${pkg}:"
 
@@ -695,7 +651,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -708,7 +664,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "Navnet på din databases administrationsbruger:"
 
@@ -716,7 +672,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -727,7 +683,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -739,13 +695,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Din databases administrationsbrugers adgangskode:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -755,19 +711,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Forbindelsesmetode for ${pkg}s PostgreSQL-database:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -781,13 +737,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL-programadgangskode for ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
 "not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
@@ -800,7 +756,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -816,7 +772,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
@@ -824,19 +780,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "adgangskode"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Måde at autentificere PostgreSQL-administratoren på:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -850,7 +806,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -862,7 +818,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -874,7 +830,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -891,7 +847,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -901,13 +857,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Måde at autentificere PostgreSQL-bruger på:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -919,13 +875,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Vil du vælge en anden PostgreSQL-forbindelsesmetode?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -937,7 +893,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -951,13 +907,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Ret PostgreSQL-opsætningen automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -976,19 +932,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Genskab den gamle PostgreSQL-opsætning automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -1007,13 +963,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Ret venligst /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1025,10 +981,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL understøtter ikke tomme adgangskoder."
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "${dbvendor}-databasenavn for ${pkg}:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "${dbvendor}-databasenavn for ${pkg}:"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr ""
 #~ "dbconfig-common vil forsøge at indlæse de eksisterende indstillinger"

Modified: branches/sqlite/debian/po/de.po
===================================================================
--- branches/sqlite/debian/po/de.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/de.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 0.9\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2005-04-10 20:30+0100\n"
 "Last-Translator: Andreas Tille <tille at debian.org>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -626,55 +626,11 @@
 "Bitte einen Namen für die ${dbvendor} Datenbank, die vom Paket ${pkg} "
 "verwendet werden soll, eingeben."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "${dbvendor} Datenbankname für ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "${dbvendor} Datenbankname für ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr ""
 
@@ -682,19 +638,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Verbindungsmethode an die MySQL Datenbank von ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -709,7 +665,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL Anwendungspasswort für ${pkg}:"
 
@@ -717,7 +673,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -730,7 +686,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "Login-Name des Datenbank-Administrators:"
 
@@ -738,7 +694,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -750,7 +706,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -762,13 +718,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Passwort des Datenbank-Administrators:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -778,19 +734,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Verbindungsmethode für die PostgreSQL Datenbank von ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -805,13 +761,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL Anwendungspasswort für ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -825,7 +781,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -841,7 +797,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
@@ -849,19 +805,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Authentifizierungsmethode des PostgreSQL Administrators:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -875,7 +831,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -887,7 +843,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -900,7 +856,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -916,7 +872,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -926,13 +882,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Authentifizierungsmethode des PostgreSQL Nutzers:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -944,13 +900,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Eine andere Verbindungsmethode für PostgreSQL wählen?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -962,7 +918,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -976,13 +932,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Soll die PostgreSQL Konfiguration automatisch geändert werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -1002,19 +958,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Soll die PostgreSQL Konfiguration automatisch geändert werden?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -1036,13 +992,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Bitte passen Sie die Datei /etc/postgresql/pg_hba.conf selbst an."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1054,10 +1010,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL unterstützt keine leeren Passwörter."
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "${dbvendor} Datenbankname für ${pkg}:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "${dbvendor} Datenbankname für ${pkg}:"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr ""
 #~ "dbconfig-common wird versuchen, existierende Einstellungen zu setzen."

Modified: branches/sqlite/debian/po/es.po
===================================================================
--- branches/sqlite/debian/po/es.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/es.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -35,7 +35,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2006-06-10 23:46+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs at debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -630,55 +630,11 @@
 "Por favor, indique el nombre de la base de datos ${dbvendor} que va a "
 "utilizar ${pkg}."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "Nombre de la base de datos ${dbvendor} para ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "Nombre de la base de datos ${dbvendor} para ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr ""
 
@@ -686,19 +642,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Método de conexión para la base de datos MySQL de ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -712,7 +668,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Contraseña de aplicación MySQL para ${pkg}:"
 
@@ -720,7 +676,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
@@ -734,7 +690,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "Nombre del usuario de administración de base de datos:"
 
@@ -742,7 +698,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -754,7 +710,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -766,13 +722,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Contraseña de su usuario de administración de la base de datos:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -782,19 +738,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Método de conexión para la base de datos PostgreSQL de ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -808,13 +764,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Contraseña de aplicación PostgreSQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -827,7 +783,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -843,7 +799,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
@@ -851,19 +807,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Método de autenticación para el administrador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -877,7 +833,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -889,7 +845,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -901,7 +857,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -918,7 +874,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -928,13 +884,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Método de autenticación del usuario de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -946,13 +902,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -961,7 +917,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -975,13 +931,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "¿Desea modificar automáticamente la configuración de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -995,20 +951,20 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "¿Desea modificar automáticamente la configuración de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -1021,13 +977,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor, modifique «/etc/postgresql/pg_hba.conf»"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1039,10 +995,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "Nombre de la base de datos ${dbvendor} para ${pkg}:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "Nombre de la base de datos ${dbvendor} para ${pkg}:"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr ""
 #~ "dbconfig-common intentará cargar los valores de configuración existentes"

Modified: branches/sqlite/debian/po/eu.po
===================================================================
--- branches/sqlite/debian/po/eu.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/eu.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common-templates-eu\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2005-04-01 00:08+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <eu at li.org>\n"
@@ -592,55 +592,11 @@
 msgstr ""
 "Mesedez ezarri ${pkg}-ek erabiliko duen ${dbvendor} databasearen izena."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "${pkg}-ren ${dbvendor} database izena:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "${pkg}-ren ${dbvendor} database izena:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr ""
 
@@ -648,19 +604,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "${pkg}-ren MySQL-rekiko konexio metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -674,7 +630,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "${pkg}-ren MySQL aplikazio pasahitza:"
 
@@ -682,7 +638,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
@@ -695,7 +651,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "Database kudeatzaile erabiltzaile izena:"
 
@@ -703,7 +659,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -715,7 +671,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -727,13 +683,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Databasearen kudeatzaile erabiltzaileran pasahitza:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -743,19 +699,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "${pkg}-ren PostgreSQL-rekiko konexio metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -769,13 +725,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "${pkg}-ren PostgreSQL aplikazio pasahitza:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -788,7 +744,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -804,7 +760,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
@@ -812,19 +768,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "PostgreSQL kudeatzaile egiaztapen metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -837,7 +793,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -849,7 +805,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -862,7 +818,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -878,7 +834,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -888,13 +844,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "PostgreSQL erabiltzaile egiaztapen metodoa:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -906,13 +862,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -921,7 +877,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -935,13 +891,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "PostgreSQL konfigurazioa automatikoki aldatu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -955,20 +911,20 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "PostgreSQL konfigurazioa automatikoki aldatu?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -981,13 +937,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Mesedez /etc/postgresql/pg_hba.conf aldatu"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -999,10 +955,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "${pkg}-ren ${dbvendor} database izena:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "${pkg}-ren ${dbvendor} database izena:"
+
 #~ msgid ""
 #~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
 #~ "configuration of PostgreSQL has to be changed.  It is suggested that this "

Modified: branches/sqlite/debian/po/fr.po
===================================================================
--- branches/sqlite/debian/po/fr.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/fr.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2006-06-18 10:58+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -636,55 +636,11 @@
 "Veuillez indiquer un nom pour la base de données ${dbvendor} à utiliser pour "
 "${pkg}."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "Nom de la base de données ${dbvendor} pour ${pkg} :"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "Nom de la base de données ${dbvendor} pour ${pkg} :"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr "Socket UNIX"
 
@@ -692,19 +648,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr "TCP/IP"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Méthode de connexion pour la base de données MySQL de ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -718,7 +674,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Mot de passe de connexion MySQL pour ${pkg} :"
 
@@ -726,7 +682,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -739,7 +695,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "Nom de l'administrateur de la base de données :"
 
@@ -747,7 +703,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -759,7 +715,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -771,13 +727,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Mot de passe de l'administrateur de la base de données :"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -787,19 +743,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "TCP/IP + SSL"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Méthode de connexion pour la base de données PostgreSQL de ${pkg} :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -813,13 +769,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Mot de passe de connexion PostgreSQL pour ${pkg} :"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
 "not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
@@ -833,7 +789,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -849,7 +805,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "Ident"
 
@@ -857,19 +813,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "Mot de passe"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Méthode d'authentification de l'administrateur PostgreSQL :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -883,7 +839,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -895,7 +851,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -908,7 +864,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -923,7 +879,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -933,13 +889,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Méthode d'authentification pour l'utilisateur de PostgreSQL :"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -951,14 +907,14 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 "Faut-il choisir une méthode différente pour la connexion à PostgreSQL ?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -970,7 +926,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -984,13 +940,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Faut-il modifier la configuration de PostgreSQL automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -1009,19 +965,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Faut-il restaurer la configuration de PostgreSQL automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -1041,13 +997,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Modification de /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1059,10 +1015,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL n'accepte pas les mots de passe vides."
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "Nom de la base de données ${dbvendor} pour ${pkg} :"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "Nom de la base de données ${dbvendor} pour ${pkg} :"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr "Tentative de récupération des réglages actuels"
 

Modified: branches/sqlite/debian/po/it.po
===================================================================
--- branches/sqlite/debian/po/it.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/it.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.6\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2005-07-22 11:23+0200\n"
 "Last-Translator: Giuseppe Sacco <eppesuig at debian.org>\n"
 "Language-Team: italian <tp at lists.linux.it>\n"
@@ -592,55 +592,11 @@
 "be installed into."
 msgstr "Inserire il nome del database ${dbvendor} da fare usare a ${pkg}."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "Nome del database ${dbvendor} per ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "Nome del database ${dbvendor} per ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr ""
 
@@ -648,19 +604,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Metodo di connessione al database MySQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -674,7 +630,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Password applicativa per MySQL per ${pkg}:"
 
@@ -682,7 +638,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -694,7 +650,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "Node dell'utente amministratore del database:"
 
@@ -702,7 +658,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -714,7 +670,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -726,13 +682,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Password per l'utente amministratore del database:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -742,19 +698,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Metodo di connessione al database PostgreSQL per ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -768,13 +724,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Password applicativa di ${pkg} per PostgreSQL:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -788,7 +744,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -804,7 +760,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
@@ -812,19 +768,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Modalità di autenticazione dell'amministratore PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -838,7 +794,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -850,7 +806,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -863,7 +819,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -879,7 +835,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -889,13 +845,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Modalità di autenticazione dell'utente PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -907,13 +863,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Scegliere un diverso metodo di connessione a PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -925,7 +881,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -939,13 +895,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Modificare la configurazione di PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -959,20 +915,20 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Modificare la configurazione di PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -985,13 +941,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Modificare /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1003,10 +959,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL non permette le password vuote."
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "Nome del database ${dbvendor} per ${pkg}:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "Nome del database ${dbvendor} per ${pkg}:"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr "dbconfig-common cercherà di carica le impostazioni esistenti"
 

Modified: branches/sqlite/debian/po/nl.po
===================================================================
--- branches/sqlite/debian/po/nl.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/nl.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2006-07-03 14:59+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -644,57 +644,11 @@
 "Gelieve hier de naam op te geven van de door ${pkg} te gebruiken ${dbvendor}-"
 "database."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr ""
-"Wat is/wordt de naam van de door ${pkg} te gebruiken ${dbvendor}-database?"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr ""
-"Wat is/wordt de naam van de door ${pkg} te gebruiken ${dbvendor}-database?"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr "unix socket"
 
@@ -702,20 +656,20 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr ""
 "Met welke methode wilt u verbinding leggen met de ${pkg}-MySQL-database?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -729,7 +683,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr ""
 "Wat is het wachtwoord waarmee ${pkg} zich bij MySQL dient aan te melden?"
@@ -738,7 +692,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -751,7 +705,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "Wat is de naam van de beheers-account voor uw database?"
 
@@ -759,7 +713,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -770,7 +724,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -782,13 +736,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Wat is het wachtwoord van de beheers-account voor uw database?"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -798,20 +752,20 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr ""
 "Met welke methode wilt u verbinding leggen met de ${pkg}-PostgreSQL-database?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -825,14 +779,14 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr ""
 "Wat is het wachtwoord waarmee ${pkg} zich bij PostgreSQL dient aan te melden?"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -846,7 +800,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -862,7 +816,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
@@ -870,20 +824,20 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "wachtwoord"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr ""
 "Welke authenticatiemethode wordt gebruikt door de PostgreSQL-beheerder?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -897,7 +851,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -909,7 +863,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -922,7 +876,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -938,7 +892,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -948,14 +902,14 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr ""
 "Welke authenticatiemethode wordt gebruikt door de PostgreSQL-gebruiker?"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -968,13 +922,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Een andere PostgreSQL verbindingsmethode kiezen?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -986,7 +940,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -1000,13 +954,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Wilt u dat de PostgreSQL-configuratie automatisch aangepast wordt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -1026,19 +980,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Wilt u dat de PostgreSQL-configuratie automatisch teruggezet wordt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -1058,13 +1012,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Gelieve /etc/postgresql/pg_hba.conf aan te passen."
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1076,10 +1030,20 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL ondersteunt geen lege wachtwoorden."
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr ""
+#~ "Wat is/wordt de naam van de door ${pkg} te gebruiken ${dbvendor}-database?"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr ""
+#~ "Wat is/wordt de naam van de door ${pkg} te gebruiken ${dbvendor}-database?"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr "dbconfig-common zal proberen bestaande instellingen te laden"
 

Modified: branches/sqlite/debian/po/pt.po
===================================================================
--- branches/sqlite/debian/po/pt.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/pt.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.6\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2006-02-21 23:13+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -610,55 +610,11 @@
 "Por favor disponibilize um nome para a base de dados ${dbvendor} para ser "
 "utilizada por ${pkg}."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "Nome de base de dados ${dbvendor} para ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "Nome de base de dados ${dbvendor} para ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr "socket unix"
 
@@ -666,19 +622,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "MÃ©todo de ligaÃ§Ã£o para a base de dados MySQL de ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -692,7 +648,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Password da aplicaÃ§Ã£o MySQL para ${pkg}:"
 
@@ -700,7 +656,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -713,7 +669,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "Nome do utilizador administrativo da sua base de dados:"
 
@@ -721,7 +677,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -733,7 +689,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -745,13 +701,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Password do utilizador administrativo da sua base de dados:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -761,19 +717,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "MÃ©todo de ligaÃ§Ã£o para a base de dados PostgreSQL para ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -787,13 +743,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Password da aplicaÃ§Ã£o PostgreSQL para ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -807,7 +763,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -823,7 +779,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
@@ -831,19 +787,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "password"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "MÃ©todo para autenticar o administrador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -857,7 +813,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -869,7 +825,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -881,7 +837,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -897,7 +853,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -907,13 +863,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "MÃ©todo para autenticar o utilizador de PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -925,13 +881,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Escolher um mÃ©todo de ligaÃ§Ã£o de PostgreSQL diferente?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -943,7 +899,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -956,13 +912,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Alterar a configuraÃ§Ã£o de PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -982,19 +938,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Reverter automaticamente a configuraÃ§Ã£o de PostgreSQL?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -1014,13 +970,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor altere /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1032,10 +988,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "O PostgreSQL nÃ£o suporta passwords vazias."
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "Nome de base de dados ${dbvendor} para ${pkg}:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "Nome de base de dados ${dbvendor} para ${pkg}:"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr "o dbconfig-common irÃ¡ tentar carregar as definiÃ§Ãµes existentes"
 

Modified: branches/sqlite/debian/po/pt_BR.po
===================================================================
--- branches/sqlite/debian/po/pt_BR.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/pt_BR.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.5.1\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2005-04-13 18:51-0300\n"
 "Last-Translator: Gustavo Noronha Silva <kov at debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
@@ -602,55 +602,11 @@
 "Por favor forneça um nome para a base de dados ${dbvendor} a ser usada pelo "
 "pacote ${pkg}."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "Nome da base de dados ${dbvendor} para o pacote ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "Nome da base de dados ${dbvendor} para o pacote ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr ""
 
@@ -658,19 +614,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Método de conexão para a base de dados MySQL do pacote ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -684,7 +640,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Senha MySQL da aplicação para o pacote ${pkg}:"
 
@@ -692,7 +648,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
@@ -705,7 +661,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "Nome do usuário administrativo do banco de dados:"
 
@@ -713,7 +669,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -724,7 +680,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -736,13 +692,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Senha do usuário administrativo do banco de dados:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -752,19 +708,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Método de conexão para a base de dados PostgreSQL do pacote ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -778,13 +734,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Senha da aplicação PostgreSQL para o pacote ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -797,7 +753,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -812,7 +768,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
@@ -820,19 +776,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Método para autenticar o administrador do PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -846,7 +802,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -858,7 +814,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -870,7 +826,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -886,7 +842,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -896,13 +852,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Método para autenticar o usuário PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -914,13 +870,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -929,7 +885,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 #, fuzzy
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
@@ -944,13 +900,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Mudar a configuração do PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -964,20 +920,20 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 #, fuzzy
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Mudar a configuração do PostgreSQL automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -990,13 +946,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "Por favor modifique o /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1008,10 +964,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "Nome da base de dados ${dbvendor} para o pacote ${pkg}:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "Nome da base de dados ${dbvendor} para o pacote ${pkg}:"
+
 #~ msgid ""
 #~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
 #~ "configuration of PostgreSQL has to be changed.  It is suggested that this "

Modified: branches/sqlite/debian/po/sv.po
===================================================================
--- branches/sqlite/debian/po/sv.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/sv.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.8.5\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2005-12-01 22:10+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -597,55 +597,11 @@
 "be installed into."
 msgstr "Ange ett namn fÃ¶r ${dbvendor}-databasen som ska anvÃ¤ndas av ${pkg}."
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "${dbvendor}-databasnamn fÃ¶r ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "${dbvendor}-databasnamn fÃ¶r ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr "unix socket"
 
@@ -653,19 +609,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr "tcp/ip"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "Anslutningsmetod fÃ¶r MySQL-databasen fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -679,7 +635,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "MySQL-lÃ¶senord fÃ¶r ${pkg}:"
 
@@ -687,7 +643,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -699,7 +655,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "Namnet pÃ¥ din databasadministratÃ¶rs anvÃ¤ndare:"
 
@@ -707,7 +663,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -719,7 +675,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -731,13 +687,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "LÃ¶senord fÃ¶r din databasadministratÃ¶rs anvÃ¤ndare:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -747,19 +703,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "tcp/ip + ssl"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "Anslutningsmetod fÃ¶r PostgreSQL-databasen fÃ¶r ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -773,13 +729,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "PostgreSQL-lÃ¶senord fÃ¶r ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -793,7 +749,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -808,7 +764,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
@@ -816,19 +772,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "lÃ¶senord"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "Metod fÃ¶r att autentisera PostgreSQL-administratÃ¶ren:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -842,7 +798,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -854,7 +810,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -866,7 +822,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -882,7 +838,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -892,13 +848,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "Metod fÃ¶r att autentisera PostgreSQL-anvÃ¤ndare:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -910,13 +866,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "VÃ¤lja en annan anslutningsmetod fÃ¶r PostgreSQL?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -928,7 +884,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -941,13 +897,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Ã„ndra konfiguration fÃ¶r PostgreSQL automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -966,19 +922,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Ã…terstÃ¤ll PostgreSQL-konfigurationen automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -998,13 +954,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "VÃ¤nligen Ã¤ndra /etc/postgresql/pg_hba.conf"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1016,10 +972,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL har inte stÃ¶d fÃ¶r blanka lÃ¶senord."
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "${dbvendor}-databasnamn fÃ¶r ${pkg}:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "${dbvendor}-databasnamn fÃ¶r ${pkg}:"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr ""
 #~ "dbconfig-common kommer att fÃ¶rsÃ¶ka att lÃ¤sa in existerande instÃ¤llningar"

Modified: branches/sqlite/debian/po/templates.pot
===================================================================
--- branches/sqlite/debian/po/templates.pot	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/templates.pot	2006-08-09 12:42:35 UTC (rev 293)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -504,53 +504,11 @@
 "be installed into."
 msgstr ""
 
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr ""
 
@@ -558,19 +516,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -580,7 +538,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr ""
 
@@ -588,7 +546,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -598,7 +556,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr ""
 
@@ -606,7 +564,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -615,7 +573,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -625,13 +583,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -639,19 +597,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -661,13 +619,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
 "not be used and can be left blank.  Otherwise, PostgreSQL access may need to "
@@ -676,7 +634,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -688,7 +646,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr ""
 
@@ -696,19 +654,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -719,7 +677,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -729,7 +687,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -739,7 +697,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -751,7 +709,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -759,13 +717,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -774,13 +732,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -789,7 +747,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -799,13 +757,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -819,19 +777,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -844,13 +802,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -859,6 +817,6 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr ""

Modified: branches/sqlite/debian/po/vi.po
===================================================================
--- branches/sqlite/debian/po/vi.po	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/debian/po/vi.po	2006-08-09 12:42:35 UTC (rev 293)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dbconfig-common 1.8.5\n"
 "Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-08-10 00:38+1200\n"
+"POT-Creation-Date: 2006-08-10 00:40+1200\n"
 "PO-Revision-Date: 2005-12-05 15:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -594,55 +594,11 @@
 "be installed into."
 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:22001
-#, fuzzy
-msgid "${dbvendor} database ownership for ${pkg}:"
-msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid ""
-"Please specify the filesystem ownership that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:22001
-msgid "This should be specified in the format owner:group."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-#, fuzzy
-msgid "${dbvendor} database permissions for ${pkg}:"
-msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"Please specify the filesystem permissions that you would like to set on the "
-"${dbvendor} database for ${pkg}."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dbconfig-common.templates:23001
-msgid ""
-"This should be specified in octal format as would be passed to the chmod  "
-"unix command. eg. 0644."
-msgstr ""
-
 #. Type: select
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "unix socket"
 msgstr "á»• cáº¯m UNIX"
 
@@ -650,19 +606,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:22001 ../dbconfig-common.templates:26001
 msgid "tcp/ip"
 msgstr "TCP/IP"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid "Connection method for MySQL database of ${pkg}:"
 msgstr "PhÆ°Æ¡ng phÃ¡p káº¿t ná»‘i cho cÆ¡ sá»Ÿ dá»¯ liÃªu MySQL cá»§a ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:24002
+#: ../dbconfig-common.templates:22002
 msgid ""
 "By default, ${pkg} will be configured to use a MySQL server through a local "
 "unix socket (this provides the best performance). However, if you would like "
@@ -676,7 +632,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001
+#: ../dbconfig-common.templates:23001
 msgid "MySQL application password for ${pkg}:"
 msgstr "Máºt kháº©u á»©ng dá»¥ng MySQL cho ${pkg}:"
 
@@ -684,7 +640,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:23001 ../dbconfig-common.templates:27001
 msgid ""
 "Please provide a password for ${pkg} to register with the database server.  "
 "If left blank, a random password will be generated for you."
@@ -696,7 +652,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid "Name of your database's administrative user:"
 msgstr "TÃªn ngÆ°á»i dÃ¹ng quáº£n trá»‹ cho cÆ¡ sá»Ÿ dá»¯ liá»‡u:"
 
@@ -704,7 +660,7 @@
 #. Description
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001 ../dbconfig-common.templates:30001
+#: ../dbconfig-common.templates:24001 ../dbconfig-common.templates:28001
 msgid ""
 "What is the name of the account with which this package should perform "
 "administrative actions?  This user is the one which is able to create new "
@@ -715,7 +671,7 @@
 
 #. Type: string
 #. Description
-#: ../dbconfig-common.templates:26001
+#: ../dbconfig-common.templates:24001
 msgid ""
 "For MySQL, this is almost always \"root\".  Note that this is NOT the same "
 "as the UNIX login 'root'."
@@ -727,13 +683,13 @@
 #. Description
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001 ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:25001 ../dbconfig-common.templates:29001
 msgid "Password of your database's administrative user:"
 msgstr "Máºt kháº©u cá»§a ngÆ°á»i dÃ¹ng quáº£n trá»‹ cho cÆ¡ sá»Ÿ dá»¯ liá»‡u:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:27001
+#: ../dbconfig-common.templates:25001
 msgid ""
 "What is the password for the administrative account with which this package "
 "should create its MySQL database and user?"
@@ -743,19 +699,19 @@
 
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:28001
+#: ../dbconfig-common.templates:26001
 msgid "tcp/ip + ssl"
 msgstr "TCP/IP + SSL"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid "Connection method for PostgreSQL database of ${pkg}:"
 msgstr "PhÆ°Æ¡ng phÃ¡p káº¿t ná»‘i cho cÆ¡ sá»Ÿ dá»¯ liá»‡u PostgreSQL cá»§a ${pkg}:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:28002
+#: ../dbconfig-common.templates:26002
 msgid ""
 "By default, ${pkg} will be configured to use a PostgreSQL server through a "
 "local unix socket (this provides the best performance). However, if you "
@@ -769,13 +725,13 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 msgid "PostgreSQL application password for ${pkg}:"
 msgstr "Máºt kháº©u á»©ng dá»¥ng PostgreSQL cho ${pkg}:"
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:29001
+#: ../dbconfig-common.templates:27001
 #, fuzzy
 msgid ""
 "If you are using \"ident\" based authentication, the supplied password will "
@@ -789,7 +745,7 @@
 
 #. Type: password
 #. Description
-#: ../dbconfig-common.templates:31001
+#: ../dbconfig-common.templates:29001
 msgid ""
 "What is the password for the account with which this package should perform "
 "administrative actions?  (For a normal Debian PostgreSQL installation, a "
@@ -804,7 +760,7 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "ident"
 msgstr "ident"
 
@@ -812,19 +768,19 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../dbconfig-common.templates:32001 ../dbconfig-common.templates:33001
+#: ../dbconfig-common.templates:30001 ../dbconfig-common.templates:31001
 msgid "password"
 msgstr "máºt kháº©u"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid "Method for authenticating PostgreSQL administrator:"
 msgstr "PhÆ°Æ¡ng phÃ¡p xÃ¡c thá»©c quáº£n trá»‹ PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002
+#: ../dbconfig-common.templates:30002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the administrative user should use "
@@ -838,7 +794,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication on the local machine, the server will check "
 "that the owner of the unix socket is allowed to connect."
@@ -850,7 +806,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"ident\" authentication to remote hosts, RFC 1413 based ident is used "
 "(note this can be considered a security risk)."
@@ -862,7 +818,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "With \"password\" authentication, a password will be passed to the server "
 "for use with some authentication backend (such as \"md5\" or \"pam\").  Note "
@@ -878,7 +834,7 @@
 #. Description
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:32002 ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:30002 ../dbconfig-common.templates:31002
 msgid ""
 "For a default Debian PostgreSQL installation running on the same host, you "
 "probably want \"ident\"."
@@ -888,13 +844,13 @@
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid "Method for authenticating PostgreSQL user:"
 msgstr "PhÆ°Æ¡ng phÃ¡p xÃ¡c thá»©c ngÆ°á»i dÃ¹ng PostgreSQL:"
 
 #. Type: select
 #. Description
-#: ../dbconfig-common.templates:33002
+#: ../dbconfig-common.templates:31002
 msgid ""
 "PostgreSQL servers provide several different mechanisms for authenticating "
 "connections.  Please select what method the database user should use when "
@@ -906,13 +862,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid "Choose a different PostgreSQL connection method?"
 msgstr "Chá»n má»™t phÆ°Æ¡ng phÃ¡p káº¿t ná»‘i PostgreSQL khÃ¡c khÃ´ng?"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "Unfortunately, it seems that the database connection method you have "
 "selected for ${pkg} will not work, because it requires the existence of a "
@@ -924,7 +880,7 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:34001
+#: ../dbconfig-common.templates:32001
 msgid ""
 "If you would like to reconfigure your application to use a different method, "
 "you should choose this option.  If you know for certain that this method "
@@ -938,13 +894,13 @@
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid "Change PostgreSQL configuration automatically?"
 msgstr "Tá»± Ä‘á»™ng thay Ä‘á»•i cáº¥u hÃ¬nh PostgreSQL khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001
+#: ../dbconfig-common.templates:33001
 msgid ""
 "It has been determined that the database installation for ${pkg} can not be "
 "automatically accomplished without making changes to your PostgreSQL "
@@ -964,19 +920,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:35001 ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:33001 ../dbconfig-common.templates:34001
 msgid "${pghbaline}"
 msgstr "${pghbaline}"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid "Revert PostgreSQL configuration automatically?"
 msgstr "Tá»± Ä‘á»™ng hoÃ n nguyÃªn cáº¥u hÃ¬nh PostgreSQL khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../dbconfig-common.templates:36001
+#: ../dbconfig-common.templates:34001
 msgid ""
 "As ${pkg} is now being removed, it may no longer be necessary to have an "
 "access control entry in your PostgreSQL server's configuration. While "
@@ -995,13 +951,13 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid "Please change /etc/postgresql/pg_hba.conf"
 msgstr "HÃ£y sá»a Ä‘á»•i </etc/postgresql/pg_hba.conf>"
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:37001
+#: ../dbconfig-common.templates:35001
 msgid ""
 "To get the database for package ${pkg} bootstrapped you have to edit the "
 "configuration of your PostgreSQL server. You may be able to find help in the "
@@ -1013,10 +969,18 @@
 
 #. Type: note
 #. Description
-#: ../dbconfig-common.templates:38001
+#: ../dbconfig-common.templates:36001
 msgid "PostgreSQL does not support empty passwords."
 msgstr "PostgreSQL khÃ´ng há»— trá»£ máºt kháº©u rá»—ng."
 
+#, fuzzy
+#~ msgid "${dbvendor} database ownership for ${pkg}:"
+#~ msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
+
+#, fuzzy
+#~ msgid "${dbvendor} database permissions for ${pkg}:"
+#~ msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u ${dbvendor} cho ${pkg}:"
+
 #~ msgid "dbconfig-common will attempt to load existing settings"
 #~ msgstr "TrÃ¬nh dbconfig-common sáº½ cá»‘ táº£i thiáº¿t láºp Ä‘Ã£ cÃ³."
 

Modified: branches/sqlite/doc/dbconfig-common.sgml
===================================================================
--- branches/sqlite/doc/dbconfig-common.sgml	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/doc/dbconfig-common.sgml	2006-08-09 12:42:35 UTC (rev 293)
@@ -400,14 +400,6 @@
 				<item>database storage directory for local (filesystem)
 				based database types. Not applicable for RDBMs like mysql 
 				and postgres. (defaults to: /var/lib/dbconfig-common)
-			<tag>dbc_owner (used in: <var>config</var>)
-				<item>set the owner:group of database files stored in the
-				<var>dbc_basepath</var> directory. Not applicable for RDBMs
-				like mysql and postgres. (defaults to: root:root)
-			<tag>dbc_mode (used in: <var>config</var>)
-				<item>set the permissions of database files stored in the
-				<var>dbc_basepath</var> directory. Not applicable for RDBMs
-				like mysql and postgres. (defaults to: 0644)
 			<tag>dbc_dbname (used in: <var>config</var>)
 				<item>name of database resource to which
 				to connect (defaults to: package name)

Modified: branches/sqlite/dpkg/common
===================================================================
--- branches/sqlite/dpkg/common	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/dpkg/common	2006-08-09 12:42:35 UTC (rev 293)
@@ -40,7 +40,7 @@
 	dbc_pgsql_templates="pgsql/method remote/host remote/newhost pgsql/app-pass pgsql/admin-user pgsql/admin-pass remote/port pgsql/authmethod-admin pgsql/authmethod-user pgsql/changeconf pgsql/manualconf db/dbname db/app-user pgsql/no-empty-passwords"
 
 	# templates common to sqlite database types
-	dbc_sqlite_templates="db/dbname db/basepath db/owner db/mode"
+	dbc_sqlite_templates="db/dbname db/basepath"
 
 	# all dbtypes supported by dbconfig-common
 	dbc_all_supported_dbtypes="mysql pgsql sqlite"
@@ -83,8 +83,6 @@
 	### dbtype-specific variable section
 	###
 	dbc_default_basepath=""
-	dbc_default_owner=""
-	dbc_default_mode=""
 
 	# now set some variables based on the dbtype
 	case $dbc_dbtype in
@@ -133,8 +131,6 @@
 		dbc_default_admin=""
 		dbc_default_dbuser="";
 		dbc_default_basepath="/var/lib/dbconfig-common"
-		dbc_default_owner="root:root"
-		dbc_default_mode="0644"
 		dbc_use_dbuser="false"
 		dbc_dbvendor="SQLite"
 	;;
@@ -246,10 +242,6 @@
 	if echo "$dbc_fs_dbtypes" | grep -qa "$dbc_dbtype"; then
 		# set the directory that the database file is found in
 		db_set $dbc_package/db/basepath "$dbc_basepath"
-
-		# pemissions for the database file
-		db_set $dbc_package/db/owner "$dbc_owner"
-		db_set $dbc_package/db/mode "$dbc_mode"
 	fi
 
 	# set the name of the database to be created
@@ -327,10 +319,6 @@
 	if echo "$dbc_fs_dbtypes" | grep -qa "$dbc_dbtype"; then
 		# get the directory that the database file is found in
 		db_get $dbc_package/db/basepath && dbc_basepath="$RET"
-
-		# pemissions for the database file
-		db_get $dbc_package/db/owner && dbc_owner="$RET"
-		db_get $dbc_package/db/mode && dbc_mode="$RET"
 	fi
 
 	# get the name of the database to be created
@@ -447,16 +435,6 @@
 #	using a local (filesystem based) database.    
 dbc_basepath="$dbc_basepath"
 
-# dbc_owner: owner:group to set on the database file
-#	leave unset to use the default.  only applicable if you are
-#	using a local (filesystem based) database.    
-dbc_owner="$dbc_owner"
-
-# dbc_mode: file mode (permissions) for the database
-#	leave unset to use the default.  only applicable if you are
-#	using a local (filesystem based) database.    
-dbc_mode="$dbc_mode"
-
 ##
 ## postgresql specific settings.  if you don't use postgresql,
 ## you can safely ignore all of these

Modified: branches/sqlite/dpkg/config
===================================================================
--- branches/sqlite/dpkg/config	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/dpkg/config	2006-08-09 12:42:35 UTC (rev 293)
@@ -208,12 +208,6 @@
 			if [ ! "$dbc_basepath" ]; then 
 				dbc_basepath="$dbc_default_basepath"; 
 			fi
-			if [ ! "$dbc_owner" ]; then 
-				dbc_owner="$dbc_default_owner"; 
-			fi
-			if [ ! "$dbc_mode" ]; then 
-				dbc_mode="$dbc_default_mode"; 
-			fi
 		fi
 
 		if [ ! "$dbc_dbname" ]; then 
@@ -259,12 +253,6 @@
 			if [ "$dbc_basepath" ]; then 
 				db_set $dbc_package/db/basepath "$dbc_basepath"
 			fi
-			if [ "$dbc_owner" ]; then 
-				db_set $dbc_package/db/owner "$dbc_owner"
-			fi
-			if [ "$dbc_mode" ]; then 
-				db_set $dbc_package/db/mode "$dbc_mode"
-			fi
 		fi
 
 	;;
@@ -387,8 +375,6 @@
 		if echo "$dbc_fs_dbtypes" | grep -q "$dbc_dbtype"; then
 			# check the path / permissions to install to
 			db_input low $dbc_package/db/basepath || true
-			db_input low $dbc_package/db/owner || true
-			db_input low $dbc_package/db/mode || true
 		fi
 
 		# get the name of the database to use

Modified: branches/sqlite/internal/sqlite
===================================================================
--- branches/sqlite/internal/sqlite	2006-08-09 12:38:18 UTC (rev 292)
+++ branches/sqlite/internal/sqlite	2006-08-09 12:42:35 UTC (rev 293)
@@ -82,8 +82,8 @@
 		ret=0
 		mkdir -p "${dbc_basepath}"
 		dbc_sqlite_exec_command ".schema" && \
-		chown "$dbc_owner" "$l_dbfile" && \
-		chmod "$dbc_mode" "$l_dbfile" || ret=$?
+		chown root:root "$l_dbfile" && \
+		chmod 0640 "$l_dbfile" || ret=$?
 		if [ "$ret" = "0" ]; then
 			dbc_logline "success"
 			dbc_logpart "verifying database $dbc_dbname exists:"


