diff -Nru resolvconf-1.38/debian/changelog resolvconf-1.38ubuntu1/debian/changelog
--- resolvconf-1.38/debian/changelog	2008-01-08 17:46:27.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/changelog	2008-01-13 01:39:40.000000000 +0100
@@ -1,3 +1,11 @@
+resolvconf (1.38ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #182433):
+    - use /var/run instead of /dev/shm
+    - debian/rules: don't install the init script in runlevels 0 and 6
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Sun, 13 Jan 2008 01:36:43 +0100
+
 resolvconf (1.38) unstable; urgency=low
 
   [ Thomas Hood ]
@@ -16,6 +24,14 @@
 
  -- Thomas Hood <jdthood@yahoo.co.uk>  Tue, 31 Dec 2007 12:00:00 +0100
 
+resolvconf (1.37ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - use /var/run instead of /dev/shm
+    - debian/rules: don't install the init script in runlevels 0 and 6
+
+ -- Michael Bienia <geser@ubuntu.com>  Tue, 19 Dec 2006 14:19:02 +0100
+
 resolvconf (1.37) unstable; urgency=high
 
   [ Thomas Hood ]
@@ -30,6 +46,20 @@
 
  -- Marco Nenciarini <mnencia@debian.org>  Wed, 13 Dec 2006 15:13:02 +0100
 
+resolvconf (1.36ubuntu1) edgy; urgency=low
+
+  [ William Alexander Grant ]
+  * Readded patch to use /var/run rather than /dev/shm (it was lost in a sync
+    a while back)
+  (Closes Ubuntu: #61310).
+
+  [ Daniel T. Chen ]
+  * debian/rules: Follow multiuser semantics for dh_installinit(1) --
+    that is, we don't need to save anything for runlevels 0 or 6, so
+    don't create those symlinks.
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Wed, 20 Sep 2006 03:12:20 -0400
+
 resolvconf (1.36) unstable; urgency=low
 
   [ D.K. Gillmor / TH ]
@@ -833,3 +863,4 @@
   * Initial Debian release. Closes: #204677
 
  -- Thomas Hood <jdthood@yahoo.co.uk>  Wed, 27 Aug 2003 17:53:54 -0100
+
diff -Nru resolvconf-1.38/debian/po/cs.po resolvconf-1.38ubuntu1/debian/po/cs.po
--- resolvconf-1.38/debian/po/cs.po	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/cs.po	2008-01-08 23:45:32.000000000 +0100
@@ -154,129 +154,165 @@
 "nameservers\", měli byste přesměrovat symbolický odkaz /etc/resolvconf/"
 "resolv.conf.d/tail na /dev/null."
 
-#~ msgid "A rogue pppconfig PPP hook script is present"
-#~ msgstr "Je přítomen PPP skript balíku pppconfig"
-
-#~ msgid ""
-#~ "Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
-#~ "d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
-#~ "interface is brought up or down) that overwrite /etc/resolv.conf. These "
-#~ "scripts must be modified, disabled or deleted so that they will not "
-#~ "interfere with the operation of resolvconf."
-#~ msgstr ""
-#~ "Některé verze balíku pppconfig obsahují skripty /etc/ppp/ip-up.d/0dns-up "
-#~ "a /etc/ppp/ip-down.d/0dns-down (spouští je pppd poté, co je PPP rozhraní "
-#~ "nahozeno resp. shozeno), které přepisují /etc/resolv.conf. Tyto skripty "
-#~ "musí být upraveny, zakázány nebo smazány, aby nekolidovaly s činností "
-#~ "programu resolvconf."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
-#~ "down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
-#~ "conf. Each one that does so must be modified, disabled or deleted. The "
-#~ "best way to disable it is to remove its execute permission. The best way "
-#~ "to delete it is to purge the pppconfig package."
-#~ msgstr ""
-#~ "Byl rozpoznán neprázdný spustitelný skript /etc/ppp/ip-up.d/0dns-up a/"
-#~ "nebo /etc/ppp/ip-down.d/0dns-down, který vypadá, že přepisuje /etc/resolv."
-#~ "conf. Každý takový skript musí být upraven, zakázán nebo smazán. "
-#~ "Nejjednodušeji ho zakážete tak, že mu zrušíte práva na spouštění. "
-#~ "Nejlepší cesta, jak se ho zbavit, je odstranění balíku pppconfig s "
-#~ "parametrem --purge."
-
-#~ msgid "A rogue pppoeconf PPP hook script is present"
-#~ msgstr "Je přítomen PPP skript balíku pppoeconf"
-
-#~ msgid ""
-#~ "Versions of the pppoeconf package prior to version 1.0 contain a script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is "
-#~ "brought up) that overwrites /etc/resolv.conf. The script must be "
-#~ "modified, disabled or deleted so that it will not interfere with the "
-#~ "operation of resolvconf. Contrary to Debian policy, merely removing the "
-#~ "pppoeconf package does not disable the script."
-#~ msgstr ""
-#~ "Dřívější verze balíku pppoeconf obsahují skript /etc/ppp/ip-up."
-#~ "d/000usepeerdns (spouští jej pppd poté, co je PPP rozhraní nahozeno), "
-#~ "který přepisuje soubor /etc/resolv.conf. Skript musí být upraven, zakázán "
-#~ "nebo smazán, aby nekolidoval s činností programu resolvconf. V rozporu s "
-#~ "politikou Debianu prosté odstranění balíku pppoeconf tento skript "
-#~ "nezakáže."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
-#~ "detected. It must be modified, disabled or deleted. The best way to "
-#~ "modify it is to upgrade the pppoeconf package to version 1.0 or later and "
-#~ "to allow dpkg to install the new version of the script. The best way to "
-#~ "disable it is to remove its execute permission. The best way to delete it "
-#~ "is to purge the pppoeconf package."
-#~ msgstr ""
-#~ "Byl rozpoznán neprázdný spustitelný skript /etc/ppp/ip-up."
-#~ "d/000usepeerdns. Tento skript musí být upraven, zakázán nebo smazán. "
-#~ "Nejjednodušeji jej upravíte tak, že aktualizujete balík pppoeconf na "
-#~ "verzi 1.0 nebo pozdější a povolíte dpkg, aby nainstaloval novou verzi "
-#~ "skriptu. Zakázání skriptu dosáhnete tak, že mu zrušíte práva na "
-#~ "spouštění. Nejlepší cesta, jak se skriptu zbavit, je odstranění balíku "
-#~ "pppoeconf s parametrem --purge."
-
-#~ msgid "A rogue xisp PPP hook script is present"
-#~ msgstr "Je přítomen PPP skript balíku xisp"
-
-#~ msgid ""
-#~ "The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (run by pppd after a PPP interface is brought up or "
-#~ "down) that overwrite /etc/resolv.conf. The scripts must be modified, "
-#~ "disabled or deleted so that they will not interfere with the operation of "
-#~ "resolvconf. Contrary to Debian policy, merely removing the xisp package "
-#~ "does not disable the scripts."
-#~ msgstr ""
-#~ "Balík xisp obsahuje skripty /etc/ppp/ip-up.d/0xisp-dns a /etc/ppp/ip-down."
-#~ "d/0xisp-dns (spouští je pppd poté, co je PPP rozhraní nahozeno resp. "
-#~ "shozeno), které přepisují /etc/resolv.conf. Tyto skripty musí být "
-#~ "upraveny, zakázány nebo smazány, aby nekolidovaly s činností programu "
-#~ "resolvconf. V rozporu s politikou Debianu prosté odstranění balíku xisp "
-#~ "tyto skripty nezakáže."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/"
-#~ "ip-down.d/0xisp-dns has been detected. Each one must be modified, "
-#~ "disabled or deleted. The best way to disable it is to remove its execute "
-#~ "permission. The best way to delete it is to purge the xisp package."
-#~ msgstr ""
-#~ "Byly rozpoznány neprázdné spustitelné skripty /etc/ppp/ip-up.d/0xisp-dns "
-#~ "a /etc/ppp/ip-down.d/0xisp-dns. Oba skripty musí být upraveny, zakázány "
-#~ "nebo smazány. Nejjednodušeji je zakážete tak, že jim zrušíte práva na "
-#~ "spouštění. Nejlepší cesta, jak se jich zbavit, je odstranění balíku xisp "
-#~ "s parametrem --purge."
-
-#~ msgid "Disable rogue hook scripts?"
-#~ msgstr "Zakázat nezbedné skripty?"
-
-#~ msgid ""
-#~ "Certain packages contain hook scripts which, contrary to Debian policy, "
-#~ "modify the resolver configuration file even when the packages that own "
-#~ "them are removed. Packages known to contain such rogue hook scripts are: "
-#~ "pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and "
-#~ "xisp. Although the resolvconf package is marked as conflicting with these "
-#~ "packages so that they are removed before resolvconf is installed, their "
-#~ "rogue hook scripts may remain behind."
-#~ msgstr ""
-#~ "Určité balíky obsahují skripty, které, v rozporu s politikou Debianu, "
-#~ "mění konfigurační soubor resolveru i když už jsou balíky, jež je vlastní, "
-#~ "odstraněny. Mezi takové balíky patří pppconfig (<< 2.2.0 a 2.3), "
-#~ "pppoeconf (<< 1.0), totd (<< 1.4-4) a xisp. Přestože je balík resolvconf "
-#~ "označen jako konfliktní se zmíněnými balíky, tudíž bude nainstalován až "
-#~ "po jejich odstranění, v systému stále mohou zůstat nezbedné skripty."
-
-#~ msgid ""
-#~ "If you agree then the post-installation process will disable rogue hook "
-#~ "scripts by removing their execute permissions."
-#~ msgstr ""
-#~ "Budete-li souhlasit, poinstalační proces zakáže pozůstalé skripty tím, že "
-#~ "jim odebere právo spouštění."
-
-#~ msgid ""
-#~ "If you do not agree then you should disable the rogue scripts manually, "
-#~ "otherwise resolvconf will not work properly."
-#~ msgstr ""
-#~ "Jestliže nebudete souhlasit, měli byste nezbedné skripty zakázat ručně, "
-#~ "protože jinak nebude resolvconf pracovat správně."
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr "Je přítomen PPP skript balíku pppconfig"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+"Některé verze balíku pppconfig obsahují skripty /etc/ppp/ip-up.d/0dns-up a /"
+"etc/ppp/ip-down.d/0dns-down (spouští je pppd poté, co je PPP rozhraní "
+"nahozeno resp. shozeno), které přepisují /etc/resolv.conf. Tyto skripty musí "
+"být upraveny, zakázány nebo smazány, aby nekolidovaly s činností programu "
+"resolvconf."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+"Byl rozpoznán neprázdný spustitelný skript /etc/ppp/ip-up.d/0dns-up a/nebo /"
+"etc/ppp/ip-down.d/0dns-down, který vypadá, že přepisuje /etc/resolv.conf. "
+"Každý takový skript musí být upraven, zakázán nebo smazán. Nejjednodušeji ho "
+"zakážete tak, že mu zrušíte práva na spouštění. Nejlepší cesta, jak se ho "
+"zbavit, je odstranění balíku pppconfig s parametrem --purge."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr "Je přítomen PPP skript balíku pppoeconf"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+"Dřívější verze balíku pppoeconf obsahují skript /etc/ppp/ip-up."
+"d/000usepeerdns (spouští jej pppd poté, co je PPP rozhraní nahozeno), který "
+"přepisuje soubor /etc/resolv.conf. Skript musí být upraven, zakázán nebo "
+"smazán, aby nekolidoval s činností programu resolvconf. V rozporu s "
+"politikou Debianu prosté odstranění balíku pppoeconf tento skript nezakáže."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+"Byl rozpoznán neprázdný spustitelný skript /etc/ppp/ip-up.d/000usepeerdns. "
+"Tento skript musí být upraven, zakázán nebo smazán. Nejjednodušeji jej "
+"upravíte tak, že aktualizujete balík pppoeconf na verzi 1.0 nebo pozdější a "
+"povolíte dpkg, aby nainstaloval novou verzi skriptu. Zakázání skriptu "
+"dosáhnete tak, že mu zrušíte práva na spouštění. Nejlepší cesta, jak se "
+"skriptu zbavit, je odstranění balíku pppoeconf s parametrem --purge."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr "Je přítomen PPP skript balíku xisp"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+"Balík xisp obsahuje skripty /etc/ppp/ip-up.d/0xisp-dns a /etc/ppp/ip-down."
+"d/0xisp-dns (spouští je pppd poté, co je PPP rozhraní nahozeno resp. "
+"shozeno), které přepisují /etc/resolv.conf. Tyto skripty musí být upraveny, "
+"zakázány nebo smazány, aby nekolidovaly s činností programu resolvconf. V "
+"rozporu s politikou Debianu prosté odstranění balíku xisp tyto skripty "
+"nezakáže."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+"Byly rozpoznány neprázdné spustitelné skripty /etc/ppp/ip-up.d/0xisp-dns a /"
+"etc/ppp/ip-down.d/0xisp-dns. Oba skripty musí být upraveny, zakázány nebo "
+"smazány. Nejjednodušeji je zakážete tak, že jim zrušíte práva na spouštění. "
+"Nejlepší cesta, jak se jich zbavit, je odstranění balíku xisp s parametrem --"
+"purge."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr "Zakázat nezbedné skripty?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+"Určité balíky obsahují skripty, které, v rozporu s politikou Debianu, mění "
+"konfigurační soubor resolveru i když už jsou balíky, jež je vlastní, "
+"odstraněny. Mezi takové balíky patří pppconfig (<< 2.2.0 a 2.3), pppoeconf "
+"(<< 1.0), totd (<< 1.4-4) a xisp. Přestože je balík resolvconf označen jako "
+"konfliktní se zmíněnými balíky, tudíž bude nainstalován až po jejich "
+"odstranění, v systému stále mohou zůstat nezbedné skripty."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+"Budete-li souhlasit, poinstalační proces zakáže pozůstalé skripty tím, že "
+"jim odebere právo spouštění."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr ""
+"Jestliže nebudete souhlasit, měli byste nezbedné skripty zakázat ručně, "
+"protože jinak nebude resolvconf pracovat správně."
diff -Nru resolvconf-1.38/debian/po/de.po resolvconf-1.38ubuntu1/debian/po/de.po
--- resolvconf-1.38/debian/po/de.po	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/de.po	2008-01-08 23:45:32.000000000 +0100
@@ -162,135 +162,173 @@
 "nameservers\"-Zeile einzuf�gen sollten Sie den symbolischen Link von /etc/"
 "resolvconf/resolv.conf.d/tail auf /dev/null zeigen lassen."
 
-#~ msgid "A rogue pppconfig PPP hook script is present"
-#~ msgstr "Ein vandalierendes pppconfig-PPP-Einh�ng-Skript ist vorhanden"
-
-#~ msgid ""
-#~ "Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
-#~ "d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
-#~ "interface is brought up or down) that overwrite /etc/resolv.conf. These "
-#~ "scripts must be modified, disabled or deleted so that they will not "
-#~ "interfere with the operation of resolvconf."
-#~ msgstr ""
-#~ "Bestimmte Versionen des pppconfig-Paketes enthalten die Skripte /etc/ppp/"
-#~ "ip-up.d/0dns-up und /etc/ppp/ip-down.d/0dns-down (welche vom pppd "
-#~ "ausgef�hrt werden, nachdem die PPP-Schnittstelle hoch oder runtergefahren "
-#~ "wurde) die /etc/resolv.conf �berschreiben. Diese Skripte m�ssen "
-#~ "modifiziert, deaktiviert oder gel�scht werden, so da� sie nicht mit der "
-#~ "Arbeit von resolvconf interferieren."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
-#~ "down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
-#~ "conf. Each one that does so must be modified, disabled or deleted. The "
-#~ "best way to disable it is to remove its execute permission. The best way "
-#~ "to delete it is to purge the pppconfig package."
-#~ msgstr ""
-#~ "Ein nicht-leeres, ausf�hrbares Skript /etc/ppp/ip-up.d/0dns-up und/oder /"
-#~ "etc/ppp/ip-down.d/0dns-down wurde erkannt, das /etc/resolv.conf zu "
-#~ "�berschreiben scheint. Jedes das dies macht, mu� modifiziert, deaktiviert "
-#~ "oder gel�scht werden. Der beste Weg es zu deaktivieren, ist es, das "
-#~ "Ausf�hrrecht zu entfernen. Der beste Weg es zu l�schen, ist es, das "
-#~ "pppconfig-Paket komplett zu l�schen."
-
-#~ msgid "A rogue pppoeconf PPP hook script is present"
-#~ msgstr "Ein vandalierendes pppoeconf-PPP-Einh�ng-Skript ist vorhanden"
-
-#~ msgid ""
-#~ "Versions of the pppoeconf package prior to version 1.0 contain a script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is "
-#~ "brought up) that overwrites /etc/resolv.conf. The script must be "
-#~ "modified, disabled or deleted so that it will not interfere with the "
-#~ "operation of resolvconf. Contrary to Debian policy, merely removing the "
-#~ "pppoeconf package does not disable the script."
-#~ msgstr ""
-#~ "Versionen des pppoeconf-Paketes vor Version 1.0 enthalten ein Skript /etc/"
-#~ "ppp/ip-up.d/000usepeerdns (welches vom pppd ausgef�hrt wird, nachdem die "
-#~ "PPP-Schnittstelle hochgefahren wurde) das /etc/resolv.conf �berschreibt.  "
-#~ "Das Skript mu� modifiziert, deaktiviert oder gel�scht werden, so das es "
-#~ "nicht mit der Arbeit von resolvconf interferiert. Entgegen den Debian-"
-#~ "Richtlinien reicht das Entfernen des Pakets nicht aus, um das Skript zu "
-#~ "deaktivieren."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
-#~ "detected. It must be modified, disabled or deleted. The best way to "
-#~ "modify it is to upgrade the pppoeconf package to version 1.0 or later and "
-#~ "to allow dpkg to install the new version of the script. The best way to "
-#~ "disable it is to remove its execute permission. The best way to delete it "
-#~ "is to purge the pppoeconf package."
-#~ msgstr ""
-#~ "Ein nicht-leeres, ausf�hrbares Skript /etc/ppp/ip-up.d/000usepeerdns "
-#~ "wurde erkannt. Es mu� modifiziert, deaktiviert oder gel�scht werden. Der "
-#~ "beste Weg es zu modifizieren, ist pppoeconf auf Version 1.0 oder Neuer zu "
-#~ "aktualisieren und dpkg zu erlauben, die neue Version des Skriptes zu "
-#~ "installieren. Der beste Weg es zu deaktivieren, ist es, das Auff�hrrecht "
-#~ "zu entfernen. Der beste Weg es zu l�schen, ist es, das pppoeconf-Paket "
-#~ "komplett zu l�schen."
-
-#~ msgid "A rogue xisp PPP hook script is present"
-#~ msgstr "Ein vandalierendes xisp-PPP-Einh�ng-Skript ist vorhanden"
-
-#~ msgid ""
-#~ "The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (run by pppd after a PPP interface is brought up or "
-#~ "down) that overwrite /etc/resolv.conf. The scripts must be modified, "
-#~ "disabled or deleted so that they will not interfere with the operation of "
-#~ "resolvconf. Contrary to Debian policy, merely removing the xisp package "
-#~ "does not disable the scripts."
-#~ msgstr ""
-#~ "Das xisp-Paket enth�lt die Skripte /etc/ppp/ip-up.d/0xisp-dns und /etc/"
-#~ "ppp/ip-down.d/0xisp-dns (welche vom pppd ausgef�hrt werden, nachdem die "
-#~ "PPP-Schnittstelle hoch oder runtergefahren wurde) die /etc/resolv.conf "
-#~ "�berschreiben. Die Skripte m�ssen modifiziert, deaktiviert oder gel�scht "
-#~ "werden, so da� sie nicht mit der Arbeit von resolvconf interferieren. "
-#~ "Entgegen den Debian-Richtlinien reicht das Entfernen des Pakets nicht "
-#~ "aus, um die Skripte zu deaktivieren."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/"
-#~ "ip-down.d/0xisp-dns has been detected. Each one must be modified, "
-#~ "disabled or deleted. The best way to disable it is to remove its execute "
-#~ "permission. The best way to delete it is to purge the xisp package."
-#~ msgstr ""
-#~ "Ein nicht-leeres, ausf�hrbares Skript /etc/ppp/ip-up.d/0xisp-dns und/"
-#~ "oder /etc/ppp/ip-down.d/0xisp-dns wurde erkannt. Jedes davon mu� "
-#~ "modifiziert, deaktiviert oder gel�scht werden. Der beste Weg es zu "
-#~ "deaktivieren, ist es, das Ausf�hrrecht zu entfernen. Der beste Weg es zu "
-#~ "l�schen, ist es, das xisp-Paket komplett zu l�schen."
-
-#~ msgid "Disable rogue hook scripts?"
-#~ msgstr "Vandalierende Einh�ng-Skripte deaktivieren?"
-
-#~ msgid ""
-#~ "Certain packages contain hook scripts which, contrary to Debian policy, "
-#~ "modify the resolver configuration file even when the packages that own "
-#~ "them are removed. Packages known to contain such rogue hook scripts are: "
-#~ "pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and "
-#~ "xisp. Although the resolvconf package is marked as conflicting with these "
-#~ "packages so that they are removed before resolvconf is installed, their "
-#~ "rogue hook scripts may remain behind."
-#~ msgstr ""
-#~ "Einige Pakete enthalten Einh�ng-Skripte, die entgegen den Debian-"
-#~ "Richtlinien die resolver-Konfigurationsdateien selbst dann ver�ndern, "
-#~ "wenn die Pakete, zu denen sie geh�ren, entfernt w�rden. Pakete, von denen "
-#~ "solche vandalierende Einh�ng-Skripte bekannt sind, sind: pppconfig (<< "
-#~ "2.2.0 und 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) und xisp. Obwohl das "
-#~ "resolvconf-Paket als Konflikt zu diesen gekennzeichnet ist, so da� diese "
-#~ "vor der Installation von resolvconf entfernt werden, k�nnen ihre "
-#~ "vandalierende Einh�ng-Skripte zur�ckbleiben."
-
-#~ msgid ""
-#~ "If you agree then the post-installation process will disable rogue hook "
-#~ "scripts by removing their execute permissions."
-#~ msgstr ""
-#~ "Falls Sie dem zustimmen, wird der Post-Installationsprozess diese "
-#~ "vandalierende Einh�ng-Skripte durch entfernen ihrer Ausf�hrrechte "
-#~ "deaktivieren."
-
-#~ msgid ""
-#~ "If you do not agree then you should disable the rogue scripts manually, "
-#~ "otherwise resolvconf will not work properly."
-#~ msgstr ""
-#~ "Falls Sie nicht zustimmen, sollten Sie die vandalierende Skripte manuell "
-#~ "deaktivieren da andernfalls resolvconf nicht korrekt funktionieren wird."
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr "Ein vandalierendes pppconfig-PPP-Einh�ng-Skript ist vorhanden"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+"Bestimmte Versionen des pppconfig-Paketes enthalten die Skripte /etc/ppp/ip-"
+"up.d/0dns-up und /etc/ppp/ip-down.d/0dns-down (welche vom pppd ausgef�hrt "
+"werden, nachdem die PPP-Schnittstelle hoch oder runtergefahren wurde) die /"
+"etc/resolv.conf �berschreiben. Diese Skripte m�ssen modifiziert, deaktiviert "
+"oder gel�scht werden, so da� sie nicht mit der Arbeit von resolvconf "
+"interferieren."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+"Ein nicht-leeres, ausf�hrbares Skript /etc/ppp/ip-up.d/0dns-up und/oder /etc/"
+"ppp/ip-down.d/0dns-down wurde erkannt, das /etc/resolv.conf zu �berschreiben "
+"scheint. Jedes das dies macht, mu� modifiziert, deaktiviert oder gel�scht "
+"werden. Der beste Weg es zu deaktivieren, ist es, das Ausf�hrrecht zu "
+"entfernen. Der beste Weg es zu l�schen, ist es, das pppconfig-Paket komplett "
+"zu l�schen."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr "Ein vandalierendes pppoeconf-PPP-Einh�ng-Skript ist vorhanden"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+"Versionen des pppoeconf-Paketes vor Version 1.0 enthalten ein Skript /etc/"
+"ppp/ip-up.d/000usepeerdns (welches vom pppd ausgef�hrt wird, nachdem die PPP-"
+"Schnittstelle hochgefahren wurde) das /etc/resolv.conf �berschreibt.  Das "
+"Skript mu� modifiziert, deaktiviert oder gel�scht werden, so das es nicht "
+"mit der Arbeit von resolvconf interferiert. Entgegen den Debian-Richtlinien "
+"reicht das Entfernen des Pakets nicht aus, um das Skript zu deaktivieren."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+"Ein nicht-leeres, ausf�hrbares Skript /etc/ppp/ip-up.d/000usepeerdns wurde "
+"erkannt. Es mu� modifiziert, deaktiviert oder gel�scht werden. Der beste Weg "
+"es zu modifizieren, ist pppoeconf auf Version 1.0 oder Neuer zu "
+"aktualisieren und dpkg zu erlauben, die neue Version des Skriptes zu "
+"installieren. Der beste Weg es zu deaktivieren, ist es, das Auff�hrrecht zu "
+"entfernen. Der beste Weg es zu l�schen, ist es, das pppoeconf-Paket komplett "
+"zu l�schen."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr "Ein vandalierendes xisp-PPP-Einh�ng-Skript ist vorhanden"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+"Das xisp-Paket enth�lt die Skripte /etc/ppp/ip-up.d/0xisp-dns und /etc/ppp/"
+"ip-down.d/0xisp-dns (welche vom pppd ausgef�hrt werden, nachdem die PPP-"
+"Schnittstelle hoch oder runtergefahren wurde) die /etc/resolv.conf "
+"�berschreiben. Die Skripte m�ssen modifiziert, deaktiviert oder gel�scht "
+"werden, so da� sie nicht mit der Arbeit von resolvconf interferieren. "
+"Entgegen den Debian-Richtlinien reicht das Entfernen des Pakets nicht aus, "
+"um die Skripte zu deaktivieren."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+"Ein nicht-leeres, ausf�hrbares Skript /etc/ppp/ip-up.d/0xisp-dns und/oder /"
+"etc/ppp/ip-down.d/0xisp-dns wurde erkannt. Jedes davon mu� modifiziert, "
+"deaktiviert oder gel�scht werden. Der beste Weg es zu deaktivieren, ist es, "
+"das Ausf�hrrecht zu entfernen. Der beste Weg es zu l�schen, ist es, das xisp-"
+"Paket komplett zu l�schen."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr "Vandalierende Einh�ng-Skripte deaktivieren?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+"Einige Pakete enthalten Einh�ng-Skripte, die entgegen den Debian-Richtlinien "
+"die resolver-Konfigurationsdateien selbst dann ver�ndern, wenn die Pakete, "
+"zu denen sie geh�ren, entfernt w�rden. Pakete, von denen solche "
+"vandalierende Einh�ng-Skripte bekannt sind, sind: pppconfig (<< 2.2.0 und "
+"2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) und xisp. Obwohl das resolvconf-"
+"Paket als Konflikt zu diesen gekennzeichnet ist, so da� diese vor der "
+"Installation von resolvconf entfernt werden, k�nnen ihre vandalierende "
+"Einh�ng-Skripte zur�ckbleiben."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+"Falls Sie dem zustimmen, wird der Post-Installationsprozess diese "
+"vandalierende Einh�ng-Skripte durch entfernen ihrer Ausf�hrrechte "
+"deaktivieren."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr ""
+"Falls Sie nicht zustimmen, sollten Sie die vandalierende Skripte manuell "
+"deaktivieren da andernfalls resolvconf nicht korrekt funktionieren wird."
diff -Nru resolvconf-1.38/debian/po/es.po resolvconf-1.38ubuntu1/debian/po/es.po
--- resolvconf-1.38/debian/po/es.po	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/es.po	2008-01-08 23:45:32.000000000 +0100
@@ -181,134 +181,172 @@
 "a�adido las l�neas �dns-nameservers� que sean necesarias."
 
 # hook script? programa �anzuelo� ? o gui�n de arranqe?
-#~ msgid "A rogue pppconfig PPP hook script is present"
-#~ msgstr "Se ha encontrado un programa �anzuelo� PPP de pppconfig"
-
-#~ msgid ""
-#~ "Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
-#~ "d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
-#~ "interface is brought up or down) that overwrite /etc/resolv.conf. These "
-#~ "scripts must be modified, disabled or deleted so that they will not "
-#~ "interfere with the operation of resolvconf."
-#~ msgstr ""
-#~ "Algunas versiones del paquete pppconfig incluyen los programas �/etc/ppp/"
-#~ "ip-up.d/0dns-up� y �/etc/ppp/ip-down.d/0dns-down� (para que los ejecute "
-#~ "pppd despu�s de que una interfaz PPP se haya activado o desactivado) que "
-#~ "sobreescriben el fichero �/etc/resolv.conf�. Estos programas deben "
-#~ "modificarse, deshabilitarse o borrarse para que no interfieran con el "
-#~ "mecanismo de operaci�n de resolvconf."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
-#~ "down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
-#~ "conf. Each one that does so must be modified, disabled or deleted. The "
-#~ "best way to disable it is to remove its execute permission. The best way "
-#~ "to delete it is to purge the pppconfig package."
-#~ msgstr ""
-#~ "Se ha detectado un programa ejecutable y no vac�o �/etc/ppp/ip-up.d/0dns-"
-#~ "up� y/o �/etc/ppp/ip-down.d/0dns-down� que parece que sobreescribe/n �/"
-#~ "etc/resolv.conf�. Debe modificarse, deshabilitarse o borrarse cada "
-#~ "programa que hace esto. La mejor forma de deshabilitarlos es quitar los "
-#~ "permisos de ejecuci�n al programa. La mejor forma de borrarlos es purgar "
-#~ "el paquete pppconfig."
-
-#~ msgid "A rogue pppoeconf PPP hook script is present"
-#~ msgstr "Se ha encontrado un programa �anzuelo� PPP de pppoeconf"
-
-#~ msgid ""
-#~ "Versions of the pppoeconf package prior to version 1.0 contain a script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is "
-#~ "brought up) that overwrites /etc/resolv.conf. The script must be "
-#~ "modified, disabled or deleted so that it will not interfere with the "
-#~ "operation of resolvconf. Contrary to Debian policy, merely removing the "
-#~ "pppoeconf package does not disable the script."
-#~ msgstr ""
-#~ "Las versiones del paquete pppoeconf anteriores a la versi�n 1.0 inclu�an "
-#~ "un programas �/etc/ppp/ip-up.d/000usepeerdns� (ejecutado por pppd despu�s "
-#~ "de que una interfaz PPP se activara) que sobreescribe el fichero �/etc/"
-#~ "resolv.conf�. Este programa debe modificarse, deshabilitarse o borrarse "
-#~ "para que no interfiera con el mecanismo de operaci�n de resolvconf. "
-#~ "Aunque es lo opuesto a lo que manda la normativa de Debian, no basta con "
-#~ "borrar simplemente el paquete pppoeconf para deshabilitar el programa."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
-#~ "detected. It must be modified, disabled or deleted. The best way to "
-#~ "modify it is to upgrade the pppoeconf package to version 1.0 or later and "
-#~ "to allow dpkg to install the new version of the script. The best way to "
-#~ "disable it is to remove its execute permission. The best way to delete it "
-#~ "is to purge the pppoeconf package."
-#~ msgstr ""
-#~ "Se ha detectado un programa ejecutable y no vac�o �/etc/ppp/ip-up."
-#~ "d/000usepeerdns�. Debe modificarse, deshabilitarse o borrarse.. La mejor "
-#~ "forma de modificarlo es actualizar el paquete pppoeconf a la versi�n 1.0 "
-#~ "o posterior y permitir que el programa sea sobrescrito por dpkg. La mejor "
-#~ "forma de deshabilitarlo es eliminar el permiso de ejecuci�n del programa. "
-#~ "La mejor forma de borrarlo es purgar el paquete pppoeconf."
-
-#~ msgid "A rogue xisp PPP hook script is present"
-#~ msgstr "Se ha detectado un programa �anzuelo� PPP de xisp"
-
-#~ msgid ""
-#~ "The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (run by pppd after a PPP interface is brought up or "
-#~ "down) that overwrite /etc/resolv.conf. The scripts must be modified, "
-#~ "disabled or deleted so that they will not interfere with the operation of "
-#~ "resolvconf. Contrary to Debian policy, merely removing the xisp package "
-#~ "does not disable the scripts."
-#~ msgstr ""
-#~ "El paquete xisp incluye los programas �/etc/ppp/ip-up.d/0xisp-up� y �/etc/"
-#~ "ppp/ip-down.d/0xisp-down� (para que los ejecute pppd despu�s de que una "
-#~ "interfaz PPP se haya activado o desactivado) que sobreescriben el fichero "
-#~ "�/etc/resolv.conf�. Estos programas deben modificarse, deshabilitarse o "
-#~ "borrarse para que no interfieran con el mecanismo de operaci�n de "
-#~ "resolvconf. Aunque es lo opuesto a lo que manda la normativa de Debian, "
-#~ "no basta con borrar simplemente el paquete xisp para deshabilitar los "
-#~ "programas."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/"
-#~ "ip-down.d/0xisp-dns has been detected. Each one must be modified, "
-#~ "disabled or deleted. The best way to disable it is to remove its execute "
-#~ "permission. The best way to delete it is to purge the xisp package."
-#~ msgstr ""
-#~ "Se ha detectado un programa ejecutable y no vac�o �/etc/ppp/ip-up.d/0xisp-"
-#~ "up� y/o �/etc/ppp/ip-down.d/0xisp-down�. Cada programa debe modificarse, "
-#~ "deshabilitarse o borrarse. La mejor forma de deshabilitarlos es quitar "
-#~ "los permisos de ejecuci�n al programa. La mejor forma de borrarlos es "
-#~ "purgar el paquete xisp."
-
-#~ msgid "Disable rogue hook scripts?"
-#~ msgstr "�Deshabilitar los programas �anzuelo�?"
-
-#~ msgid ""
-#~ "Certain packages contain hook scripts which, contrary to Debian policy, "
-#~ "modify the resolver configuration file even when the packages that own "
-#~ "them are removed. Packages known to contain such rogue hook scripts are: "
-#~ "pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and "
-#~ "xisp. Although the resolvconf package is marked as conflicting with these "
-#~ "packages so that they are removed before resolvconf is installed, their "
-#~ "rogue hook scripts may remain behind."
-#~ msgstr ""
-#~ "Algunos paquetes contienen programas �anzuelo� que, en contra de la "
-#~ "normativa de Debian, modifican la configuraci�n del archivo de resoluci�n "
-#~ "a�n cuando los propios paquetes se han eliminado. Los paquetes que se "
-#~ "sabe que contienen este tipo de programas �anzuelo� son: pppconfig (<< "
-#~ "2.2.0 y 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) y xisp. Si bien el "
-#~ "paquete de resolvconf entra en conflicto con estos paquetes de forma que "
-#~ "se eliminar�n antes de instalarle, es posible que sus programas �anzuelo� "
-#~ "permanezcan en el sistema."
-
-#~ msgid ""
-#~ "If you agree then the post-installation process will disable rogue hook "
-#~ "scripts by removing their execute permissions."
-#~ msgstr ""
-#~ "El proceso de postinstalaci�n deshabilitar� estos programas �anzuelo� "
-#~ "quitando los permisos de ejecuci�n si vd. est� de acuerdo."
-
-#~ msgid ""
-#~ "If you do not agree then you should disable the rogue scripts manually, "
-#~ "otherwise resolvconf will not work properly."
-#~ msgstr ""
-#~ "Si no est� de acuerdo, deber�a deshabilitar manualmente estos programas. "
-#~ "Si no lo hace resolvconf no podr� trabajar correctamente."
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr "Se ha encontrado un programa �anzuelo� PPP de pppconfig"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+"Algunas versiones del paquete pppconfig incluyen los programas �/etc/ppp/ip-"
+"up.d/0dns-up� y �/etc/ppp/ip-down.d/0dns-down� (para que los ejecute pppd "
+"despu�s de que una interfaz PPP se haya activado o desactivado) que "
+"sobreescriben el fichero �/etc/resolv.conf�. Estos programas deben "
+"modificarse, deshabilitarse o borrarse para que no interfieran con el "
+"mecanismo de operaci�n de resolvconf."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+"Se ha detectado un programa ejecutable y no vac�o �/etc/ppp/ip-up.d/0dns-up� "
+"y/o �/etc/ppp/ip-down.d/0dns-down� que parece que sobreescribe/n �/etc/"
+"resolv.conf�. Debe modificarse, deshabilitarse o borrarse cada programa que "
+"hace esto. La mejor forma de deshabilitarlos es quitar los permisos de "
+"ejecuci�n al programa. La mejor forma de borrarlos es purgar el paquete "
+"pppconfig."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr "Se ha encontrado un programa �anzuelo� PPP de pppoeconf"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+"Las versiones del paquete pppoeconf anteriores a la versi�n 1.0 inclu�an un "
+"programas �/etc/ppp/ip-up.d/000usepeerdns� (ejecutado por pppd despu�s de "
+"que una interfaz PPP se activara) que sobreescribe el fichero �/etc/resolv."
+"conf�. Este programa debe modificarse, deshabilitarse o borrarse para que no "
+"interfiera con el mecanismo de operaci�n de resolvconf. Aunque es lo opuesto "
+"a lo que manda la normativa de Debian, no basta con borrar simplemente el "
+"paquete pppoeconf para deshabilitar el programa."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+"Se ha detectado un programa ejecutable y no vac�o �/etc/ppp/ip-up."
+"d/000usepeerdns�. Debe modificarse, deshabilitarse o borrarse.. La mejor "
+"forma de modificarlo es actualizar el paquete pppoeconf a la versi�n 1.0 o "
+"posterior y permitir que el programa sea sobrescrito por dpkg. La mejor "
+"forma de deshabilitarlo es eliminar el permiso de ejecuci�n del programa. La "
+"mejor forma de borrarlo es purgar el paquete pppoeconf."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr "Se ha detectado un programa �anzuelo� PPP de xisp"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+"El paquete xisp incluye los programas �/etc/ppp/ip-up.d/0xisp-up� y �/etc/"
+"ppp/ip-down.d/0xisp-down� (para que los ejecute pppd despu�s de que una "
+"interfaz PPP se haya activado o desactivado) que sobreescriben el fichero �/"
+"etc/resolv.conf�. Estos programas deben modificarse, deshabilitarse o "
+"borrarse para que no interfieran con el mecanismo de operaci�n de "
+"resolvconf. Aunque es lo opuesto a lo que manda la normativa de Debian, no "
+"basta con borrar simplemente el paquete xisp para deshabilitar los programas."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+"Se ha detectado un programa ejecutable y no vac�o �/etc/ppp/ip-up.d/0xisp-"
+"up� y/o �/etc/ppp/ip-down.d/0xisp-down�. Cada programa debe modificarse, "
+"deshabilitarse o borrarse. La mejor forma de deshabilitarlos es quitar los "
+"permisos de ejecuci�n al programa. La mejor forma de borrarlos es purgar el "
+"paquete xisp."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr "�Deshabilitar los programas �anzuelo�?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+"Algunos paquetes contienen programas �anzuelo� que, en contra de la "
+"normativa de Debian, modifican la configuraci�n del archivo de resoluci�n "
+"a�n cuando los propios paquetes se han eliminado. Los paquetes que se sabe "
+"que contienen este tipo de programas �anzuelo� son: pppconfig (<< 2.2.0 y "
+"2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) y xisp. Si bien el paquete de "
+"resolvconf entra en conflicto con estos paquetes de forma que se eliminar�n "
+"antes de instalarle, es posible que sus programas �anzuelo� permanezcan en "
+"el sistema."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+"El proceso de postinstalaci�n deshabilitar� estos programas �anzuelo� "
+"quitando los permisos de ejecuci�n si vd. est� de acuerdo."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr ""
+"Si no est� de acuerdo, deber�a deshabilitar manualmente estos programas. Si "
+"no lo hace resolvconf no podr� trabajar correctamente."
diff -Nru resolvconf-1.38/debian/po/fr.po resolvconf-1.38ubuntu1/debian/po/fr.po
--- resolvconf-1.38/debian/po/fr.po	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/fr.po	2008-01-08 23:45:32.000000000 +0100
@@ -163,125 +163,162 @@
 "nameservers��, vous devriez faire pointer le lien symbolique /etc/resolvconf/"
 "resolv.conf.d/tail vers /dev/null."
 
-#~ msgid "A rogue pppconfig PPP hook script is present"
-#~ msgstr "Script de configuration PPP de pppconfig erron�"
-
-#~ msgid ""
-#~ "Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
-#~ "d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
-#~ "interface is brought up or down) that overwrite /etc/resolv.conf. These "
-#~ "scripts must be modified, disabled or deleted so that they will not "
-#~ "interfere with the operation of resolvconf."
-#~ msgstr ""
-#~ "Certaines versions du paquet pppconfig contiennent deux scripts /etc/ppp/"
-#~ "ip-up.d/0dns-up et /etc/ppp/ip-down.d/0dns-down (lanc�s par pppd d�s "
-#~ "qu'une interface PPP est d�marr�e) qui r��crivent le fichier /etc/resolv."
-#~ "conf. Ces scripts doivent donc �tre modifi�s, neutralis�s ou enlev�s afin "
-#~ "qu'il n'y ait aucune interf�rence avec l'intervention de resolvconf."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
-#~ "down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
-#~ "conf. Each one that does so must be modified, disabled or deleted. The "
-#~ "best way to disable it is to remove its execute permission. The best way "
-#~ "to delete it is to purge the pppconfig package."
-#~ msgstr ""
-#~ "Un script ex�cutable /etc/ppp/ip-up.d/0dns-up ou /etc/ppp/ip-down.d/0dns-"
-#~ "down a �t� d�tect� qui semble r��crire le fichier /etc/resolv.conf. "
-#~ "Chaque script qui fait cela doit �tre modifi�, d�sactiv� ou enlev�. La "
-#~ "meilleure fa�on de le d�sactiver est d'enlever sa permission d'ex�cution. "
-#~ "La meilleure fa�on de le effacer est de purger le paquet pppconfig."
-
-#~ msgid "A rogue pppoeconf PPP hook script is present"
-#~ msgstr "Script de configuration PPP de pppoeconf erron�"
-
-#~ msgid ""
-#~ "Versions of the pppoeconf package prior to version 1.0 contain a script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is "
-#~ "brought up) that overwrites /etc/resolv.conf. The script must be "
-#~ "modified, disabled or deleted so that it will not interfere with the "
-#~ "operation of resolvconf. Contrary to Debian policy, merely removing the "
-#~ "pppoeconf package does not disable the script."
-#~ msgstr ""
-#~ "Le paquet pppoeconf ant�rieur � la version 1,0 contient un script /etc/"
-#~ "ppp/ip-up.d/000usepeerdns (lanc� par pppd d�s qu'une interface PPP est "
-#~ "d�marr�e) qui r��crit le fichier /etc/resolv.conf. Le script doit donc "
-#~ "�tre modifi�, neutralis� ou enlev� afin qu'il n'y ait aucune interf�rence "
-#~ "avec l'intervention de resolvconf. Contrairement � la charte Debian, une "
-#~ "simple suppression du paquet pppoeconf ne neutralise pas le script."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
-#~ "detected. It must be modified, disabled or deleted. The best way to "
-#~ "modify it is to upgrade the pppoeconf package to version 1.0 or later and "
-#~ "to allow dpkg to install the new version of the script. The best way to "
-#~ "disable it is to remove its execute permission. The best way to delete it "
-#~ "is to purge the pppoeconf package."
-#~ msgstr ""
-#~ "Un script ex�cutable /etc/ppp/ip-up.d/000usepeerdns a �t� d�tect�. Il "
-#~ "doit �tre modifi�, d�sactiv� ou enlev�. La meilleure fa�on de le modifier "
-#~ "est de mettre � jour le paquet pppoeconf vers la version 1.0 ou sup�rieur "
-#~ "et d'autoriser dpkg � installer la nouvelle version du script. La "
-#~ "meilleure fa�on de le d�sactiver est d'enlever sa permission d'ex�cution. "
-#~ "La meilleure fa�on d'enlever le script est de purger le paquet pppoeconf."
-
-#~ msgid "A rogue xisp PPP hook script is present"
-#~ msgstr "Script de configuration PPP de xisp erron�"
-
-#~ msgid ""
-#~ "The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (run by pppd after a PPP interface is brought up or "
-#~ "down) that overwrite /etc/resolv.conf. The scripts must be modified, "
-#~ "disabled or deleted so that they will not interfere with the operation of "
-#~ "resolvconf. Contrary to Debian policy, merely removing the xisp package "
-#~ "does not disable the scripts."
-#~ msgstr ""
-#~ "Le paquet xisp contient des scripts /etc/ppp/ip-up.d/0xisp-dns et /etc/"
-#~ "ppp/ip-down.d/0xisp-dns (d�marr�s par pppd d�s qu'une interface PPP est "
-#~ "d�marr�e) qui r��crivent le fichier /etc/resolv.conf. Ces scripts doivent "
-#~ "donc �tre modifi�s, neutralis�s ou enlev�s afin qu'il n'y ait aucune "
-#~ "interf�rence avec l'intervention de resolvconf. Contrairement � la charte "
-#~ "Debian, une simple suppression du paquet xisp ne neutralise pas le script."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/"
-#~ "ip-down.d/0xisp-dns has been detected. Each one must be modified, "
-#~ "disabled or deleted. The best way to disable it is to remove its execute "
-#~ "permission. The best way to delete it is to purge the xisp package."
-#~ msgstr ""
-#~ "Un script ex�cutable /etc/ppp/ip-up.d/0xisp-dns ou /etc/ppp/ip-down."
-#~ "d/0xisp-dns a �t� d�tect�. Il doit �tre modifi�, d�sactiv� ou enlev�. La "
-#~ "meilleure fa�on de le d�sactiver est d'enlever sa permission d'ex�cution. "
-#~ "La meilleure fa�on de le effacer est de purger le paquet xisp."
-
-#~ msgid "Disable rogue hook scripts?"
-#~ msgstr "Faut-il d�sactiver les scripts erron�s�?"
-
-#~ msgid ""
-#~ "Certain packages contain hook scripts which, contrary to Debian policy, "
-#~ "modify the resolver configuration file even when the packages that own "
-#~ "them are removed. Packages known to contain such rogue hook scripts are: "
-#~ "pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and "
-#~ "xisp. Although the resolvconf package is marked as conflicting with these "
-#~ "packages so that they are removed before resolvconf is installed, their "
-#~ "rogue hook scripts may remain behind."
-#~ msgstr ""
-#~ "Certains paquets contiennent des scripts contraires � la charte Debian. "
-#~ "Ils modifient le fichier de configuration du r�solveur m�me lorsque ces "
-#~ "paquets ont �t� enlev�s. Les paquets connus pour contenir de tels scripts "
-#~ "sont�: pppconfig (<< 2.2.0 et 2.3), ppoeconf (<< 1.0), totd (<< 1.4-4) et "
-#~ "xisp. Bien que le paquet resolvconf soit marqu� comme �tant en conflit "
-#~ "avec ces paquets, leurs scripts d�fectueux peuvent malgr� tout rester "
-#~ "pr�sents."
-
-#~ msgid ""
-#~ "If you agree then the post-installation process will disable rogue hook "
-#~ "scripts by removing their execute permissions."
-#~ msgstr ""
-#~ "Si vous �tes d'accord, le processus d'installation d�sactivera ces "
-#~ "scripts."
-
-#~ msgid ""
-#~ "If you do not agree then you should disable the rogue scripts manually, "
-#~ "otherwise resolvconf will not work properly."
-#~ msgstr "Dans le cas contraire, vous devrez les d�sactiver vous-m�mes."
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr "Script de configuration PPP de pppconfig erron�"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+"Certaines versions du paquet pppconfig contiennent deux scripts /etc/ppp/ip-"
+"up.d/0dns-up et /etc/ppp/ip-down.d/0dns-down (lanc�s par pppd d�s qu'une "
+"interface PPP est d�marr�e) qui r��crivent le fichier /etc/resolv.conf. Ces "
+"scripts doivent donc �tre modifi�s, neutralis�s ou enlev�s afin qu'il n'y "
+"ait aucune interf�rence avec l'intervention de resolvconf."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+"Un script ex�cutable /etc/ppp/ip-up.d/0dns-up ou /etc/ppp/ip-down.d/0dns-"
+"down a �t� d�tect� qui semble r��crire le fichier /etc/resolv.conf. Chaque "
+"script qui fait cela doit �tre modifi�, d�sactiv� ou enlev�. La meilleure "
+"fa�on de le d�sactiver est d'enlever sa permission d'ex�cution. La meilleure "
+"fa�on de le effacer est de purger le paquet pppconfig."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr "Script de configuration PPP de pppoeconf erron�"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+"Le paquet pppoeconf ant�rieur � la version 1,0 contient un script /etc/ppp/"
+"ip-up.d/000usepeerdns (lanc� par pppd d�s qu'une interface PPP est d�marr�e) "
+"qui r��crit le fichier /etc/resolv.conf. Le script doit donc �tre modifi�, "
+"neutralis� ou enlev� afin qu'il n'y ait aucune interf�rence avec "
+"l'intervention de resolvconf. Contrairement � la charte Debian, une simple "
+"suppression du paquet pppoeconf ne neutralise pas le script."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+"Un script ex�cutable /etc/ppp/ip-up.d/000usepeerdns a �t� d�tect�. Il doit "
+"�tre modifi�, d�sactiv� ou enlev�. La meilleure fa�on de le modifier est de "
+"mettre � jour le paquet pppoeconf vers la version 1.0 ou sup�rieur et "
+"d'autoriser dpkg � installer la nouvelle version du script. La meilleure "
+"fa�on de le d�sactiver est d'enlever sa permission d'ex�cution. La meilleure "
+"fa�on d'enlever le script est de purger le paquet pppoeconf."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr "Script de configuration PPP de xisp erron�"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+"Le paquet xisp contient des scripts /etc/ppp/ip-up.d/0xisp-dns et /etc/ppp/"
+"ip-down.d/0xisp-dns (d�marr�s par pppd d�s qu'une interface PPP est "
+"d�marr�e) qui r��crivent le fichier /etc/resolv.conf. Ces scripts doivent "
+"donc �tre modifi�s, neutralis�s ou enlev�s afin qu'il n'y ait aucune "
+"interf�rence avec l'intervention de resolvconf. Contrairement � la charte "
+"Debian, une simple suppression du paquet xisp ne neutralise pas le script."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+"Un script ex�cutable /etc/ppp/ip-up.d/0xisp-dns ou /etc/ppp/ip-down.d/0xisp-"
+"dns a �t� d�tect�. Il doit �tre modifi�, d�sactiv� ou enlev�. La meilleure "
+"fa�on de le d�sactiver est d'enlever sa permission d'ex�cution. La meilleure "
+"fa�on de le effacer est de purger le paquet xisp."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr "Faut-il d�sactiver les scripts erron�s�?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+"Certains paquets contiennent des scripts contraires � la charte Debian. Ils "
+"modifient le fichier de configuration du r�solveur m�me lorsque ces paquets "
+"ont �t� enlev�s. Les paquets connus pour contenir de tels scripts sont�: "
+"pppconfig (<< 2.2.0 et 2.3), ppoeconf (<< 1.0), totd (<< 1.4-4) et xisp. "
+"Bien que le paquet resolvconf soit marqu� comme �tant en conflit avec ces "
+"paquets, leurs scripts d�fectueux peuvent malgr� tout rester pr�sents."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+"Si vous �tes d'accord, le processus d'installation d�sactivera ces scripts."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr "Dans le cas contraire, vous devrez les d�sactiver vous-m�mes."
diff -Nru resolvconf-1.38/debian/po/ja.po resolvconf-1.38ubuntu1/debian/po/ja.po
--- resolvconf-1.38/debian/po/ja.po	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/ja.po	2008-01-08 23:45:33.000000000 +0100
@@ -155,130 +155,167 @@
 "クリンク /etc/resolvconf/resolv.conf.d/tail が /dev/null を指すようにする必要"
 "があります。"
 
-#~ msgid "A rogue pppconfig PPP hook script is present"
-#~ msgstr ""
-#~ "問題になりそうな pppconfig の PPP フックスクリプトが存在しています。"
-
-#~ msgid ""
-#~ "Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
-#~ "d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
-#~ "interface is brought up or down) that overwrite /etc/resolv.conf. These "
-#~ "scripts must be modified, disabled or deleted so that they will not "
-#~ "interfere with the operation of resolvconf."
-#~ msgstr ""
-#~ "ある特定バージョンの pppconfig パッケージは、/etc/resolv.conf を上書きす"
-#~ "る /etc/ppp/ip-up.d/0dns-up および /etc/ppp/ip-down.d/0dns-down スクリプト"
-#~ "を含んでいます。(これらは pppd によって PPP インターフェイスが開始または停"
-#~ "止する際に実行されます)。resolvconf の動作に干渉しないように、これらのスク"
-#~ "リプトは修正・無効化、あるいは削除を行う必要があります。"
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
-#~ "down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
-#~ "conf. Each one that does so must be modified, disabled or deleted. The "
-#~ "best way to disable it is to remove its execute permission. The best way "
-#~ "to delete it is to purge the pppconfig package."
-#~ msgstr ""
-#~ "/etc/resolv.conf を上書きするであろう、空でない実行可能なスクリプト /etc/"
-#~ "ppp/ip-up.d/0dns-up および /etc/ppp/ip-down.d/0dns-down が検出されました。"
-#~ "それぞれ、修正する・無効にする、あるいは削除を行う必要があります。無効にす"
-#~ "るのに最も良い方法は、実行権限を削除すること。そして、削除するのに最も良い"
-#~ "方法は、pppconfig パッケージを完全に削除 (purge) することです。"
-
-#~ msgid "A rogue pppoeconf PPP hook script is present"
-#~ msgstr "問題になりそうな pppoeconf の PPP フックスクリプトが存在しています"
-
-#~ msgid ""
-#~ "Versions of the pppoeconf package prior to version 1.0 contain a script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is "
-#~ "brought up) that overwrites /etc/resolv.conf. The script must be "
-#~ "modified, disabled or deleted so that it will not interfere with the "
-#~ "operation of resolvconf. Contrary to Debian policy, merely removing the "
-#~ "pppoeconf package does not disable the script."
-#~ msgstr ""
-#~ "バージョン 1.0 以前の pppoeconf パッケージは /etc/resolv.conf を上書きす"
-#~ "る /etc/ppp/ip-up.d/000usepeerdns スクリプトを含んでいます (これは、pppd "
-#~ "によって PPP インターフェイスが起動した後に実行されます)。resolvconf の動"
-#~ "作に干渉しないように、これらのスクリプトは修正・無効化、あるいは削除を行う"
-#~ "必要があります。Debian ポリシーに反して、単純に pppoeconf パッケージの削除"
-#~ "ではスクリプトは無効にされません。"
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
-#~ "detected. It must be modified, disabled or deleted. The best way to "
-#~ "modify it is to upgrade the pppoeconf package to version 1.0 or later and "
-#~ "to allow dpkg to install the new version of the script. The best way to "
-#~ "disable it is to remove its execute permission. The best way to delete it "
-#~ "is to purge the pppoeconf package."
-#~ msgstr ""
-#~ "空でない実行可能なスクリプト /etc/ppp/ip-up.d/000usepeerdns が検出されまし"
-#~ "た。これに対しては、修正する・無効にする、または削除を行う必要があります。"
-#~ "修正を行うのに最も良い方法は、pppoeconf パッケージをバージョン 1.0 以降に"
-#~ "アップグレードし、dpkg に新しいバージョンのスクリプトをインストールさせる"
-#~ "ことです。無効にするのに最も良い方法は、実行権限を削除すること。そして、削"
-#~ "除するのに最も良い方法は、pppoeconf パッケージを完全に削除 (purge) するこ"
-#~ "とです。"
-
-#~ msgid "A rogue xisp PPP hook script is present"
-#~ msgstr "問題になりそうな xisp の PPP フックスクリプトが存在しています。"
-
-#~ msgid ""
-#~ "The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (run by pppd after a PPP interface is brought up or "
-#~ "down) that overwrite /etc/resolv.conf. The scripts must be modified, "
-#~ "disabled or deleted so that they will not interfere with the operation of "
-#~ "resolvconf. Contrary to Debian policy, merely removing the xisp package "
-#~ "does not disable the scripts."
-#~ msgstr ""
-#~ "xisp パッケージは、/etc/resolv.conf を上書きする /etc/ppp/ip-up.d/0xisp-"
-#~ "dns および /etc/ppp/ip-down.d/0xisp-dns スクリプトを含んでいます (これら"
-#~ "は PPP インターフェイスが起動・停止された後に pppd によって実行されます)。"
-#~ "resolvconf の動作に干渉しないように、これらのスクリプトは修正・無効化、あ"
-#~ "るいは削除を行う必要があります。Debian ポリシーに反して、単純に xisp パッ"
-#~ "ケージの削除ではスクリプトは無効にされません。"
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/"
-#~ "ip-down.d/0xisp-dns has been detected. Each one must be modified, "
-#~ "disabled or deleted. The best way to disable it is to remove its execute "
-#~ "permission. The best way to delete it is to purge the xisp package."
-#~ msgstr ""
-#~ "空でない実行可能なスクリプト /etc/ppp/ip-up.d/0xisp-dns および /etc/ppp/"
-#~ "ip-down.d/0xisp-dns が検出されました。それぞれ、修正する・無効にする、ある"
-#~ "いは削除を行う必要があります。無効にするのに最も良い方法は、実行権限を削除"
-#~ "すること。そして、削除するのに最も良い方法は、xisp パッケージを完全に削除 "
-#~ "(purge) することです。"
-
-#~ msgid "Disable rogue hook scripts?"
-#~ msgstr "問題になりそうなフックスクリプトを無効にしますか?"
-
-#~ msgid ""
-#~ "Certain packages contain hook scripts which, contrary to Debian policy, "
-#~ "modify the resolver configuration file even when the packages that own "
-#~ "them are removed. Packages known to contain such rogue hook scripts are: "
-#~ "pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and "
-#~ "xisp. Although the resolvconf package is marked as conflicting with these "
-#~ "packages so that they are removed before resolvconf is installed, their "
-#~ "rogue hook scripts may remain behind."
-#~ msgstr ""
-#~ "フックスクリプトを含んでいる一部のパッケージは、Debian ポリシーに反し、ス"
-#~ "クリプトを含むパッケージが削除される際にリゾルバ設定ファイルを変更します。"
-#~ "そのような問題のあるスクリプトを含んでいるパッケージは pppconfig (<< "
-#~ "2.2.0 および 2.3)、pppoeconf (<< 1.0)、totd (<< 1.4-4)、そして xisp です。"
-#~ "resolvconf パッケージはこれらのパッケージと衝突 (conflict) するように設定"
-#~ "されているので、resolvconf がインストールされる前にこれらのパッケージは削"
-#~ "除されますが、問題のスクリプトは残ったままかもしれません。"
-
-#~ msgid ""
-#~ "If you agree then the post-installation process will disable rogue hook "
-#~ "scripts by removing their execute permissions."
-#~ msgstr ""
-#~ "ここで「はい」と答えると、問題になりそうなフックスクリプトを post-install "
-#~ "時に実行権限を取り去ることで無効にします。"
-
-#~ msgid ""
-#~ "If you do not agree then you should disable the rogue scripts manually, "
-#~ "otherwise resolvconf will not work properly."
-#~ msgstr ""
-#~ "「いいえ」と答えた場合は、問題になりそうなスクリプトを手動で無効にする必要"
-#~ "があります。さもなければ resolvconf は正しく動作しないでしょう。"
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr "問題になりそうな pppconfig の PPP フックスクリプトが存在しています。"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+"ある特定バージョンの pppconfig パッケージは、/etc/resolv.conf を上書きする /"
+"etc/ppp/ip-up.d/0dns-up および /etc/ppp/ip-down.d/0dns-down スクリプトを含ん"
+"でいます。(これらは pppd によって PPP インターフェイスが開始または停止する際"
+"に実行されます)。resolvconf の動作に干渉しないように、これらのスクリプトは修"
+"正・無効化、あるいは削除を行う必要があります。"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+"/etc/resolv.conf を上書きするであろう、空でない実行可能なスクリプト /etc/ppp/"
+"ip-up.d/0dns-up および /etc/ppp/ip-down.d/0dns-down が検出されました。それぞ"
+"れ、修正する・無効にする、あるいは削除を行う必要があります。無効にするのに最"
+"も良い方法は、実行権限を削除すること。そして、削除するのに最も良い方法は、"
+"pppconfig パッケージを完全に削除 (purge) することです。"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr "問題になりそうな pppoeconf の PPP フックスクリプトが存在しています"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+"バージョン 1.0 以前の pppoeconf パッケージは /etc/resolv.conf を上書きする /"
+"etc/ppp/ip-up.d/000usepeerdns スクリプトを含んでいます (これは、pppd によっ"
+"て PPP インターフェイスが起動した後に実行されます)。resolvconf の動作に干渉し"
+"ないように、これらのスクリプトは修正・無効化、あるいは削除を行う必要がありま"
+"す。Debian ポリシーに反して、単純に pppoeconf パッケージの削除ではスクリプト"
+"は無効にされません。"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+"空でない実行可能なスクリプト /etc/ppp/ip-up.d/000usepeerdns が検出されまし"
+"た。これに対しては、修正する・無効にする、または削除を行う必要があります。修"
+"正を行うのに最も良い方法は、pppoeconf パッケージをバージョン 1.0 以降にアップ"
+"グレードし、dpkg に新しいバージョンのスクリプトをインストールさせることです。"
+"無効にするのに最も良い方法は、実行権限を削除すること。そして、削除するのに最"
+"も良い方法は、pppoeconf パッケージを完全に削除 (purge) することです。"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr "問題になりそうな xisp の PPP フックスクリプトが存在しています。"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+"xisp パッケージは、/etc/resolv.conf を上書きする /etc/ppp/ip-up.d/0xisp-dns "
+"および /etc/ppp/ip-down.d/0xisp-dns スクリプトを含んでいます (これらは PPP イ"
+"ンターフェイスが起動・停止された後に pppd によって実行されます)。resolvconf "
+"の動作に干渉しないように、これらのスクリプトは修正・無効化、あるいは削除を行"
+"う必要があります。Debian ポリシーに反して、単純に xisp パッケージの削除ではス"
+"クリプトは無効にされません。"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+"空でない実行可能なスクリプト /etc/ppp/ip-up.d/0xisp-dns および /etc/ppp/ip-"
+"down.d/0xisp-dns が検出されました。それぞれ、修正する・無効にする、あるいは削"
+"除を行う必要があります。無効にするのに最も良い方法は、実行権限を削除するこ"
+"と。そして、削除するのに最も良い方法は、xisp パッケージを完全に削除 (purge) "
+"することです。"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr "問題になりそうなフックスクリプトを無効にしますか?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+"フックスクリプトを含んでいる一部のパッケージは、Debian ポリシーに反し、スクリ"
+"プトを含むパッケージが削除される際にリゾルバ設定ファイルを変更します。そのよ"
+"うな問題のあるスクリプトを含んでいるパッケージは pppconfig (<< 2.2.0 および "
+"2.3)、pppoeconf (<< 1.0)、totd (<< 1.4-4)、そして xisp です。resolvconf パッ"
+"ケージはこれらのパッケージと衝突 (conflict) するように設定されているので、"
+"resolvconf がインストールされる前にこれらのパッケージは削除されますが、問題の"
+"スクリプトは残ったままかもしれません。"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+"ここで「はい」と答えると、問題になりそうなフックスクリプトを post-install 時"
+"に実行権限を取り去ることで無効にします。"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr ""
+"「いいえ」と答えた場合は、問題になりそうなスクリプトを手動で無効にする必要が"
+"あります。さもなければ resolvconf は正しく動作しないでしょう。"
diff -Nru resolvconf-1.38/debian/po/nl.po resolvconf-1.38ubuntu1/debian/po/nl.po
--- resolvconf-1.38/debian/po/nl.po	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/nl.po	2008-01-08 23:45:33.000000000 +0100
@@ -162,133 +162,170 @@
 "nameservers\"-regels toe te voegen dient u de symbolische koppeling /etc/"
 "resolvconf/resolv.conf.d/tail naar /dev/null te laten wijzen."
 
-#~ msgid "A rogue pppconfig PPP hook script is present"
-#~ msgstr "Een schadelijk PPP-haak-script van pppconfig is aanwezig."
-
-#~ msgid ""
-#~ "Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
-#~ "d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
-#~ "interface is brought up or down) that overwrite /etc/resolv.conf. These "
-#~ "scripts must be modified, disabled or deleted so that they will not "
-#~ "interfere with the operation of resolvconf."
-#~ msgstr ""
-#~ "Bepaalde versies van het pakket pppconfig bevatten scripts /etc/ppp/ip-up."
-#~ "d/0dns-up en /etc/ppp/ip-down.d/0dns-down (die worden uitgevoerd door "
-#~ "pppd nadat een PPP-interface op of neer is gebracht) die /etc/resolv.conf "
-#~ "overschrijven. Deze scripts moeten dus worden aangepast, uitgezet of "
-#~ "verwijderd, zodat ze de werking van resolvconf niet verstoren."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
-#~ "down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
-#~ "conf. Each one that does so must be modified, disabled or deleted. The "
-#~ "best way to disable it is to remove its execute permission. The best way "
-#~ "to delete it is to purge the pppconfig package."
-#~ msgstr ""
-#~ "Er is een niet-leeg, uitvoerbaar script /etc/ppp/ip-up.d/0dns-up en/of /"
-#~ "etc/ppp/ip-down.d/0dns-down aangetroffen die schijnt /etc/resolv.conf "
-#~ "over te schrijven. Elk script die dat werkelijk doet dient te worden "
-#~ "aangepast, uitgezet of verwijderd. De beste manier om het script uit te "
-#~ "zetten is door zijn uitvoer-permissie te verwijderen. De beste manier om "
-#~ "het script te verwijderen is het pppconfig pakket te wissen (purge)."
-
-#~ msgid "A rogue pppoeconf PPP hook script is present"
-#~ msgstr "Een schadelijk PPP-haak-script van pppoeconf is aanwezig."
-
-#~ msgid ""
-#~ "Versions of the pppoeconf package prior to version 1.0 contain a script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is "
-#~ "brought up) that overwrites /etc/resolv.conf. The script must be "
-#~ "modified, disabled or deleted so that it will not interfere with the "
-#~ "operation of resolvconf. Contrary to Debian policy, merely removing the "
-#~ "pppoeconf package does not disable the script."
-#~ msgstr ""
-#~ "Versies van het pakket pppoeconf vroeger dan 1.0 bevatten het script /etc/"
-#~ "ppp/ip-up.d/000usepeerdns (dat wordt uitgevoerd door pppd nadat een PPP-"
-#~ "interface op is gebracht) dat /etc/resolv.conf overschrijft. Dit script "
-#~ "moet dus worden aangepast, uitgezet of verwijderd, zodat het de werking "
-#~ "van resolvconf niet verstoort. Ondanks dat Debian-beleid dit eist, zal "
-#~ "het verwijderen (remove) van het pakket pppoeconf dit script niet "
-#~ "uitzetten."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
-#~ "detected. It must be modified, disabled or deleted. The best way to "
-#~ "modify it is to upgrade the pppoeconf package to version 1.0 or later and "
-#~ "to allow dpkg to install the new version of the script. The best way to "
-#~ "disable it is to remove its execute permission. The best way to delete it "
-#~ "is to purge the pppoeconf package."
-#~ msgstr ""
-#~ "Er is een niet-leeg, uitvoerbaar script /etc/ppp/ip-up.d/000usepeerdns "
-#~ "aangetroffen. Het dient te worden aangepast, uitgezet of verwijderd. De "
-#~ "beste manier om het aan te passen is door het pakket pppoeconf op te "
-#~ "waarderen tot versie 1.0 of later en dpkg de nieuwste versies van dit "
-#~ "script te laten installeren. De beste manier om het script uit te zetten "
-#~ "is door zijn uitvoer-permissie te verwijderen. De beste manier om het "
-#~ "script te verwijderen is het pppoeconf pakket te wissen (purge)."
-
-#~ msgid "A rogue xisp PPP hook script is present"
-#~ msgstr "Een schadelijk PPP-haak-script van xisp is aanwezig."
-
-#~ msgid ""
-#~ "The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (run by pppd after a PPP interface is brought up or "
-#~ "down) that overwrite /etc/resolv.conf. The scripts must be modified, "
-#~ "disabled or deleted so that they will not interfere with the operation of "
-#~ "resolvconf. Contrary to Debian policy, merely removing the xisp package "
-#~ "does not disable the scripts."
-#~ msgstr ""
-#~ "Het pakket xisp bevat de scripts /etc/ppp/ip-up.d/0xisp-dns en /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (die worden uitgevoerd door pppd nadat een PPP-"
-#~ "interface op of neer is gebracht) die /etc/resolv.conf overschrijven. "
-#~ "Deze scripts moeten dus worden aangepast, uitgezet of verwijderd, zodat "
-#~ "ze de werking van resolvconf niet verstoren. Ondanks dat Debian-beleid "
-#~ "dit eist, zal het verwijderen (remove) van het pakket xisp deze scripts "
-#~ "niet uitzetten."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/"
-#~ "ip-down.d/0xisp-dns has been detected. Each one must be modified, "
-#~ "disabled or deleted. The best way to disable it is to remove its execute "
-#~ "permission. The best way to delete it is to purge the xisp package."
-#~ msgstr ""
-#~ "Er is een niet-leeg, uitvoerbaar script /etc/ppp/ip-up.d/0xisp-dns en/of /"
-#~ "etc/ppp/ip-down.d/0xisp-dns aangetroffen. Deze scripts dienen te worden "
-#~ "aangepast, uitgezet of verwijderd. De beste manier om het script uit te "
-#~ "zetten is door zijn uitvoer-permissie te verwijderen. De beste manier om "
-#~ "het script te verwijderen is het xisp pakket te wissen (purge)."
-
-#~ msgid "Disable rogue hook scripts?"
-#~ msgstr "Zet schadelijke haak-scripts uit?"
-
-#~ msgid ""
-#~ "Certain packages contain hook scripts which, contrary to Debian policy, "
-#~ "modify the resolver configuration file even when the packages that own "
-#~ "them are removed. Packages known to contain such rogue hook scripts are: "
-#~ "pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and "
-#~ "xisp. Although the resolvconf package is marked as conflicting with these "
-#~ "packages so that they are removed before resolvconf is installed, their "
-#~ "rogue hook scripts may remain behind."
-#~ msgstr ""
-#~ "Sommige pakketten bevatten haak-scripts die, in strijd met Debian-beleid, "
-#~ "de resolver-configuratiebestanden wijzigen zelfs als de pakketten die ze "
-#~ "hebben ge�nstalleerd zijn verwijderd. Pakketten waarvan bekend zijn dat "
-#~ "ze zulke scripts bevatten zijn: pppconfig (<< 2.2.0 en 2.3), pppoeconf "
-#~ "(<< 1.0), totd (<< 1.4-4) en xisp. Ondanks het feit dat resolvconf "
-#~ "aangeeft dat het strijdig is met deze pakketten, zodat ze worden "
-#~ "verwijderd voordat resolvconf wordt ge�nstalleerd, blijven de schadelijke "
-#~ "haak-scripts soms achter."
-
-#~ msgid ""
-#~ "If you agree then the post-installation process will disable rogue hook "
-#~ "scripts by removing their execute permissions."
-#~ msgstr ""
-#~ "Als u toestemt dan zal het post-installatieproces de schadelijke haak-"
-#~ "scripts uitzetten door hun uitvoer-permissies te verwijderen."
-
-#~ msgid ""
-#~ "If you do not agree then you should disable the rogue scripts manually, "
-#~ "otherwise resolvconf will not work properly."
-#~ msgstr ""
-#~ "Als u niet toestemt dient u de schadelijke scripts handmatig te "
-#~ "verwijderen, anders zal resolvconf niet goed werken."
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr "Een schadelijk PPP-haak-script van pppconfig is aanwezig."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+"Bepaalde versies van het pakket pppconfig bevatten scripts /etc/ppp/ip-up."
+"d/0dns-up en /etc/ppp/ip-down.d/0dns-down (die worden uitgevoerd door pppd "
+"nadat een PPP-interface op of neer is gebracht) die /etc/resolv.conf "
+"overschrijven. Deze scripts moeten dus worden aangepast, uitgezet of "
+"verwijderd, zodat ze de werking van resolvconf niet verstoren."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+"Er is een niet-leeg, uitvoerbaar script /etc/ppp/ip-up.d/0dns-up en/of /etc/"
+"ppp/ip-down.d/0dns-down aangetroffen die schijnt /etc/resolv.conf over te "
+"schrijven. Elk script die dat werkelijk doet dient te worden aangepast, "
+"uitgezet of verwijderd. De beste manier om het script uit te zetten is door "
+"zijn uitvoer-permissie te verwijderen. De beste manier om het script te "
+"verwijderen is het pppconfig pakket te wissen (purge)."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr "Een schadelijk PPP-haak-script van pppoeconf is aanwezig."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+"Versies van het pakket pppoeconf vroeger dan 1.0 bevatten het script /etc/"
+"ppp/ip-up.d/000usepeerdns (dat wordt uitgevoerd door pppd nadat een PPP-"
+"interface op is gebracht) dat /etc/resolv.conf overschrijft. Dit script moet "
+"dus worden aangepast, uitgezet of verwijderd, zodat het de werking van "
+"resolvconf niet verstoort. Ondanks dat Debian-beleid dit eist, zal het "
+"verwijderen (remove) van het pakket pppoeconf dit script niet uitzetten."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+"Er is een niet-leeg, uitvoerbaar script /etc/ppp/ip-up.d/000usepeerdns "
+"aangetroffen. Het dient te worden aangepast, uitgezet of verwijderd. De "
+"beste manier om het aan te passen is door het pakket pppoeconf op te "
+"waarderen tot versie 1.0 of later en dpkg de nieuwste versies van dit script "
+"te laten installeren. De beste manier om het script uit te zetten is door "
+"zijn uitvoer-permissie te verwijderen. De beste manier om het script te "
+"verwijderen is het pppoeconf pakket te wissen (purge)."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr "Een schadelijk PPP-haak-script van xisp is aanwezig."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+"Het pakket xisp bevat de scripts /etc/ppp/ip-up.d/0xisp-dns en /etc/ppp/ip-"
+"down.d/0xisp-dns (die worden uitgevoerd door pppd nadat een PPP-interface op "
+"of neer is gebracht) die /etc/resolv.conf overschrijven. Deze scripts moeten "
+"dus worden aangepast, uitgezet of verwijderd, zodat ze de werking van "
+"resolvconf niet verstoren. Ondanks dat Debian-beleid dit eist, zal het "
+"verwijderen (remove) van het pakket xisp deze scripts niet uitzetten."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+"Er is een niet-leeg, uitvoerbaar script /etc/ppp/ip-up.d/0xisp-dns en/of /"
+"etc/ppp/ip-down.d/0xisp-dns aangetroffen. Deze scripts dienen te worden "
+"aangepast, uitgezet of verwijderd. De beste manier om het script uit te "
+"zetten is door zijn uitvoer-permissie te verwijderen. De beste manier om het "
+"script te verwijderen is het xisp pakket te wissen (purge)."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr "Zet schadelijke haak-scripts uit?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+"Sommige pakketten bevatten haak-scripts die, in strijd met Debian-beleid, de "
+"resolver-configuratiebestanden wijzigen zelfs als de pakketten die ze hebben "
+"ge�nstalleerd zijn verwijderd. Pakketten waarvan bekend zijn dat ze zulke "
+"scripts bevatten zijn: pppconfig (<< 2.2.0 en 2.3), pppoeconf (<< 1.0), totd "
+"(<< 1.4-4) en xisp. Ondanks het feit dat resolvconf aangeeft dat het "
+"strijdig is met deze pakketten, zodat ze worden verwijderd voordat "
+"resolvconf wordt ge�nstalleerd, blijven de schadelijke haak-scripts soms "
+"achter."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+"Als u toestemt dan zal het post-installatieproces de schadelijke haak-"
+"scripts uitzetten door hun uitvoer-permissies te verwijderen."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr ""
+"Als u niet toestemt dient u de schadelijke scripts handmatig te verwijderen, "
+"anders zal resolvconf niet goed werken."
diff -Nru resolvconf-1.38/debian/po/pt_BR.po resolvconf-1.38ubuntu1/debian/po/pt_BR.po
--- resolvconf-1.38/debian/po/pt_BR.po	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/pt_BR.po	2008-01-08 23:45:33.000000000 +0100
@@ -162,131 +162,170 @@
 "linhas \"dns-nameservers\" necess�rias voc� dever� apontar a liga��o "
 "simb�lica /etc/resolvconf/resolv.conf.d/tail para /dev/null."
 
-#~ msgid "A rogue pppconfig PPP hook script is present"
-#~ msgstr "Um script de gancho PPP do pppconfig foi encontrado"
-
-#~ msgid ""
-#~ "Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
-#~ "d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
-#~ "interface is brought up or down) that overwrite /etc/resolv.conf. These "
-#~ "scripts must be modified, disabled or deleted so that they will not "
-#~ "interfere with the operation of resolvconf."
-#~ msgstr ""
-#~ "Algumas vers�es do pacote pppconfig cont�m scripts em /etc/ppp/ip-up."
-#~ "d/0dns-up e /etc/ppp/ip-down.d/0dns-down (executados pelo pppd ap�s uma "
-#~ "interface ser ativada ou desativada) que alteram o /etc/resolv.conf. "
-#~ "Estes scripts devem ser modificados, desativados ou apagados para n�o "
-#~ "interferir com a opera��o do resolvconf."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
-#~ "down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
-#~ "conf. Each one that does so must be modified, disabled or deleted. The "
-#~ "best way to disable it is to remove its execute permission. The best way "
-#~ "to delete it is to purge the pppconfig package."
-#~ msgstr ""
-#~ "Um script n�o execut�vel /etc/ppp/ip-up.d/0dns-up e/ou /etc/ppp/ip-down."
-#~ "d/0dns-down foi detectado e parece substituir o arquivo /etc/resolv.conf. "
-#~ "Cada um destes que faz isto deve ser modificado, desativado ou apagado. O "
-#~ "melhor m�todo de desativa-lo � remover suas permiss�es de execut�vel. A "
-#~ "melhor forma de apaga-lo � dar um purge no pacote pppconfig."
-
-#~ msgid "A rogue pppoeconf PPP hook script is present"
-#~ msgstr "Um script de gancho PPP do pppoeconf foi encontrado"
-
-#~ msgid ""
-#~ "Versions of the pppoeconf package prior to version 1.0 contain a script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is "
-#~ "brought up) that overwrites /etc/resolv.conf. The script must be "
-#~ "modified, disabled or deleted so that it will not interfere with the "
-#~ "operation of resolvconf. Contrary to Debian policy, merely removing the "
-#~ "pppoeconf package does not disable the script."
-#~ msgstr ""
-#~ "Vers�es anteriores a vers�o 1.0 do pacote pppoeconf incluem um script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (executado pelo pppd ap�s uma interface ser "
-#~ "ativada ou desativada) que alteram o /etc/resolv.conf. Esse script deve "
-#~ "ser modificado, desativado ou apagado para n�o interferir com a opera��o "
-#~ "do resolvconf. Ao contr�rio do que diz a pol�tica Debian, a mera remo��o "
-#~ "do pacote pppoeconf n�o ir� desabilitar o script."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
-#~ "detected. It must be modified, disabled or deleted. The best way to "
-#~ "modify it is to upgrade the pppoeconf package to version 1.0 or later and "
-#~ "to allow dpkg to install the new version of the script. The best way to "
-#~ "disable it is to remove its execute permission. The best way to delete it "
-#~ "is to purge the pppoeconf package."
-#~ msgstr ""
-#~ "A presen�a de um script execut�vel de nome /etc/ppp/ip-up.d/000usepeerdns "
-#~ "foi detectada. O mesmo precisa ser modificado, desabilitado ou removido. "
-#~ "A melhor maneira de modific�-lo � atualizar o pacote pppoeconf para a "
-#~ "vers�o 1.0 ou superior e permitir que o dpkg instale a nova vers�o do "
-#~ "script. A melhor maneira de desabilit�-lo � remover suas permiss�es de "
-#~ "execut�vel. A melhor maneira de remov�-lo � expurgar o pacote pppoeconf."
-
-#~ msgid "A rogue xisp PPP hook script is present"
-#~ msgstr "Um script de gancho PPP do xisp foi encontrado"
-
-#~ msgid ""
-#~ "The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (run by pppd after a PPP interface is brought up or "
-#~ "down) that overwrite /etc/resolv.conf. The scripts must be modified, "
-#~ "disabled or deleted so that they will not interfere with the operation of "
-#~ "resolvconf. Contrary to Debian policy, merely removing the xisp package "
-#~ "does not disable the scripts."
-#~ msgstr ""
-#~ "O pacote xisp cont�m scripts em /etc/ppp/ip-up.d/0xisp-dns e /etc/ppp/ip-"
-#~ "down.d/0xisp-dns (executados pelo pppd ap�s uma interface ser ativada ou "
-#~ "desativada) que alteram o /etc/resolv.conf. Estes scripts devem ser "
-#~ "modificados, desativados ou apagados para n�o interferir com a opera��o "
-#~ "do resolvconf. Ao contr�rio do que diz a pol�tica Debian, a mera remo��o "
-#~ "do pacote xisp n�o ir� desabilitar os scripts."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/"
-#~ "ip-down.d/0xisp-dns has been detected. Each one must be modified, "
-#~ "disabled or deleted. The best way to disable it is to remove its execute "
-#~ "permission. The best way to delete it is to purge the xisp package."
-#~ msgstr ""
-#~ "A presen�a de scripts execut�veis n�o vazios em /etc/ppp/ip-up.d/0xisp-"
-#~ "dns e/ou /etc/ppp/ip-down.d/0xisp-dns foi detectada. Cada um desses "
-#~ "scripts deve ser modificado, desabilitado ou removido. A melhor maneira "
-#~ "de desabilit�-lo � remover suas permiss�es de execut�vel. A melhor "
-#~ "maneira de remov�-lo � expurgar o pacote xisp."
-
-#~ msgid "Disable rogue hook scripts?"
-#~ msgstr "Desabilitar scripts de gancho ultrapassados ?"
-
-#~ msgid ""
-#~ "Certain packages contain hook scripts which, contrary to Debian policy, "
-#~ "modify the resolver configuration file even when the packages that own "
-#~ "them are removed. Packages known to contain such rogue hook scripts are: "
-#~ "pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and "
-#~ "xisp. Although the resolvconf package is marked as conflicting with these "
-#~ "packages so that they are removed before resolvconf is installed, their "
-#~ "rogue hook scripts may remain behind."
-#~ msgstr ""
-#~ "Certos pacotes cont�m scripts ganchos PPP os quais, ao contr�rio do que "
-#~ "dita a pol�tica Debian, modificam o arquivo de configura��o do resolvedor "
-#~ "de nomes quando os pacote que os instalam s�o removidos. Alguns pacotes "
-#~ "conhecidos que usam esse procedimento s�o: pppconfig (<< 2.2.0 e 2.3), "
-#~ "pppoeconf (<< 1.0), totd (<< 1.4-4) e xisp. Apesar do pacote resolvconf "
-#~ "estar corretamente marcado como conflitante com esses pacotes, de forma "
-#~ "que a instala��o do mesmo remove previamente qualquer um desses pacotes "
-#~ "caso estejam presentes em seu sistema, seus scripts de gancho PPP podem "
-#~ "permanecer presentes e sendo executados."
-
-#~ msgid ""
-#~ "If you agree then the post-installation process will disable rogue hook "
-#~ "scripts by removing their execute permissions."
-#~ msgstr ""
-#~ "Caso voc� concorde, o processo de p�s-instala��o do resolvconf ir� "
-#~ "desabilitar os scripts de gancho PPP removindo a permiss�o de execut�vel "
-#~ "dos mesmos."
-
-#~ msgid ""
-#~ "If you do not agree then you should disable the rogue scripts manually, "
-#~ "otherwise resolvconf will not work properly."
-#~ msgstr ""
-#~ "Caso voc� n�o concorde, voc� dever� desabilitar os scripts de gancho PPP "
-#~ "manualmente ou de outra forma o resolvconf n�o funcionar� corretamente."
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr "Um script de gancho PPP do pppconfig foi encontrado"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+"Algumas vers�es do pacote pppconfig cont�m scripts em /etc/ppp/ip-up.d/0dns-"
+"up e /etc/ppp/ip-down.d/0dns-down (executados pelo pppd ap�s uma interface "
+"ser ativada ou desativada) que alteram o /etc/resolv.conf. Estes scripts "
+"devem ser modificados, desativados ou apagados para n�o interferir com a "
+"opera��o do resolvconf."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+"Um script n�o execut�vel /etc/ppp/ip-up.d/0dns-up e/ou /etc/ppp/ip-down."
+"d/0dns-down foi detectado e parece substituir o arquivo /etc/resolv.conf. "
+"Cada um destes que faz isto deve ser modificado, desativado ou apagado. O "
+"melhor m�todo de desativa-lo � remover suas permiss�es de execut�vel. A "
+"melhor forma de apaga-lo � dar um purge no pacote pppconfig."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr "Um script de gancho PPP do pppoeconf foi encontrado"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+"Vers�es anteriores a vers�o 1.0 do pacote pppoeconf incluem um script /etc/"
+"ppp/ip-up.d/000usepeerdns (executado pelo pppd ap�s uma interface ser "
+"ativada ou desativada) que alteram o /etc/resolv.conf. Esse script deve ser "
+"modificado, desativado ou apagado para n�o interferir com a opera��o do "
+"resolvconf. Ao contr�rio do que diz a pol�tica Debian, a mera remo��o do "
+"pacote pppoeconf n�o ir� desabilitar o script."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+"A presen�a de um script execut�vel de nome /etc/ppp/ip-up.d/000usepeerdns "
+"foi detectada. O mesmo precisa ser modificado, desabilitado ou removido. A "
+"melhor maneira de modific�-lo � atualizar o pacote pppoeconf para a vers�o "
+"1.0 ou superior e permitir que o dpkg instale a nova vers�o do script. A "
+"melhor maneira de desabilit�-lo � remover suas permiss�es de execut�vel. A "
+"melhor maneira de remov�-lo � expurgar o pacote pppoeconf."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr "Um script de gancho PPP do xisp foi encontrado"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+"O pacote xisp cont�m scripts em /etc/ppp/ip-up.d/0xisp-dns e /etc/ppp/ip-"
+"down.d/0xisp-dns (executados pelo pppd ap�s uma interface ser ativada ou "
+"desativada) que alteram o /etc/resolv.conf. Estes scripts devem ser "
+"modificados, desativados ou apagados para n�o interferir com a opera��o do "
+"resolvconf. Ao contr�rio do que diz a pol�tica Debian, a mera remo��o do "
+"pacote xisp n�o ir� desabilitar os scripts."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+"A presen�a de scripts execut�veis n�o vazios em /etc/ppp/ip-up.d/0xisp-dns e/"
+"ou /etc/ppp/ip-down.d/0xisp-dns foi detectada. Cada um desses scripts deve "
+"ser modificado, desabilitado ou removido. A melhor maneira de desabilit�-lo "
+"� remover suas permiss�es de execut�vel. A melhor maneira de remov�-lo � "
+"expurgar o pacote xisp."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr "Desabilitar scripts de gancho ultrapassados ?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+"Certos pacotes cont�m scripts ganchos PPP os quais, ao contr�rio do que dita "
+"a pol�tica Debian, modificam o arquivo de configura��o do resolvedor de "
+"nomes quando os pacote que os instalam s�o removidos. Alguns pacotes "
+"conhecidos que usam esse procedimento s�o: pppconfig (<< 2.2.0 e 2.3), "
+"pppoeconf (<< 1.0), totd (<< 1.4-4) e xisp. Apesar do pacote resolvconf "
+"estar corretamente marcado como conflitante com esses pacotes, de forma que "
+"a instala��o do mesmo remove previamente qualquer um desses pacotes caso "
+"estejam presentes em seu sistema, seus scripts de gancho PPP podem "
+"permanecer presentes e sendo executados."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+"Caso voc� concorde, o processo de p�s-instala��o do resolvconf ir� "
+"desabilitar os scripts de gancho PPP removindo a permiss�o de execut�vel dos "
+"mesmos."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr ""
+"Caso voc� n�o concorde, voc� dever� desabilitar os scripts de gancho PPP "
+"manualmente ou de outra forma o resolvconf n�o funcionar� corretamente."
diff -Nru resolvconf-1.38/debian/po/ru.po resolvconf-1.38ubuntu1/debian/po/ru.po
--- resolvconf-1.38/debian/po/ru.po	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/ru.po	2008-01-08 23:45:33.000000000 +0100
@@ -159,127 +159,164 @@
 "nameservers\" нужно изменить символическую ссылку /etc/resolvconf/resolv."
 "conf.d/tail, чтобы она указывала в /dev/null."
 
-#~ msgid "A rogue pppconfig PPP hook script is present"
-#~ msgstr "Обнаружен неконтролируемый обработчик pppconfig PPP"
-
-#~ msgid ""
-#~ "Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
-#~ "d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
-#~ "interface is brought up or down) that overwrite /etc/resolv.conf. These "
-#~ "scripts must be modified, disabled or deleted so that they will not "
-#~ "interfere with the operation of resolvconf."
-#~ msgstr ""
-#~ "Некоторые версии пакета pppconfig содержат сценарии /etc/ppp/ip-up.d/0dns-"
-#~ "up и /etc/ppp/ip-down.d/0dns-down (запускаемые pppd после активации или "
-#~ "деактивации PPP интерфейса), которые перезаписывают /etc/resolv.conf. Эти "
-#~ "сценарии должны быть изменены, выключены или удалены для того, чтобы не "
-#~ "мешать работе resolvconf."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
-#~ "down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
-#~ "conf. Each one that does so must be modified, disabled or deleted. The "
-#~ "best way to disable it is to remove its execute permission. The best way "
-#~ "to delete it is to purge the pppconfig package."
-#~ msgstr ""
-#~ "Обнаружен не пустой исполняемый сценарий /etc/ppp/ip-up.d/0dns-up и/или /"
-#~ "etc/ppp/ip-down.d/0dns-down, который вероятно перезаписывает /etc/resolv."
-#~ "conf. Если это так, то его нужно изменить, выключить или удалить. Для "
-#~ "выключения отлично подходит способ удаления прав исполнения со сценария. "
-#~ "При удалении лучше всего вычищать пакет pppconfig целиком."
-
-#~ msgid "A rogue pppoeconf PPP hook script is present"
-#~ msgstr "Обнаружен неконтролируемый обработчик pppoeconf PPP"
-
-#~ msgid ""
-#~ "Versions of the pppoeconf package prior to version 1.0 contain a script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is "
-#~ "brought up) that overwrites /etc/resolv.conf. The script must be "
-#~ "modified, disabled or deleted so that it will not interfere with the "
-#~ "operation of resolvconf. Contrary to Debian policy, merely removing the "
-#~ "pppoeconf package does not disable the script."
-#~ msgstr ""
-#~ "Все версии пакета pppoeconf до 1.0 содержат сценарий /etc/ppp/ip-up."
-#~ "d/000usepeerdns (запускаемый pppd после активации PPP интерфейса), "
-#~ "который перезаписывает /etc/resolv.conf. Этот сценарий должен быть "
-#~ "изменён, выключен или удалён для того, чтобы не мешать работе resolvconf. "
-#~ "Вопреки политике Debian, простое удаление пакета pppoeconf не блокирует "
-#~ "этот сценарий."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
-#~ "detected. It must be modified, disabled or deleted. The best way to "
-#~ "modify it is to upgrade the pppoeconf package to version 1.0 or later and "
-#~ "to allow dpkg to install the new version of the script. The best way to "
-#~ "disable it is to remove its execute permission. The best way to delete it "
-#~ "is to purge the pppoeconf package."
-#~ msgstr ""
-#~ "Обнаружен не пустой исполняемый сценарий /etc/ppp/ip-up.d/000usepeerdns. "
-#~ "Он должен быть изменён, выключен или удалён. Для изменения лучше обновить "
-#~ "пакет pppoeconf до версии 1.0 или более новой и разрешить dpkg установить "
-#~ "новую версию сценария. Для выключения отлично подходит способ удаления "
-#~ "прав исполнения со сценария. При удалении лучше всего вычищать пакет "
-#~ "pppoeconf целиком."
-
-#~ msgid "A rogue xisp PPP hook script is present"
-#~ msgstr "Обнаружен неконтролируемый обработчик xisp PPP"
-
-#~ msgid ""
-#~ "The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (run by pppd after a PPP interface is brought up or "
-#~ "down) that overwrite /etc/resolv.conf. The scripts must be modified, "
-#~ "disabled or deleted so that they will not interfere with the operation of "
-#~ "resolvconf. Contrary to Debian policy, merely removing the xisp package "
-#~ "does not disable the scripts."
-#~ msgstr ""
-#~ "Пакет xisp содержит сценарии /etc/ppp/ip-up.d/0xisp-dns и /etc/ppp/ip-"
-#~ "down.d/0xisp-dns (запускаемые pppd после активации или деактивации PPP "
-#~ "интерфейса), которые перезаписывают /etc/resolv.conf. Эти сценарии должны "
-#~ "быть изменены, выключены или удалены для того, чтобы не мешать работе "
-#~ "resolvconf. Вопреки политике Debian, простое удаление пакета xisp не "
-#~ "блокирует этот сценарий."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/"
-#~ "ip-down.d/0xisp-dns has been detected. Each one must be modified, "
-#~ "disabled or deleted. The best way to disable it is to remove its execute "
-#~ "permission. The best way to delete it is to purge the xisp package."
-#~ msgstr ""
-#~ "Обнаружен не пустой исполняемый сценарий /etc/ppp/ip-up.d/0xisp-dns и/"
-#~ "или /etc/ppp/ip-down.d/0xisp-dns. Его нужно изменить, выключить или "
-#~ "удалить. Для выключения отлично подходит способ удаления прав исполнения "
-#~ "со сценария. При удалении лучше всего вычищать пакет xisp целиком."
-
-#~ msgid "Disable rogue hook scripts?"
-#~ msgstr "Заблокировать неконтролируемые обработчики?"
-
-#~ msgid ""
-#~ "Certain packages contain hook scripts which, contrary to Debian policy, "
-#~ "modify the resolver configuration file even when the packages that own "
-#~ "them are removed. Packages known to contain such rogue hook scripts are: "
-#~ "pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and "
-#~ "xisp. Although the resolvconf package is marked as conflicting with these "
-#~ "packages so that they are removed before resolvconf is installed, their "
-#~ "rogue hook scripts may remain behind."
-#~ msgstr ""
-#~ "Некоторые пакеты содержат обработчики, которые вопреки политике Debian, "
-#~ "изменяют файл настройки определителя имён, даже когда пакеты содержащие "
-#~ "их, были удалены. Известные таким поведением пакеты: pppconfig (<< 2.2.0 "
-#~ "и 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) и xisp. Хотя пакет resolvconf "
-#~ "настроен как конфликтующий с этими пакетами и они будут удалены перед "
-#~ "установкой resolvconf, их неконтролируемые обработчики могут остаться в "
-#~ "системе."
-
-#~ msgid ""
-#~ "If you agree then the post-installation process will disable rogue hook "
-#~ "scripts by removing their execute permissions."
-#~ msgstr ""
-#~ "Если вы ответите утвердительно, то завершающий процесс установки "
-#~ "заблокирует неконтролируемые обработчики удалив их права исполнения."
-
-#~ msgid ""
-#~ "If you do not agree then you should disable the rogue scripts manually, "
-#~ "otherwise resolvconf will not work properly."
-#~ msgstr ""
-#~ "Если вы ответите отрицательно, то вы должны самостоятельно выключить "
-#~ "неконтролируемые обработчики, иначе resolvconf будет работать неправильно."
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr "Обнаружен неконтролируемый обработчик pppconfig PPP"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+"Некоторые версии пакета pppconfig содержат сценарии /etc/ppp/ip-up.d/0dns-up "
+"и /etc/ppp/ip-down.d/0dns-down (запускаемые pppd после активации или "
+"деактивации PPP интерфейса), которые перезаписывают /etc/resolv.conf. Эти "
+"сценарии должны быть изменены, выключены или удалены для того, чтобы не "
+"мешать работе resolvconf."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+"Обнаружен не пустой исполняемый сценарий /etc/ppp/ip-up.d/0dns-up и/или /etc/"
+"ppp/ip-down.d/0dns-down, который вероятно перезаписывает /etc/resolv.conf. "
+"Если это так, то его нужно изменить, выключить или удалить. Для выключения "
+"отлично подходит способ удаления прав исполнения со сценария. При удалении "
+"лучше всего вычищать пакет pppconfig целиком."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr "Обнаружен неконтролируемый обработчик pppoeconf PPP"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+"Все версии пакета pppoeconf до 1.0 содержат сценарий /etc/ppp/ip-up."
+"d/000usepeerdns (запускаемый pppd после активации PPP интерфейса), который "
+"перезаписывает /etc/resolv.conf. Этот сценарий должен быть изменён, выключен "
+"или удалён для того, чтобы не мешать работе resolvconf. Вопреки политике "
+"Debian, простое удаление пакета pppoeconf не блокирует этот сценарий."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+"Обнаружен не пустой исполняемый сценарий /etc/ppp/ip-up.d/000usepeerdns. Он "
+"должен быть изменён, выключен или удалён. Для изменения лучше обновить пакет "
+"pppoeconf до версии 1.0 или более новой и разрешить dpkg установить новую "
+"версию сценария. Для выключения отлично подходит способ удаления прав "
+"исполнения со сценария. При удалении лучше всего вычищать пакет pppoeconf "
+"целиком."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr "Обнаружен неконтролируемый обработчик xisp PPP"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+"Пакет xisp содержит сценарии /etc/ppp/ip-up.d/0xisp-dns и /etc/ppp/ip-down."
+"d/0xisp-dns (запускаемые pppd после активации или деактивации PPP "
+"интерфейса), которые перезаписывают /etc/resolv.conf. Эти сценарии должны "
+"быть изменены, выключены или удалены для того, чтобы не мешать работе "
+"resolvconf. Вопреки политике Debian, простое удаление пакета xisp не "
+"блокирует этот сценарий."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+"Обнаружен не пустой исполняемый сценарий /etc/ppp/ip-up.d/0xisp-dns и/или /"
+"etc/ppp/ip-down.d/0xisp-dns. Его нужно изменить, выключить или удалить. Для "
+"выключения отлично подходит способ удаления прав исполнения со сценария. При "
+"удалении лучше всего вычищать пакет xisp целиком."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr "Заблокировать неконтролируемые обработчики?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+"Некоторые пакеты содержат обработчики, которые вопреки политике Debian, "
+"изменяют файл настройки определителя имён, даже когда пакеты содержащие их, "
+"были удалены. Известные таким поведением пакеты: pppconfig (<< 2.2.0 и 2.3), "
+"pppoeconf (<< 1.0), totd (<< 1.4-4) и xisp. Хотя пакет resolvconf настроен "
+"как конфликтующий с этими пакетами и они будут удалены перед установкой "
+"resolvconf, их неконтролируемые обработчики могут остаться в системе."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+"Если вы ответите утвердительно, то завершающий процесс установки заблокирует "
+"неконтролируемые обработчики удалив их права исполнения."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr ""
+"Если вы ответите отрицательно, то вы должны самостоятельно выключить "
+"неконтролируемые обработчики, иначе resolvconf будет работать неправильно."
diff -Nru resolvconf-1.38/debian/po/sv.po resolvconf-1.38ubuntu1/debian/po/sv.po
--- resolvconf-1.38/debian/po/sv.po	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/sv.po	2008-01-08 23:45:33.000000000 +0100
@@ -158,129 +158,166 @@
 "\"dns-nameservers\" som kr�vs b�r du peka en symbolisk l�nk fr�n /etc/"
 "resolvconf/resolv.conf.d/tail till /dev/null."
 
-#~ msgid "A rogue pppconfig PPP hook script is present"
-#~ msgstr "Ett p�verkande PPP-kopplingsskript f�r pppconfig hittades"
-
-#~ msgid ""
-#~ "Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
-#~ "d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
-#~ "interface is brought up or down) that overwrite /etc/resolv.conf. These "
-#~ "scripts must be modified, disabled or deleted so that they will not "
-#~ "interfere with the operation of resolvconf."
-#~ msgstr ""
-#~ "Vissa versioner av paketet pppconfig inneh�ller skripten /etc/ppp/ip-up."
-#~ "d/0dns-up och /etc/ppp/ip-down.d/0dns-down (k�rs av pppd efter ett PPP-"
-#~ "gr�nssnitt tas upp eller ner) som skriver �ver /etc/resolv.conf. Dessa "
-#~ "skript m�ste modifieras, st�ngas av eller tas bort s� att de inte "
-#~ "p�verkar resolvconf."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
-#~ "down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
-#~ "conf. Each one that does so must be modified, disabled or deleted. The "
-#~ "best way to disable it is to remove its execute permission. The best way "
-#~ "to delete it is to purge the pppconfig package."
-#~ msgstr ""
-#~ "Ett icke-blankt startbart skript, /etc/ppp/ip-up.d/0dns-up och/eller /etc/"
-#~ "ppp/ip-down.d/0dns-down har identifierats och som verkar skriva �ver /etc/"
-#~ "resolv.conf. De m�ste modifieras, st�ngas av eller tas bort. Det b�sta "
-#~ "s�ttet att st�nga av de �r att ta bort dess r�ttighet att starta. Det "
-#~ "b�sta s�ttet att ta bort det �r att rensa ut paketet pppconfig."
-
-#~ msgid "A rogue pppoeconf PPP hook script is present"
-#~ msgstr "Ett p�verkande PPP-kopplingsskript f�r pppoeconf hittades"
-
-#~ msgid ""
-#~ "Versions of the pppoeconf package prior to version 1.0 contain a script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is "
-#~ "brought up) that overwrites /etc/resolv.conf. The script must be "
-#~ "modified, disabled or deleted so that it will not interfere with the "
-#~ "operation of resolvconf. Contrary to Debian policy, merely removing the "
-#~ "pppoeconf package does not disable the script."
-#~ msgstr ""
-#~ "Versioner av paketet pppoeconf f�re version 1.0 inneh�ller ett skript, /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (k�rs av pppd efter ett PPP-gr�nssnitt "
-#~ "satts upp) som skriver �ver /etc/resolv.conf. Skriptet m�ste modifieras, "
-#~ "st�ngas av eller tas bort s� att det inte p�verkar resolvconf. Tv�rtemot "
-#~ "Debians policy r�cker det inte att ta bort paketet pppoeconf f�r att "
-#~ "st�nga av skriptet."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
-#~ "detected. It must be modified, disabled or deleted. The best way to "
-#~ "modify it is to upgrade the pppoeconf package to version 1.0 or later and "
-#~ "to allow dpkg to install the new version of the script. The best way to "
-#~ "disable it is to remove its execute permission. The best way to delete it "
-#~ "is to purge the pppoeconf package."
-#~ msgstr ""
-#~ "Ett icke-blankt startbart skript, /etc/ppp/ip-up.d/000usepeerdns har "
-#~ "identifierats. Det m�ste modifieras, st�ngas av eller tas bort. Det b�sta "
-#~ "s�ttet att modifiera det �r att uppgradera paketet pppoeconf till version "
-#~ "1.0 eller senare och att till�ta dpkg att installera den nya versionen av "
-#~ "skriptet. Det b�sta s�ttet att st�nga av det �r att ta bort dess "
-#~ "r�ttighet att starta. Det b�sta s�ttet att ta bort det �r att rensa ut "
-#~ "paketet pppoeconf."
-
-#~ msgid "A rogue xisp PPP hook script is present"
-#~ msgstr "Ett p�verkande PPP-kopplingsskript f�r xisp hittades"
-
-#~ msgid ""
-#~ "The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (run by pppd after a PPP interface is brought up or "
-#~ "down) that overwrite /etc/resolv.conf. The scripts must be modified, "
-#~ "disabled or deleted so that they will not interfere with the operation of "
-#~ "resolvconf. Contrary to Debian policy, merely removing the xisp package "
-#~ "does not disable the scripts."
-#~ msgstr ""
-#~ "Paketet xisp inneh�ller skripten /etc/ppp/ip-up.d/0xisp-dns och /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (k�rs av pppd efter ett PPP-gr�nssnitt tas upp eller "
-#~ "ner) som skriver �ver /etc/resolv.conf. Dessa skript m�ste modifieras, "
-#~ "st�ngas av eller tas bort s� att de inte p�verkar resolvconf. Tv�rtemot "
-#~ "Debians policy r�cker det inte att ta bort paketet xisp f�r att st�nga av "
-#~ "skripten."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/"
-#~ "ip-down.d/0xisp-dns has been detected. Each one must be modified, "
-#~ "disabled or deleted. The best way to disable it is to remove its execute "
-#~ "permission. The best way to delete it is to purge the xisp package."
-#~ msgstr ""
-#~ "Ett icke-blankt startbart skript, /etc/ppp/ip-up.d/0xisp-dns och/eller /"
-#~ "etc/ppp/ip-down.d/0xisp-dns har identifierats. De m�ste modifieras, "
-#~ "st�ngas av eller tas bort. Det b�sta s�ttet att st�nga av de �r att ta "
-#~ "bort dess r�ttighet att starta. Det b�sta s�ttet att ta bort det �r att "
-#~ "rensa ut paketet xisp."
-
-#~ msgid "Disable rogue hook scripts?"
-#~ msgstr "St�nga av p�verkande kopplingsskript?"
-
-#~ msgid ""
-#~ "Certain packages contain hook scripts which, contrary to Debian policy, "
-#~ "modify the resolver configuration file even when the packages that own "
-#~ "them are removed. Packages known to contain such rogue hook scripts are: "
-#~ "pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and "
-#~ "xisp. Although the resolvconf package is marked as conflicting with these "
-#~ "packages so that they are removed before resolvconf is installed, their "
-#~ "rogue hook scripts may remain behind."
-#~ msgstr ""
-#~ "Vissa paket inneh�ller kopplingsskript som, tv�rtemot Debians policy, "
-#~ "modifierar konfigurationsfilen f�r uppslag �ven n�r paketen som �ger dem "
-#~ "�r borttagna. Paket k�nda att inneh�lla s�dana p�verkande kopplingsskript "
-#~ "�r: pppconfig (<< 2.2.0 och 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) och "
-#~ "xisp. �ven om paketet resolvconf �r markerat f�r att vara i konflikt med "
-#~ "dessa paket s� att de blir borttagna f�re resolvconf �r installerat kan "
-#~ "deras kopplingsskript fortfarande finnas kvar."
-
-#~ msgid ""
-#~ "If you agree then the post-installation process will disable rogue hook "
-#~ "scripts by removing their execute permissions."
-#~ msgstr ""
-#~ "Om du godk�nner kommer efterinstallationsprocessen att st�nga av "
-#~ "p�verkande kopplingsskript genom att ta bort deras startr�ttigheter. "
-
-#~ msgid ""
-#~ "If you do not agree then you should disable the rogue scripts manually, "
-#~ "otherwise resolvconf will not work properly."
-#~ msgstr ""
-#~ "Om du inte godk�nner b�r du st�nga av de p�verkande skripten manuellt "
-#~ "annars kommer inte resolvconf att fungera korrekt."
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr "Ett p�verkande PPP-kopplingsskript f�r pppconfig hittades"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+"Vissa versioner av paketet pppconfig inneh�ller skripten /etc/ppp/ip-up."
+"d/0dns-up och /etc/ppp/ip-down.d/0dns-down (k�rs av pppd efter ett PPP-"
+"gr�nssnitt tas upp eller ner) som skriver �ver /etc/resolv.conf. Dessa "
+"skript m�ste modifieras, st�ngas av eller tas bort s� att de inte p�verkar "
+"resolvconf."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+"Ett icke-blankt startbart skript, /etc/ppp/ip-up.d/0dns-up och/eller /etc/"
+"ppp/ip-down.d/0dns-down har identifierats och som verkar skriva �ver /etc/"
+"resolv.conf. De m�ste modifieras, st�ngas av eller tas bort. Det b�sta "
+"s�ttet att st�nga av de �r att ta bort dess r�ttighet att starta. Det b�sta "
+"s�ttet att ta bort det �r att rensa ut paketet pppconfig."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr "Ett p�verkande PPP-kopplingsskript f�r pppoeconf hittades"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+"Versioner av paketet pppoeconf f�re version 1.0 inneh�ller ett skript, /etc/"
+"ppp/ip-up.d/000usepeerdns (k�rs av pppd efter ett PPP-gr�nssnitt satts upp) "
+"som skriver �ver /etc/resolv.conf. Skriptet m�ste modifieras, st�ngas av "
+"eller tas bort s� att det inte p�verkar resolvconf. Tv�rtemot Debians policy "
+"r�cker det inte att ta bort paketet pppoeconf f�r att st�nga av skriptet."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+"Ett icke-blankt startbart skript, /etc/ppp/ip-up.d/000usepeerdns har "
+"identifierats. Det m�ste modifieras, st�ngas av eller tas bort. Det b�sta "
+"s�ttet att modifiera det �r att uppgradera paketet pppoeconf till version "
+"1.0 eller senare och att till�ta dpkg att installera den nya versionen av "
+"skriptet. Det b�sta s�ttet att st�nga av det �r att ta bort dess r�ttighet "
+"att starta. Det b�sta s�ttet att ta bort det �r att rensa ut paketet "
+"pppoeconf."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr "Ett p�verkande PPP-kopplingsskript f�r xisp hittades"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+"Paketet xisp inneh�ller skripten /etc/ppp/ip-up.d/0xisp-dns och /etc/ppp/ip-"
+"down.d/0xisp-dns (k�rs av pppd efter ett PPP-gr�nssnitt tas upp eller ner) "
+"som skriver �ver /etc/resolv.conf. Dessa skript m�ste modifieras, st�ngas av "
+"eller tas bort s� att de inte p�verkar resolvconf. Tv�rtemot Debians policy "
+"r�cker det inte att ta bort paketet xisp f�r att st�nga av skripten."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+"Ett icke-blankt startbart skript, /etc/ppp/ip-up.d/0xisp-dns och/eller /etc/"
+"ppp/ip-down.d/0xisp-dns har identifierats. De m�ste modifieras, st�ngas av "
+"eller tas bort. Det b�sta s�ttet att st�nga av de �r att ta bort dess "
+"r�ttighet att starta. Det b�sta s�ttet att ta bort det �r att rensa ut "
+"paketet xisp."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr "St�nga av p�verkande kopplingsskript?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+"Vissa paket inneh�ller kopplingsskript som, tv�rtemot Debians policy, "
+"modifierar konfigurationsfilen f�r uppslag �ven n�r paketen som �ger dem �r "
+"borttagna. Paket k�nda att inneh�lla s�dana p�verkande kopplingsskript �r: "
+"pppconfig (<< 2.2.0 och 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) och xisp. "
+"�ven om paketet resolvconf �r markerat f�r att vara i konflikt med dessa "
+"paket s� att de blir borttagna f�re resolvconf �r installerat kan deras "
+"kopplingsskript fortfarande finnas kvar."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+"Om du godk�nner kommer efterinstallationsprocessen att st�nga av p�verkande "
+"kopplingsskript genom att ta bort deras startr�ttigheter. "
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr ""
+"Om du inte godk�nner b�r du st�nga av de p�verkande skripten manuellt annars "
+"kommer inte resolvconf att fungera korrekt."
diff -Nru resolvconf-1.38/debian/po/templates.pot resolvconf-1.38ubuntu1/debian/po/templates.pot
--- resolvconf-1.38/debian/po/templates.pot	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/templates.pot	2008-01-08 23:45:32.000000000 +0100
@@ -112,3 +112,124 @@
 "nameservers\" lines you should point the /etc/resolvconf/resolv.conf.d/tail "
 "symbolic link to /dev/null."
 msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr ""
diff -Nru resolvconf-1.38/debian/po/vi.po resolvconf-1.38ubuntu1/debian/po/vi.po
--- resolvconf-1.38/debian/po/vi.po	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/po/vi.po	2008-01-08 23:45:33.000000000 +0100
@@ -150,129 +150,165 @@
 "nameservers» cần thiết, bạn nên chỉ liên kết tượng trưng «/etc/resolvconf/"
 "resolv.conf.d/tail» tới «/dev/null». "
 
-#~ msgid "A rogue pppconfig PPP hook script is present"
-#~ msgstr "Gặp một tập lệnh móc PPP pppconfig độc."
-
-#~ msgid ""
-#~ "Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
-#~ "d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
-#~ "interface is brought up or down) that overwrite /etc/resolv.conf. These "
-#~ "scripts must be modified, disabled or deleted so that they will not "
-#~ "interfere with the operation of resolvconf."
-#~ msgstr ""
-#~ "Một số phiên bản gói tin «pppconfig» chứa tập lệnh «/etc/ppp/ip-up.d/0dns-"
-#~ "up» và «/etc/ppp/ip-down.d/0dns-down» (mà trình nền «pppd» chạy sau khi "
-#~ "giao diện PPP bật hay tắt) sẽ ghi đè lên tập tin cấu hình «/etc/resolv."
-#~ "conf». Những tập lệnh này phải bị sửa đổi, bị vô hiệu hóa hay bị xóa bỏ, "
-#~ "để ngăn cản chúng xung đột với thao tác của «resolvconf»."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
-#~ "down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
-#~ "conf. Each one that does so must be modified, disabled or deleted. The "
-#~ "best way to disable it is to remove its execute permission. The best way "
-#~ "to delete it is to purge the pppconfig package."
-#~ msgstr ""
-#~ "Mới phát hiện một tập lệnh thực thị không phải rỗng «/etc/ppp/ip-up."
-#~ "d/0dns-up» và/hay «/etc/ppp/ip-down.d/0dns-down», và hình như nó ghi đè "
-#~ "lên tập tin cấu hình «/etc/resolv.conf». Mỗi tập lệnh làm như thế phải bị "
-#~ "sửa đổi, bị vô hiệu hóa hay bị xóa bỏ. Cách hữu ích để vô hiệu hóa nó là "
-#~ "loại bỏ quyền thực thị của nó. Cách hữu ích nhất để xóa bỏ nó là tẩy gói "
-#~ "tin «pppconfig»."
-
-#~ msgid "A rogue pppoeconf PPP hook script is present"
-#~ msgstr "Gặp một tập lệnh móc PPP pppoeconf độc."
-
-#~ msgid ""
-#~ "Versions of the pppoeconf package prior to version 1.0 contain a script /"
-#~ "etc/ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is "
-#~ "brought up) that overwrites /etc/resolv.conf. The script must be "
-#~ "modified, disabled or deleted so that it will not interfere with the "
-#~ "operation of resolvconf. Contrary to Debian policy, merely removing the "
-#~ "pppoeconf package does not disable the script."
-#~ msgstr ""
-#~ "Phiên bản gói tin «pppoeconf» trước phiên bản 1.0 chứa một tập lệnh «/etc/"
-#~ "ppp/ip-up.d/000usepeerdns» (mà trình nền «pppd» chạy sau khi giao diện "
-#~ "PPP bật) sẽ ghi đè lên tập tin cấu hình «/etc/resolv.conf». Tập lệnh này "
-#~ "phải bị sửa đổi, bị vô hiệu hóa hay bị xóa bỏ, để ngăn cản nó xung đột "
-#~ "với thao tác của «resolvconf». Trái với chính sách Debian, đơn giản loại "
-#~ "bỏ gói tin «pppoeconf» không vô hiệu hóa tập lệnh ấy."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
-#~ "detected. It must be modified, disabled or deleted. The best way to "
-#~ "modify it is to upgrade the pppoeconf package to version 1.0 or later and "
-#~ "to allow dpkg to install the new version of the script. The best way to "
-#~ "disable it is to remove its execute permission. The best way to delete it "
-#~ "is to purge the pppoeconf package."
-#~ msgstr ""
-#~ "Mới phát hiện một tập lệnh thực thị không phải rỗng «/etc/ppp/ip-up."
-#~ "d/000usepeerdns». Nó phải bị sửa đổi, bị vô hiệu hóa hay bị xóa bỏ. Cách "
-#~ "hữu ích nhất để sửa đổi nó là nâng cấp gói tin «pppoeconf» lên phiên bản "
-#~ "1.0 hay sau, và cho phép trình «dpkg» cài đặt phiên bản mới của tập lệnh "
-#~ "ấy. Cách hữu ích để vô hiệu hóa nó là loại bỏ quyền thực thị của nó. Cách "
-#~ "hữu ích nhất để xóa bỏ nó là tẩy gói tin «pppoeconf»."
-
-#~ msgid "A rogue xisp PPP hook script is present"
-#~ msgstr "Gặp một tập lệnh móc PPP xisp độc."
-
-#~ msgid ""
-#~ "The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/"
-#~ "ip-down.d/0xisp-dns (run by pppd after a PPP interface is brought up or "
-#~ "down) that overwrite /etc/resolv.conf. The scripts must be modified, "
-#~ "disabled or deleted so that they will not interfere with the operation of "
-#~ "resolvconf. Contrary to Debian policy, merely removing the xisp package "
-#~ "does not disable the scripts."
-#~ msgstr ""
-#~ "Gói tin «xisp» chứa tập lệnh «/etc/ppp/ip-up.d/0xisp-dns» và «/etc/ppp/ip-"
-#~ "down.d/0xisp-dns» (mà trình nền «pppd» chạy sau khi giao diện PPP bật hay "
-#~ "tắt) sẽ ghi đè lên tập tin cấu hình «/etc/resolv.conf». Tập lệnh này phải "
-#~ "bị sửa đổi, bị vô hiệu hóa hay bị xóa bỏ, để ngăn cản nó xung đột với "
-#~ "thao tác của «resolvconf». Trái với chính sách Debian, đơn giản loại bỏ "
-#~ "gói tin «xisp» không vô hiệu hóa tập lệnh ấy."
-
-#~ msgid ""
-#~ "A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/"
-#~ "ip-down.d/0xisp-dns has been detected. Each one must be modified, "
-#~ "disabled or deleted. The best way to disable it is to remove its execute "
-#~ "permission. The best way to delete it is to purge the xisp package."
-#~ msgstr ""
-#~ "Mới phát hiện một tập lệnh thực thị không phải rỗng «/etc/ppp/ip-up."
-#~ "d/0xisp-dns» và/hay «/etc/ppp/ip-down.d/0xisp-dns». Mỗi tập lệnh phải bị "
-#~ "sửa đổi, bị vô hiệu hóa hay bị xóa bỏ. Cách hữu ích để vô hiệu hóa nó là "
-#~ "loại bỏ quyền thực thị của nó. Cách hữu ích nhất để xóa bỏ nó là tẩy gói "
-#~ "tin «xisp»."
-
-#~ msgid "Disable rogue hook scripts?"
-#~ msgstr "Vô hiệu hóa mọi tập lệnh móc độc không?"
-
-#~ msgid ""
-#~ "Certain packages contain hook scripts which, contrary to Debian policy, "
-#~ "modify the resolver configuration file even when the packages that own "
-#~ "them are removed. Packages known to contain such rogue hook scripts are: "
-#~ "pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and "
-#~ "xisp. Although the resolvconf package is marked as conflicting with these "
-#~ "packages so that they are removed before resolvconf is installed, their "
-#~ "rogue hook scripts may remain behind."
-#~ msgstr ""
-#~ "Một số gói tin chứa tập lệnh móc mà, trái với chính sách Debian, sửa đổi "
-#~ "tập tin cấu hình tháo gỡ, ngay cả khi gói tin sở hữu chúng bị loại bỏ. "
-#~ "Gói tin được biết là chứa tập lệnh móc độc như thế là: «pppconfig» (<< "
-#~ "2.2.0 và 2.3), «pppoeconf» (<< 1.0), «totd» (<< 1.4-4) và «xisp». Dù gói "
-#~ "tin «resolvconf» được đánh dấu có xung đột với những gói tin ấy, để loại "
-#~ "bỏ chúng trước khi cài đặt «resolvconf», tập lệnh móc độc ấy có thể còn "
-#~ "lại."
-
-#~ msgid ""
-#~ "If you agree then the post-installation process will disable rogue hook "
-#~ "scripts by removing their execute permissions."
-#~ msgstr ""
-#~ "Nếu bạn chấp nhận thì tiến trình hậu cài đặt sẽ vô hiệu hóa mọi tập lệnh "
-#~ "móc độc bằng cách loại bỏ quyền thực thị của chúng."
-
-#~ msgid ""
-#~ "If you do not agree then you should disable the rogue scripts manually, "
-#~ "otherwise resolvconf will not work properly."
-#~ msgstr ""
-#~ "Nếu bạn không chấp nhận thì bạn nên tự vô hiệu hóa những tập lệnh độc ấy, "
-#~ "nếu không thì trình resolvconf sẽ không hoạt động cho đúng."
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "A rogue pppconfig PPP hook script is present"
+msgstr "Gặp một tập lệnh móc PPP pppconfig độc."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Certain versions of the pppconfig package contain scripts /etc/ppp/ip-up."
+"d/0dns-up and /etc/ppp/ip-down.d/0dns-down (run by pppd after a PPP "
+"interface is brought up or down) that overwrite /etc/resolv.conf. These "
+"scripts must be modified, disabled or deleted so that they will not "
+"interfere with the operation of resolvconf."
+msgstr ""
+"Một số phiên bản gói tin «pppconfig» chứa tập lệnh «/etc/ppp/ip-up.d/0dns-"
+"up» và «/etc/ppp/ip-down.d/0dns-down» (mà trình nền «pppd» chạy sau khi giao "
+"diện PPP bật hay tắt) sẽ ghi đè lên tập tin cấu hình «/etc/resolv.conf». "
+"Những tập lệnh này phải bị sửa đổi, bị vô hiệu hóa hay bị xóa bỏ, để ngăn "
+"cản chúng xung đột với thao tác của «resolvconf»."
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0dns-up and/or /etc/ppp/ip-"
+"down.d/0dns-down has been detected that appears to overwrite /etc/resolv."
+"conf. Each one that does so must be modified, disabled or deleted. The best "
+"way to disable it is to remove its execute permission. The best way to "
+"delete it is to purge the pppconfig package."
+msgstr ""
+"Mới phát hiện một tập lệnh thực thị không phải rỗng «/etc/ppp/ip-up.d/0dns-"
+"up» và/hay «/etc/ppp/ip-down.d/0dns-down», và hình như nó ghi đè lên tập tin "
+"cấu hình «/etc/resolv.conf». Mỗi tập lệnh làm như thế phải bị sửa đổi, bị vô "
+"hiệu hóa hay bị xóa bỏ. Cách hữu ích để vô hiệu hóa nó là loại bỏ quyền thực "
+"thị của nó. Cách hữu ích nhất để xóa bỏ nó là tẩy gói tin «pppconfig»."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "A rogue pppoeconf PPP hook script is present"
+msgstr "Gặp một tập lệnh móc PPP pppoeconf độc."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"Versions of the pppoeconf package prior to version 1.0 contain a script /etc/"
+"ppp/ip-up.d/000usepeerdns (run by pppd after a PPP interface is brought up) "
+"that overwrites /etc/resolv.conf. The script must be modified, disabled or "
+"deleted so that it will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the pppoeconf package does not "
+"disable the script."
+msgstr ""
+"Phiên bản gói tin «pppoeconf» trước phiên bản 1.0 chứa một tập lệnh «/etc/"
+"ppp/ip-up.d/000usepeerdns» (mà trình nền «pppd» chạy sau khi giao diện PPP "
+"bật) sẽ ghi đè lên tập tin cấu hình «/etc/resolv.conf». Tập lệnh này phải bị "
+"sửa đổi, bị vô hiệu hóa hay bị xóa bỏ, để ngăn cản nó xung đột với thao tác "
+"của «resolvconf». Trái với chính sách Debian, đơn giản loại bỏ gói tin "
+"«pppoeconf» không vô hiệu hóa tập lệnh ấy."
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/000usepeerdns has been "
+"detected. It must be modified, disabled or deleted. The best way to modify "
+"it is to upgrade the pppoeconf package to version 1.0 or later and to allow "
+"dpkg to install the new version of the script. The best way to disable it is "
+"to remove its execute permission. The best way to delete it is to purge the "
+"pppoeconf package."
+msgstr ""
+"Mới phát hiện một tập lệnh thực thị không phải rỗng «/etc/ppp/ip-up."
+"d/000usepeerdns». Nó phải bị sửa đổi, bị vô hiệu hóa hay bị xóa bỏ. Cách hữu "
+"ích nhất để sửa đổi nó là nâng cấp gói tin «pppoeconf» lên phiên bản 1.0 hay "
+"sau, và cho phép trình «dpkg» cài đặt phiên bản mới của tập lệnh ấy. Cách "
+"hữu ích để vô hiệu hóa nó là loại bỏ quyền thực thị của nó. Cách hữu ích "
+"nhất để xóa bỏ nó là tẩy gói tin «pppoeconf»."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "A rogue xisp PPP hook script is present"
+msgstr "Gặp một tập lệnh móc PPP xisp độc."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"The xisp package contains scripts /etc/ppp/ip-up.d/0xisp-dns and /etc/ppp/ip-"
+"down.d/0xisp-dns (run by pppd after a PPP interface is brought up or down) "
+"that overwrite /etc/resolv.conf. The scripts must be modified, disabled or "
+"deleted so that they will not interfere with the operation of resolvconf. "
+"Contrary to Debian policy, merely removing the xisp package does not disable "
+"the scripts."
+msgstr ""
+"Gói tin «xisp» chứa tập lệnh «/etc/ppp/ip-up.d/0xisp-dns» và «/etc/ppp/ip-"
+"down.d/0xisp-dns» (mà trình nền «pppd» chạy sau khi giao diện PPP bật hay "
+"tắt) sẽ ghi đè lên tập tin cấu hình «/etc/resolv.conf». Tập lệnh này phải bị "
+"sửa đổi, bị vô hiệu hóa hay bị xóa bỏ, để ngăn cản nó xung đột với thao tác "
+"của «resolvconf». Trái với chính sách Debian, đơn giản loại bỏ gói tin "
+"«xisp» không vô hiệu hóa tập lệnh ấy."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"A non-empty executable script /etc/ppp/ip-up.d/0xisp-dns and/or /etc/ppp/ip-"
+"down.d/0xisp-dns has been detected. Each one must be modified, disabled or "
+"deleted. The best way to disable it is to remove its execute permission. The "
+"best way to delete it is to purge the xisp package."
+msgstr ""
+"Mới phát hiện một tập lệnh thực thị không phải rỗng «/etc/ppp/ip-up.d/0xisp-"
+"dns» và/hay «/etc/ppp/ip-down.d/0xisp-dns». Mỗi tập lệnh phải bị sửa đổi, bị "
+"vô hiệu hóa hay bị xóa bỏ. Cách hữu ích để vô hiệu hóa nó là loại bỏ quyền "
+"thực thị của nó. Cách hữu ích nhất để xóa bỏ nó là tẩy gói tin «xisp»."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Disable rogue hook scripts?"
+msgstr "Vô hiệu hóa mọi tập lệnh móc độc không?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Certain packages contain hook scripts which, contrary to Debian policy, "
+"modify the resolver configuration file even when the packages that own them "
+"are removed. Packages known to contain such rogue hook scripts are: "
+"pppconfig (<< 2.2.0 and 2.3), pppoeconf (<< 1.0), totd (<< 1.4-4) and xisp. "
+"Although the resolvconf package is marked as conflicting with these packages "
+"so that they are removed before resolvconf is installed, their rogue hook "
+"scripts may remain behind."
+msgstr ""
+"Một số gói tin chứa tập lệnh móc mà, trái với chính sách Debian, sửa đổi tập "
+"tin cấu hình tháo gỡ, ngay cả khi gói tin sở hữu chúng bị loại bỏ. Gói tin "
+"được biết là chứa tập lệnh móc độc như thế là: «pppconfig» (<< 2.2.0 và "
+"2.3), «pppoeconf» (<< 1.0), «totd» (<< 1.4-4) và «xisp». Dù gói tin "
+"«resolvconf» được đánh dấu có xung đột với những gói tin ấy, để loại bỏ "
+"chúng trước khi cài đặt «resolvconf», tập lệnh móc độc ấy có thể còn lại."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you agree then the post-installation process will disable rogue hook "
+"scripts by removing their execute permissions."
+msgstr ""
+"Nếu bạn chấp nhận thì tiến trình hậu cài đặt sẽ vô hiệu hóa mọi tập lệnh móc "
+"độc bằng cách loại bỏ quyền thực thị của chúng."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you do not agree then you should disable the rogue scripts manually, "
+"otherwise resolvconf will not work properly."
+msgstr ""
+"Nếu bạn không chấp nhận thì bạn nên tự vô hiệu hóa những tập lệnh độc ấy, "
+"nếu không thì trình resolvconf sẽ không hoạt động cho đúng."
diff -Nru resolvconf-1.38/debian/postinst resolvconf-1.38ubuntu1/debian/postinst
--- resolvconf-1.38/debian/postinst	2008-01-05 18:18:40.000000000 +0100
+++ resolvconf-1.38ubuntu1/debian/postinst	2008-01-13 01:36:33.000000000 +0100
@@ -13,9 +13,11 @@
 ### Create /etc/resolvconf/run ###
 case "$1" in
 configure|reconfigure)
-	# Unfortunately we can't keep state files in /var/run/ because 
-	# resolvconf, as it must, initializes before networking does and
-	# /var/ can be on the network.
+	# The following remark is not true for Ubuntu:
+	#   Unfortunately we can't keep state files in /var/run/ because 
+	#   resolvconf, as it must, initializes before networking does and
+	#   /var/ can be on the network.
+	# End of remark.  Ubuntu has a tmpfs at /var/run early.
 	#
 	# Only use an existing symlink if it is canonicalizable
 	if [ -L /etc/resolvconf/run ] ; then
@@ -57,16 +59,15 @@
 		mkdir -v "${RUN_CANONICALPATH}/interface"
 	else
 		# It's a nonexistent
-		# Use /lib/init/rw if possible
+		# Use /var/run.
 		if \
-			[ -d /lib/init/rw ] \
-			&& [ -w /lib/init/rw ] \
-			&& [ -r /proc/mounts ] \
-			&& grep -qs "^tmpfs[[:space:]]\+/lib/init/rw[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \
-			&& { [ -d /lib/init/rw/resolvconf ] || mkdir -v /lib/init/rw/resolvconf ; } \
-			&& { [ -d /lib/init/rw/resolvconf/interface ] || mkdir -v /lib/init/rw/resolvconf/interface ; }
+			[ -d /var/run ] \
+			&& [ -w /var/run ] \
+			&& grep -qs "^tmpfs[[:space:]]\+/var/run[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \
+			&& { [ -d /var/run/resolvconf ] || mkdir -v /var/run/resolvconf ; } \
+			&& { [ -d /var/run/resolvconf/interface ] || mkdir -v /var/run/resolvconf/interface ; }
 		then
-			ln -s /lib/init/rw/resolvconf /etc/resolvconf/run
+			ln -s /var/run/resolvconf /etc/resolvconf/run
 		else
 			mkdir -v /etc/resolvconf/run
 			mkdir -v /etc/resolvconf/run/interface
diff -Nru resolvconf-1.38/debian/rules resolvconf-1.38ubuntu1/debian/rules
--- resolvconf-1.38/debian/rules	2006-08-09 15:37:50.000000000 +0200
+++ resolvconf-1.38ubuntu1/debian/rules	2008-01-08 23:45:32.000000000 +0100
@@ -28,7 +28,7 @@
 	dh_installdocs README
 	dh_installman
 	dh_installchangelogs
-	dh_installinit --no-start -- start 38 S . stop 89 0 6 .
+	dh_installinit --no-start -- start 07 S .
 	dh_installppp --name=000resolvconf
 	install --mode=0755 debian/resolvconf.000resolvconf.ifupdown.if-up $(DESTDIR)/etc/network/if-up.d/000resolvconf
 	install --mode=0755 debian/resolvconf.resolvconf.ifupdown.if-down $(DESTDIR)/etc/network/if-down.d/resolvconf