diff -Nru amavisd-new-2.6.1.dfsg.old/debian/changelog amavisd-new-2.6.1.dfsg/debian/changelog
--- amavisd-new-2.6.1.dfsg.old/debian/changelog	2008-09-10 21:06:14.297924919 +0200
+++ amavisd-new-2.6.1.dfsg/debian/changelog	2008-09-14 08:06:23.016287033 +0200
@@ -1,3 +1,13 @@
+amavisd-new (1:2.6.1.dfsg-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n bugs. Debconf translations:
+  * Brazilian Portuguese. Closes: #487417
+  * Swedish. Closes: #498814
+  * Basque. Closes: #498873
+
+ -- Christian Perrier <bubulle@debian.org>  Thu, 11 Sep 2008 19:11:31 +0200
+
 amavisd-new (1:2.6.1.dfsg-1) unstable; urgency=low
 
   * New upstream release 
diff -Nru amavisd-new-2.6.1.dfsg.old/debian/po/eu.po amavisd-new-2.6.1.dfsg/debian/po/eu.po
--- amavisd-new-2.6.1.dfsg.old/debian/po/eu.po	2008-09-10 21:06:14.237946071 +0200
+++ amavisd-new-2.6.1.dfsg/debian/po/eu.po	2008-09-14 08:06:21.964286000 +0200
@@ -1,14 +1,14 @@
-# translation of conserver-eu.po to Euskara
+# translation of amavisd-new-eu.po to Euskara
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Piarres Beobide <pi@beobide.net>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: conserver-eu\n"
+"Project-Id-Version: amavisd-new-eu\n"
 "Report-Msgid-Bugs-To: bam@debian.org\n"
 "POT-Creation-Date: 2006-08-10 11:09-0300\n"
-"PO-Revision-Date: 2008-05-16 11:46+0200\n"
+"PO-Revision-Date: 2008-09-14 01:10+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@
 #. Description
 #: ../amavisd-new.templates:1001
 msgid "Incompatible configuration file layout detected"
-msgstr ""
+msgstr "Konfigurazio fitxategi bateraezin ingurunea antzeman da"
 
 #. Type: note
 #. Description
@@ -30,6 +30,9 @@
 "amavisd-new to a better system, which uses multiple files instead of a "
 "single, monolithic file."
 msgstr ""
+"Debian paketeek amavisd-new konfigurazio fitxategien kudeaketa aldatu dute; "
+"modu honek fitxategi ezberdinak erabiltzen ditu fitxategi bakar, "
+"monolitikoaren ordez."
 
 #. Type: note
 #. Description
@@ -39,6 +42,9 @@
 "system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
 "incompatible with this new config file layout."
 msgstr ""
+"Amavisd-new konfigurazio zaharra zure sisteman jarraitzen duen ( /etc/"
+"amavisd.conf edo /etc/amavis/amavisd.conf izenarekin) konfigurazio ingurune "
+"berriarekin bateraezinak dira."
 
 #. Type: note
 #. Description
@@ -48,6 +54,9 @@
 "new configuration layout, and after that you should port your configuration "
 "to the new layout."
 msgstr ""
+"/usr/share/doc/amavisd-new/README.Debian irakurri behar duzu konfigurazio "
+"ingurune berria ulertzeko, eta hau egin ondoren konfigurazio ingurune "
+"berrira migratu dezakezu."
 
 #. Type: note
 #. Description
@@ -58,6 +67,10 @@
 "amavisd-new service will refuse to start until you remove (or rename) these "
 "\".disabled\" files."
 msgstr ""
+"Zure segurtasunagatik, zure sistemako konfigurazio fitxategiak desgaitu egin "
+"dira, eta \".disabled\" aurrizkia gehitu zaie fitxategi izenei. Amavisd-new "
+"zerbitzua ez da abiaraziko \".disabled\" fitxategiak ezabatu (edo "
+"berrizendatu) arte."
 
 #. Type: note
 #. Description
@@ -68,122 +81,7 @@
 "files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
 "and ported your old configuration to the new layout."
 msgstr ""
-
-#~ msgid "Do you want to configure console automatically?"
-#~ msgstr "Kontsola automatikoki konfiguratu nahi al duzu?"
-
-#~ msgid ""
-#~ "Setting this to true will edit /etc/conserver/console.cf and replace "
-#~ "CONSERVER_MASTER and CONSERVER_PORT with the configured values in the "
-#~ "next questions"
-#~ msgstr ""
-#~ "Hau bai bezala ezartzean /etc/conserver/console.cf editatuko da eta "
-#~ "CONSERVER_MASTER eta CONSERVER_PORT eremuak hurrengo galderetako "
-#~ "erantzunekin ordeztuko dira"
-
-#~ msgid "Hostname where your conserver server is installed:"
-#~ msgstr "Conserver zerbitzaria instalaturik dagoen ostalari-izena:"
-
-#~ msgid ""
-#~ "The conserver hostname is the hostname where the conserver-server package "
-#~ "is installed. The client, 'console', will use the hostname 'console' if "
-#~ "left empty. The server name can be changed during runtime with the -M "
-#~ "option."
-#~ msgstr ""
-#~ "Conserver ostalari-izena conserver-server paketea instalaturik dagoen "
-#~ "makinaren ostalari-izena da. Bezeroak ('console') 'console' erabiliko du "
-#~ "ostalari-izen gisa zurian utziaz. Zerbitzari izena aldatu egin daiteke "
-#~ "exekuzio bitartean -M aukeraren bidez."
-
-#~ msgid "The server port number to connect to:"
-#~ msgstr "Konektatzeko zerbitzari ataka:"
-
-#~ msgid ""
-#~ "Set the conserver server port to connect to. This may be either a port "
-#~ "number or a service name."
-#~ msgstr ""
-#~ "Zehaztu konektatzeko erabili behar den conserver zerbitzari ataka. Ataka "
-#~ "zenbaki bat edo zerbitzu izen bat izan behar da."
-
-#~ msgid "The master port number for the conserver server:"
-#~ msgstr "Conserver zerbitzariaren ataka nagusiaren zenbakia:"
-
-#~ msgid ""
-#~ "Set the TCP port for the master process to listen on for clients. This "
-#~ "may be either a port number or a service name. The original port number "
-#~ "for conserver is 782, must be higher than 1024 if running as non-root."
-#~ msgstr ""
-#~ "Ezarri bezeroak itxoiten dituen prozesu nagusiaren TCP ataka. Ataka "
-#~ "zenbaki bat edo zerbitzu izen bat izan behar da. Conserver-en jatorrizko "
-#~ "ataka zenbakia 782 da, 1024 baina handiagoa izan behar da ez-root gisa "
-#~ "exekutatzeko."
-
-#~ msgid "The base port number for the conserver children:"
-#~ msgstr "Conserver semearen oinarri ataka zenbakia:"
-
-#~ msgid ""
-#~ "Set the base port for children to listen on. Each child starts looking "
-#~ "for free ports at this port number and working upward, trying a maximum "
-#~ "number of ports equal to twice the maximum number of groups. If no free "
-#~ "ports are available in that range, conserver exits. By default, conserver "
-#~ "lets the operating system choose a free port. Empty input selects the "
-#~ "default. (Conserver forks a child for each group of consoles it must "
-#~ "manage and assigns each process a port number to listen on.)"
-#~ msgstr ""
-#~ "Semeak entzuteko oinarri ataka ezarri. Seme bakoitza ataka libreen bila "
-#~ "ataka zenbaki honetatik hasiko da gero goraka joateko talde kopuruaren "
-#~ "ataka kopuru bikoitza probatzen. Tartean ez bada ataka librerik aurkitzen "
-#~ "conserver irten egingo da. Lehenespen gisa conserver-ek sistema "
-#~ "eragileari uzten dio ataka libre bat hautatzen. Sarrera hutsak "
-#~ "lehenespena onartzen du (Conserver-ek seme bat sortu eta entzuteko ataka "
-#~ "zenbaki bat ezartzen du kudeatu behar duen kontsola talde "
-#~ "bakoitzarentzat.)"
-
-#~ msgid "The listen address (defaults to all addresses if empty):"
-#~ msgstr ""
-#~ "Entzuteko helbidea (helbide guztiak erabiliko dira hutsa utziaz gero):"
-
-#~ msgid ""
-#~ "Set the address to listen on.  This allows conserver to bind to a "
-#~ "particular IP address (like `127.0.0.1') instead of all interfaces. The "
-#~ "default is to bind to all interfaces."
-#~ msgstr ""
-#~ "Entzuteko helbidea ezarri.  Honek conserver-en IP helbide zehatz batera "
-#~ "(`127.0.0.1' bezalakoak) lotzeko aukera ematen du interfaze guztiak "
-#~ "entzun ordez. Lehenetsia interfaze guztietara lotzea da."
-
-#~ msgid "Should conserver run as root?"
-#~ msgstr "Conserver root gisa exekutatu behar al da?"
-
-#~ msgid ""
-#~ "Conserver can be configured to run as root or as 'conservr'. It is not "
-#~ "possible to use the shadow password if running as non-root in conserver."
-#~ "passwd. (See the manual for conserver.passwd for more details.)"
-#~ msgstr ""
-#~ "Conserver root gisa edo 'conservr' gisa exekutatzeko konfiguratu daiteke. "
-#~ "Ez da posible itzalpeko pasahitzak erabiltzea conserver pasahitzean ez-"
-#~ "root gisa exekutatzen bada. (Ikusi conserver.passwd manuala xehetasun "
-#~ "gehiagorako.)"
-
-#~ msgid "Convert conserver.cf and conserver.passwd to new format?"
-#~ msgstr "Bihurtu conserver.cf eta conserver.passwd formatu berrira?"
-
-#~ msgid ""
-#~ "Protocol and file format has changed! The client/server protocol has been "
-#~ "rearchitected. You *MUST* use an 8.0.1 client with an 8.0.1 server.  No "
-#~ "combination of client/server will work with pre-8.0.0 code. The config "
-#~ "file format for both conserver.cf and conserver.passwd has been changed, "
-#~ "read /usr/share/doc/conserver-server/README.Debian for more details. The /"
-#~ "etc/conserver/conserver.cf and /etc/conserver/conserver.passwd will be "
-#~ "converted to the new format and the old will be renamed with .OLD as "
-#~ "suffix. Check the files after the conversion!"
-#~ msgstr ""
-#~ "Protokolo eta fitxategi formatua aldatu egin dira. Bezero/zerbitzari "
-#~ "protokoloa berregin egin da. 8.0.1 bezero bat erabili *BEHAR* duzu 8.0.1 "
-#~ "zerbitzariarekin.  Bezero/zerbitzari nahasketarik ez da onartzen 8.0.0 "
-#~ "aurreko kodearekin. Bai conserver.cf eta bai conserver.passwd fitxategien "
-#~ "formatua aldatu egin da, ikusi /usr/share/doc/conserver-server/README."
-#~ "Debian xehetasun gehiagorako. /etc/conserver/conserver.cf eta /etc/"
-#~ "conserver/conserver.passwd fitxategiak formatu  berrira aldatuko dira eta "
-#~ "fitxategi zaharrak .OLD atzizkiarekin berrizendatuko dira. Egiaztatu "
-#~ "fitxategiak bihurketa ondoren!"
+"Segurtasun neurri hau aurretik konfiguraturik zenuenaren ordez konfiguratu "
+"gabeko amavid-new bat abiarazi ez dadin egiten da. Ez ezabatu \".disabled\" "
+"fitxategiak /usr/share/doc/amavisd-new/README.Debian fitxategia irakurri eta "
+"konfigurazio ingurune berrira berritu arte."
diff -Nru amavisd-new-2.6.1.dfsg.old/debian/po/pt_BR.po amavisd-new-2.6.1.dfsg/debian/po/pt_BR.po
--- amavisd-new-2.6.1.dfsg.old/debian/po/pt_BR.po	1970-01-01 01:00:00.000000000 +0100
+++ amavisd-new-2.6.1.dfsg/debian/po/pt_BR.po	2008-09-11 19:12:21.315495000 +0200
@@ -0,0 +1,88 @@
+# amavisd-new Brazilian Portuguese translation
+# Copyright (C) 2008 THE amavisd-new'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the amavisd-new package.
+# Adriano Rafael Gomes <adrianorg@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new 1:2.6.0-1\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2008-06-14 20:33-0300\n"
+"Last-Translator: Adriano Rafael Gomes <adrianorg@gmail.com>\n"
+"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "Detectado layout de arquivo de configuração incompatível"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"Os pacotes Debian alteraram o modo com o qual manipulam os arquivos de "
+"configuração do amavisd-new para um sistema melhor, que usa múltiplos "
+"arquivos ao invés de um único arquivo monolítico."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"Os arquivos de configuração antigos do amavisd-new que ainda estão presentes "
+"no seu sistema (nomeados como /etc/amavisd.conf ou /etc/amavis/amavisd.conf) "
+"são incompatíveis com este novo layout de arquivos de configuração."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"Você deveria ler /usr/share/doc/amavisd-new/README.Debian para entender o "
+"novo layout de configuração, e depois disso você deveria portar a sua "
+"configuração para o novo layout."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"Para sua segurança, os arquivos de configuração antigos em seu sistema foram "
+"desabilitados, e um sufixo \".disabled\" foi adicionado aos seus nomes de "
+"arquivo. O serviço amavisd-new se recusará a iniciar até que você remova (ou "
+"renomeie) estes arquivos \".disabled\"."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Esta medida de segurança é tomada para evitar que se inicie um amavisd-new "
+"desconfigurado no lugar do seu já configurado anteriormente. Não remova os "
+"arquivos \".disabled\" até que você tenha lido o arquivo /usr/share/doc/"
+"amavisd-new/README.Debian e portado a sua configuração antiga para o novo "
+"layout."
diff -Nru amavisd-new-2.6.1.dfsg.old/debian/po/sv.po amavisd-new-2.6.1.dfsg/debian/po/sv.po
--- amavisd-new-2.6.1.dfsg.old/debian/po/sv.po	1970-01-01 01:00:00.000000000 +0100
+++ amavisd-new-2.6.1.dfsg/debian/po/sv.po	2008-09-14 08:06:05.548286000 +0200
@@ -0,0 +1,88 @@
+# translation of amavisd-new_1:2.6.1.dfsg-1_sv.po to Swedish
+# Copyright (C) 2008
+# This file is distributed under the same license as the amavisd-new package.
+#
+# Martin Ågren <martin.agren@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new_1:2.6.1.dfsg-1_sv\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2008-09-13 16:53+0200\n"
+"Last-Translator: Martin Ågren <martin.agren@gmail.com>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "En inkompatibel konfigurationsfilslayout har upptäckts"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"Debianpaketen har ändrat sättet på vilket de hanterar konfigurationsfiler "
+"för amavisd-new till ett bättre system, som använder flera filer istället "
+"för en enda, ogenomtränglig fil."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"De gamla amavisd-new-konfigurationsfilerna som fortfarande finns i ditt "
+"system (de heter antingen /etc/amavisd.conf eller /etc/amavis/amavisd.conf) "
+"är inkompatibla med den nya konfigurationsfilslayouten."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"Du måste läsa /usr/share/doc/amavisd-new/README.Debian för att förstå den "
+"nya konfigurationslayouten och därefter överföra din konfiguration till den "
+"nya layouten."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"För säkerhets skull har de gamla konfigurationsfilerna i ditt system "
+"avaktiverats och ett \".disabled\"-suffix lagts till deras filnamn. amavisd-"
+"new-tjänsten kommer vägra starta tills du tar bort (eller byter namn på) "
+"dessa \".disabled\"-filer."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Den här säkerhetsmekanismen finns till för att undvika att en okonfigurerad "
+"amavisd-new startas i stället för din tidigare konfigurerade version. Ta "
+"inte bort \".disabled\"-filerna innan du har läst /usr/share/doc/amavisd-new/"
+"README.Debian och fört över din gamla konfiguration till den nya layouten."
