diff --git a/debian/changelog b/debian/changelog
index f55f71c..95a0cd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+pnm2ppa (1.12-16.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix pending l10n issues.
+  * Debconf translations:
+    - Dutch. Closes: #415514
+    - Portuguese. Closes: #436562
+  * Remove mention of pbm2ppa from the package's description. 
+    Closes: #400259
+  * [Lintian] Add copyright information to debian/copyright
+  * [Lintian] Update FSF address in debian/copyright
+  * [Lintian] Change doc-base section from 'text' to 'Text'
+  * [Lintian] Replace underscore in Document: in doc-base documents
+
+ -- Christian Perrier <bubulle@debian.org>  Tue, 01 Apr 2008 22:48:03 +0200
+
 pnm2ppa (1.12-16) unstable; urgency=low
 
   * debian/po/es.po: Spanish translation by Cesar Gomez Martin
diff --git a/debian/control b/debian/control
index ca348ea..179fb74 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@
 Description: PPM to PPA converter
  Using pnm2ppa it's possible to run HP-GDI printers on Linux. These printers
  are normally "Windows-only" and use the PPA protocol which is proprietary.
- pnm2ppa supports color and is supposed to work faster than pbm2ppa.
+ pnm2ppa supports color.
  .
  pnm2ppa supports the following printers: HP Deskjet 7XX Series, HP Deskjet
  820 Series and HP Deskjet 1000 Series.
diff --git a/debian/copyright b/debian/copyright
index 7138e9f..29ebf7f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@
 Upstream Authors: A complete list of authors and their contributions can be
     found in /usr/share/doc/pnm2ppa/CREDITS.
 
-Copyright:
+Copyright © 1998-2000 by the pnm2ppa project
 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/pnm2ppa.doc-base.calibrate b/debian/pnm2ppa.doc-base.calibrate
index 8846a95..72e8163 100644
--- a/debian/pnm2ppa.doc-base.calibrate
+++ b/debian/pnm2ppa.doc-base.calibrate
@@ -3,7 +3,7 @@
 Author: The pnm2ppa project team ppa-rpms@users.sourceforge.net
 Abstract: This manual describes how to calibrate a PPA Printer for use with
  pnm2ppa.
-Section: text
+Section: Text
 
 Format: debiandoc-sgml
 Files: /usr/share/doc/pnm2ppa/en/sgml/CALIBRATION.sgml.gz
diff --git a/debian/pnm2ppa.doc-base.color b/debian/pnm2ppa.doc-base.color
index ac79add..e76be91 100644
--- a/debian/pnm2ppa.doc-base.color
+++ b/debian/pnm2ppa.doc-base.color
@@ -4,7 +4,7 @@
 Abstract: Information and instructions for color correction of pnm2ppa color
  printing. http://sourceforge.net/projects/pnm2ppa (Updated for pnm2ppa-1.0 and
  later.)
-Section: text
+Section: Text
 
 Format: debiandoc-sgml
 Files: /usr/share/doc/pnm2ppa/en/sgml/COLOR.sgml.gz
diff --git a/debian/pnm2ppa.doc-base.networking b/debian/pnm2ppa.doc-base.networking
index e6c5fdd..392982e 100644
--- a/debian/pnm2ppa.doc-base.networking
+++ b/debian/pnm2ppa.doc-base.networking
@@ -1,4 +1,4 @@
-Document: pnm2ppa-ppa_networking
+Document: pnm2ppa-ppa-networking
 Title: PPA Networking for Non-Windows Hosts or Clients using SAMBA
 Author:  The pnm2ppa project team ppa-rpms@users.sourceforge.net 
 Abstract: This document discusses Networking HP 710C, 720C 820C or 1000C Series
@@ -7,7 +7,7 @@
  across the network, Windows and Linux/Unix Hosts, Windows and Linux/Unix
  Clients, and emulating a PostScript printer on Windows.  (Updated for
  pnm2ppa-1.04 and later.)
-Section: text
+Section: Text
 
 Format: debiandoc-sgml
 Files: /usr/share/doc/pnm2ppa/en/sgml/PPA_networking.sgml.gz
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 52eda6f..3f08614 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pnm2ppa\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-16 17:02-0500\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
 "PO-Revision-Date: 2005-05-22 12:28+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -25,13 +25,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Would you like debconf to configure pnm2ppa?"
 msgstr "Chcete pnm2ppa nastavit pomocí debconfu?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "You can have debconf perform some simple configuration steps for your "
 "default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
@@ -41,13 +41,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "Jaký model tiskárny HP DeskJet používáte?"
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid ""
 "The pnm2ppa printer filter behaves differently depending upon which HP "
 "DeskJet model you use. Choose your model of printer for the default "
@@ -59,13 +59,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "Chcete, aby debconf vytvořil filtry pro magicfilter?"
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "Magicfilter is a customizable, extensible automatic printer filter. It uses "
 "its own magic database (a la file(1)) to decide how to print out a given "
@@ -81,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
 "in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
@@ -96,7 +96,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
 "etc/printcap."
diff --git a/debian/po/da.po b/debian/po/da.po
index f668496..6d33a5d 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pnm2ppa_1.12-10-da\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-16 17:02-0500\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
 "PO-Revision-Date: 2004-02-26 19:57+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -27,13 +27,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Would you like debconf to configure pnm2ppa?"
 msgstr "Vil du have debconf til at sætte pnm2ppa op?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "You can have debconf perform some simple configuration steps for your "
 "default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
@@ -43,13 +43,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "Hvilken model er den HP Deskjet-printer, du bruger?"
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid ""
 "The pnm2ppa printer filter behaves differently depending upon which HP "
 "DeskJet model you use. Choose your model of printer for the default "
@@ -61,13 +61,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "Vil du have at debconf opretter magicfilter-filtre?"
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "Magicfilter is a customizable, extensible automatic printer filter. It uses "
 "its own magic database (a la file(1)) to decide how to print out a given "
@@ -83,7 +83,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
 "in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
@@ -99,7 +99,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
 "etc/printcap."
diff --git a/debian/po/de.po b/debian/po/de.po
index 5ccbbc5..759eb40 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pnm2ppa_1.12-12_templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-16 17:02-0500\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
 "PO-Revision-Date: 2004-11-06 21:22+0100\n"
 "Last-Translator: Erik Schanze <mail@erikschanze.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -26,13 +26,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Would you like debconf to configure pnm2ppa?"
 msgstr "Soll debconf für die Einstellungen verwendet werden?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "You can have debconf perform some simple configuration steps for your "
 "default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
@@ -43,13 +43,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "Welches Modell eines HP-Deskjet-Druckers benutzen Sie?"
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid ""
 "The pnm2ppa printer filter behaves differently depending upon which HP "
 "DeskJet model you use. Choose your model of printer for the default "
@@ -61,13 +61,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "Soll debconf \"magicfilter\" erstellen?"
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "Magicfilter is a customizable, extensible automatic printer filter. It uses "
 "its own magic database (a la file(1)) to decide how to print out a given "
@@ -83,7 +83,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
 "in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
@@ -100,7 +100,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
 "etc/printcap."
diff --git a/debian/po/es.po b/debian/po/es.po
index 0d2bbdb..0681609 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -26,8 +26,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pnm2ppa\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-29 04:33+0100\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
 "PO-Revision-Date: 2006-12-28 10:34+0100\n"
 "Last-Translator: César Gómez Martín <cesar.gomez@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -47,7 +47,9 @@
 msgid ""
 "You can have debconf perform some simple configuration steps for your "
 "default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
-msgstr "Puede dejar que debconf realice unos pasos sencillos para configurar su instalación de pnm2ppa por omisión (editando su fichero «/etc/pnm2ppa.conf»)."
+msgstr ""
+"Puede dejar que debconf realice unos pasos sencillos para configurar su "
+"instalación de pnm2ppa por omisión (editando su fichero «/etc/pnm2ppa.conf»)."
 
 #. Type: select
 #. Description
@@ -82,7 +84,12 @@
 "print job.  Debconf can run the custom pnm2ppa script called \"update-"
 "magicfilter\" to generate a default set of filters for color and black-and-"
 "white printing."
-msgstr "Magicfilter es un filtro de impresión automático configurable y extensible. Utiliza su propia base de datos mágica (al estilo de file(1)) para decidir como debe imprimir un trabajo de impresión. Debconf puede ejecutar el script personalizado pnm2ppa llamado «update-magicfilter» para generar un conjunto de filtros por defecto para impresión en color y en blanco y negro."
+msgstr ""
+"Magicfilter es un filtro de impresión automático configurable y extensible. "
+"Utiliza su propia base de datos mágica (al estilo de file(1)) para decidir "
+"como debe imprimir un trabajo de impresión. Debconf puede ejecutar el script "
+"personalizado pnm2ppa llamado «update-magicfilter» para generar un conjunto "
+"de filtros por defecto para impresión en color y en blanco y negro."
 
 #. Type: boolean
 #. Description
@@ -93,7 +100,12 @@
 "and place the resulting filters in /etc/magicfilter.  Additionally, symbolic "
 "links are created from the generated pnm2ppa filters to pbm2ppa filters (the "
 "deprecated predecessor to pnm2ppa)."
-msgstr "El filtro plantilla se encuentra en /usr/share/pnm2ppa/ como «pnm2ppa-magicfilter.in». update-magicfilter utiliza sed para reemplazar @OPTIONS@ de la plantilla y colocar los filtros resultantes en /etc/magicfilter. Adicionalmente se crean enlaces simbólicos de los filtros pnm2ppa generados a los filtros pbm2ppa (el predecesor obsoleto de pnm2ppa)."
+msgstr ""
+"El filtro plantilla se encuentra en /usr/share/pnm2ppa/ como «pnm2ppa-"
+"magicfilter.in». update-magicfilter utiliza sed para reemplazar @OPTIONS@ de "
+"la plantilla y colocar los filtros resultantes en /etc/magicfilter. "
+"Adicionalmente se crean enlaces simbólicos de los filtros pnm2ppa generados "
+"a los filtros pbm2ppa (el predecesor obsoleto de pnm2ppa)."
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 57458ee..d1a3104 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pnm2ppa 1.12-5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-16 17:02-0500\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
 "PO-Revision-Date: 2003-09-07 12:38+0200\n"
 "Last-Translator: Nicolas Bertolissio <nico.bertol@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -25,13 +25,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Would you like debconf to configure pnm2ppa?"
 msgstr "Faut-il utiliser debconf pour configurer pnm2ppa�?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "You can have debconf perform some simple configuration steps for your "
 "default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
@@ -41,13 +41,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "Quel mod�le d'imprimante HP Deskjet utilisez-vous�?"
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid ""
 "The pnm2ppa printer filter behaves differently depending upon which HP "
 "DeskJet model you use. Choose your model of printer for the default "
@@ -59,13 +59,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "Faut-il utiliser debconf pour configurer pnm2ppa�?"
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "Magicfilter is a customizable, extensible automatic printer filter. It uses "
 "its own magic database (a la file(1)) to decide how to print out a given "
@@ -82,7 +82,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
 "in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
@@ -98,7 +98,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
 "etc/printcap."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 76d7492..4a570bc 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -11,12 +11,11 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: pmn2ppa 1.12-7\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-16 17:02-0500\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
 "PO-Revision-Date: 2003-12-16 23:12+0900\n"
 "Last-Translator: OHURA Makoto <ohura@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -26,13 +25,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Would you like debconf to configure pnm2ppa?"
 msgstr "pnm2ppa �����ꤹ�뤿��� debconf ��Ȥ������Ǥ�����"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "You can have debconf perform some simple configuration steps for your "
 "default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
@@ -42,13 +41,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "���Ѥ��Ƥ��� HP Deskjet �ץ�󥿤Υ�ǥ�ϲ��Ǥ�����"
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid ""
 "The pnm2ppa printer filter behaves differently depending upon which HP "
 "DeskJet model you use. Choose your model of printer for the default "
@@ -60,13 +59,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "magicfilter �Υե��륿���뤿��� debconf ��Ȥ��ޤ�����"
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "Magicfilter is a customizable, extensible automatic printer filter. It uses "
 "its own magic database (a la file(1)) to decide how to print out a given "
@@ -82,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 #, fuzzy
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
@@ -99,7 +98,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 #, fuzzy
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 0000000..93f8fad
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,101 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pnm2ppa\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
+"PO-Revision-Date: 2007-03-09 22:32+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Would you like debconf to configure pnm2ppa?"
+msgstr "Wilt u pnm2ppa via debconf instellen?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"You can have debconf perform some simple configuration steps for your "
+"default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
+msgstr ""
+"U kunt debconf enkele eenvoudige configuratie-instellingen voor uw standaard "
+"pnm2ppa-configuratie laten maken (dit wordt aangepast in uw /etc/pnm2ppa."
+"conf bestand)."
+
+#. Type: select
+#. Description
+#: ../templates:2001
+msgid "What model of HP Deskjet printer do you use?"
+msgstr "Welk model HP Deskjet printer gebruikt u?"
+
+#. Type: select
+#. Description
+#: ../templates:2001
+msgid ""
+"The pnm2ppa printer filter behaves differently depending upon which HP "
+"DeskJet model you use. Choose your model of printer for the default "
+"configuration file /etc/pnm2ppa.conf."
+msgstr ""
+"De pnm2ppa-printer-filters gedragen zich anders afhankelijk van welk model "
+"HP Deskjet u gebruikt. Welk printermodel moet ingesteld worden als standaard "
+"in het configuratiebestand /etc/pnm2ppa.conf?"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid "Would you like debconf to create magicfilter filters?"
+msgstr "Wilt u dat debconf magicfilter-filters aanmaakt?"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"Magicfilter is a customizable, extensible automatic printer filter. It uses "
+"its own magic database (a la file(1)) to decide how to print out a given "
+"print job.  Debconf can run the custom pnm2ppa script called \"update-"
+"magicfilter\" to generate a default set of filters for color and black-and-"
+"white printing."
+msgstr ""
+"Magicfilter is een aanpasbaar, uitbreidbaar automatische printerfilter. Het "
+"gebruikt zijn eigen magische database (net als file(1)) om te beslissen hoe "
+"een gegeven opdracht uitgedrukt moet worden. Debconf kan het pnm2ppa-script "
+"'update-magicfilter' uitvoeren om een standaardset van filters voor kleur en "
+"zwart-wit printen aan te maken."
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
+"in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
+"and place the resulting filters in /etc/magicfilter.  Additionally, symbolic "
+"links are created from the generated pnm2ppa filters to pbm2ppa filters (the "
+"deprecated predecessor to pnm2ppa)."
+msgstr ""
+"De template-filter is terug te vinden in /usr/share/pnm2ppa/ al 'pnm2ppa-"
+"magicfilter.in'. Het 'update-magicfilter'-script gebruikt sed om de "
+"@OPTIONS@ in het templatebestand te vervangen, en plaatst de resulterende "
+"filters in /etc/magicfilter. Daarnaast worden er ook symbolische koppelingen "
+"aangemaakt van de pnm2ppa-filters naar de pbm2ppa-filters (dit is de "
+"verouderde voorganger van pnm2ppa)."
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"The only thing left for you to do is run magicfilterconfig to generate your /"
+"etc/printcap."
+msgstr ""
+"Het enige wat u zelf nog moet doen is uw '/etc/printcap'-bestand aanmaken "
+"door het commando 'magicfilterconfig' uit te voeren."
diff --git a/debian/po/pt.po b/debian/po/pt.po
new file mode 100644
index 0000000..1f0f2d2
--- /dev/null
+++ b/debian/po/pt.po
@@ -0,0 +1,100 @@
+# translation of pnm2ppa to Portuguese
+# Copyright (C) 2007 Américo Monteiro
+# This file is distributed under the same license as the pnm2ppa package.
+#
+# Américo Monteiro <a_monteiro@netcabo.pt>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: pnm2ppa 1.12-16\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
+"PO-Revision-Date: 2007-08-08 03:57+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
+"Language-Team: Portuguese <traduz@debianpt.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"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Would you like debconf to configure pnm2ppa?"
+msgstr "Deseja que o debconf configure o pnm2ppa?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"You can have debconf perform some simple configuration steps for your "
+"default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
+msgstr ""
+"O debconf pode executar alguns passos simples de configuração para a sua "
+"configuração por omissão do pnm2ppa (editado no seu ficheiro /etc/pnm2ppa."
+"conf)."
+
+#. Type: select
+#. Description
+#: ../templates:2001
+msgid "What model of HP Deskjet printer do you use?"
+msgstr "Qual modelo de impressora HP Deskjet você usa?"
+
+#. Type: select
+#. Description
+#: ../templates:2001
+msgid ""
+"The pnm2ppa printer filter behaves differently depending upon which HP "
+"DeskJet model you use. Choose your model of printer for the default "
+"configuration file /etc/pnm2ppa.conf."
+msgstr ""
+"O filtro de impressoras pnm2ppa tem diferentes comportamentos dependendo de "
+"qual modelo HP Deskjet você usa. Escolha o modelo de impressora para o "
+"ficheiro de configuração de omissão /etc/pnm2ppa.conf."
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid "Would you like debconf to create magicfilter filters?"
+msgstr "Deseja que o debconf crie filtros magicfilter?"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"Magicfilter is a customizable, extensible automatic printer filter. It uses "
+"its own magic database (a la file(1)) to decide how to print out a given "
+"print job.  Debconf can run the custom pnm2ppa script called \"update-"
+"magicfilter\" to generate a default set of filters for color and black-and-"
+"white printing."
+msgstr ""
+"Magicfilter é um filtro de impressoras automático extensível e "
+"personalizável. Usa a sua própria base de dados magic (file(1)) para decidir "
+"como imprimir um trabalho de impressão pedido. Debconf pode correr um script "
+"personalizado chamado \"update-magicfilter\" para gerar uma série de filtros "
+"por omissão para impressão a cores e preto-e-branco."
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
+"in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
+"and place the resulting filters in /etc/magicfilter.  Additionally, symbolic "
+"links are created from the generated pnm2ppa filters to pbm2ppa filters (the "
+"deprecated predecessor to pnm2ppa)."
+msgstr ""
+"O filtro modelo é encontrado em /usr/share/pnm2ppa/ como \"pnm2ppa-"
+"magicfilter.in\".  O update-magicfilter usa o sed para substituir @OPTIONS@ "
+"do modelo e colocar os filtros resultantes em /etc/magicfilter. "
+"Adicionalmente, são criados links simbólicos dos filtros pnm2ppa gerados "
+"para filtros pbm2ppa (o predecessor em desuso do pnm2ppa)."
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"The only thing left for you to do is run magicfilterconfig to generate your /"
+"etc/printcap."
+msgstr ""
+"A única coisa deixada para você fazer é correr o magicfilterconfig para "
+"criar o seu /etc/printcap."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 41708c9..d35ac30 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pnm2ppa 1.12-14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-16 17:02-0500\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
 "PO-Revision-Date: 2005-11-30 14:19+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv>\n"
@@ -25,13 +25,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Would you like debconf to configure pnm2ppa?"
 msgstr "Vill du att debconf ska konfigurera pnm2ppa?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "You can have debconf perform some simple configuration steps for your "
 "default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
@@ -41,13 +41,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "Vilken modell av HP Deskjet-skrivaren anv�nder du?"
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid ""
 "The pnm2ppa printer filter behaves differently depending upon which HP "
 "DeskJet model you use. Choose your model of printer for the default "
@@ -59,13 +59,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "Vill du att debconf ska skapa magicfilter-filter?"
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "Magicfilter is a customizable, extensible automatic printer filter. It uses "
 "its own magic database (a la file(1)) to decide how to print out a given "
@@ -81,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
 "in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
@@ -97,7 +97,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
 "etc/printcap."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index d0fc755..884981f 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,22 +1,14 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-16 17:02-0500\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Would you like debconf to configure pnm2ppa?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "You can have debconf perform some simple configuration steps for your "
 "default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
@@ -40,13 +32,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid "What model of HP Deskjet printer do you use?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid ""
 "The pnm2ppa printer filter behaves differently depending upon which HP "
 "DeskJet model you use. Choose your model of printer for the default "
@@ -55,13 +47,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "Magicfilter is a customizable, extensible automatic printer filter. It uses "
 "its own magic database (a la file(1)) to decide how to print out a given "
@@ -72,7 +64,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
 "in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
@@ -83,7 +75,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
 "etc/printcap."
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 48b4f7d..9660070 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,12 +1,12 @@
 # Vietnamese translation for pnm2ppa.
 # Copyright © 2005 Free Software Foundation, Inc.
 # Clytie Siddall <clytie@riverland.net.au>, 2005.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: pnm2ppa 1.12-14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-16 17:02-0500\n"
+"Report-Msgid-Bugs-To: pnm2ppa@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-09 09:45+0200\n"
 "PO-Revision-Date: 2005-07-04 22:20+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -18,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Would you like debconf to configure pnm2ppa?"
 msgstr "Bạn có muốn trình debconf cấu hình «pnm2ppa» không?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "You can have debconf perform some simple configuration steps for your "
 "default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
@@ -35,13 +35,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "Bạn có sử dụng máy in HP Deskjet mẫu nào?"
 
 #. Type: select
 #. Description
-#: ../templates:12
+#: ../templates:2001
 msgid ""
 "The pnm2ppa printer filter behaves differently depending upon which HP "
 "DeskJet model you use. Choose your model of printer for the default "
@@ -53,7 +53,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr ""
 "Bạn có muốn trình debconf tạo bộ lọc loại magicfilter (bộ lọc «ma thuật») "
@@ -61,7 +61,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "Magicfilter is a customizable, extensible automatic printer filter. It uses "
 "its own magic database (a la file(1)) to decide how to print out a given "
@@ -70,14 +70,14 @@
 "white printing."
 msgstr ""
 "Magicfilter là một bộ lọc máy in tự động có thể mở rộng và tùy chỉnh. Nó "
-"dùng cơ sở dữ liệu «ma thuật» của chính nó (như «file(1)») để quyết định "
-"cách in ra một công việc in đựa ra. Trình debconf có thể chạy tập lệnh "
-"pnm2ppa tùy chỉnh được gọi «update-magicfilter» (cập nhật bộ lọc «ma thuật») "
-"để tạo ra một tập hợp bộ lọc cho cả hai việc in tô màu và đen trắng đều."
+"dùng cơ sở dữ liệu «ma thuật» của chính nó (như «file(1)») để quyết định cách "
+"in ra một công việc in đựa ra. Trình debconf có thể chạy tập lệnh pnm2ppa "
+"tùy chỉnh được gọi «update-magicfilter» (cập nhật bộ lọc «ma thuật») để tạo ra "
+"một tập hợp bộ lọc cho cả hai việc in tô màu và đen trắng đều."
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
 "in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
@@ -85,15 +85,15 @@
 "links are created from the generated pnm2ppa filters to pbm2ppa filters (the "
 "deprecated predecessor to pnm2ppa)."
 msgstr ""
-"Trong «/usr/share/pnm2ppa/» có thể tìm bộ lọc mẫu là «pnm2ppa-magicfilter."
-"in». Tập lệnh «update-magicfilter» có dùng trình «sed» để thay thế "
-"«@OPTIONS@» trong mẫu và để những bộ lọc kết quả vào «/etc/magicfilter». Hơn "
-"nữa, liên kết tượng trưng được tạo từ những bộ lọc pnm2ppa đến bộ lọc "
-"«pbm2ppa» (trình đã bị phản đối đi trước pnm2ppa)."
+"Trong «/usr/share/pnm2ppa/» có thể tìm bộ lọc mẫu là «pnm2ppa-magicfilter.in». "
+"Tập lệnh «update-magicfilter» có dùng trình «sed» để thay thế «@OPTIONS@» trong "
+"mẫu và để những bộ lọc kết quả vào «/etc/magicfilter». Hơn nữa, liên kết "
+"tượng trưng được tạo từ những bộ lọc pnm2ppa đến bộ lọc «pbm2ppa» (trình đã "
+"bị phản đối đi trước pnm2ppa)."
 
 #. Type: boolean
 #. Description
-#: ../templates:20
+#: ../templates:3001
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
 "etc/printcap."