diff --git a/++log.pnm2ppa--debian--1.0--chewie@debian.org--debian b/++log.pnm2ppa--debian--1.0--chewie@debian.org--debian
deleted file mode 100644
index df94051..0000000
--- a/++log.pnm2ppa--debian--1.0--chewie@debian.org--debian
+++ /dev/null
@@ -1,3 +0,0 @@
-Summary:  Add Czech translation of templates
-Keywords: 
-
diff --git a/debian/changelog b/debian/changelog
index 954ac75..f71d043 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,20 @@
+pnm2ppa (1.12-15) unstable; urgency=low
+
+  * debian/control: Updated Standards version.  Updated Build-Depends on
+    debhelper to avoid depending upon po-debconf.
+  * debian/templates: Added 710 as a default printer by Colin Watson
+    <cjwatson@ubuntu.com>.  Closes: #393427
+  * debian/po/vi.po: Added Vietnamese template submitted by Clytie Siddall
+    <clytie@riverland.net.au>.  Closes: #316874
+  * debian/po/sv.po: Added Swedish template submitted by Daniel Nylander
+    <yeager@lidkoping.net>.  Closes: #341404
+  * debian/watch: Updated to version 3 and added sourceforge syntax.
+
+ -- Chad Walstrom <chewie@debian.org>  Mon, 16 Oct 2006 17:03:16 -0500
+
 pnm2ppa (1.12-14) unstable; urgency=low
 
-  * debian/po/cs.po: Added Czech debconf templat submitted by
+  * debian/po/cs.po: Added Czech debconf template submitted by
     Miroslav Kure <kurem@upcase.inf.upol.cz>.
 
  -- Chad Walstrom <chewie@debian.org>  Mon, 23 May 2005 11:22:13 -0500
diff --git a/debian/control b/debian/control
index 47932e7..ca348ea 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@
 Section: text
 Priority: optional
 Maintainer: Chad Walstrom <chewie@debian.org>
-Build-Depends: debhelper (>= 4), dbs (>= 0.9)
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.2.32), dbs (>= 0.9)
+Standards-Version: 3.7.2
 
 Package: pnm2ppa
 Architecture: any
diff --git a/debian/po/cs.po b/debian/po/cs.po
index ac31c13..52eda6f 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: pnm2ppa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-06 10:43-0600\n"
+"POT-Creation-Date: 2006-10-16 17:02-0500\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"
@@ -36,18 +36,18 @@
 "You can have debconf perform some simple configuration steps for your "
 "default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
 msgstr ""
-"Pro základní nastavení pnm2ppa můžete místo editace souboru "
-"/etc/pnm2ppa.conf použít debconf."
+"Pro základní nastavení pnm2ppa můžete místo editace souboru /etc/pnm2ppa."
+"conf použít debconf."
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "Jaký model tiskárny HP DeskJet používáte?"
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 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:19
+#: ../templates:20
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "Chcete, aby debconf vytvořil filtry pro magicfilter?"
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 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 "
@@ -73,15 +73,15 @@
 "magicfilter\" to generate a default set of filters for color and black-and-"
 "white printing."
 msgstr ""
-"Magicfilter je přizpůsobitelný rozšiřitelný filtr pro tiskové úlohy. "
-"Používá vlastní databázi (a la file(1)), na základě které se rozhoduje, "
-"jakým způsobem má danou úlohu vytisknout. Debconf může spustit skript "
-"\"update-magicfilter\", kterým vygeneruje výchozí sadu filtrů pro "
-"barevné i černobílé výtisky."
+"Magicfilter je přizpůsobitelný rozšiřitelný filtr pro tiskové úlohy. Používá "
+"vlastní databázi (a la file(1)), na základě které se rozhoduje, jakým "
+"způsobem má danou úlohu vytisknout. Debconf může spustit skript \"update-"
+"magicfilter\", kterým vygeneruje výchozí sadu filtrů pro barevné i černobílé "
+"výtisky."
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
 "in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
@@ -89,18 +89,17 @@
 "links are created from the generated pnm2ppa filters to pbm2ppa filters (the "
 "deprecated predecessor to pnm2ppa)."
 msgstr ""
-"Vzorovou šablonu můžete nalézt v /usr/share/pnm2ppa/ pod názvem "
-"\"pnm2ppa-magicfilter.in\". Skript update-magicfilter nahradí v šabloně "
-"řetězec @OPTIONS@ a výsledné filtry umístí do /etc/magicfilter. Kromě toho "
-"se ještě vytvoří symbolické odkazy mezi filtry pnm2ppa a pbm2ppa "
-"(předchůdce pnm2ppa)."
+"Vzorovou šablonu můžete nalézt v /usr/share/pnm2ppa/ pod názvem \"pnm2ppa-"
+"magicfilter.in\". Skript update-magicfilter nahradí v šabloně řetězec "
+"@OPTIONS@ a výsledné filtry umístí do /etc/magicfilter. Kromě toho se ještě "
+"vytvoří symbolické odkazy mezi filtry pnm2ppa a pbm2ppa (předchůdce pnm2ppa)."
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
 "etc/printcap."
 msgstr ""
-"Jediné, co musíte udělat, je ručně spustit magicfilterconfig, což vytvoří "
-"/etc/printcap."
+"Jediné, co musíte udělat, je ručně spustit magicfilterconfig, což vytvoří /"
+"etc/printcap."
diff --git a/debian/po/da.po b/debian/po/da.po
index 7cce6de..f668496 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: pnm2ppa_1.12-10-da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-06 10:43-0600\n"
+"POT-Creation-Date: 2006-10-16 17:02-0500\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"
@@ -43,31 +43,31 @@
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "Hvilken model er den HP Deskjet-printer, du bruger?"
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 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 ""
 "pnm2ppa-printerfiltret opfører sig forskelligt afhængigt af hvilken HP "
-"DeskJet-model, du bruger. Vælg din printermodel til standard-opsætningsfilen "
-"/etc/pnm2ppa.conf."
+"DeskJet-model, du bruger. Vælg din printermodel til standard-"
+"opsætningsfilen /etc/pnm2ppa.conf."
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "Vil du have at debconf opretter magicfilter-filtre?"
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 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 "
@@ -78,12 +78,12 @@
 "Magicfilter er et automatisk printerfilter, der kan tilrettes og udvides. "
 "Det benytter sin egen magiske oversigt (a'la file(1)) til at afgøre hvordan "
 "det skal udskrive et givet udskriftsjob. Debconf kan køre det tilpassede "
-"pnm2ppa-skript \"update-magicfilter\" for at generere et standard-filsæt "
-"til udskrivning i farver og sort/hvid."
+"pnm2ppa-skript \"update-magicfilter\" for at generere et standard-filsæt til "
+"udskrivning i farver og sort/hvid."
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
 "in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
@@ -91,19 +91,18 @@
 "links are created from the generated pnm2ppa filters to pbm2ppa filters (the "
 "deprecated predecessor to pnm2ppa)."
 msgstr ""
-"Skabelonfiltret ligger i /usr/share/pnm2ppa/ som \"pnm2ppa-magicfilter."
-"in\". update-magicfilter benytter sed til at erstatte @OPTIONS@ fra skabelonen "
-"og lægge de resulterende filtre i /etc/magicfilter. Derudover oprettes "
-"symbolske lænker fra de genererede pnm2ppa-filtre til pbm2ppa-filtre (den "
-"nu forældede forgænger til pnm2ppa)."
+"Skabelonfiltret ligger i /usr/share/pnm2ppa/ som \"pnm2ppa-magicfilter.in\". "
+"update-magicfilter benytter sed til at erstatte @OPTIONS@ fra skabelonen og "
+"lægge de resulterende filtre i /etc/magicfilter. Derudover oprettes "
+"symbolske lænker fra de genererede pnm2ppa-filtre til pbm2ppa-filtre (den nu "
+"forældede forgænger til pnm2ppa)."
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
 "etc/printcap."
 msgstr ""
 "Det eneste du derefter behøver at gøre, er at køre magicfilterconfig for at "
 "generere din /etc/printcap."
-
diff --git a/debian/po/de.po b/debian/po/de.po
index a11e2e0..5ccbbc5 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: pnm2ppa_1.12-12_templates\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-06 10:43-0600\n"
+"POT-Creation-Date: 2006-10-16 17:02-0500\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"
@@ -43,13 +43,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "Welches Modell eines HP-Deskjet-Druckers benutzen Sie?"
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 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:19
+#: ../templates:20
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "Soll debconf \"magicfilter\" erstellen?"
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 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 "
@@ -75,15 +75,15 @@
 "magicfilter\" to generate a default set of filters for color and black-and-"
 "white printing."
 msgstr ""
-"Magicfilter ist ein anpassbarer, erweiterbarer automatischer Druckerfilter. Er "
-"nutzt seine eigene magische Datenbank (wie file(1)), um zu entscheiden, wie "
-"ein übergebener Druckjob ausgedruckt wird. Debconf kann das Skript "
+"Magicfilter ist ein anpassbarer, erweiterbarer automatischer Druckerfilter. "
+"Er nutzt seine eigene magische Datenbank (wie file(1)), um zu entscheiden, "
+"wie ein übergebener Druckjob ausgedruckt wird. Debconf kann das Skript "
 "\"update-magicfilter\" aufrufen, um einige Standardfilter für Farb- und "
 "Schwarz-Weiß-Druck zu erstellen."
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
 "in\".  update-magicfilter uses sed to replace @OPTIONS@ from the template "
@@ -92,19 +92,18 @@
 "deprecated predecessor to pnm2ppa)."
 msgstr ""
 "Die Vorlage für den Filter befindet sich im Verzeichnis /usr/share/pnm2ppa/ "
-"als \"pnm2ppa-magicfilter.in\". Das Skript update-magicfilter nutzt 'sed', um "
-"@OPTIONS@ in der Vorlage zu ersetzen und legt den erstellten Filter im "
+"als \"pnm2ppa-magicfilter.in\". Das Skript update-magicfilter nutzt 'sed', "
+"um @OPTIONS@ in der Vorlage zu ersetzen und legt den erstellten Filter im "
 "Verzeichnis /etc/magicfilter ab. Zusätzlich werden symbolische Links von den "
 "erstellten pnm2ppa-Filtern zu den pbm2ppa-Filtern (dem veralteten Vorgänger "
 "von pnm2ppa) angelegt."
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
 "etc/printcap."
 msgstr ""
-"Sie müssen nun nur noch das Programm 'magicfilterconfig' starten, um die Datei "
-"/etc/printcap zu erzeugen."
-
+"Sie müssen nun nur noch das Programm 'magicfilterconfig' starten, um die "
+"Datei /etc/printcap zu erzeugen."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 76e8d6d..57458ee 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: pnm2ppa 1.12-5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-06 10:43-0600\n"
+"POT-Creation-Date: 2006-10-16 17:02-0500\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"
@@ -41,13 +41,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "Quel mod�le d'imprimante HP Deskjet utilisez-vous�?"
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 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:19
+#: ../templates:20
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "Faut-il utiliser debconf pour configurer pnm2ppa�?"
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 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:19
+#: ../templates:20
 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:19
+#: ../templates:20
 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 f24e117..76d7492 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: pmn2ppa 1.12-7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-06 10:43-0600\n"
+"POT-Creation-Date: 2006-10-16 17:02-0500\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"
@@ -42,13 +42,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 msgid "What model of HP Deskjet printer do you use?"
 msgstr "���Ѥ��Ƥ��� HP Deskjet �ץ�󥿤Υ�ǥ�ϲ��Ǥ�����"
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 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 +60,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr "magicfilter �Υե��륿���뤿��� debconf ��Ȥ��ޤ�����"
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 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:19
+#: ../templates:20
 #, fuzzy
 msgid ""
 "The template filter is found in /usr/share/pnm2ppa/ as \"pnm2ppa-magicfilter."
@@ -99,7 +99,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 #, fuzzy
 msgid ""
 "The only thing left for you to do is run magicfilterconfig to generate your /"
diff --git a/debian/po/sv.po b/debian/po/sv.po
new file mode 100644
index 0000000..41708c9
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,106 @@
+#
+#    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.
+#
+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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Would you like debconf to configure pnm2ppa?"
+msgstr "Vill du att debconf ska konfigurera pnm2ppa?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"You can have debconf perform some simple configuration steps for your "
+"default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
+msgstr ""
+"Du kan f� debconf att genomf�ra enkla konfigurationssteg f�r dina f�rvalda "
+"inst�llningar av pnm2ppa (redigerade i din fil /etc/pnm2ppa.conf). "
+
+#. Type: select
+#. Description
+#: ../templates:12
+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
+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 ""
+"Filter f�r pnm2ppa-skrivare uppf�r sig olika beroende p� vilken modell av HP "
+"Deskjet du anv�nder. V�lj den modell du anv�nder f�r den f�rvalda "
+"konfigurationen i /etc/pnm2ppa.conf."
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+msgid "Would you like debconf to create magicfilter filters?"
+msgstr "Vill du att debconf ska skapa magicfilter-filter?"
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+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 �r en anpassningsbar, ut�kningsbar automatiskt skrivarfilter. "
+"Den anv�nder sina egen magic-databas (a la fil(1)) f�r att best�mma hur "
+"utskriften ska utf�ras. Debconf kan k�ra det anpassade pnm2ppa-skriptet som "
+"kallas \"update-magicfilter\" f�r att generera en f�rvald upps�ttning filter "
+"f�r utskrifter i f�rg och svart-vitt."
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+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 ""
+"Mallfiltren finns i /usr/share/pnm2ppa/ som \"pnm2ppa-magicfilter.in\".  "
+"update-magicfilter anv�nder \"sed\" f�r att ers�tta @OPTIONS@ fr�n mallen "
+"och placera det resulterande filtret i /etc/magicfilter.  Ytterligare kommer "
+"symboliska l�nkar skapas fr�n de genererade pnm2ppa-filtren till pbm2ppa-"
+"filtren (den f�r�ldrade f�rlagan till pnm2ppa)."
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+msgid ""
+"The only thing left for you to do is run magicfilterconfig to generate your /"
+"etc/printcap."
+msgstr ""
+"Det enda som �terst�r f�r dig �r att k�ra magicfilterconfig f�r att generera "
+"din /etc/printcap."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index ac12244..d0fc755 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-06 10:43-0600\n"
+"POT-Creation-Date: 2006-10-16 17:02-0500\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"
@@ -40,13 +40,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 msgid "What model of HP Deskjet printer do you use?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:11
+#: ../templates:12
 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 +55,13 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 msgid "Would you like debconf to create magicfilter filters?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 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 +72,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 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 +83,7 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:19
+#: ../templates:20
 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
new file mode 100644
index 0000000..48b4f7d
--- /dev/null
+++ b/debian/po/vi.po
@@ -0,0 +1,101 @@
+# 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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.2.2\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+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
+msgid ""
+"You can have debconf perform some simple configuration steps for your "
+"default pnm2ppa setup (edited in your /etc/pnm2ppa.conf file)."
+msgstr ""
+"Trình debconf có thể thực hiện một số việc cấu hình đơn giản cho thiết lập "
+"pnm2ppa mặc định (được hiệu chỉnh trong tập tin cấu hình «/etc/pnm2ppa.conf» "
+"của bạn)."
+
+#. Type: select
+#. Description
+#: ../templates:12
+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
+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 ""
+"Bộ lọc máy in pnm2ppa vân hành một cách khác phụ thuộc vào mẫu HP Deskjet "
+"nào bạn sử dụng. Hãy chọn mẫu máy in bạn cho tập tin cấu hình mặc định «/etc/"
+"pnm2ppa.conf»."
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+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») "
+"không?"
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+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 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."
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+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 ""
+"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
+msgid ""
+"The only thing left for you to do is run magicfilterconfig to generate your /"
+"etc/printcap."
+msgstr ""
+"Chỉ hãy chạy «magicfilterconfig» để tạo ra «/etc/printcap» mình. Xong rồi!"
diff --git a/debian/templates b/debian/templates
index c5ca88d..d28ad82 100644
--- a/debian/templates
+++ b/debian/templates
@@ -8,6 +8,7 @@
 Template: pnm2ppa/printer_model
 Type: select
 Choices: 710, 712, 720, 722, 820, 1000
+Default: 710
 _Description: What model of HP Deskjet printer do you use?
  The pnm2ppa printer filter behaves differently depending upon which HP
  DeskJet model you use. Choose your model of printer for the default
diff --git a/debian/watch b/debian/watch
index 06c7f4e..20b6fdc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,9 @@
 #
 # watch -- uscan configuration file for pnm2ppa
 #
-version=2
-ftp://ftp2.sf.net/pub/sourceforge/p/pn/pnm2ppa/pnm2ppa-?_?\d+\.([\w+\d+\.]+|\d+)(\.tar|\.tgz)(\.gz|\.bz2|) debian
+version=3
+
+# If your package is located on sourceforge, use the following format
+# to automatically use the qa.debian.org redirector, avoiding SF's
+# difficult mirror system.
+http://sf.net/pnm2ppa-project/pnm2ppa-(.*)\.tar\.gz