Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/foomatic-filtersubuntu/4.0.5-0ubuntu2

Conflicts:
	debian/changelog

21 files changed, 218 insertions, 220 deletions

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..aec6ed4
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,13 @@
+foomatic-filters (4.0.4-1) UNRELEASED; urgency=low
+
+   Change of the ps_accounting default value
+   
+   The ps_accounting default value changes to "true". It can be changed by
+   reconfiguring this package or by editing /etc/foomatic/filter.conf
+   directly.
+
+   Extensive testing has been made in Ubuntu without problems since 2007 so
+   this is most probably not an issue. Please report bugs against the
+   foomatic-db package if you are experiencing additional page prints.
+
+ -- Didier Raboud <didier@raboud.com>  Tue, 10 Aug 2010 17:54:34 +0200
diff --git a/debian/changelog b/debian/changelog
index d732ec5..548b791 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,17 @@
+foomatic-filters (4.0.5-0ubuntu2) maverick; urgency=low
+
+  [ Didier Raboud ]
+  * Document the default change in NEWS.
+  * Remove the big warning in the debconf template.
+  * Packaging fixes (Closes: #235829, #254682)
+  * Bump Standards to 3.9.1.0
+
+ -- Till Kampeter <till.kamppeter@gmail.com>  Tue, 10 Aug 2010 19:18:03 +0200
+
 foomatic-filters (4.0.5-0ubuntu1) maverick; urgency=low
 
   [ Till Kamppeter ]
-  * New upstream release
+  * New upstream release (Closes: #539676)
      - Made some string variables longer to avoid space problems.
      - Let foomatic-rip actually error out if something goes wrong. It simply
        continued or closed silently (exit status 0) in many cases (LP: #570522).
diff --git a/debian/control b/debian/control
index d4b381d..9a15e3b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>> 7.0.50~), po-debconf, perl, libcups2-dev
 Homepage: http://www.openprinting.org/
 Vcs-Git: git://git.debian.org/collab-maint/foomatic-filters.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/foomatic-filters.git
-Standards-Version: 3.9.0.0
+Standards-Version: 3.9.1.0
 
 Package: foomatic-filters
 Architecture: any
diff --git a/debian/foomatic-filters.templates b/debian/foomatic-filters.templates
index c166541..110a40f 100644
--- a/debian/foomatic-filters.templates
+++ b/debian/foomatic-filters.templates
@@ -54,10 +54,6 @@ _Description: Enable PostScript accounting for CUPS?
  You should choose this option if you want to insert PostScript code
  for accounting into each print job. This is currently only useful
  with CUPS.
- .
- When used with generic PostScript printers (and under certain
- conditions with other printers) this causes an extra page to be
- printed after each job.
 
 Template: foomatic-filters/spooler
 Type: select
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 49f05c3..310b955 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.0.2-20061031-1.2\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-08 14:27+0200\n"
 "Last-Translator: Jordà Polo <jorda@ettin.org>\n"
 "Language-Team: Català <debian-l10n-catalan@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -148,17 +149,6 @@ msgstr ""
 "Activeu aquesta opció si voleu inserir codi PostScript de comptatge a cada "
 "tasca d'impressió. Actualment això només és útil amb CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Quan s'utilitza amb impressores PostScript genèriques (i sota certes "
-"condicions amb altres impressores), això provoca la impressió d'una pàgina "
-"addicional després de cada tasca."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -192,6 +182,15 @@ msgstr ""
 "o si s'ha instal·lat més d'una cua, és possible que la detecció no sigui "
 "correcta."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Quan s'utilitza amb impressores PostScript genèriques (i sota certes "
+#~ "condicions amb altres impressores), això provoca la impressió d'una "
+#~ "pàgina addicional després de cada tasca."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Intèrpret Ghostscript que hauria d'utilitzar Foomatic:"
 
diff --git a/debian/po/cs.po b/debian/po/cs.po
index f656eac..bd36448 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,10 +15,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-14 18:19+0200\n"
 "Last-Translator: Jan Outrata <outrata@pharaoh.inf.upol.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -148,16 +149,6 @@ msgstr ""
 "Tuto možnost byste měli zvolit, jestliže chcete vložit do každé tiskové "
 "úlohy kód PostScriptu pro účtování. Momentálně je to užitečné pouze s CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Při použití s generickými PostScriptovými tiskárnami (a za určitých podmínek "
-"i s jinými tiskárnami) se po každé úloze tiskne extra stránka."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -190,6 +181,14 @@ msgstr ""
 "toto prvotní instalace tohoto systému, nebo je nainstalovaných více než "
 "jeden správce, může být detekovaný správce nesprávný."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Při použití s generickými PostScriptovými tiskárnami (a za určitých "
+#~ "podmínek i s jinými tiskárnami) se po každé úloze tiskne extra stránka."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Interpret Ghostscriptu, který má Foomatic používat:"
 
diff --git a/debian/po/de.po b/debian/po/de.po
index 0d1af4c..cf25cd7 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -15,10 +15,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters_3.0.2-20061031-1.3_de\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-18 22:08+0200\n"
 "Last-Translator: Erik Schanze <eriks@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -155,17 +156,6 @@ msgstr ""
 "in jeden Druckauftrag einbauen lassen wollen. Das ist derzeit nur mit CUPS "
 "sinnvoll."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Beim Einsatz von gewöhnlichen PostScript-Druckern (und manchmal auch bei "
-"anderen Druckern), wird hierdurch nach jedem Druckauftrag eine zusätzliche "
-"Seite ausgedruckt."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -198,6 +188,15 @@ msgstr ""
 "worden sein. Bei der Erstinstallation dieses Systems oder falls mehr als ein "
 "Druckdienst installiert ist, könnte die Erkennung aber fehlerhaft sein."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Beim Einsatz von gewöhnlichen PostScript-Druckern (und manchmal auch bei "
+#~ "anderen Druckern), wird hierdurch nach jedem Druckauftrag eine "
+#~ "zusätzliche Seite ausgedruckt."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Ghostscript-Übersetzer, den Foomatic benutzt:"
 
@@ -223,7 +222,8 @@ msgstr ""
 #~ "Alternativen-System für »gs« eingestellt ist. (Das können Sie durch das "
 #~ "Kommando 'update-alternatives --config gs' ändern.) Vielleicht wollen Sie "
 #~ "für das Drucken einen anderen Ghostscript-Übersetzer als für die Anzeige "
-#~ "am Bildschirm verwenden; »gs-esp« ist meist eine gute Wahl für das Drucken."
+#~ "am Bildschirm verwenden; »gs-esp« ist meist eine gute Wahl für das "
+#~ "Drucken."
 
 #~ msgid ""
 #~ "You should use the Custom option if you have a locally-installed "
diff --git a/debian/po/es.po b/debian/po/es.po
index f5e690b..a614495 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -42,10 +42,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters 4.0-20090311-1\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2009-03-20 14:01+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -180,17 +181,6 @@ msgstr ""
 "Debería escoger esta opción si quiere insertar código PostScript para "
 "informar a cada trabajo de impresión. Actualmente, sólo es útil con CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Cuando se utiliza con impresoras PostScript genéricas (y bajo ciertas "
-"condiciones también con otras impresoras) esto provoca la impresión de una "
-"página extra después de cada trabajo."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -225,5 +215,14 @@ msgstr ""
 "si ésta es la primera vez que instala este sistema o si tiene más de un "
 "gestor de cola instalado."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Cuando se utiliza con impresoras PostScript genéricas (y bajo ciertas "
+#~ "condiciones también con otras impresoras) esto provoca la impresión de "
+#~ "una página extra después de cada trabajo."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Intérprete de Ghostscript que ha de usar Foomatic:"
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 34995f1..c31165c 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-12 23:30+0200\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -139,17 +140,6 @@ msgstr ""
 "varten jokaiseen tulostustyöhön. Tällä hetkellä tämä on hyödyllinen vain "
 "CUPSin kanssa."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Käytettäessä tavallisten PostScript-tulostimien kanssa (ja tietyissä "
-"tilanteissa muiden tulostimien kanssa) tämä aiheuttaa ylimääräisen sivun "
-"tulostuksen jokaisen työn jälkeen."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -182,6 +172,15 @@ msgstr ""
 "tämä on järjestelmän ensimmäinen asennus tai jos useampia tulostusjonoja on "
 "asennettuna, löydetty tulostusjono saattaa olla väärä."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Käytettäessä tavallisten PostScript-tulostimien kanssa (ja tietyissä "
+#~ "tilanteissa muiden tulostimien kanssa) tämä aiheuttaa ylimääräisen sivun "
+#~ "tulostuksen jokaisen työn jälkeen."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Foomaticin käyttämä Ghostscript-tulkki:"
 
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 4a1b0f6..76428ff 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -17,10 +17,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-04 07:14+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -157,17 +158,6 @@ msgstr ""
 "comptabilité dans chaque demande d'impression. Cette fonctionnalité n'est "
 "utile qu'avec CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Lorsque cette option est utilisée avec des imprimantes PostScript génériques "
-"(et, dans certaines conditions, avec d'autres imprimantes), elle provoque "
-"l'impression d'une page supplémentaire après chaque impression."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -202,6 +192,16 @@ msgstr ""
 "système ou si plus d'un gestionnaire est installé, celui qui est détecté "
 "n'est peut-être pas le bon."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Lorsque cette option est utilisée avec des imprimantes PostScript "
+#~ "génériques (et, dans certaines conditions, avec d'autres imprimantes), "
+#~ "elle provoque l'impression d'une page supplémentaire après chaque "
+#~ "impression."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Interpréteur Ghostscript utilisé par Foomatic :"
 
@@ -226,8 +226,8 @@ msgstr ""
 #~ "Habituellement, Foomatic utilise la version par défaut (l'alternative "
 #~ "« gs » configurée avec la commande « update-alternatives --config gs »). "
 #~ "Cependant, il peut être recommandé d'utiliser un interpréteur Ghostscript "
-#~ "différent pour l'affichage à l'écran et pour l'impression ; « gs-esp » est "
-#~ "généralement recommandé pour l'impression."
+#~ "différent pour l'affichage à l'écran et pour l'impression ; « gs-esp » "
+#~ "est généralement recommandé pour l'impression."
 
 #~ msgid ""
 #~ "You should use the Custom option if you have a locally-installed "
diff --git a/debian/po/gl.po b/debian/po/gl.po
index b41e0fa..7d3612d 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-13 12:17+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -141,17 +142,6 @@ msgstr ""
 "contabilidade en cada traballo de impresión. Isto só é útil, de momento, con "
 "CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Se se usa con impresoras PostScript xenéricas (e, baixo certas condicións, "
-"tamén con outras impresoras) isto fai que se imprima unha páxina adicional "
-"despois de cada traballo."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -184,6 +174,15 @@ msgstr ""
 "se é a primeira vez que instala este sistema, ou se hai máis dun motor de "
 "colas instalado, o motor detectado pode ser incorrecto."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Se se usa con impresoras PostScript xenéricas (e, baixo certas "
+#~ "condicións, tamén con outras impresoras) isto fai que se imprima unha "
+#~ "páxina adicional despois de cada traballo."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Intérprete Ghostscript a empregar por Foomatic:"
 
diff --git a/debian/po/it.po b/debian/po/it.po
index e21a2c4..c454f27 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filter italian debconf\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-14 10:33+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -141,17 +142,6 @@ msgstr ""
 "per inserire informazioni in ogni lavoro di stampa. Attualmente questa "
 "opzione è utile solo con CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Quando usato con stampanti PostScript generiche (e in alcuni casi anche con "
-"altre stampanti) può provocare la stampa di un'ulteriore pagina al termine "
-"di ogni lavoro."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -184,6 +174,15 @@ msgstr ""
 "comunque, se questa è l'installazione iniziale del sistema oppure se sono "
 "installati più spooler, lo spooler rilevato potrebbe non essere corretto."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Quando usato con stampanti PostScript generiche (e in alcuni casi anche "
+#~ "con altre stampanti) può provocare la stampa di un'ulteriore pagina al "
+#~ "termine di ogni lavoro."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Interprete Ghostscript che Foomatic deve usare:"
 
diff --git a/debian/po/ja.po b/debian/po/ja.po
index f9ede3a..dad98f8 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,10 +15,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-05 14:54+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -150,16 +151,6 @@ msgstr ""
 "選択肢に「はい」と答えてください。これは現在のところ、CUPS 上でのみ動作しま"
 "す。"
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"一般の PostScript プリンタ (およびほかのプリンタでも正しい状態であれば) を"
-"使っている場合、各ジョブのあとに余分なページが印刷されることになります。"
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -192,6 +183,14 @@ msgstr ""
 "れがこのシステムの初期インストール段階であるか、あなたのシステムに 1 つ以上の"
 "スプーラがあると、検出されたスプーラは誤っているかもしれません。"
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "一般の PostScript プリンタ (およびほかのプリンタでも正しい状態であれば) を"
+#~ "使っている場合、各ジョブのあとに余分なページが印刷されることになります。"
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Foomatic で使う Ghostscript インタプリタ:"
 
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 32ab338..fb1da07 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -21,10 +21,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters_3.0.2-20061031-1_nl\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2006-12-28 23:23+0200\n"
 "Last-Translator: Kurt De Bree <kdebree@telenet.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -177,22 +178,6 @@ msgstr ""
 "PostScript-code invoegen voor boekhouding in elke printjob. Dit werkt "
 "momenteel enkel met CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-#, fuzzy
-#| msgid ""
-#| "Note: When used with generic PostScript printers (and under certain "
-#| "conditions with other printers also) this causes an extra page to be "
-#| "printed after each job, so this is off by default."
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Let op: wanneer dit wordt gebruikt met algemene PostScript-printers (en "
-"onder bepaalde omstandigheden ook met andere printers), veroorzaakt dit een "
-"extra te printen pagina na elke job, dus standaard staat dit uit."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -238,6 +223,20 @@ msgstr ""
 "u hebt meer dan één spooler geïnstalleerd op uw systeem, dan is de "
 "gedetecteerde spooler misschien niet correct."
 
+#, fuzzy
+#~| msgid ""
+#~| "Note: When used with generic PostScript printers (and under certain "
+#~| "conditions with other printers also) this causes an extra page to be "
+#~| "printed after each job, so this is off by default."
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Let op: wanneer dit wordt gebruikt met algemene PostScript-printers (en "
+#~ "onder bepaalde omstandigheden ook met andere printers), veroorzaakt dit "
+#~ "een extra te printen pagina na elke job, dus standaard staat dit uit."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Ghostscript-vertolker te gebruiken door Foomatic:"
 
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 950493c..ae0d4f8 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters 3.0.2-20060712-3\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-05 10:39+0100\n"
 "Last-Translator: Rui Branco <ruipb@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -146,17 +147,6 @@ msgstr ""
 "contabilizar em cada trabalho de impressão. Esta funcionalidade apenas é "
 "útil com o CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Quando usado com impressoras genéricas PostScript ( e sobre certas condições "
-"com outras impressoras também) pode causar a impressão de uma página extra "
-"no final de cada trabalho de impressão."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -190,6 +180,15 @@ msgstr ""
 "entanto, se esta for a instalação inicial deste sistema ou tem mais que um "
 "'spooler' instalado, o 'spooler' detectado pode não ser o correcto."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Quando usado com impressoras genéricas PostScript ( e sobre certas "
+#~ "condições com outras impressoras também) pode causar a impressão de uma "
+#~ "página extra no final de cada trabalho de impressão."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Intérprete de Ghostscript a ser usado pelo Foomatic:"
 
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 4b17b38..5a657d8 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-05 01:27-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -147,17 +148,6 @@ msgstr ""
 "contabilidade em cada trabalho de impressão. Atualmente, isto só é útil com "
 "o CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Quando usado com impressoras PostScript genéricas (e sob certas condições "
-"com outras impressoras) isto faz com que uma página extra seja impressa a "
-"cada trabalho."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -191,6 +181,15 @@ msgstr ""
 "entanto, se esta é a instalação inicial do sistema, ou se há mais de um "
 "\"spooler\" instalado, o \"spooler\" detectado pode estar incorreto."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Quando usado com impressoras PostScript genéricas (e sob certas condições "
+#~ "com outras impressoras) isto faz com que uma página extra seja impressa a "
+#~ "cada trabalho."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Interpretador Ghostscript a ser usado pelo Foomatic:"
 
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 1742d28..f50ce47 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -15,16 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-15 20:57+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"Language: ru\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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: title
 #. Description
@@ -154,17 +155,6 @@ msgstr ""
 "Ответьте утвердительно, если хотите, чтобы код PostScript для учёта "
 "вставлялся в каждое печатное задание. Работает только с CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"При использовании с обычными принтерами PostScript (а также в некоторых "
-"случаях, с другими принтерами) это приводит к печати дополнительной страницы "
-"после каждого задания."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -197,6 +187,15 @@ msgstr ""
 "выполняете первоначальную настройку системы, или у вас установлено больше "
 "одного диспетчера, то найденный диспетчер может быть неправильным."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "При использовании с обычными принтерами PostScript (а также в некоторых "
+#~ "случаях, с другими принтерами) это приводит к печати дополнительной "
+#~ "страницы после каждого задания."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Команда интерпретатора Ghostscript, используемая Foomatic:"
 
diff --git a/debian/po/sv.po b/debian/po/sv.po
index bfde7ac..f93f66e 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2009-03-06 16:51+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -143,17 +144,6 @@ msgstr ""
 "hålla reda på exempelvis kostnadsberäkning i varje utskriftsjobb. Detta "
 "fungerar endast med CUPS för tillfället."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"När detta används med allmänna PostScript-skrivare (och även under vissa "
-"förhållande med andra skrivare) orsakar detta att en extra sida skrivs ut "
-"efter varje jobb."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -186,3 +176,12 @@ msgstr ""
 "är första gången som du installerar systemet, eller om du på något sätt har "
 "fler än en kö installerad på ditt system, kan den identifierade kön vara "
 "felaktig."
+
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "När detta används med allmänna PostScript-skrivare (och även under vissa "
+#~ "förhållande med andra skrivare) orsakar detta att en extra sida skrivs ut "
+#~ "efter varje jobb."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index e06c42d..8e7f42e 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -123,14 +124,6 @@ msgid ""
 "accounting into each print job. This is currently only useful with CUPS."
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 346650e..240bbd0 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2004-06-05 20:00-0500\n"
 "Last-Translator: Gürkan Aslan <gurkan@iaslan.com>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -164,23 +165,6 @@ msgstr ""
 "Yazdırma muhasebesinde kullanılmak üzere her yazdırma görevine eklenecek "
 "olan PostScript kodunu girin.  Bu özellik şu an sadece CUPS ile çalışır."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-#, fuzzy
-#| msgid ""
-#| "Note: When used with generic PostScript printers (and under certain "
-#| "conditions with other printers also) this causes an extra page to be "
-#| "printed after each job, so this is off by default."
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Not: Bu özellik genel amaçlı PostScript yazıcılarla (ve belirli durumlarda "
-"diğer bazı yazıcılarla) kullanıldığında her görevden sonra ek bir sayfanın "
-"bastırılmasına neden olacaktır.  Bu yüzden bu özellik öntanımlı olarak etkin "
-"değildir."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -207,6 +191,21 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~| msgid ""
+#~| "Note: When used with generic PostScript printers (and under certain "
+#~| "conditions with other printers also) this causes an extra page to be "
+#~| "printed after each job, so this is off by default."
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Not: Bu özellik genel amaçlı PostScript yazıcılarla (ve belirli "
+#~ "durumlarda diğer bazı yazıcılarla) kullanıldığında her görevden sonra ek "
+#~ "bir sayfanın bastırılmasına neden olacaktır.  Bu yüzden bu özellik "
+#~ "öntanımlı olarak etkin değildir."
+
+#, fuzzy
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Foomatic ile beraber hangi Ghostscript yorumlayıcısı kullanılsın?"
 
diff --git a/debian/po/vi.po b/debian/po/vi.po
index fcc58d4..8dd5335 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foomatic-filters 3.0.2-20061031-1.3\n"
 "Report-Msgid-Bugs-To: foomatic-filters@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-19 17:16+0200\n"
+"POT-Creation-Date: 2010-08-10 18:01+0200\n"
 "PO-Revision-Date: 2007-10-16 21:45+09300\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -139,16 +140,6 @@ msgstr ""
 "Khuyên bạn bật tùy chọn này để chèn vào mỗi công việc in mã PostScript để "
 "tính toán. Tùy chọn này hiện thời chỉ hữu ích với hệ thống in CUPS."
 
-#. Type: boolean
-#. Description
-#: ../foomatic-filters.templates:6001
-msgid ""
-"When used with generic PostScript printers (and under certain conditions "
-"with other printers) this causes an extra page to be printed after each job."
-msgstr ""
-"Dùng với máy in PostScript giống loài (cũng với máy in khác dưới điều kiện "
-"nào đó) thì gây ra một trang thêm được in ra sau mỗi công việc."
-
 #. Type: select
 #. Description
 #: ../foomatic-filters.templates:7001
@@ -182,6 +173,14 @@ msgstr ""
 "mềm ghi hàng đợi được cài đặt, phần mềm ghi hàng đợi có thể được phát hiện "
 "sai."
 
+#~ msgid ""
+#~ "When used with generic PostScript printers (and under certain conditions "
+#~ "with other printers) this causes an extra page to be printed after each "
+#~ "job."
+#~ msgstr ""
+#~ "Dùng với máy in PostScript giống loài (cũng với máy in khác dưới điều "
+#~ "kiện nào đó) thì gây ra một trang thêm được in ra sau mỗi công việc."
+
 #~ msgid "Ghostscript interpreter to be used by Foomatic:"
 #~ msgstr "Bộ giải thích GhostScript cho Foomatic dùng:"